taskinator 0.3.7 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0dc34a77947a18f75fccbf9b5ccd71e7bcc43591
-  data.tar.gz: b47ec466da7225f0fb196965a94be1336f87cf06
+  metadata.gz: 4f8f0c88f1bf0ade876afc82c451b310064d0e07
+  data.tar.gz: 920e74b55fef2506b49e9a2ec21389cf646ef72d
 SHA512:
-  metadata.gz: 76c92d0969d760410749ee0cdcf75e26e0cf1fbb2ff0c10bd61cdb166940d88c8b62c97098515c869de6f8314dc80f525ec825c7470c139cdf788227424c70de
-  data.tar.gz: a077db5955b84d3cb17b88644c33632404f4f1132da92aaab1b7c579f090b853176a5cc5bf2b680099939ec5a2482c40b68b2c2a4ce0d6caf6db4709f0e58729
+  metadata.gz: dd62e9056ce98cf2e78aa51dd95a3ce24d14e0fb894bfc699afca93950bca9c54d9c39a9259dc180a10ca7ac97a1bf76fa133cd38058833e38a5ee114920d0e1
+  data.tar.gz: 9dec75c348b5a66f55526b15fe7f04e76992e574d066667134bab276c27694ae60a29bce396b1aa668ef367b6ec491ef8276034984dca769f782096ab6681a6f

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    taskinator (0.3.7)
+    taskinator (0.3.9)
       builder (>= 3.2.2)
       connection_pool (>= 2.2.0)
+      globalid (~> 0.3)
       json (>= 1.8.2)
       redis (>= 3.2.1)
       redis-namespace (>= 1.5.2)
@@ -33,6 +34,8 @@ GEM
       activesupport (>= 3.0, < 5.1)
     diff-lcs (1.2.5)
     docile (1.1.5)
+    globalid (0.3.7)
+      activesupport (>= 4.1.0)
     i18n (0.7.0)
     json (1.8.3)
     method_source (0.8.2)
@@ -70,7 +73,7 @@ GEM
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
       rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.2)
+    rspec-core (3.5.3)
       rspec-support (~> 3.5.0)
     rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)

data/lib/taskinator.rb

@@ -2,6 +2,7 @@ require 'json'
 require 'yaml'
 require 'securerandom'
 require 'redis-semaphore'
+require 'benchmark'
 
 require 'taskinator/version'
 
@@ -71,9 +72,12 @@ module Taskinator
 
     def redis_mutex(lockid, options={}, &block)
       raise ArgumentError, "requires a block" unless block_given?
-      redis do |r|
-        Redis::Semaphore.new(lockid, {:redis => r}.merge(options)).lock(&block)
+      m = Benchmark.measure do
+        redis do |r|
+          Redis::Semaphore.new(lockid, {:redis => r}.merge(options)).lock(&block)
+        end
       end
+      logger.debug("Time spent in mutex: #{m.real}")
     end
 
     def redis_pool

data/lib/taskinator/persistence.rb

@@ -509,14 +509,14 @@ module Taskinator
         # special case, convert models to global id's
         if values.is_a?(Array)
           values = values.collect {|value|
-            value.respond_to?(:global_id) ? value.global_id : value
+            value.respond_to?(:to_global_id) ? value.to_global_id : value
           }
         elsif values.is_a?(Hash)
           values.each {|key, value|
-            values[key] = value.global_id if value.respond_to?(:global_id)
+            values[key] = value.to_global_id if value.respond_to?(:to_global_id)
           }
-        elsif values.respond_to?(:global_id)
-          values = values.global_id
+        elsif values.respond_to?(:to_global_id)
+          values = values.to_global_id
         end
         YAML.dump(values)
       end

data/lib/taskinator/version.rb

@@ -1,3 +1,3 @@
 module Taskinator
-  VERSION = "0.3.7"
+  VERSION = "0.3.9"
 end

data/spec/taskinator/persistence_spec.rb

@@ -87,7 +87,7 @@ describe Taskinator::Persistence, :redis => true do
         }
 
         it {
-          expect(subject.serialize([MockModel.new])).to eq(YAML.dump([{:model_id => 1, :model_type => 'TypeX'}]))
+          expect(subject.serialize([MockModel.new])).to eq("---\n- !ruby/object:MockModel\n  model_id: 1\n  model_type: TypeX\n")
         }
       end
 
@@ -105,7 +105,7 @@ describe Taskinator::Persistence, :redis => true do
         }
 
         it {
-          expect(subject.serialize({:foo => MockModel.new})).to eq(YAML.dump({:foo => {:model_id => 1, :model_type => 'TypeX'}}))
+          expect(subject.serialize({:foo => MockModel.new})).to eq("---\n:foo: !ruby/object:MockModel\n  model_id: 1\n  model_type: TypeX\n")
         }
       end
 
@@ -123,7 +123,7 @@ describe Taskinator::Persistence, :redis => true do
         }
 
         it {
-          expect(subject.serialize(MockModel.new)).to eq(YAML.dump({:model_id => 1, :model_type => 'TypeX'}))
+          expect(subject.serialize(MockModel.new)).to eq("--- !ruby/object:MockModel\nmodel_id: 1\nmodel_type: TypeX\n")
         }
       end
     end
@@ -144,7 +144,7 @@ describe Taskinator::Persistence, :redis => true do
 
         it {
           expect_any_instance_of(MockModel).to receive(:find)
-          subject.deserialize(YAML.dump([MockModel.new]))
+          subject.deserialize("---\n!ruby/object:MockModel\n  model_id: 1\n  model_type: TypeX\n")
         }
       end
 
@@ -163,7 +163,7 @@ describe Taskinator::Persistence, :redis => true do
 
         it {
           expect_any_instance_of(MockModel).to receive(:find)
-          subject.deserialize(YAML.dump({:foo => MockModel.new}))
+          subject.deserialize("---\n:foo: !ruby/object:MockModel\n  model_id: 1\n  model_type: TypeX\n")
         }
       end
 
@@ -182,7 +182,7 @@ describe Taskinator::Persistence, :redis => true do
 
         it {
           expect_any_instance_of(MockModel).to receive(:find)
-          subject.deserialize(YAML.dump(MockModel.new))
+          subject.deserialize("---\n!ruby/object:MockModel\n  model_id: 1\n  model_type: TypeX\n")
         }
       end
     end

data/taskinator.gemspec

@@ -27,4 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'connection_pool'             , '>= 2.2.0'
   spec.add_dependency 'json'                        , '>= 1.8.2'
   spec.add_dependency 'builder'                     , '>= 3.2.2'
+  spec.add_dependency 'globalid'                    , '~> 0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: taskinator
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.9
 platform: ruby
 authors:
 - Chris Stefano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-18 00:00:00.000000000 Z
+date: 2016-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.2
+- !ruby/object:Gem::Dependency
+  name: globalid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 description: Simple process orchestration
 email:
 - virtualstaticvoid@gmail.com