active_elastic_job 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9ced62a0162f40de919760ea5563c6bf6e6417e
-  data.tar.gz: 182d2fc41d98ee5fce356190e7ece9aa6d85e449
+  metadata.gz: a7920ea5a8cddd9a08241262d501ce3e35023fb0
+  data.tar.gz: 60c134bbb660447bbabd3a9082e2946d896efa4c
 SHA512:
-  metadata.gz: 4f7f9614d11eac062792ff694ca57a2d598f9abd882d42cdfab6fdbd538c171783a14b7f9467de56745c29c6c8688440e08c48b7cd87e19e54ca34c7a8c7b204
-  data.tar.gz: 9871d65f4264d52d4f13d1858093ce2e7de4929f76925f22dfb014be2a5c33370e9c1259486a645ea86bed660f0707ca60b98ac483d9bb820eccc25b943d7ef6
+  metadata.gz: 839ad7a954dfe1580b1dc39fda59f32997a36342005304c278fc4c2c8601924dde28199775d1c7f3e9d67fd7067669f3b060fdfe99ef68f9ce4be43a55991ead
+  data.tar.gz: 8165acdb80c9143b23fa50eb9c3407549f9d4b7d828630afc6f48fb166dcb9392a5b12be4ed556a8f277fb179afcd5fb838224bd9ff724e77380aa904eb4326f

data/active-elastic-job.gemspec

@@ -22,11 +22,6 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 1.9.3'
 
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rspec', '~> 3.4'
-  spec.add_development_dependency 'dotenv'
-  spec.add_development_dependency 'fuubar'
-  spec.add_development_dependency 'rails', '~> 4.2'
-  spec.add_development_dependency 'rdoc'
   spec.add_dependency 'aws-sdk', '~> 2'
+  spec.add_dependency 'rails', '~> 4.2'
 end

data/lib/active_elastic_job/version.rb

@@ -1,3 +1,3 @@
 module ActiveElasticJob
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/lib/active_job/queue_adapters/active_elastic_job_adapter.rb

@@ -14,31 +14,69 @@ module ActiveJob
     #
     #   Rails.application.config.active_job.queue_adapter = :active_elastic_job
     class ActiveElasticJobAdapter
+      MAX_MESSAGE_SIZE = (256 * 1024)
+
+      class Error < StandardError; end;
+
+      class SerializedJobTooBig < Error
+        def initialize(serialized_job)
+          msg = <<-MSG
+The job contains #{serialized_job.bytesize} bytes in its serialzed form,
+which exceeds the allowed maximum of #{MAX_MESSAGE_SIZE} bytes imposed by Amazon SQS.
+          MSG
+          super msg
+        end
+      end
+
+      # Raised when job queue does not exist. The job queue is determined
+      # <tt>ActiveJob::Base.queue_as</tt>. You can either: (1) create a new Amazon
+      # SQS queue and attach a worker enviroment to it, or (2) select a different
+      # queue for your jobs.
+      #
+      # Example:
+      #  * Open your AWS console and create an SQS queue named +high_priority+ in
+      #    the same AWS region of your Elastic Beanstalk environments.
+      #  * Queue your jobs accordingly:
+      #
+      #  class MyJob < ActiveJob::Base
+      #    queue_as :high_priority
+      #    #..
+      #  end
+      class NonExistentQueue < Error
+        def initialize(job)
+          msg = <<-MSG
+The job is bound to queue at #{job.queue_name}. Unfortunately a queue
+with this name does not exist in this region. Either create an Amazon SQS queue
+named #{job.queue_name} - you can do this in AWS console, make sure to select
+region '#{ENV['AWS_REGION']}' - or you select another queue for
+#{job.class.name} jobs.
+          MSG
+          super msg
+        end
+      end
+
       class << self
         def enqueue(job) #:nodoc:
           enqueue_at(job, Time.now)
         end
 
         def enqueue_at(job, timestamp) #:nodoc:
-          queue_url = aws_sqs_client.create_queue(queue_name: job.queue_name.to_s).queue_url
-          message_body = JSON.dump(job.serialize)
-          delay = (timestamp - Time.current.to_f).to_i + 1
-          if delay > 15.minutes
-            msg =<<-MSG
-             Jobs cannot be scheduled more than 15 minutes into the future.
-             See http://docs.aws.amazon.com/AWSSimpleQueueService/latest/APIReference/API_SendMessage.html
-             for further details!
-            MSG
-            raise RangeError, msg if delay > 15.minutes
+          queue_url = nil
+          begin
+            resp = aws_sqs_client.get_queue_url(queue_name: job.queue_name.to_s)
+            queue_url = resp.queue_url
+          rescue Aws::SQS::Errors::NonExistentQueue => e
+            raise NonExistentQueue, job
           end
-
+          serialized_job = JSON.dump(job.serialize)
+          check_job_size!(serialized_job)
           aws_sqs_client.send_message(
             queue_url: queue_url,
-            message_body: message_body,
-            delay_seconds: delay,
+            message_body: serialized_job,
+            delay_seconds: calculate_delay(timestamp),
             message_attributes: {
               "message_digest" => {
-                string_value: message_digest(message_body),
+                string_value: message_digest(serialized_job),
                 data_type: "String"
               }
             }
@@ -47,6 +85,25 @@ module ActiveJob
 
         private
 
+        def calculate_delay(timestamp)
+          delay = (timestamp - Time.current.to_f).to_i + 1
+          if delay > 15.minutes
+            msg =<<-MSG
+Jobs cannot be scheduled more than 15 minutes into the future.
+See http://docs.aws.amazon.com/AWSSimpleQueueService/latest/APIReference/API_SendMessage.html
+for further details!
+            MSG
+            raise RangeError, msg if delay > 15.minutes
+          end
+          delay
+        end
+
+        def check_job_size!(serialized_job)
+          if serialized_job.bytesize > MAX_MESSAGE_SIZE
+            raise SerializedJobTooBig, serialized_job
+          end
+        end
+
         def aws_sqs_client
           Aws::SQS::Client.new(
             access_key_id: ENV['AWS_ACCESS_KEY_ID'],

metadata

@@ -1,71 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: active_elastic_job
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Tawan Sierek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-06 00:00:00.000000000 Z
+date: 2016-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
+  name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
-  type: :development
+        version: '2'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
-- !ruby/object:Gem::Dependency
-  name: dotenv
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: fuubar
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -73,41 +31,13 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: aws-sdk
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '4.2'
 description: Active Elastic Job is a simple to use Active Job backend for Rails applications
   deployed on the Amazon Elastic Beanstalk platform.
 email: