active_batch 0.0.1 → 0.0.2

data/test/jobs/active_batch/batch_job_test.rb

@@ -0,0 +1,15 @@
+require 'test_helper'
+
+module ActiveBatch
+  class BatchJobTest < ActiveJob::TestCase
+
+    setup do
+      @test_string = 'test'
+    end
+
+    test 'can be enqueued outside a batch' do
+      BatchJob.perform_now(@test_string)
+      assert_equal @test_string, IO.read('/tmp/batch_job_result')
+    end
+  end
+end

data/test/jobs/active_batch/batch_scheduler_job_test.rb

@@ -2,7 +2,6 @@ require 'test_helper'
 
 module ActiveBatch
   class BatchSchedulerJobTest < ActiveJob::TestCase
-    include ActiveJob::TestHelper
 
     setup do
       @batch_job = 'BatchJob'
@@ -37,5 +36,11 @@ module ActiveBatch
       batch = Batch.find_by(job_id: job.job_id)
       assert_equal @test_string.length, batch.work_units.enqueued.count
     end
+
+    test 'uses same queue than the Batch Job' do
+      assert_enqueued_with(job: BatchSchedulerJob, queue: BatchJob.new.queue_name) do
+        BatchSchedulerJob.perform_later(BatchJob)
+      end
+    end
   end
 end

data/test/jobs/active_batch/batch_status_check_job_test.rb

@@ -41,10 +41,10 @@ module ActiveBatch
       @work_unit_running.update!(status: :done)
       BatchStatusCheckJob.perform_now(@batch)
 
-      assert File.exists?('/tmp/batch_job_result')
+      assert File.exists?('/tmp/batch_job_results')
       assert File.exists?('/tmp/batch_job_arguments')
       assert_equal @batch.arguments.first, IO.read('/tmp/batch_job_arguments')
-      assert_equal [@first_result, @second_result].to_s, IO.read('/tmp/batch_job_result')
+      assert_equal [@first_result, @second_result].to_s, IO.read('/tmp/batch_job_results')
     end
 
   end

data/test/jobs/batch_job.rb

@@ -10,11 +10,12 @@ class BatchJob < ActiveJob::Base
   end
 
   def self.after_batch(args, results)
-    File.open('/tmp/batch_job_arguments', 'w') { |f| f << args.first }
-    File.open('/tmp/batch_job_result', 'w') { |f| f << results }
+    File.open('/tmp/batch_job_arguments', 'w') { |f| f << args }
+    File.open('/tmp/batch_job_results', 'w') { |f| f << results }
   end
 
   def perform(char)
+    File.open('/tmp/batch_job_result', 'w') { |f| f << char }
     save_result(char)
   end
 

data/test/lib/active_batch/batched_job_test.rb

@@ -3,19 +3,26 @@ require 'test_helper'
 module ActiveBatch
   class BatchedJobTest < ActiveSupport::TestCase
 
-    test 'can save work result' do
+    test 'can save work result when in batch' do
       @batched_job = BatchJob.new
+      @batched_job.in_batch = true
       @work_unit = WorkUnit.create(job_id: @batched_job.job_id)
       @batched_job.save_result('blah')
       assert_equal 'blah', @work_unit.reload.work_result
     end
 
-    test 'sets status to failed on exception' do
+    test 'sets status to failed on exception when in batch' do
       @rescue_job = RescueJob.new
+      @rescue_job.in_batch = true
       @work_unit = WorkUnit.create(job_id: @rescue_job.job_id)
       @rescue_job.perform_now rescue nil
       assert @work_unit.reload.failed?
     end
 
+    test 'can perform batch' do
+      assert_enqueued_with(job: BatchSchedulerJob, args: [BatchJob, 1, 2]) do
+        BatchJob.perform_batch(1, 2)
+      end
+    end
   end
 end

data/test/models/concerns/active_batch/with_active_job_arguments_test.rb

