pusherable 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb72230284a1165afb48e848d9c8ad4e4cde90c4
-  data.tar.gz: 98f0afdffbcda0ecb23bfc8b7c27f3fa17d60b88
+  metadata.gz: 5c18133f953b3c56cd0fe9676f82b2c38855fd01
+  data.tar.gz: be7ba0aef7aae80b68130acc799a9bc5d14c923a
 SHA512:
-  metadata.gz: bd6bf6f031cca1a283a45086680f155d5054c519e7cc18bdebc060c787f62b0919bdce5373d3f209a49d367a08c12b3a2e7a9748a3d0eb5636171b55709f95f1
-  data.tar.gz: 99737dcb6ed8301b84655deebd75a8cdeb0369487913f115fa3b974d4f11445cbd5f3a94073f2f0f9ba9ece775d190fc80c5de4e4c82c47de50afcb3f73d6842
+  metadata.gz: 3fe4cd38923b516de2bc34e8b9aa21dfa9f18a4e1c6ab9322bea9b3e3716f51bb7295ab058483b4cc9dfaa41a52001cec035895336929f7d73351a127cb1936e
+  data.tar.gz: 325040feffb181151c81586f5e965e35a7733929b9aaf6f311948c48bf29a64c93c513119ee0ed7e92c409364f20779537526b48d4be8518da1cd879c080cb0e

data/.travis.yml

@@ -3,6 +3,7 @@ script: "bundle install && bundle exec rake"
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.1
 env:
   - DB=sqlite3
 services:

data/{LICENSE.txt → LICENSE}

@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -3,5 +3,5 @@ require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new
 
-task :default => :spec
-task :test => :spec
+task default: :spec
+task test: :spec

data/lib/pusherable/version.rb

@@ -1,3 +1,3 @@
 module Pusherable
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/lib/pusherable.rb

@@ -32,6 +32,24 @@ module Pusherable
           true
         end
 
+        singleton_class.send(:alias_method, :generated_pusherable_channel, :pusherable_channel)
+
+        def self.pusherable_channel(obj=nil)
+          if generated_pusherable_channel.respond_to? :call
+            if generated_pusherable_channel.arity > 0
+              generated_pusherable_channel.call(obj)
+            else
+              generated_pusherable_channel.call
+            end
+          else
+            generated_pusherable_channel
+          end
+        end
+
+        def pusherable_channel
+          self.class.pusherable_channel(self)
+        end
+
         private
 
         def pusherable_class_name
@@ -39,15 +57,15 @@ module Pusherable
         end
 
         def pusherable_trigger_create
-          Pusher.trigger(pusherable_channel, "#{pusherable_class_name}.create", self.to_json)
+          Pusher.trigger(pusherable_channel, "#{pusherable_class_name}.create", to_json)
         end
 
         def pusherable_trigger_update
-          Pusher.trigger(pusherable_channel, "#{pusherable_class_name}.update", self.to_json)
+          Pusher.trigger(pusherable_channel, "#{pusherable_class_name}.update", to_json)
         end
 
         def pusherable_trigger_destroy
-          Pusher.trigger(pusherable_channel, "#{pusherable_class_name}.destroy", self.to_json)
+          Pusher.trigger(pusherable_channel, "#{pusherable_class_name}.destroy", to_json)
         end
       end
     end

data/pusherable.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |gem|
   gem.description   = %q{Adds callback hooks for your ActiveModel models for sending messages to a Pusher channel.}
   gem.summary       = %q{Adds callback hooks to your models for sending messages to a Pusher channel.}
   gem.homepage      = "https://github.com/tonycoco/pusherable"
+  gem.licenses      = ["MIT"]
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/spec/mongoid_pusherable_spec.rb

@@ -48,13 +48,16 @@ describe Pusherable do
   describe "channels" do
     let(:default_model) { MongoidDefaultedPusherableModel.new }
     let(:setup_model) { MongoidPusherableModel.new }
+    let(:callable_model) { MongoidCallablePusherableModel.new }
 
     it "should get and set the channel to push to" do
       expect(MongoidDefaultedPusherableModel.pusherable_channel).to eq("test_channel")
       expect(MongoidPusherableModel.pusherable_channel).to eq("our_channel")
+      expect(MongoidCallablePusherableModel.pusherable_channel).to eq("lambda_channel")
 
       expect(default_model.pusherable_channel).to eq("test_channel")
       expect(setup_model.pusherable_channel).to eq("our_channel")
+      expect(callable_model.pusherable_channel).to eq("lambda_channel")
     end
   end
 end

data/spec/sqlite_pusherable_spec.rb

@@ -48,13 +48,16 @@ describe Pusherable do
   describe "channels" do
     let(:default_model) { DefaultedPusherableModel.new }
     let(:setup_model) { PusherableModel.new }
+    let(:callable_model) { CallablePusherableModel.new(name: "_name") }
 
     it "should get and set the channel to push to" do
       expect(DefaultedPusherableModel.pusherable_channel).to eq("test_channel")
       expect(PusherableModel.pusherable_channel).to eq("our_channel")
+      expect(CallablePusherableModel.pusherable_channel).to eq("lambda_channel")
 
       expect(default_model.pusherable_channel).to eq("test_channel")
       expect(setup_model.pusherable_channel).to eq("our_channel")
+      expect(callable_model.pusherable_channel).to eq("lambda_channel_name")
     end
   end
 end

data/spec/support/models/mongoid.rb

@@ -11,3 +11,9 @@ class MongoidPusherableModel
   include Mongoid::Document
   pusherable("our_channel")
 end
+
+class MongoidCallablePusherableModel
+  include Mongoid::Document
+  field :name, type: String
+  pusherable ->(o) { "lambda_channel#{o.name if o}" }
+end

data/spec/support/models/sqlite.rb

@@ -8,3 +8,7 @@ end
 class PusherableModel < ActiveRecord::Base
   pusherable("our_channel")
 end
+
+class CallablePusherableModel < ActiveRecord::Base
+  pusherable ->(o) { "lambda_channel#{o.name if o}" }
+end

data/spec/support/schema.rb

@@ -1,15 +1,20 @@
 ActiveRecord::Schema.define do
   self.verbose = false
 
-  create_table :non_pusherable_models, :force => true do |t|
+  create_table :non_pusherable_models, force: true do |t|
     t.timestamps
   end
 
-  create_table :defaulted_pusherable_models, :force => true do |t|
+  create_table :defaulted_pusherable_models, force: true do |t|
     t.timestamps
   end
 
-  create_table :pusherable_models, :force => true do |t|
+  create_table :pusherable_models, force: true do |t|
+    t.timestamps
+  end
+
+  create_table :callable_pusherable_models, force: true do |t|
+    t.string "name"
     t.timestamps
   end
 end

metadata

@@ -1,125 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: pusherable
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Tony Coconate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-31 00:00:00.000000000 Z
+date: 2014-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: pusher
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.5
 - !ruby/object:Gem::Dependency
   name: mongoid-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Adds callback hooks for your ActiveModel models for sending messages
@@ -130,10 +130,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
-- LICENSE.txt
+- LICENSE
 - README.md
 - Rakefile
 - lib/pusherable.rb
@@ -146,7 +146,8 @@ files:
 - spec/support/models/sqlite.rb
 - spec/support/schema.rb
 homepage: https://github.com/tonycoco/pusherable
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -154,17 +155,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Adds callback hooks to your models for sending messages to a Pusher channel.