pusherable 1.2.3 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfb4424b0d18f8e9424047dad10498e4a25429d6
-  data.tar.gz: 54eff13e45b4f50a5c62fbbb8c6ff69f41c44822
+  metadata.gz: 7e81c50fffca963ff4a426b270f811ae3538da5c
+  data.tar.gz: df962dad85f7dbd422745164c5710f410a43b338
 SHA512:
-  metadata.gz: 487d350d8fb6115721bf1d23668d948f5a34f62eeebad2d0b949006aad2184d5755511b6e382ecc9457551c722660189b31ace59d6766db79b84cb7670b6a2e4
-  data.tar.gz: 50b79cb3ea0ccfee89d7473f191edc18a8410fb3d2fd2866445049ccec2c7541ae2f06f487541ec9e648c39bb9121846929f8b8afe318de4d239ef40893b6678
+  metadata.gz: ab41203bc3440483075115863b094417a4c0045ae2fc882851d5f4111e5c7562c3a3d7c6584182c0c036da9929c8580939cc34ef88150f3da62aaaddc033d7aa
+  data.tar.gz: 6a2d12bcaf36130f6686e982645b4b3c1ac45bc1ac40d65c94fd16dfeebad1557c638c64b7469452bc881e60c73fde87fc61dc0b59cd9a70a9fb7ee05998477d

data/.travis.yml

@@ -1,7 +1,6 @@
 language: ruby
 script: "bundle install && bundle exec rake"
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1.1
 env:

data/README.md

@@ -4,6 +4,10 @@
 
 Adds callback hooks for your `ActiveModel` models for sending messages to a `Pusher` channel.
 
+## Requirements
+
+* Ruby 2.0+
+
 ## Installation
 
 Install and configure `Pusher` to work on your application by following the [pusher gem's instructions](https://github.com/pusher/pusher-gem).
@@ -69,6 +73,8 @@ Currently this gem extends `ActiveRecord::Base` and `Mongoid::Document` (if defi
 
 For any other `ActiveModel` compliant data store, simply mirror this statement.
 
+This gem supports soft deletes when used with [paranoia](https://github.com/radar/paranoia).
+
 ## Contributing
 
 1. Fork it

data/lib/pusherable.rb

@@ -10,55 +10,56 @@ module Pusherable
       false
     end
 
-    def pusherable(pusherable_channel="test_channel")
+    def pusherable(channel="test_channel")
       raise "Please `gem install pusher` and configure it to run in your app!" if Pusher.app_id.blank? || Pusher.key.blank? || Pusher.secret.blank?
 
-      class_attribute :pusherable_channel
-      class_attribute :pusherable_triggers_active
-
-      self.pusherable_channel = pusherable_channel
-      self.pusherable_triggers_active = true
+      class_attribute :pusherable_channel_obj
+      self.pusherable_channel_obj = channel
 
       class << self
         def pusherable_triggers?
-          pusherable_triggers_active
+          Thread.current.thread_variable_get("#{self.name.underscore}_pusherable_triggers_active") != false
         end
 
         def activate_pusherable_triggers
-          self.pusherable_triggers_active = true
+          Thread.current.thread_variable_set "#{self.name.underscore}_pusherable_triggers_active", true
         end
 
         def deactivate_pusherable_triggers
-          self.pusherable_triggers_active = false
+          Thread.current.thread_variable_set "#{self.name.underscore}_pusherable_triggers_active", false
         end
-      end
 
-      class_eval do
-        if defined?(Mongoid) && defined?(Mongoid::Document) && include?(Mongoid::Document)
-          after_create :pusherable_trigger_create, if: :pusherable_triggers_active
-          after_update :pusherable_trigger_update, if: :pusherable_triggers_active
-          before_destroy :pusherable_trigger_destroy, if: :pusherable_triggers_active
-        else
-          after_commit :pusherable_trigger_create, on: :create, if: :pusherable_triggers_active
-          after_commit :pusherable_trigger_update, on: :update, if: :pusherable_triggers_active
-          after_commit :pusherable_trigger_destroy, on: :destroy, if: :pusherable_triggers_active
-        end
-
-        def self.pusherable?
+        def 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)
+        def pusherable_channel(obj=nil)
+          if pusherable_channel_obj.respond_to? :call
+            if pusherable_channel_obj.arity > 0
+              pusherable_channel_obj.call(obj)
             else
-              generated_pusherable_channel.call
+              pusherable_channel_obj.call
             end
           else
-            generated_pusherable_channel
+            pusherable_channel_obj
+          end
+        end
+      end
+
+      class_eval do
+        if defined?(Mongoid) && defined?(Mongoid::Document) && include?(Mongoid::Document)
+          after_create :pusherable_trigger_create, if: :pusherable_triggers?
+          after_update :pusherable_trigger_update, if: :pusherable_triggers?
+          before_destroy :pusherable_trigger_destroy, if: :pusherable_triggers?
+        else
+          after_commit :pusherable_trigger_create, on: :create, if: :pusherable_triggers?
+
+          if defined?(Paranoia) && include?(Paranoia)
+            after_update :pusherable_trigger_update, if: :pusherable_triggers?
+            before_destroy :pusherable_trigger_destroy, if: :pusherable_triggers?
+          else
+            after_commit :pusherable_trigger_update, on: :update, if: :pusherable_triggers?
+            after_commit :pusherable_trigger_destroy, on: :destroy, if: :pusherable_triggers?
           end
         end
 
@@ -79,15 +80,15 @@ module Pusherable
         end
 
         def pusherable_trigger_create
-          Pusher.trigger(pusherable_channel, "#{pusherable_class_name}.create", to_json)
+          Pusher.trigger_async(pusherable_channel, "#{pusherable_class_name}.create", to_json)
         end
 
         def pusherable_trigger_update
-          Pusher.trigger(pusherable_channel, "#{pusherable_class_name}.update", to_json)
+          Pusher.trigger_async(pusherable_channel, "#{pusherable_class_name}.update", to_json)
         end
 
         def pusherable_trigger_destroy
-          Pusher.trigger(pusherable_channel, "#{pusherable_class_name}.destroy", to_json)
+          Pusher.trigger_async(pusherable_channel, "#{pusherable_class_name}.destroy", to_json)
         end
       end
     end

data/lib/pusherable/version.rb

@@ -1,3 +1,3 @@
 module Pusherable
-  VERSION = "1.2.3"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pusherable
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.0
 platform: ruby
 authors:
 - Tony Coconate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-02 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -165,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Adds callback hooks to your models for sending messages to a Pusher channel.