@@ -0,0 +1,21 @@
+require 'test_helper'
+
+module ActiveBatch
+  class WithActiveJobArgumentsTest < ActiveSupport::TestCase
+
+    setup do
+      build_model :dummy do
+        string :arguments
+
+        include WithActiveJobArguments
+      end
+      @arguments = [1, { 'a' => 3 }, Batch.create]
+    end
+
+    test 'serializes active job arguments' do
+      dummy = Dummy.create(arguments: @arguments)
+      assert_equal @arguments, Dummy.find(dummy.id).arguments
+    end
+
+  end
+end

data/test/test_helper.rb

@@ -7,6 +7,7 @@ ActiveRecord::Migrator.migrations_paths << File.expand_path('../../db/migrate',
 require "rails/test_help"
 require "jobs/batch_job"
 require "jobs/rescue_job"
+require 'acts_as_fu'
 
 # Filter out Minitest backtrace while allowing backtrace from other libraries
 # to be shown.
@@ -18,4 +19,9 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 # Load fixtures from the engine
 if ActiveSupport::TestCase.respond_to?(:fixture_path=)
   ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
+end
+
+class ActiveSupport::TestCase
+  include ActiveJob::TestHelper
+  include ActsAsFu
 end

metadata

@@ -1,41 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: active_batch
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - adrien
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-23 00:00:00.000000000 Z
+date: 2015-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   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'
+- !ruby/object:Gem::Dependency
+  name: acts_as_fu
+  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: Allows handling batch of ActiveJobs
@@ -46,7 +60,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - MIT-LICENSE
-- README.rdoc
 - Rakefile
 - app/assets/javascripts/active_batch/application.js
 - app/assets/javascripts/active_batch/batches.js
@@ -65,6 +78,7 @@ files:
 - app/jobs/active_batch/batch_status_check_job.rb
 - app/models/active_batch/batch.rb
 - app/models/active_batch/work_unit.rb
+- app/models/concerns/active_batch/with_active_job_arguments.rb
 - app/views/active_batch/batches/_form.html.erb
 - app/views/active_batch/batches/index.html.erb
 - app/views/active_batch/batches/new.html.erb
@@ -136,6 +150,7 @@ files:
 - test/fixtures/active_batch/batches.yml
 - test/fixtures/active_batch/work_units.yml
 - test/integration/navigation_test.rb
+- test/jobs/active_batch/batch_job_test.rb
 - test/jobs/active_batch/batch_scheduler_job_test.rb
 - test/jobs/active_batch/batch_status_check_job_test.rb
 - test/jobs/batch_job.rb
@@ -143,6 +158,7 @@ files:
 - test/lib/active_batch/batched_job_test.rb
 - test/models/active_batch/batch_test.rb
 - test/models/active_batch/work_unit_test.rb
+- test/models/concerns/active_batch/with_active_job_arguments_test.rb
 - test/test_helper.rb
 homepage: https://github.com/idolweb/active_batch
 licenses:
@@ -154,17 +170,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.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Batch of ActiveJobs
@@ -226,6 +242,7 @@ test_files:
 - test/fixtures/active_batch/batches.yml
 - test/fixtures/active_batch/work_units.yml
 - test/integration/navigation_test.rb
+- test/jobs/active_batch/batch_job_test.rb
 - test/jobs/active_batch/batch_scheduler_job_test.rb
 - test/jobs/active_batch/batch_status_check_job_test.rb
 - test/jobs/batch_job.rb
@@ -233,4 +250,5 @@ test_files:
 - test/lib/active_batch/batched_job_test.rb
 - test/models/active_batch/batch_test.rb
 - test/models/active_batch/work_unit_test.rb
+- test/models/concerns/active_batch/with_active_job_arguments_test.rb
 - test/test_helper.rb

data/README.rdoc

@@ -1,3 +0,0 @@
-= ActiveBatch
-
-This project rocks and uses MIT-LICENSE.