dalliance 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 770b598ecda6d6367cfd24565553f708e299fafe
-  data.tar.gz: 35655132bdd46cc7f08c158f62ee7317639a23cc
+  metadata.gz: 267405e920c6dfe198292f8ae05498c00494b34b
+  data.tar.gz: ad7ffd0ee48511a8121a68def129eb8ac8ccb6f9
 SHA512:
-  metadata.gz: 64e6db3bd0dd227225e6fb19478f12dab7ba5eeb6c61ba93b1f3e16f0a7f663989e841f352bc4928194564fe37dc70be43eabd8ace1b2d40b2ca78ad024b3b2f
-  data.tar.gz: 4548bf3c28267439d47e7a35d7ce3c18dcb0366d8ab90044e037e283f5a00e4163839de39c61e6c1738a9f8c3fcab024cebdb86e696e3cd25b8c1d4d668d919c
+  metadata.gz: 67b7ba61c97d54b59a5c11b83fee1e735ff43ac1b6c8f5998f6f102395eee408a099a05a66ea3c4aed7d871fd7ed4a24492efd9155abd5464afe65b109d54f46
+  data.tar.gz: a331099ddaf02e82c158ff928ad8a4a3cbf8ebd5aa19ea2aaa98593dc80574f6e6977bcd0b51bea715c75a3c4a9d70b26f35615deb2a798bf1e4804c6d2040ab

data/Appraisals

@@ -1,7 +1,3 @@
-appraise "rails-3.1" do
-  gem "rails", "~> 3.1.0"
-end
-
 appraise "rails-3.2" do
   gem "rails", "~> 3.2.0"
 end
@@ -13,3 +9,7 @@ end
 appraise "rails-4.1" do
   gem "rails", "~> 4.1.0"
 end
+
+appraise "rails-4.2" do
+  gem "rails", "~> 4.2.0"
+end

data/dalliance.gemspec

@@ -18,8 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency('activerecord', '>= 3.1', "< 4.2")
-  s.add_dependency('activesupport', '>= 3.1', "< 4.2")
+  s.add_dependency('rails', '>= 3.2', "< 5.0")
 
   s.add_dependency('state_machine')
 

data/gemfiles/rails_3.1.gemfile

@@ -5,4 +5,8 @@ source "http://rubygems.org"
 gem "appraisal"
 gem "rails", "~> 3.1.0"
 
+group :development, :test do
+  gem "byebug"
+end
+
 gemspec :path => "../"

data/gemfiles/rails_3.1.gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: ../
   specs:
-    dalliance (0.3.0)
-      activerecord (>= 3.1, < 4.2)
-      activesupport (>= 3.1, < 4.2)
+    dalliance (0.3.3)
+      activerecord (>= 3.1, < 5.0)
+      activesupport (>= 3.1, < 5.0)
       state_machine
 
 GEM
@@ -43,6 +43,7 @@ GEM
       thor (>= 0.14.0)
     arel (2.2.3)
     builder (3.0.4)
+    byebug (9.0.5)
     delayed_job (4.0.6)
       activesupport (>= 3.0, < 5.0)
     delayed_job_active_record (4.0.3)
@@ -135,6 +136,7 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal
+  byebug
   dalliance!
   delayed_job (>= 3.0.0)
   delayed_job_active_record
@@ -142,3 +144,6 @@ DEPENDENCIES
   resque
   rspec (>= 3.0.0)
   sqlite3
+
+BUNDLED WITH
+   1.13.1

data/gemfiles/rails_3.2.gemfile

@@ -5,4 +5,8 @@ source "http://rubygems.org"
 gem "appraisal"
 gem "rails", "~> 3.2.0"
 
+group :development, :test do
+  gem "byebug"
+end
+
 gemspec :path => "../"

data/gemfiles/rails_3.2.gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: ../
   specs:
-    dalliance (0.3.0)
-      activerecord (>= 3.1, < 4.2)
-      activesupport (>= 3.1, < 4.2)
+    dalliance (0.3.4)
+      rails (>= 3.2, < 5.0)
       state_machine
 
 GEM
@@ -42,6 +41,7 @@ GEM
       thor (>= 0.14.0)
     arel (3.0.3)
     builder (3.0.4)
+    byebug (9.0.5)
     delayed_job (4.0.6)
       activesupport (>= 3.0, < 5.0)
     delayed_job_active_record (4.0.3)
