mikezter-workling 0.4.9.7 → 0.4.9.8

data/lib/workling/clients/rude_q_client.rb

@@ -8,8 +8,7 @@ module Workling
 
       def self.installed?
         begin
-          gem 'rudeq'
-          require 'rudeq' 
+          gem 'matthewrudy-rudeq', :lib => 'rude_q'
         rescue LoadError
         end
 
@@ -18,8 +17,7 @@ module Workling
 
       def self.load
         begin
-          gem 'rudeq'
-          require 'rudeq'
+          gem 'matthewrudy-rudeq', :lib => 'rude_q'
         rescue Gem::LoadError
           Workling::Base.logger.info "WORKLING: couldn't find rudeq library. Install: \"gem install matthewrudy-rudeq\". "
         end
@@ -33,7 +31,7 @@ module Workling
       def close
       end
 
-      # implements the client job request and retrieval 
+      # implements the client job request and retrieval
       def request(key, value)
         RudeQueue.set(key, value)
       end
@@ -45,3 +43,4 @@ module Workling
     end
   end
 end
+

data/lib/workling/clients/sqs_client.rb

@@ -1,6 +1,3 @@
-require 'json'
-require 'right_aws'
-
 #
 #  An SQS client
 #
@@ -23,11 +20,31 @@ require 'right_aws'
 #
 #     # The SQS visibility timeout for retrieved messages. Defaults to 30 seconds.
 #     visibility_timeout: 15
-#   
+#
 module Workling
   module Clients
     class SqsClient < Workling::Clients::BrokerBase
 
+      def self.installed?
+        begin
+          require 'json'
+          require 'right_aws'
+        rescue LoadError
+        end
+
+        Object.const_defined? "RightAws"
+      end
+
+      def self.load
+        begin
+          gem 'right_aws'
+          require 'json'
+          require 'right_aws'
+        rescue Gem::LoadError
+          Workling::Base.logger.info "WORKLING: couldn't find memcache-client. Install: \"gem install memcache-client\". "
+        end
+      end
+
       unless defined?(AWS_MAX_QUEUE_NAME)
         AWS_MAX_QUEUE_NAME = 80
 
@@ -37,13 +54,13 @@ module Workling
         DEFAULT_VISIBILITY_TIMEOUT = 30
         DEFAULT_VISIBILITY_RESERVE = 10
       end
-      
+
       # Mainly exposed for testing purposes
       attr_reader :sqs_options
       attr_reader :messages_per_req
       attr_reader :visibility_timeout
-      
-      # Starts the client. 
+
+      # Starts the client.
       def connect
         @sqs_options = Workling.config[:sqs_options]
 
@@ -52,12 +69,12 @@ module Workling
                @sqs_options.include?('aws_secret_access_key'))
           raise WorklingError, 'Unable to start SqsClient due to missing SQS options'
         end
-        
+
         # Optional settings
         @messages_per_req = @sqs_options['messages_per_req'] || DEFAULT_MESSAGES_PER_REQ
         @visibility_timeout = @sqs_options['visibility_timeout'] || DEFAULT_VISIBILITY_TIMEOUT
         @visibility_reserve = @sqs_options['visibility_reserve'] || DEFAULT_VISIBILITY_RESERVE
-        
+
         begin
           @sqs = RightAws::SqsGen2.new(
             @sqs_options['aws_access_key_id'],
@@ -67,13 +84,13 @@ module Workling
           raise WorklingError, "Unable to connect to SQS. Error: #{e}"
         end
       end
-      
+
       # No need for explicit closing, since there is no persistent
       # connection to SQS.
       def close
         true
       end
-      
+
       # Retrieve work.
       def retrieve(key)
         begin
@@ -105,13 +122,13 @@ module Workling
               # Need to wrap in HashWithIndifferentAccess, as JSON serialization
               # loses symbol keys.
               parsed_msg = HashWithIndifferentAccess.new(JSON.parse(msg.body))
-            
+
               # Delete the msg from SQS, so we don't re-retrieve it after the
               # visibility timeout. Ideally we would defer deleting a msg until
               # after Workling has successfully processed it, but it currently
               # doesn't provide the necessary hooks for this.
               msg.delete
-            
+
               parsed_msg
             end
           end
@@ -119,7 +136,7 @@ module Workling
         rescue => e
           logger.error "Error retrieving msg for key: #{key}; Error: #{e}\n#{e.backtrace.join("\n")}"
         end
-        
+
       end
 
       # Request work.
@@ -131,14 +148,14 @@ module Workling
           raise WorklingError, "Error sending msg for key: #{key}, value: #{value.inspect}; Error: #{e}"
         end
       end
-      
+
       # Returns the queue that corresponds to the specified key. Creates the
       # queue if it doesn't exist yet.
       def queue_for_key(key)
         # Use thread local for storing queues, for the same reason as for buffers
         Thread.current["queue_#{key}"] ||= @sqs.queue(queue_name(key), true, @visibility_timeout)
       end
-      
+
       # Returns the queue name for the specified key. The name consists of an
       # optional prefix, followed by the environment and the key itself. Note
       # that with a long worker class / method name, the name could exceed the
@@ -148,16 +165,17 @@ module Workling
       def queue_name(key)
         "#{@sqs_options['prefix'] || ''}#{env}_#{key}"[0, AWS_MAX_QUEUE_NAME]
       end
-      
+
       private
-      
+
       def logger
         Rails.logger
       end
-      
+
       def env
         Rails.env
       end
     end
   end
-end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mikezter-workling
 version: !ruby/object:Gem::Version 
-  version: 0.4.9.7
+  version: 0.4.9.8
 platform: ruby
 authors: 
 - Rany Keddo