job-iteration 0.9.8 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 491bb815da57f76483532694ef9ae646650fb7aceba6f6ec13e9cdcf7b1fa45d
-  data.tar.gz: 122091085c03c51c798a6f6524ac21a225bff29025e538a34c1cff42eb891128
+  metadata.gz: 6d2d963a3239101fbb564b9864936a7f06413aead04540979b8d3737c7fc1429
+  data.tar.gz: e8b7e4d4d75f263633883d6b24b1af0adfe549b0d8778d2fb57aeb937a482c03
 SHA512:
-  metadata.gz: 190b96aeb121423cb7e0ec13c212804aa14164ac8a37a8641a96d2621185d42e4aa0898d116cd284ff8f4d839652bb248d58369abbe733d518f62350dfc0af6d
-  data.tar.gz: 2efbc27bd9fcf6ca8b189febc0c5d1151e93430b9cdf60b2df5a3bd9fe0270e1f75f80296decf695143dc7a4881c0c47d6da36bdd161c8b6387bb8014a531ae1
+  metadata.gz: d3140b3feff8927f989a1ac2ad9c118254793e23119aabe56c405e6a35d0bd944ea176f3398e07fd5e1f0f3f43a7eac053bcf4565dfcc23341c1c26a67e58044
+  data.tar.gz: 4b71e936e4801192f62e1990761dcd544425d5fdffb7020bcabe9f0d91778c50b599d14f341ce04b8491797dff774b02ee26db8ff6dbc8ed1f1a2f0b42d2aa56

data/.gitignore

@@ -8,3 +8,5 @@
 /tmp/
 .ruby-version
 .rubocop-http---shopify-github-io-ruby-style-guide-rubocop-yml