@@ -133,6 +133,7 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal
+  byebug
   dalliance!
   delayed_job (>= 3.0.0)
   delayed_job_active_record
@@ -140,3 +141,6 @@ DEPENDENCIES
   resque
   rspec (>= 3.0.0)
   sqlite3
+
+BUNDLED WITH
+   1.13.1

data/gemfiles/rails_4.0.gemfile

@@ -5,4 +5,8 @@ source "http://rubygems.org"
 gem "appraisal"
 gem "rails", "~> 4.0.0"
 
+group :development, :test do
+  gem "byebug"
+end
+
 gemspec :path => "../"

data/gemfiles/rails_4.0.gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: ../
   specs:
-    dalliance (0.3.0)
-      activerecord (>= 3.1, < 4.2)
-      activesupport (>= 3.1, < 4.2)
+    dalliance (0.3.4)
+      rails (>= 3.2, < 5.0)
       state_machine
 
 GEM
@@ -39,6 +38,7 @@ GEM
       thor (>= 0.14.0)
     arel (4.0.2)
     builder (3.1.4)
+    byebug (9.0.5)
     delayed_job (4.0.6)
       activesupport (>= 3.0, < 5.0)
     delayed_job_active_record (4.0.3)
@@ -121,6 +121,7 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal
+  byebug
   dalliance!
   delayed_job (>= 3.0.0)
   delayed_job_active_record
@@ -128,3 +129,6 @@ DEPENDENCIES
   resque
   rspec (>= 3.0.0)
   sqlite3
+
+BUNDLED WITH
+   1.13.1

data/gemfiles/rails_4.1.gemfile

@@ -5,4 +5,8 @@ source "http://rubygems.org"
 gem "appraisal"
 gem "rails", "~> 4.1.0"
 
+group :development, :test do
+  gem "byebug"
+end
+
 gemspec :path => "../"

data/gemfiles/rails_4.1.gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: ../
   specs:
-    dalliance (0.3.0)
-      activerecord (>= 3.1, < 4.2)
-      activesupport (>= 3.1, < 4.2)
+    dalliance (0.3.4)
+      rails (>= 3.2, < 5.0)
       state_machine
 
 GEM
@@ -41,6 +40,7 @@ GEM
       thor (>= 0.14.0)
     arel (5.0.1.20140414130214)
     builder (3.2.2)
+    byebug (9.0.5)
     delayed_job (4.0.6)
       activesupport (>= 3.0, < 5.0)
     delayed_job_active_record (4.0.3)
@@ -127,6 +127,7 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal
+  byebug
   dalliance!
   delayed_job (>= 3.0.0)
   delayed_job_active_record
@@ -134,3 +135,6 @@ DEPENDENCIES
   resque
   rspec (>= 3.0.0)
   sqlite3
+
+BUNDLED WITH
+   1.13.1

data/gemfiles/rails_4.2.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "appraisal"
+gem "rails", "~> 4.2.0"
+
+group :development, :test do
+  gem "byebug"
+end
+
+gemspec :path => "../"

data/gemfiles/rails_4.2.gemfile.lock

