rocketjob 2.1.3 → 3.0.0.alpha

data/test/plugins/state_machine_test.rb

@@ -8,8 +8,8 @@ module Plugins
       include RocketJob::Plugins::Document
       include RocketJob::Plugins::StateMachine
 
-      key :name
-      key :state
+      field :name, type: String
+      field :state, type: String
       validates_presence_of :name, :state
 
       aasm column: :state do
@@ -33,19 +33,19 @@ module Plugins
 
       describe '#aasm_write_state' do
         it 'raises an exception when a validation fails on create!' do
-          assert_raises MongoMapper::DocumentNotValid do
+          assert_raises Mongoid::Errors::Validations do
             @doc = Test.create!
           end
         end
 
         it 'raises an exception when a validation fails on save' do
-          assert_raises MongoMapper::DocumentNotValid do
+          assert_raises Mongoid::Errors::Validations do
             @doc.save!
           end
         end
 
         it 'raises an exception when a validation fails on state transition with save' do
-          assert_raises MongoMapper::DocumentNotValid do
+          assert_raises Mongoid::Errors::Validations do
             @doc.enable!
           end
           assert @doc.pending?

data/test/test_helper.rb

@@ -17,4 +17,7 @@ MiniTest::Reporters.use! MiniTest::Reporters::SpecReporter.new
 SemanticLogger.add_appender(file_name: 'test.log', formatter: :color)
 SemanticLogger.default_level = :debug
 
-RocketJob::Config.load!('test', 'test/config/mongo.yml')
+RocketJob::Config.load!('test', 'test/config/mongoid.yml')
+Mongoid.logger = SemanticLogger[Mongoid]
+
+#RocketJob::Job.collection.database.command(dropDatabase: 1)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocketjob
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 3.0.0.alpha
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-01 00:00:00.000000000 Z
+date: 2016-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -25,45 +25,31 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: mongo_ha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.11'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.11'
-- !ruby/object:Gem::Dependency
-  name: mongo_mapper
+  name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.0.rc1
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.0.rc1
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: semantic_logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
@@ -94,12 +80,12 @@ files:
 - Rakefile
 - bin/rocketjob
 - bin/rocketjob_perf
+- lib/rocket_job/active_server.rb
 - lib/rocket_job/cli.rb
 - lib/rocket_job/config.rb
 - lib/rocket_job/dirmon_entry.rb
 - lib/rocket_job/extensions/aasm.rb
-- lib/rocket_job/extensions/mongo.rb
-- lib/rocket_job/extensions/mongo_mapper.rb
+- lib/rocket_job/extensions/mongo/logging.rb
 - lib/rocket_job/extensions/rocket_job_adapter.rb
 - lib/rocket_job/heartbeat.rb
 - lib/rocket_job/job.rb
@@ -111,7 +97,6 @@ files:
 - lib/rocket_job/plugins/cron.rb
 - lib/rocket_job/plugins/document.rb
 - lib/rocket_job/plugins/job/callbacks.rb
-- lib/rocket_job/plugins/job/defaults.rb
 - lib/rocket_job/plugins/job/logger.rb
 - lib/rocket_job/plugins/job/model.rb
 - lib/rocket_job/plugins/job/persistence.rb
@@ -124,10 +109,11 @@ files:
 - lib/rocket_job/plugins/rufus/zo_time.rb
 - lib/rocket_job/plugins/singleton.rb
 - lib/rocket_job/plugins/state_machine.rb
+- lib/rocket_job/server.rb
 - lib/rocket_job/version.rb
 - lib/rocket_job/worker.rb
 - lib/rocketjob.rb
-- test/config/mongo.yml
+- test/config/mongoid.yml
 - test/config_test.rb
 - test/dirmon_entry_test.rb
 - test/dirmon_job_test.rb
@@ -159,12 +145,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1
@@ -172,7 +158,7 @@ signing_key:
 specification_version: 4
 summary: Ruby's missing batch system.
 test_files:
-- test/config/mongo.yml
+- test/config/mongoid.yml
 - test/config_test.rb
 - test/dirmon_entry_test.rb
 - test/dirmon_job_test.rb

data/lib/rocket_job/extensions/mongo.rb

@@ -1,23 +0,0 @@
-require 'mongo'
-
-Mongo::Logging
-module Mongo
-  module Logging
-
-    # Remove annoying message on startup
-    def write_logging_startup_message
-    end
-
-    # Cleanup output
-    def log(level, msg)
-      MongoClient.logger.send(level, msg)
-    end
-
-    private
-
-    def log_operation(name, payload, duration)
-      MongoClient.logger.measure_trace(name, duration: (duration * 1000), payload: payload)
-    end
-
-  end
-end

data/lib/rocket_job/extensions/mongo_mapper.rb

@@ -1,30 +0,0 @@
-# TODO Delete this file once PR has been accepted
-#   https://github.com/mongomapper/mongomapper/pull/641
-MongoMapper::Plugins::Keys::Static
-module MongoMapper
-  module Plugins
-    module Keys
-      module Static
-        module ClassMethods
-          def embedded_keys
-            @embedded_keys ||= embedded_associations.collect(&:as)
-          end
-
-          def embedded_key?(key)
-            embedded_keys.include?(key.to_sym)
-          end
-        end
-
-        private
-
-        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/defaults.rb

@@ -1,40 +0,0 @@
-# encoding: UTF-8
-require 'active_support/concern'
-
-module RocketJob
-  module Plugins
-    module Job
-      # Allow each child job to set its own defaults
-      module Defaults
-        extend ActiveSupport::Concern
-
-        included do
-          # Copy parent job defaults
-          def self.inherited(base)
-            super
-            @rocket_job_defaults.each { |block| base.rocket_job(&block) } if @rocket_job_defaults
-          end
-
-          # Override parent defaults
-          def self.rocket_job(&block)
-            (@rocket_job_defaults ||=[]) << block
-          end
-
-          private
-
-          def self.rocket_job_defaults
-            @rocket_job_defaults
-          end
-
-          # Apply defaults after creating the model but before applying values
-          def rocket_job_set_defaults
-            if defaults = self.class.rocket_job_defaults
-              defaults.each { |block| block.call(self) }
-            end
-          end
-        end
-
-      end
-    end
-  end
-end

data/test/config/mongo.yml

@@ -1,46 +0,0 @@
-# Some of these options are from mongo_ha
-#
-default_options: &default_options
-  :w:                           1
-  :pool_size:                   5
-  :pool_timeout:                5
-  :connect_timeout:             5
-  :reconnect_attempts:          53
-  :reconnect_retry_seconds:     0.1
-  :reconnect_retry_multiplier:  2
-  :reconnect_max_retry_seconds: 5
-
-development:
-  uri: mongodb://localhost:27017/development_rocketjob
-  options:
-    <<: *default_options
-
-development_work:
-  uri: mongodb://localhost:27017/development_rocketjob_work
-  options:
-    <<: *default_options
-
-test:
-  uri: mongodb://localhost:27017/test_rocketjob
-  options:
-    <<: *default_options
-
-test_work:
-  uri: mongodb://localhost:27017/test_rocketjob_work
-  options:
-    <<: *default_options
-
-# Sample Production Settings
-production:
-  uri: mongodb://mongo1.site.com:27017,mongo2.site.com:27017/production_rocketjob
-  options:
-    <<: *default_options
-    :pool_size:    50
-    :pool_timeout: 5
-
-production_work:
-  uri: mongodb://mongo_local.site.com:27017/production_rocketjob_work
-  options:
-    <<: *default_options
-    :pool_size:    50
-    :pool_timeout: 5