+gemfiles/*.lock
+Gemfile.lock

data/.travis.yml

@@ -3,10 +3,9 @@ services:
   - redis-server
 language: ruby
 rvm:
-  - 2.4.5
-  - 2.5.3
+  - 2.5.5
+  - 2.6.2
 before_install:
-  - gem install bundler
   - mysql -e 'CREATE DATABASE job_iteration_test;'
 script:
   - bundle exec rake test
@@ -14,5 +13,5 @@ script:
   - bundle exec yardoc --no-output --no-save --no-stats --fail-on-warning
 
 gemfile:
-  - 'gemfiles/activejob_5_2.gemfile'
-  - 'gemfiles/activejob_edge.gemfile'
+  - 'gemfiles/rails_5_2.gemfile'
+  - 'gemfiles/rails_edge.gemfile'

data/CHANGELOG.md

@@ -4,6 +4,18 @@
 
 #### Bug fix
 
+### v1.0.0 (April 29, 2019)
+
+It’s been in production at Shopify since 2017. It has support for Rails 5 and 6 :tada:
+
+### Deprecations
+
+- [34](https://github.com/Shopify/job-iteration/pull/34) - remove supports_interruption?
+
+### Internal
+
+- [30](https://github.com/Shopify/job-iteration/pull/30) - Better #each_iteration argument names
+
 ### v0.9.8 (December 5, 2018)
 
 #### Bug fix

data/Gemfile

@@ -22,3 +22,4 @@ gem 'mocha'
 
 gem 'rubocop'
 gem 'yard'
+gem 'rake'

data/README.md

@@ -195,4 +195,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the Job::Iteration project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/kirs/job-iteration/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the Job::Iteration project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/Shopify/job-iteration/blob/master/CODE_OF_CONDUCT.md).

data/dev.yml

@@ -7,7 +7,7 @@ up:
     - mysql-client:
         or:        [mysql@5.7]
   - ruby:
-      version: 2.5.3
+      version: 2.6.2
   - railgun
   - bundler
   - custom:

data/gemfiles/{activejob_5_2.gemfile → rails_5_2.gemfile}

@@ -3,3 +3,4 @@
 eval_gemfile '../Gemfile'
 
 gem 'activejob', '~> 5.2.0'
+gem 'activerecord', '~> 5.2.0'

data/job-iteration.gemspec

@@ -25,9 +25,4 @@ Gem::Specification.new do |spec|
   spec.metadata["changelog_uri"] = "https://github.com/Shopify/job-iteration/blob/master/CHANGELOG.md"
 
   spec.add_dependency("activejob", ">= 5.2")
-
-  spec.add_development_dependency("bundler", "~> 1.16")
-  spec.add_development_dependency("rake", "~> 10.0")
-  spec.add_development_dependency("minitest", "~> 5.0")
-  spec.add_development_dependency("activerecord")
 end

data/lib/job-iteration/active_record_enumerator.rb

@@ -4,6 +4,8 @@ module JobIteration
   # Builds Enumerator based on ActiveRecord Relation. Supports enumerating on rows and batches.
   # @see EnumeratorBuilder
   class ActiveRecordEnumerator
+    SQL_DATETIME_WITH_NSEC = "%Y-%m-%d %H:%M:%S.%N"
+
     def initialize(relation, columns: nil, batch_size: 100, cursor: nil)
       @relation = relation
       @batch_size = batch_size
@@ -24,7 +26,7 @@ module JobIteration
     def batches
       cursor = finder_cursor
       Enumerator.new(method(:size)) do |yielder|
-        while records = cursor.next_batch(@batch_size)
+        while (records = cursor.next_batch(@batch_size))
           yielder.yield(records, cursor_value(records.last)) if records.any?
         end
       end
@@ -38,9 +40,8 @@ module JobIteration
 
     def cursor_value(record)
       positions = @columns.map do |column|
-        method = column.to_s.split('.').last
-        attribute = record.read_attribute(method.to_sym)
-        attribute.is_a?(Time) ? attribute.to_s(:db) : attribute
+        attribute_name = column.to_s.split('.').last
+        column_value(record, attribute_name)
       end
       return positions.first if positions.size == 1
       positions
@@ -49,5 +50,15 @@ module JobIteration
     def finder_cursor
       JobIteration::ActiveRecordCursor.new(@relation, @columns, @cursor)
     end
+
+    def column_value(record, attribute)
+      value = record.read_attribute(attribute.to_sym)
+      case record.class.columns_hash.fetch(attribute).type
+      when :datetime
+        value.strftime(SQL_DATETIME_WITH_NSEC)
+      else
+        value
+      end
+    end
   end
 end

data/lib/job-iteration/enumerator_builder.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 require_relative "./active_record_enumerator"
 require_relative "./csv_enumerator"
+require "forwardable"
 
 module JobIteration
   class EnumeratorBuilder

data/lib/job-iteration/iteration.rb

@@ -36,10 +36,6 @@ module JobIteration
         set_callback(:complete, :after, *filters, &blk)
       end
 
-      def supports_interruption?
-        true
-      end
-
       private
 
       def ban_perform_definition
@@ -73,7 +69,7 @@ module JobIteration
     end
 
     def retry_job(*)
-      super unless @retried
+      super unless defined?(@retried) && @retried
       @retried = true
     end
 
@@ -121,9 +117,9 @@ module JobIteration
 
     def iterate_with_enumerator(enumerator, arguments)
       arguments = arguments.dup.freeze
-      enumerator.each do |iteration, index|
+      enumerator.each do |object_from_enumerator, index|
         record_unit_of_work do
-          each_iteration(iteration, *arguments)
+          each_iteration(object_from_enumerator, *arguments)
           self.cursor_position = index
         end
 

data/lib/job-iteration/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JobIteration
-  VERSION = "0.9.8"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: job-iteration
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 1.0.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-05 00:00:00.000000000 Z
+date: 2019-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -24,62 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Makes your background jobs interruptible and resumable.
 email:
 - ops-accounts+shipit@shopify.com
@@ -94,14 +38,13 @@ files:
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/setup
 - dev.yml
-- gemfiles/activejob_5_2.gemfile
-- gemfiles/activejob_edge.gemfile
+- gemfiles/rails_5_2.gemfile
+- gemfiles/rails_edge.gemfile
 - guides/best-practices.md
 - guides/custom-enumerator.md
 - guides/iteration-how-it-works.md

data/Gemfile.lock

@@ -1,115 +0,0 @@
-PATH
-  remote: .
-  specs:
-    job-iteration (0.9.8)
-      activejob (>= 5.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activejob (5.2.0)
-      activesupport (= 5.2.0)
-      globalid (>= 0.3.6)
-    activemodel (5.2.0)
-      activesupport (= 5.2.0)
-    activerecord (5.2.0)
-      activemodel (= 5.2.0)
-      activesupport (= 5.2.0)
-      arel (>= 9.0)
-    activesupport (5.2.0)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    arel (9.0.0)
-    ast (2.4.0)
-    coderay (1.1.2)
-    concurrent-ruby (1.0.5)
-    connection_pool (2.2.2)
-    database_cleaner (1.7.0)
-    globalid (0.4.1)
-      activesupport (>= 4.2.0)
-    i18n (1.0.1)
-      concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.1)
-    metaclass (0.0.4)
-    method_source (0.9.0)
-    minitest (5.11.3)
-    mocha (1.5.0)
-      metaclass (~> 0.0.1)
-    mono_logger (1.1.0)
-    multi_json (1.13.1)
-    mustermann (1.0.2)
-    mysql2 (0.4.10)
-    parallel (1.12.1)
-    parser (2.5.1.0)
-      ast (~> 2.4.0)
-    powerpack (0.1.2)
-    pry (0.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    rack (2.0.5)
-    rack-protection (2.0.3)
-      rack
-    rainbow (3.0.0)
-    rake (10.5.0)
-    redis (4.0.1)
-    redis-namespace (1.6.0)
-      redis (>= 3.0.4)
-    resque (1.27.4)
-      mono_logger (~> 1.0)
-      multi_json (~> 1.0)
-      redis-namespace (~> 1.3)
-      sinatra (>= 0.9.2)
-      vegas (~> 0.1.2)
-    rubocop (0.57.2)
-      jaro_winkler (~> 1.5.1)
-      parallel (~> 1.10)
-      parser (>= 2.5)
-      powerpack (~> 0.1)
-      rainbow (>= 2.2.2, < 4.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.9.0)
-    sidekiq (5.1.3)
-      concurrent-ruby (~> 1.0)
-      connection_pool (~> 2.2, >= 2.2.0)
-      rack-protection (>= 1.5.0)
-      redis (>= 3.3.5, < 5)
-    sinatra (2.0.3)
-      mustermann (~> 1.0)
-      rack (~> 2.0)
-      rack-protection (= 2.0.3)
-      tilt (~> 2.0)
-    thread_safe (0.3.6)
-    tilt (2.0.8)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.4.0)
-    vegas (0.1.11)
-      rack (>= 1.0.0)
-    yard (0.9.15)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord
-  bundler (~> 1.16)
-  database_cleaner
-  globalid
-  i18n
-  job-iteration!
-  minitest (~> 5.0)
-  mocha
-  mysql2 (~> 0.4.4)
-  pry
-  rake (~> 10.0)
-  redis
-  resque
-  rubocop
-  sidekiq
-  yard
-
-BUNDLED WITH
-   1.17.1