dalliance 0.6.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33f7433a3391650bd85c64aa0168d2ba9c47a58623fb939241f5d379f9fd621e
-  data.tar.gz: f0cd58c87d0c512592ca19ea3f25d572569302a1e2c2fb4c8a0864ac2827a9d5
+  metadata.gz: ceb1bcc758ad39970b608af9112dfb735f7408edc7d97caf818654d5fca558db
+  data.tar.gz: eed4e050d077b5cdf74b8d8997e917423229199904740a06028e2d3daca89c66
 SHA512:
-  metadata.gz: 6882e52916979a54c75a589ead81bb4a20b2639129ae18751afc11c45ccd6e1ddd2c2eee0ecb43ed9901c0ebd9d4e194621321c7d8e2474ec69c804d4e6c7884
-  data.tar.gz: c1e5741fdcfcb3914d8b729476a7e12c64305125abb94a10687dd79693ef5499d0c61467b466e387dc3a60fd62e56354e97e17ce1f7f38d63cdc94ba76d69aa0
+  metadata.gz: 9bbddd1d2685d64b7a2ccd0d5d610f5d7d44d249ef59d0c0d76198e4c0733340dc89dc506b9c084c1f667ec7370830560854575b1dc0079d63a16cc630ba0093
+  data.tar.gz: f60a961960220bfe1973d12a1c4440bd87d1ae6d2cbfd71c57e2308d66e58e0887a5aee8513bde25316bb50765d12dbb4d42105b04d3d8dedab4465e7a63634b

data/.circleci/config.yml

@@ -0,0 +1,107 @@
+version: 2.1
+
+defaults: &defaults
+  working_directory: ~/app
+  docker:
+    - image: circleci/ruby:2.6.5
+    - image: redis
+    # - image: circleci/mysql:5.7
+    #   environment:
+    #     MYSQL_USER: root
+    #     MYSQL_PASSWORD: ''
+
+jobs:
+  build:
+    <<: *defaults
+    parallelism: 1
+    steps:
+      - checkout
+
+
+      - restore_cache:
+          keys:
+            - v2-bundle-{{ checksum "Gemfile.lock" }}
+      - run:
+          name: Bundle install
+          command: bundle check || bundle install --retry=3 --path vendor/bundle
+      - save_cache:
+          key: v2-bundle-{{ checksum "Gemfile.lock" }}
+          paths:
+            - vendor/bundle
+      - persist_to_workspace:
+          root: ~/
+          paths:
+            - app
+
+  test:
+    <<: *defaults
+    parallelism: 1
+    steps:
+      - attach_workspace:
+          at: ~/
+
+      - run: bundle --path vendor/bundle
+
+      # - run:
+      #     name: Wait for DB
+      #     command: dockerize -wait tcp://localhost:3306 -timeout 1m
+
+      - run:
+          name: Run RSpec tests
+          command: |
+            TEST_FILES="$(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)"
+            echo $TEST_FILES
+            bundle exec rspec --profile 10 \
+                              --format RspecJunitFormatter \
+                              --out test_results/rspec.xml \
+                              --format progress \
+                              $TEST_FILES
+      - store_test_results:
+          path: test_results
+      - store_artifacts:
+          path: test_results
+
+  bundler_audit:
+    <<: *defaults
+    parallelism: 1
+    steps:
+      - attach_workspace:
+          at: ~/
+      - run: bundle --path vendor/bundle
+      - run:
+          name: Run bundler-audit
+          command: |
+            if [[ "${CIRCLE_NODE_INDEX}" == 0 ]]
+            then
+              bundle exec bundle-audit update && bundle exec bundle-audit check
+            fi
+
+  rubocop:
+    <<: *defaults
+    parallelism: 1
+    steps:
+      - attach_workspace:
+          at: ~/
+      - run: bundle --path vendor/bundle
+      - run:
+          name: Run rubocop
+          command: |
+            if [[ "${CIRCLE_NODE_INDEX}" == 0 ]]
+            then
+                bundle exec rubocop -D -l
+            fi
+
+workflows:
+  version: 2
+  continuous_integration:
+    jobs:
+      - build
+      - test:
+          requires:
+            - build
+      - bundler_audit:
+          requires:
+            - build
+      - rubocop:
+          requires:
+            - build

data/Appraisals

@@ -1,7 +1,3 @@
-appraise "rails-4.2" do
-  gem "rails", "~> 4.2.0"
-end
-
 appraise "rails-5.0" do
   gem "rails", "~> 5.0.0"
 end
@@ -12,4 +8,12 @@ end
 
 appraise "rails-5.2" do
   gem "rails", "~> 5.2.2"
