Channel: cleanup, remove unnecessary duplication

Author: zimbatm

lib/pusher/channel.rb

@@ -2,18 +2,17 @@
 require 'multi_json'
 
 module Pusher
-  # Trigger events on Channels
+  # Delegates operations for a specific channel from a client
   class Channel
     attr_reader :name
     INVALID_CHANNEL_REGEX = /[^A-Za-z0-9_\-=@,.;]/
-    def initialize(base_url, name, client = Pusher)
-      @uri = base_url.dup
+
+    def initialize(_, name, client = Pusher)
       if Pusher::Channel::INVALID_CHANNEL_REGEX.match(name)
         raise Pusher::Error, "Illegal channel name '#{name}'"
-      elsif name.length > 164
+      elsif name.length > 200
         raise Pusher::Error, "Channel name too long (limit 164 characters) '#{name}'"
       end
-      @uri.path = @uri.path + "/channels/#{name}/"
       @name = name
       @client = client
     end
@@ -93,7 +92,7 @@ def trigger(event_name, data, socket_id = nil)
     # @raise [Pusher::HTTPError] on any error raised inside http client - the original error is available in the original_error attribute
     #
     def info(attributes = [])
-      @client.get("/channels/#{name}", :info => attributes.join(','))
+      @client.channel_info(name, :info => attributes.join(','))
     end
 
     # Request users for a presence channel
@@ -102,12 +101,13 @@ def info(attributes = [])
     # @example Response
     #   [{"id"=>"4"}]
     #
+    # @param params [Hash] Hash of parameters for the API - see REST API docs
     # @return [Hash] Array of user hashes for this channel
     # @raise [Pusher::Error] on invalid Pusher response - see the error message for more details
     # @raise [Pusher::HTTPError] on any error raised inside Net::HTTP - the original error is available in the original_error attribute
     #
-    def users
-      @client.get("/channels/#{name}/users")[:users]
+    def users(params = {})
+      @client.channel_users(name, params)[:users]
     end
 
     # Compute authentication string required as part of the authentication

lib/pusher/client.rb

@@ -187,17 +187,18 @@ def webhook(request)
       WebHook.new(request, self)
     end
 
-    # Return a convenience channel object by name. No API request is made.
+    # Return a convenience channel object by name that delegates operations
+    # on a channel. No API request is made.
     #
     # @example
     #   Pusher['my-channel']
     # @return [Channel]
-    # @raise [ConfigurationError] unless key, secret and app_id have been
-    #   configured. Channel names should be less than 200 characters, and
+    # @raise [Pusher::Error] if the channel name is invalid.
+    #   Channel names should be less than 200 characters, and
     #   should not contain anything other than letters, numbers, or the
     #   characters "_\-=@,.;"
     def channel(channel_name)
-      Channel.new(url, channel_name, self)
+      Channel.new(nil, channel_name, self)
     end
 
     alias :[] :channel
@@ -233,7 +234,7 @@ def channel_info(channel_name, params = {})
       get("/channels/#{channel_name}", params)
     end
 
-    # Request info for users of a channel
+    # Request info for users of a presence channel
     #
     # GET /apps/[id]/channels/[channel_name]/users
     #

spec/channel_spec.rb

@@ -87,7 +87,7 @@ def stub_post_to_raise(e)
 
   describe '#users' do
     it "should call the Client#channel_users" do
-      expect(@client).to receive(:get).with("/channels/presence-mychannel/users").and_return({:users => {'id' => '4'}})
+      expect(@client).to receive(:get).with("/channels/presence-mychannel/users", {}).and_return({:users => {'id' => '4'}})
       @channel = @client['presence-mychannel']
       @channel.users
     end

spec/client_spec.rb

@@ -141,7 +141,7 @@
         it "should raise exception if app_id is not configured" do
           @client.app_id = nil
           expect {
-            @client['test_channel']
+            @channel.trigger!('foo', 'bar')
           }.to raise_error(Pusher::ConfigurationError)
         end
       end
@@ -260,6 +260,18 @@
             expect(MultiJson.decode(req.body)["channels"]).to eq(['mychannel'])
           }
         end
+
+        %w[app_id key secret].each do |key|
+          it "should fail in missing #{key}" do
+            @client.public_send("#{key}=", nil)
+            expect {
+              @client.trigger('mychannel', 'event', {'some' => 'data'})
+            }.to raise_error(Pusher::ConfigurationError)
+            expect(WebMock).not_to have_requested(:post, @api_path).with { |req|
+              expect(MultiJson.decode(req.body)["channels"]).to eq(['mychannel'])
+            }
+          end
+        end
       end
 
       describe '#trigger_async' do