textris 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b44445640c697f0c38a8da55759fd8be3c133dbb
-  data.tar.gz: eb601a7627c8d9c371902757e1e6094aa5fa6635
+  metadata.gz: 41a7e696b4cae68e7793538ad07e490c415f048c
+  data.tar.gz: 1cd679882d001d36860d0e9e0129dd096d036422
 SHA512:
-  metadata.gz: 366ba25af97f926c66bdf98885178f321aa850bd6f781995771d054c15240281a850310fa52a8e1300c83c3a4a7b4b150ceba24a6e7cdf30b3e36f6407553e7d
-  data.tar.gz: 1402b57a76a44888c4331e54efd25f6a675228f5f96cbecb6b35bf84c836324284ead86894a28a4abea072ecf4b0c932cfa31735f5fe8a7447da1f254f63b94d
+  metadata.gz: 67b9819759fb074b871ce4ef1f4aef2c6baeddd9472e111b75beb1ac8ce33530126481d04aac3f47ac3274229bf910341d8a7f9ba926e79b813e36f114a181ac
+  data.tar.gz: 08cffc6511507e0c2898d0f0ea07ea9667e9947054db10fc89031ce0b4d977f1ea1480a3ab9f4643856e867c3a9a31e29495a6b57ce51011f59173fb03eff165

data/README.md

@@ -74,6 +74,8 @@ UserTexter.delay_until(1.day.from_now).welcome(user)
 
 > You should not call `deliver` after the action invocation when using delay. It will be called by the *Textris::Delay::Sidekiq::Worker* worker.
 
+> You can safely pass ActiveRecord records and arrays as delayed action arguments. **textris** will store their `id`'s and find them upon scheduled delivery.
+
 Keep in mind that **textris** does not install *sidekiq* for you. If you don't have it yet, [install Redis](http://redis.io/topics/quickstart) on your machine and add the *sidekiq* gem to `Gemfile`:
 
 ```ruby

data/lib/textris.rb

@@ -5,7 +5,6 @@ require 'phony'
 begin
   require 'twilio-ruby'
 rescue LoadError
-  # no twilio-ruby
 end
 
 begin
@@ -17,6 +16,7 @@ rescue LoadError
 else
   require 'textris/delay/sidekiq'
   require 'textris/delay/sidekiq/proxy'
+  require 'textris/delay/sidekiq/serializer'
   require 'textris/delay/sidekiq/worker'
 end
 

data/lib/textris/delay/sidekiq/proxy.rb

@@ -9,6 +9,7 @@ module Textris
         end
 
         def method_missing(method_name, *args)
+          args = ::Textris::Delay::Sidekiq::Serializer.serialize(args)
           args = [@texter, method_name, args]
 
           if @perform_in

data/lib/textris/delay/sidekiq/serializer.rb

@@ -0,0 +1,75 @@
+module Textris
+  module Delay
+    module Sidekiq
+      module Serializer
+        ACTIVERECORD_POINTER       = 'Textris::ActiveRecordPointer'
+        ACTIVERECORD_ARRAY_POINTER = 'Textris::ActiveRecordArrayPointer'
+
+        class << self
+          def serialize(objects)
+            objects.collect do |object|
+              serialize_active_record_object(object) ||
+                serialize_active_record_array(object) ||
+                object
+            end
+          rescue NameError
+            objects
+          end
+
+          def deserialize(objects)
+            objects.collect do |object|
+              deserialize_active_record_object(object) ||
+                deserialize_active_record_array(object) ||
+                object
+            end
+          end
+
+          private
+
+          def serialize_active_record_object(object)
+            if object.class < ActiveRecord::Base && object.id.present?
+              [ACTIVERECORD_POINTER, object.class.to_s, object.id]
+            end
+          end
+
+          def deserialize_active_record_object(object)
+            if object.is_a?(Array) &&
+                object.try(:length) == 3 &&
+                object[0] == ACTIVERECORD_POINTER
+              object[1].constantize.find(object[2])
+            end
+          end
+
+          def serialize_active_record_array(array)
+            if array.class < ActiveRecord::Relation
+              [ACTIVERECORD_ARRAY_POINTER, array.model.to_s, array.map(&:id)]
+            elsif array.is_a?(Array) &&
+                (model = get_active_record_common_model(array))
+              [ACTIVERECORD_ARRAY_POINTER, model, array.map(&:id)]
+            end
+          end
+
+          def deserialize_active_record_array(object)
+            if object.is_a?(Array) &&
+                object.try(:length) == 3 &&
+                object[0] == ACTIVERECORD_ARRAY_POINTER
+              object[1].constantize.find(object[2])
+            end
+          end
+
+          def get_active_record_common_model(items)
+            items = items.collect do |item|
+              if item.class < ActiveRecord::Base
+                item.class.to_s
+              end
+            end.uniq
+
+            if items.size == 1
+              items.first
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/textris/delay/sidekiq/worker.rb

@@ -4,11 +4,13 @@ module Textris
       class Worker
         include ::Sidekiq::Worker
 
-        def perform(texter, action, params)
+        def perform(texter, action, args)
           texter = texter.safe_constantize
 
           if texter.present?
-            texter.new(action, *params).call_action.deliver
+            args = ::Textris::Delay::Sidekiq::Serializer.deserialize(args)
+
+            texter.new(action, *args).call_action.deliver
           end
         end
       end

data/lib/textris/message.rb

@@ -63,8 +63,8 @@ module Textris
 
     def parse_to(to)
       to = [*to]
-      to = to.select { |phone| Phony.plausible?(phone) }
-      to = to.map    { |phone| Phony.normalize(phone) }
+      to = to.select { |phone| Phony.plausible?(phone.to_s) }
+      to = to.map    { |phone| Phony.normalize(phone.to_s) }
 
       to
     end

data/lib/textris/version.rb

@@ -1,3 +1,3 @@
 module Textris
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: textris
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Karol Słuszniak
@@ -179,6 +179,7 @@ files:
 - lib/textris/delay/sidekiq.rb
 - lib/textris/delay/sidekiq/missing.rb
 - lib/textris/delay/sidekiq/proxy.rb
+- lib/textris/delay/sidekiq/serializer.rb
 - lib/textris/delay/sidekiq/worker.rb
 - lib/textris/delivery.rb
 - lib/textris/delivery/base.rb