asir_resque 1.1.3 → 1.2.0

data/asir_resque.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "asir", "~> 1.1.0"
+  gem.add_dependency "asir", "~> 1.2.0"
   gem.add_dependency "redis", "~> 3.0.2"
   gem.add_dependency "resque", "~> 1.23.0"
 

data/example/example_helper.rb

@@ -7,7 +7,11 @@ when /java/i
 end
 
 $: << File.expand_path("../../lib", __FILE__)
-gem 'asir'
+if p = ENV['ASIR_LIB_PATH']
+  $:.unshift File.expand_path(p)
+else
+  gem 'asir'
+end
 
 require 'asir'
 require 'asir/coder/chain'

data/lib/asir/transport/resque.rb

@@ -37,23 +37,24 @@ module ASIR
         raise exc.class, "#{self.class} #{uri}: #{exc.message}", exc.backtrace
       end
 
-      def _receive_result message, opaque_result
-        return nil if one_way || message.one_way
+      def _receive_result state
+        return nil if one_way || state.message.one_way
         super
       end
 
-      def _send_result message, result, result_payload, stream, message_state
-        return nil if one_way || message.one_way
+      def _send_result state
+        return nil if one_way || state.message.one_way
         super
       end
 
-      def _send_message message, message_payload
+      def _send_message state
         stream.with_stream! do | io |  # Force connect
+          message = state.message
           queue = message[:resque_queue] || message[:queue] || self.queue
           $stderr.puts "  #{$$} #{self} _send_message #{message_payload.inspect} to queue=#{queue.inspect} as #{self.class} :process_job" if @verbose >= 2
           # Invokes Transport::Resque.perform(metadata, payload)
           metadata = message[:resque_metadata] || message.description
-          ::Resque.enqueue_to(queue, self.class, metadata, message_payload)
+          ::Resque.enqueue_to(queue, self.class, metadata, state.message_payload)
         end
       end
 
@@ -128,9 +129,8 @@ module ASIR
         t.serve_message! payload, nil
       end
 
-      def _receive_message payload, additional_data # is actual payload
-        # $stderr.puts "  #{$$} #{self} _receive_message payload=#{payload.inspect}"
-        [ payload, nil ]
+      def _receive_message state
+        state.message_payload = state.in_stream
       end
 
       ####################################

data/lib/asir_resque/version.rb

@@ -1,3 +1,3 @@
 module AsirResque
-  VERSION = "1.1.3"
+  VERSION = "1.2.0"
 end

data/spec/spec_helper.rb

@@ -1,7 +1,11 @@
 require 'rubygems'
 $:.unshift File.expand_path('../../lib', __FILE__)
 
-gem 'asir'
+if p = ENV['ASIR_LIB_PATH']
+  $:.unshift File.expand_path(p)
+else
+  gem 'asir'
+end
 require 'asir'
 
 module ASIR

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asir_resque
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-04 00:00:00.000000000 Z
+date: 2012-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asir
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -146,18 +146,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2014414063490366303
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2014414063490366303
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24