state_machine_job 0.2.0 → 1.0.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZGViMzAyYTY5MDM0ODM1YTEyZWQ4ODI5OGMyMjE1NWUxYjcwYTQzYQ==
-  data.tar.gz: !binary |-
-    NTlhMzgwNzk4OWJhZDNjMWE1YWJmOTAyOWIwNzkxOGZlZWYxMDY1OA==
+SHA1:
+  metadata.gz: 399f472130b3ee8015808ca3295f2802c5610bce
+  data.tar.gz: 038d38a55ee2d05627a6a0392d3e957bb1ab06b6
 SHA512:
-  metadata.gz: !binary |-
-    NmQ4NjU2Mzc0NjZiOThjMmVkYTkwODYzYTQwZmVhZGFhNWNmNmM1ZDAxNzUz
-    NDJiNDVlY2VmMjY4OWVmYzUwYmE2MWMzYjA4OTk4NjEyNzc3ZjIyZTU2MjA0
-    M2VlNmUxNjRmNzdmM2NkZGNkOTZmYjhjMmUwMTNlZmFkZGQ5ZjY=
-  data.tar.gz: !binary |-
-    YzFjNDZhYWU4YmNkYjMzMGI3ZDE3NmY2NmQ5YjI1ZGU5Mjk5ODY4NzZmNGQ4
-    MWM1OWIyNzhjZDAzMDA5NjMwMzdhZWM4NGU4M2EzY2U5YjE0YzRhODg1NzAy
-    MDdhOWRkODI4ZDUyYjVlOGZlNTRmYWI2M2JiZjBiOTA1ZTViNDM=
+  metadata.gz: 2eca4e96a81540fc28e25cfa7bd005478254b434cc0a78f04489c94f529da5796260f14d477e04bb857b2ee3f78b7430a8f87b0f06006788a7f6fe8b03c67659
+  data.tar.gz: 94668d80123330fa26e56ecc1e4c1918c46afff64d3afae6ad953a010273458ac69279204d7ad9454edf3d94117adc931cd16588ce86ded59adf0b1a3aeb7d0d

data/.travis.yml

@@ -1,4 +1,4 @@
 rvm:
-  - 1.9.3
+  - 2.1.0
 
 script: "bundle exec rspec"

data/CHANGELOG.md

@@ -1,13 +1,24 @@
 # CHANGELOG
 
-### Version 0.2.0
+### Version 1.0.0
 
-* `:if` option for job `result` to change to different states based on
-  conditionals.
-* Raise an exception if the shorthand `result` signature is used with
-  further options which would be ignored.
+2017-08-02
 
