rocketjob 2.0.0.rc2 → 2.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6eb90dc1e3aea713b4d981636208f44a0da52e6c
-  data.tar.gz: 1f9f590f2789f050d736af772843b78bd98d1795
+  metadata.gz: 272892209b4b987a90ec99fe808e7197588c1fea
+  data.tar.gz: 560ead0b08ab42a2fc6cda4de2f3ed107199fce7
 SHA512:
-  metadata.gz: 3ab4508ac667d557a4eee4533d4bdbb15c8bb6b10c35a8f9f1f71e53e33f0a1276c7b55b6ba80743169efd19bc6f240311e678a527cdd469a5bed52d45406e66
-  data.tar.gz: 201ed97e4992979ada9af839f6951c5c3f8ae373ce6a93d07d6356571f07fc91b5319b8eb2915e2c1dc6be50ef56d845136479db17f7907528ffdf9822bda01a
+  metadata.gz: b7c162229dfaed223d3346f6a31613026fd8dff5dcbd590e11b9b4569e98b65ed9fa31850db395248d54be9005017cf7bb28c12517a559a38e84f44b90146656
+  data.tar.gz: 0614a2ccfdcece55f6480d880eef065e8034629695f7678e21bc6212231351c24ebf1cab06e53553f7102479554eca419eadd208a4716b7a83a53e25ab56bc46

data/lib/rocket_job/dirmon_entry.rb

@@ -305,10 +305,12 @@ module RocketJob
     # Queues the job for the supplied pathname
     def later(pathname)
       if klass = job_class
-        job = klass.new(properties.merge(arguments: arguments))
-        upload_file(job, pathname)
-        job.save!
-        job
+        logger.benchmark_info "Enqueued: #{name}, Job class: #{job_class_name}" do
+          job = klass.new(properties.merge(arguments: arguments))
+          upload_file(job, pathname)
+          job.save!
+          job
+        end
       else
         raise(ArgumentError, "Cannot instantiate a class for: #{job_class_name.inspect}")
       end

data/lib/rocket_job/plugins/document.rb

@@ -6,17 +6,20 @@ require 'mongo_mapper'
 
 module RocketJob
   module Plugins
-    # Prevent more than one instance of this job class from running at a time
+    # Base class for storing models in MongoDB
     module Document
+      autoload :Static, 'rocket_job/plugins/document/static'
+
       extend ActiveSupport::Concern
       include MongoMapper::Document
+      include RocketJob::Plugins::Document::Static
 
       included do
         # Add after_initialize & after_find callbacks
         define_model_callbacks :initialize, :find, :only => [:after]
 
         # Prevent data in MongoDB from re-defining the model behavior
-        #self.static_keys = true
+        self.static_keys     = true
 
         # Turn off embedded callbacks. Slow and not used for Jobs
         embedded_callbacks_off

data/lib/rocket_job/plugins/document/static.rb

@@ -0,0 +1,53 @@
+module RocketJob
+  module Plugins
+    # Extension for Document to implement static keys
+    # Remove when new MongoMapper gem is released
+    module Document
+      module Static
+        extend ActiveSupport::Concern
+
+        module ClassMethods
+          attr_writer :static_keys
+
+          def static_keys
+            @static_keys || false
+          end
+
+          def embedded_keys
+            @embedded_keys ||= embedded_associations.collect(&:as)
+          end
+
+          def embedded_key?(key)
+            embedded_keys.include?(key.to_sym)
+          end
+        end
+
+        def read_key(name)
+          if !self.class.static_keys || self.class.key?(name)
+            super
+          else
+            raise MissingKeyError, "Tried to read the key #{name.inspect}, but no key was defined. Either define key :#{name} or set self.static_keys = false"
+          end
+        end
+
+        private
+
+        def write_key(name, value)
+          if !self.class.static_keys || self.class.key?(name)
+            super
+          else
+            raise MissingKeyError, "Tried to write the key #{name.inspect}, but no key was defined. Either define key :#{name} or set self.static_keys = false"
+          end
+        end
+
+        def load_from_database(attrs, with_cast = false)
+          return super if !self.class.static_keys || !attrs.respond_to?(:each)
+
+          attrs = attrs.select { |key, _| self.class.key?(key) || self.class.embedded_key?(key) }
+
+          super(attrs, with_cast)
+        end
+      end
+    end
+  end
+end

data/lib/rocket_job/plugins/job/model.rb

@@ -187,6 +187,7 @@ module RocketJob
 
           # Add to user definable properties in Dirmon Entry
           def self.public_rocket_job_properties(*properties)
+            properties.each { |property| raise("Invalid public_rocket_job_property: #{property.inspect}") unless key?(property)}
             rocket_job_properties.concat(properties).uniq!
           end
 
@@ -237,6 +238,7 @@ module RocketJob
         def as_json
           attrs = serializable_hash(methods: [:seconds, :duration])
           attrs.delete('result') unless collect_output?
+          attrs.delete('failure_count') unless failure_count > 0
           case
           when queued?
             attrs.delete('started_at')
@@ -247,6 +249,9 @@ module RocketJob
             attrs.delete('completed_at')
             attrs.delete('result')
             attrs
+          when completed?
+            attrs.delete('percent_complete')
+            attrs
           when paused?
             attrs.delete('completed_at')
             attrs.delete('result')
@@ -269,8 +274,6 @@ module RocketJob
         def status(time_zone = 'Eastern Time (US & Canada)')
           h = as_json
           h.delete('seconds')
-          h.delete('percent_complete') if completed?
-          h.delete('failure_count') unless failure_count > 0
           h.dup.each_pair do |k, v|
             case
             when v.is_a?(Time)

data/lib/rocket_job/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module RocketJob #:nodoc
-  VERSION = '2.0.0.rc2'
+  VERSION = '2.0.0.rc3'
 end

data/lib/rocket_job/worker.rb

@@ -45,7 +45,7 @@ module RocketJob
     key :started_at,         Time
 
     # The heartbeat information for this worker
-    one :heartbeat,          class_name: 'RocketJob::Heartbeat'
+    has_one :heartbeat,      class_name: 'RocketJob::Heartbeat'
 
     # Current state
     #   Internal use only. Do not set this field directly
@@ -196,7 +196,7 @@ module RocketJob
     # - The worker is no longer able to communicate with the MongoDB Server
     def zombie?(missed = 4)
       return false unless running?
-      return true if heartbeat.updated_at.nil?
+      return true if heartbeat.nil? || heartbeat.updated_at.nil?
       dead_seconds = Config.instance.heartbeat_seconds * missed
       (Time.now - heartbeat.updated_at) >= dead_seconds
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocketjob
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc2
+  version: 2.0.0.rc3
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-09 00:00:00.000000000 Z
+date: 2016-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -134,6 +134,7 @@ files:
 - lib/rocket_job/jobs/dirmon_job.rb
 - lib/rocket_job/jobs/simple_job.rb
 - lib/rocket_job/plugins/document.rb
+- lib/rocket_job/plugins/document/static.rb
 - lib/rocket_job/plugins/job/callbacks.rb
 - lib/rocket_job/plugins/job/defaults.rb
 - lib/rocket_job/plugins/job/logger.rb