@@ -0,0 +1,168 @@
+PATH
+  remote: ../
+  specs:
+    dalliance (0.3.4)
+      rails (>= 3.2, < 5.0)
+      state_machine
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (4.2.7.1)
+      actionpack (= 4.2.7.1)
+      actionview (= 4.2.7.1)
+      activejob (= 4.2.7.1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.7.1)
+      actionview (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.7.1)
+      activesupport (= 4.2.7.1)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.7.1)
+      activesupport (= 4.2.7.1)
+      globalid (>= 0.3.0)
+    activemodel (4.2.7.1)
+      activesupport (= 4.2.7.1)
+      builder (~> 3.1)
+    activerecord (4.2.7.1)
+      activemodel (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
+      arel (~> 6.0)
+    activesupport (4.2.7.1)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    appraisal (2.1.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (6.0.3)
+    builder (3.2.2)
+    byebug (9.0.5)
+    concurrent-ruby (1.0.2)
+    delayed_job (4.1.2)
+      activesupport (>= 3.0, < 5.1)
+    delayed_job_active_record (4.1.1)
+      activerecord (>= 3.0, < 5.1)
+      delayed_job (>= 3.0, < 5)
+    diff-lcs (1.2.5)
+    erubis (2.7.0)
+    globalid (0.3.7)
+      activesupport (>= 4.1.0)
+    i18n (0.7.0)
+    json (1.8.3)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.1.0)
+    minitest (5.9.0)
+    mono_logger (1.1.0)
+    multi_json (1.12.1)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    pkg-config (1.1.7)
+    rack (1.6.4)
+    rack-protection (1.5.3)
+      rack
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (4.2.7.1)
+      actionmailer (= 4.2.7.1)
+      actionpack (= 4.2.7.1)
+      actionview (= 4.2.7.1)
+      activejob (= 4.2.7.1)
+      activemodel (= 4.2.7.1)
+      activerecord (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.7.1)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.7)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (4.2.7.1)
+      actionpack (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (11.2.2)
+    redis (3.3.1)
+    redis-namespace (1.5.2)
+      redis (~> 3.0, >= 3.0.4)
+    resque (1.26.0)
+      mono_logger (~> 1.0)
+      multi_json (~> 1.0)
+      redis-namespace (~> 1.3)
+      sinatra (>= 0.9.2)
+      vegas (~> 0.1.2)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.3)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    sinatra (1.4.7)
+      rack (~> 1.5)
+      rack-protection (~> 1.4)
+      tilt (>= 1.3, < 3)
+    sprockets (3.7.0)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.0)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.3.11)
+    state_machine (1.2.0)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tilt (2.0.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    vegas (0.1.11)
+      rack (>= 1.0.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  byebug
+  dalliance!
+  delayed_job (>= 3.0.0)
+  delayed_job_active_record
+  rails (~> 4.2.0)
+  resque
+  rspec (>= 3.0.0)
+  sqlite3
+
+BUNDLED WITH
+   1.13.1

data/lib/dalliance.rb

@@ -1,3 +1,5 @@
+require 'rails'
+
 require 'state_machine'
 require 'benchmark'
 
@@ -168,7 +170,11 @@ module Dalliance
 
         self.dalliance_error_hash = { error: 'Persistance Failure: See Logs' }
 
-        self.class.where(id: self.id).update_all(dalliance_status: dalliance_status, dalliance_error_hash: dalliance_error_hash.to_yaml )
+        if defined?(Rails) && ::Rails::VERSION::MAJOR > 3
+          self.class.where(id: self.id).update_all(dalliance_status: dalliance_status, dalliance_error_hash: dalliance_error_hash )
+        else
+          self.class.where(id: self.id).update_all(dalliance_status: dalliance_status, dalliance_error_hash: dalliance_error_hash.to_yaml )
+        end
       rescue
       end
     end
@@ -232,7 +238,11 @@ module Dalliance
 
           self.dalliance_error_hash = { error: 'Persistance Failure: See Logs' }
 
-          self.class.where(id: self.id).update_all(dalliance_status: dalliance_status, dalliance_error_hash: dalliance_error_hash.to_yaml )
+          if defined?(Rails) && ::Rails::VERSION::MAJOR > 3
+            self.class.where(id: self.id).update_all(dalliance_status: dalliance_status, dalliance_error_hash: dalliance_error_hash )
+          else
+            self.class.where(id: self.id).update_all(dalliance_status: dalliance_status, dalliance_error_hash: dalliance_error_hash.to_yaml )
+          end
         rescue
         end
       end

data/lib/dalliance/version.rb

@@ -2,7 +2,7 @@ module Dalliance
   module VERSION
     MAJOR = 0
     MINOR = 3
-    TINY  = 3
+    TINY  = 4
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/lib/dalliance/workers/delayed_job.rb

@@ -1,18 +1,37 @@
 module Dalliance
   module Workers
-    class DelayedJob < Struct.new(:instance_klass, :instance_id)
-      def self.enqueue(instance, queue = 'dalliance')
-        ::Delayed::Job.enqueue(self.new(instance.class.name, instance.id), :queue => queue)
-      end
+    if defined?(Rails) && ::Rails::VERSION::MAJOR == 4 && ::Rails::VERSION::MINOR >= 2
+      class DelayedJob < ::ActiveJob::Base
+        queue_as :dalliance
+
+        def self.enqueue(instance, queue = 'dalliance')
+          Dalliance::Workers::DelayedJob.set(queue: queue).perform_later(instance.class.name, instance.id)
+        end
 
-      def perform
-        instance_klass.constantize.find(instance_id).dalliance_process(true)
+        def perform(instance_klass, instance_id)
+          instance_klass.constantize.find(instance_id).dalliance_process(true)
+        end
+
+        #Delayed job automatically retries, so rescue the error
+        def self.rescue_error?
+          true
+        end
       end
+    else
+      class DelayedJob < Struct.new(:instance_klass, :instance_id)
+        def self.enqueue(instance, queue = 'dalliance')
+          ::Delayed::Job.enqueue(self.new(instance.class.name, instance.id), :queue => queue)
+        end
+
+        def perform
+          instance_klass.constantize.find(instance_id).dalliance_process(true)
+        end
 
-      #Delayed job automatically retries, so rescue the error
-      def self.rescue_error?
-        true
+        #Delayed job automatically retries, so rescue the error
+        def self.rescue_error?
+          true
+        end
       end
     end
   end
-end
+end

data/lib/dalliance/workers/resque.rb

@@ -1,18 +1,37 @@
 module Dalliance
   module Workers
-    class Resque
-      def self.enqueue(instance, queue = 'dalliance')
-        ::Resque.enqueue_to(queue, self, instance.class.name, instance.id)
-      end
+    if defined?(Rails) && ::Rails::VERSION::MAJOR == 4 && ::Rails::VERSION::MINOR >= 2
+      class Resque < ::ActiveJob::Base
+        queue_as :dalliance
+
+        def self.enqueue(instance, queue = 'dalliance')
+          Dalliance::Workers::Resque.set(queue: queue).perform_later(instance.class.name, instance.id)
+        end
 
-      def self.perform(instance_klass, instance_id)
-        instance_klass.constantize.find(instance_id).dalliance_process(true)
+        def perform(instance_klass, instance_id)
+          instance_klass.constantize.find(instance_id).dalliance_process(true)
+        end
+
+        #Resque fails, so don't rescue the error
+        def self.rescue_error?
+          false
+        end
       end
+    else
+      class Resque
+        def self.enqueue(instance, queue = 'dalliance')
+          ::Resque.enqueue_to(queue, self, instance.class.name, instance.id)
+        end
+
+        def self.perform(instance_klass, instance_id)
+          instance_klass.constantize.find(instance_id).dalliance_process(true)
+        end
 
-      #Resque fails, so don't rescue the error
-      def self.rescue_error?
-        false
+        #Resque fails, so don't rescue the error
+        def self.rescue_error?
+          false
+        end
       end
     end
   end
-end
+end

data/spec/dalliance/asynchronous_delayed_job_spec.rb

@@ -5,6 +5,9 @@ RSpec.describe DallianceModel do
 
   before(:all) do
     DallianceModel.dalliance_options[:background_processing] = true
+    if defined?(ActiveJob)
+      ActiveJob::Base.queue_adapter = :delayed_job
+    end
   end
 
   before do

data/spec/dalliance/asynchronous_resque_spec.rb

@@ -5,6 +5,9 @@ RSpec.describe DallianceModel do
 
   before(:all) do
     DallianceModel.dalliance_options[:background_processing] = true
+    if defined?(ActiveJob)
+      ActiveJob::Base.queue_adapter = :resque
+    end
   end
 
   before do

data/spec/spec_helper.rb

@@ -3,6 +3,12 @@ require 'bundler/setup'
 
 #Automatically included in a rails app...
 require 'active_support'
+
+begin
+  require 'active_job'
+rescue LoadError
+end
+
 require 'state_machine'
 require 'byebug'
 

metadata

@@ -1,55 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: dalliance
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Eric Sullivan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-26 00:00:00.000000000 Z
+date: 2016-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.2'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: state_machine
   requirement: !ruby/object:Gem::Requirement
@@ -159,6 +139,8 @@ files:
 - gemfiles/rails_4.0.gemfile.lock
 - gemfiles/rails_4.1.gemfile
 - gemfiles/rails_4.1.gemfile.lock
+- gemfiles/rails_4.2.gemfile
+- gemfiles/rails_4.2.gemfile.lock
 - lib/dalliance.rb
 - lib/dalliance/engine.rb
 - lib/dalliance/progress_meter.rb
@@ -197,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: dalliance
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Wrapper for an ActiveRecord model with a single ascynhronous method