pusher 0.18.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6445dc1dff7034c9fa013bb13c06d797a3d508d3
-  data.tar.gz: cbadd3ea95efed035d3c8f87af33b76d7315b14c
+  metadata.gz: 41c533b3af72b8bbc59b837e057140c199df3dde
+  data.tar.gz: 72c2170cf91722d54cee192da0afda69f3304462
 SHA512:
-  metadata.gz: 4f512577534b021e70ffe2d87838c7be5437139d6f0a38d90d4ef467d8e0d738192033fcdfd21aad3a9c88370908417bf03cb7450d887ccf9cfe05130d29c068
-  data.tar.gz: 3ca887136f17144e1fa3ca1fa8c35a12ce82ee5d0f16711da327c0429f4042f041d2df6b2e6f02f0f3a2a3eaba0ed0f0db0ace46eecff914d330b264ebcf20dd
+  metadata.gz: 7991ee28bfe11b60a97fae9deaec6896fd538c45747ece3804d6db77f4b01aaedc4a407a3f4d77c5b1a3d12c7eac2365c9262ce3da1f2cad3f70652f0ce459ae
+  data.tar.gz: 02eb45ed9d8b1ed4a899084a2eca8912facd311214b45f6131b83c721a12681246b28733d394c25cbff730c1e5005d9a81878687557855949ed832c8d81aec2e

data/.travis.yml

@@ -1,19 +1,15 @@
 language: ruby
 sudo: false
 rvm:
-  - 1.9.2
   - 1.9.3
-  - 2.0.0
+  - 2.0
   - 2.1
   - 2.2
   - 2.3.0
-  - jruby-18mode
-  - jruby-19mode
+  - jruby
   - rbx-2
 
 matrix:
   allow_failures:
-    - rmv: 1.9.2
-    - rvm: jruby-18mode
-    - rvm: jruby-19mode
+    - rvm: jruby
     - rvm: rbx-2

data/CHANGELOG.md

@@ -1,4 +1,10 @@
 
+1.0.0 / 2016-05-19
+==================
+
+No breaking changes, this release is just to follow semver and show that we
+are stable.
+
 0.18.0 / 2016-05-15
 ==================
 

data/lib/pusher/channel.rb

@@ -2,18 +2,17 @@ require 'openssl'
 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 @@ module Pusher
     # @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 @@ module Pusher
     # @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

data/lib/pusher/client.rb

@@ -187,17 +187,18 @@ module Pusher
       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 @@ module Pusher
       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
     #

data/pusher.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "pusher"
-  s.version     = "0.18.0"
+  s.version     = "1.0.0"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Pusher"]
   s.email       = ["support@pusher.com"]

data/spec/channel_spec.rb

@@ -87,7 +87,7 @@ describe Pusher::Channel do
 
   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

data/spec/client_spec.rb

@@ -141,7 +141,7 @@ describe Pusher do
         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 @@ describe Pusher do
             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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pusher
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Pusher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-15 00:00:00.000000000 Z
+date: 2016-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json