+end
+
+appraise "rails-6.0" do
+  gem "rails", "~> 6.0.0"
+end
+
+appraise "rails-6.1" do
+  gem "rails", "~> 6.1.0"
 end

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in dalliance.gemspec
 gemspec

data/README.rdoc

@@ -19,7 +19,19 @@ In your model:
 process_method is the name of the method to invoke for background processing
 to kick it off just call dalliance_background_process
 
-Handle your migrations:
+Models can also be re-processed to allow front-end users to reprocess without
+needing to loop in PMs or developers:
+
+    class Model < ActiveRecord::Base
+      dalliance :process_method,
+                reprocess_method: :reprocessing_method
+    end
+
+Keep in mind that a record that has not already been completely processed (eg in
+a state of 'pending' or 'processing') cannot be reprocessed. Attempting to
+reprocess the record will raise an error.
+
+== Handle your migrations:
 
    rails g dalliance:progress_meter
 

data/config/locales/en.yml

@@ -8,6 +8,8 @@ en:
           validation_error: Validation Error
           processing_error: Processing Error
           completed: Completed
+          cancel_requested: Cancellation Requested
+          cancelled: Cancelled
   attributes:
     dalliance_status: Status
     dalliance_error_hash: Errors

data/dalliance.gemspec

@@ -11,14 +11,12 @@ Gem::Specification.new do |s|
   s.summary     = %q{ Wrapper for an ActiveRecord model with a single ascynhronous method }
   s.description = %q{ Background processing for ActiveRecord using a 'delayable' worker and a state_machine }
 
-  s.rubyforge_project = "dalliance"
-
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency('rails', '>= 4.2', "< 5.3")
+  s.add_dependency('rails', '>= 5.0', "< 6.2")
 
   s.add_dependency('state_machine')
 
@@ -26,6 +24,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency('delayed_job', '>= 3.0.0')
   s.add_development_dependency('delayed_job_active_record')
   s.add_development_dependency('sqlite3')
-
   s.add_development_dependency('resque')
+  s.add_development_dependency('bundler-audit')
+  s.add_development_dependency('rubocop', '~> 0.78')
+  s.add_development_dependency('rspec_junit_formatter')
 end

data/gemfiles/rails_5.0.gemfile

@@ -1,6 +1,6 @@
 # This file was generated by Appraisal
 
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gem "appraisal"
 gem "rails", "~> 5.0.0"

data/gemfiles/rails_5.0.gemfile.lock

@@ -1,48 +1,48 @@
 PATH
   remote: ..
   specs:
-    dalliance (0.5.1)
-      rails (>= 3.2, < 5.3)
+    dalliance (0.8.1)
+      rails (>= 5.0, < 6.2)
       state_machine
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    actioncable (5.0.0)
-      actionpack (= 5.0.0)
-      nio4r (~> 1.2)
+    actioncable (5.0.7.2)
+      actionpack (= 5.0.7.2)
+      nio4r (>= 1.2, < 3.0)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.0.0)
-      actionpack (= 5.0.0)
-      actionview (= 5.0.0)
-      activejob (= 5.0.0)
+    actionmailer (5.0.7.2)
+      actionpack (= 5.0.7.2)
+      actionview (= 5.0.7.2)
+      activejob (= 5.0.7.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.0.0)
-      actionview (= 5.0.0)
-      activesupport (= 5.0.0)
+    actionpack (5.0.7.2)
+      actionview (= 5.0.7.2)
+      activesupport (= 5.0.7.2)
       rack (~> 2.0)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.0)
-      activesupport (= 5.0.0)
+    actionview (5.0.7.2)
+      activesupport (= 5.0.7.2)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (5.0.0)
-      activesupport (= 5.0.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.0.7.2)
+      activesupport (= 5.0.7.2)
       globalid (>= 0.3.6)
-    activemodel (5.0.0)
-      activesupport (= 5.0.0)
-    activerecord (5.0.0)
-      activemodel (= 5.0.0)
-      activesupport (= 5.0.0)
+    activemodel (5.0.7.2)
+      activesupport (= 5.0.7.2)
+    activerecord (5.0.7.2)
+      activemodel (= 5.0.7.2)
+      activesupport (= 5.0.7.2)
       arel (~> 7.0)