-### Version 0.1.0
+[Compare changes](http://github.com/codevise/state_machine_job/compare/0-x-stable...v1.0.0)
 
-* `:retry_if_state` option to rerun jobs on completion if the state
-  changed since the job was scheduled.
+- Do not silence exceptions. Ensure state machine can transition to
+  failed state by invoking error result event, but then re-raise
+  exception, so they show up in the Resque error list. Jobs are still
+  free to rescue exceptions themselves and return an error result
+  instead.
+  ([#5](https://github.com/codevise/state_machine_job/pull/5))
+- Add backtrace info to exception logging
+  ([#3](https://github.com/codevise/state_machine_job/pull/3))
+- Restrict activesupport to < 5 for now
+  ([#4](https://github.com/codevise/state_machine_job/pull/4))
+- Use sinatra 1 in development and tests for ruby 2.1 compatibility
+  ([#6](https://github.com/codevise/state_machine_job/pull/6))
+
+See
+[0-x-stable branch](https://github.com/codevise/state_machine_job/blob/0-x-stable/CHANGELOG.md)
+for previous changes.

data/Gemfile

@@ -2,3 +2,6 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in state_machine_job.gemspec
 gemspec
+
+# Sinatra 2 requires Ruby 2.2
+gem 'sinatra', '~> 1.0'

data/README.md

@@ -83,7 +83,7 @@ method using the `payload` method:
 `perform_with_result` is now called with the given hash of options as
 the second parameter.
 
-### Changing to States With Conditions
+### Changing to States with Conditions
 
 One job result can lead to different states based on a conditional.
 When the job finishes with the given result, the state machine
@@ -99,7 +99,7 @@ transitions to the first state whose conditional evaluates to true.
       result :error => 'failed'
     end
 
-A conditional can either be a lambda which optionally accepting the
+A conditional can either be a lambda optionally accepting the
 record as parameter or a symbol specifying a method to call on the
 record.
 

data/Rakefile

@@ -1 +1,4 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+
+require 'semmy'
+Semmy::Tasks.install

data/lib/state_machine_job.rb

@@ -14,16 +14,19 @@ module StateMachineJob
     record = model_name.constantize.find_by_id(id)
 
     if record
-      result =
-        begin
-          perform_with_result(record, payload)
-        rescue Exception => e
-          logger.error "#{self.name} - exception for #{model_name} #{id}: #{e.inspect}"
-          :error
-        end
-
-      logger.info "#{self.name} - result #{result} for #{model_name} #{id}"
-      record.send(event_name(result))
+      begin
+        result = perform_with_result(record, payload)
+      rescue Exception => e
+        result = :error
+
+        logger.error "#{self.name} - exception for #{model_name} #{id}: #{e.inspect}"
+        e.backtrace.each { |line| logger.info(line) }
+
+        raise
+      ensure
+        logger.info "#{self.name} - result #{result} for #{model_name} #{id}"
+        record.send(event_name(result))
+      end
     else
       logger.info "#{self.name} - #{model_name} #{id} not found. Skipping job."
     end

data/lib/state_machine_job/version.rb

@@ -1,3 +1,3 @@
 module StateMachineJob
-  VERSION = '0.2.0'
+  VERSION = '1.0.0'.freeze
 end

data/spec/state_machine_job_spec.rb

@@ -21,6 +21,8 @@ describe StateMachineJob do
     extend StateMachineJob
   end
 
+  class SomeError < StandardError; end
+
   class Model
     state_machine :initial => :idle do
       extend StateMachineJob::Macro
@@ -29,6 +31,7 @@ describe StateMachineJob do
       state :first_running
       state :second_running
       state :done
+      state :failed
 
       event :run do
         transition :idle => :first_running
@@ -40,6 +43,7 @@ describe StateMachineJob do
           {:n => 1}
         end
         result :ok => :second_running
+        result :error => :failed
       end
 
       job TestJob2, TestQueue.instance do
@@ -48,6 +52,7 @@ describe StateMachineJob do
           {:n => 2}
         end
         result :ok => :done
+        result :error => :failed
       end
     end
   end
@@ -76,6 +81,33 @@ describe StateMachineJob do
     model.run
   end
 
+  it 'lets exception bubble raised by perform_with_result' do
+    model = Model.new
+
+    allow(model).to receive(:id).and_return(5)
+    allow(Model).to receive(:find_by_id).and_return(model)
+    allow(TestJob1).to receive(:perform_with_result).and_raise(SomeError)
+
+    expect {
+      model.run
+    }.to raise_error(SomeError)
+  end
+
+  it 'invokes error job result event on record if perform_with_result raises' do
+    model = Model.new
+
+    allow(model).to receive(:id).and_return(5)
+    allow(Model).to receive(:find_by_id).and_return(model)
+    allow(TestJob1).to receive(:perform_with_result).and_raise(SomeError)
+
+    expect(model).to receive(:test_job1_error!)
+
+    begin
+      model.run
+    rescue SomeError
+    end
+  end
+
   it 'job is skipped if record cannot be found' do
     allow(Model).to receive(:find_by_id).and_return(nil)
 

data/state_machine_job.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |spec|
   spec.description   = %q{State Machine + Resque.}
   spec.summary       = %q{Resque jobs class for rails state machines.}
   spec.homepage      = "http://github.com/codevise/state_machine_job"
+  spec.licenses    = ['MIT']
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -18,11 +19,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency 'bundler', '~> 1.3'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'activesupport'
+  spec.add_development_dependency 'rake', '< 13'
+  spec.add_development_dependency 'rspec', '~> 3.6'
+  spec.add_development_dependency 'activesupport', '< 5'
+  spec.add_development_dependency 'semmy', '~> 1.0'
 
-  spec.add_runtime_dependency 'resque'
-  spec.add_runtime_dependency 'resque-logger'
-  spec.add_runtime_dependency 'state_machine'
+  spec.add_runtime_dependency 'resque', '~> 1.25'
+  spec.add_runtime_dependency 'resque-logger', '~> 0.2.0'
+  spec.add_runtime_dependency 'state_machine', '~> 1.2'
 end

metadata

@@ -1,113 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: state_machine_job
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Codevise Solutions Ltd.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-01 00:00:00.000000000 Z
+date: 2017-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
+- !ruby/object:Gem::Dependency
+  name: semmy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.25'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.25'
 - !ruby/object:Gem::Dependency
   name: resque-logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: state_machine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
 description: State Machine + Resque.
 email:
 - info@codevise.de
@@ -115,8 +129,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -131,7 +145,8 @@ files:
 - spec/support/setup_resque_logger.rb
 - state_machine_job.gemspec
 homepage: http://github.com/codevise/state_machine_job
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -139,17 +154,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Resque jobs class for rails state machines.