-    activesupport (5.0.0)
+    activesupport (5.0.7.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     appraisal (2.2.0)
@@ -50,67 +50,77 @@ GEM
       rake
       thor (>= 0.14.0)
     arel (7.1.4)
-    builder (3.2.3)
-    byebug (10.0.2)
-    concurrent-ruby (1.1.5)
-    crass (1.0.4)
-    delayed_job (4.1.5)
-      activesupport (>= 3.0, < 5.3)
-    delayed_job_active_record (4.1.3)
-      activerecord (>= 3.0, < 5.3)
+    ast (2.4.0)
+    builder (3.2.4)
+    bundler-audit (0.6.1)
+      bundler (>= 1.2.0, < 3)
+      thor (~> 0.18)
+    byebug (11.1.1)
+    concurrent-ruby (1.1.6)
+    crass (1.0.6)
+    delayed_job (4.1.8)
+      activesupport (>= 3.0, < 6.1)
+    delayed_job_active_record (4.1.4)
+      activerecord (>= 3.0, < 6.1)
       delayed_job (>= 3.0, < 5)
     diff-lcs (1.3)
     erubis (2.7.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (0.9.5)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
-    loofah (2.2.3)
+    jaro_winkler (1.5.4)
+    loofah (2.4.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     method_source (0.9.2)
-    mini_mime (1.0.1)
+    mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.11.3)
+    minitest (5.14.0)
     mono_logger (1.1.0)
-    multi_json (1.13.1)
-    mustermann (1.0.3)
-    nio4r (1.2.1)
-    nokogiri (1.10.3)
+    multi_json (1.14.1)
+    mustermann (1.1.1)
+      ruby2_keywords (~> 0.0.1)
+    nio4r (2.5.2)
+    nokogiri (1.10.8)
       mini_portile2 (~> 2.4.0)
-    rack (2.0.7)
-    rack-protection (2.0.5)
+    parallel (1.19.1)
+    parser (2.7.0.3)
+      ast (~> 2.4.0)
+    rack (2.2.2)
+    rack-protection (2.0.8.1)
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (5.0.0)
-      actioncable (= 5.0.0)
-      actionmailer (= 5.0.0)
-      actionpack (= 5.0.0)
-      actionview (= 5.0.0)
-      activejob (= 5.0.0)
-      activemodel (= 5.0.0)
-      activerecord (= 5.0.0)
-      activesupport (= 5.0.0)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 5.0.0)
+    rails (5.0.7.2)
+      actioncable (= 5.0.7.2)
+      actionmailer (= 5.0.7.2)
+      actionpack (= 5.0.7.2)
+      actionview (= 5.0.7.2)
+      activejob (= 5.0.7.2)
+      activemodel (= 5.0.7.2)
+      activerecord (= 5.0.7.2)
+      activesupport (= 5.0.7.2)
+      bundler (>= 1.3.0)
+      railties (= 5.0.7.2)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (5.0.0)
-      actionpack (= 5.0.0)
-      activesupport (= 5.0.0)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (5.0.7.2)
+      actionpack (= 5.0.7.2)
+      activesupport (= 5.0.7.2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (12.3.2)
-    redis (4.1.0)
-    redis-namespace (1.6.0)
+    rainbow (3.0.0)
+    rake (13.0.1)
+    redis (4.1.3)
+    redis-namespace (1.7.0)
       redis (>= 3.0.4)
     resque (2.0.0)
       mono_logger (~> 1.0)
@@ -118,49 +128,64 @@ GEM
       redis-namespace (~> 1.6)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    rexml (3.2.4)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    sinatra (2.0.5)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
+    rspec_junit_formatter (0.4.1)
+      rspec-core (>= 2, < 4, != 2.12.0)
+    rubocop (0.80.0)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.7.0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      rexml
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    ruby-progressbar (1.10.1)
+    ruby2_keywords (0.0.2)
+    sinatra (2.0.8.1)
       mustermann (~> 1.0)
       rack (~> 2.0)
-      rack-protection (= 2.0.5)
+      rack-protection (= 2.0.8.1)
       tilt (~> 2.0)
-    sprockets (3.7.2)
+    sprockets (4.0.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.3.13)
+    sqlite3 (1.4.2)
     state_machine (1.2.0)
     thor (0.20.3)
     thread_safe (0.3.6)
-    tilt (2.0.9)
-    tzinfo (1.2.5)
+    tilt (2.0.10)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
+    unicode-display_width (1.6.1)
     vegas (0.1.11)
       rack (>= 1.0.0)
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
+    websocket-extensions (0.1.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   appraisal
+  bundler-audit
   byebug
   dalliance!
   delayed_job (>= 3.0.0)
@@ -168,6 +193,8 @@ DEPENDENCIES
   rails (~> 5.0.0)
   resque
   rspec (>= 3.0.0)
+  rspec_junit_formatter
+  rubocop (~> 0.78)
   sqlite3
 
 BUNDLED WITH