tax_generator 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 317ad3db4dcd7234da44f8b4640c0d6692438ec8
-  data.tar.gz: 14f96024f09d3254c34ffa947cdcb2570edda110
+  metadata.gz: 18cb322618a66792931dece02a7ee66078c56f3d
+  data.tar.gz: f94a7f55687d90e2a40bb7fd3527afffa035bb4a
 SHA512:
-  metadata.gz: ef9751ef774b8f9be7d353299d202850f7b16b1d7e958f3b52483f1d350d27ff91375619fb31bd68f04ed39002f50713f5f5b9cbeef4f5c002d09b47e2fadd7b
-  data.tar.gz: 32fe13515c63955a79f120148c69d64cfdf63fe1d4ac6bbea35b8459599e4fda746f1743f1dbcb04a09900237ee98281546fa1359075452655fda94d77184571
+  metadata.gz: 26f93898da8b74174afd41bffd5308c7f9446766cce6166eb6c89001bf3fbb34f8620fd78ee14293cc5c64d6e8cc5d1ec4ae08f3348756c9075e5240436c20e5
+  data.tar.gz: 05e310ba1f4dec94e32be4923197dd7eb36d9f9fcc85a3779daa68eb5a150cf1a9b45429116e255d343674aaa20e829e98cd991e419e2a1faf6bf209af395cce

data/Rakefile

@@ -23,5 +23,5 @@ task default: [:all]
 
 desc 'Test the plugin under all supported Rails versions.'
 task :all do |_t|
-    exec('bundle exec rubocop . && bundle exec inch --pedantic && bundle exec yard stats --list-undoc && bundle exec rake spec')
+    exec('bundle exec rubocop -a . && bundle exec inch --pedantic && bundle exec yard stats --list-undoc && bundle exec rake spec')
 end

data/lib/tax_generator/all.rb

@@ -19,6 +19,7 @@ require 'ostruct'
 require 'erb'
 require 'tilt'
 require 'tilt/erb'
+require 'thread'
 
 %w(classes helpers).each do |folder_name|
   Gem.find_files("tax_generator/#{folder_name}/**/*.rb").each { |path| require path }

data/lib/tax_generator/classes/processor.rb

@@ -46,6 +46,9 @@ module TaxGenerator
       @worker_supervisor = Celluloid::SupervisionGroup.run!
       @workers = @worker_supervisor.pool(TaxGenerator::FileCreator, as: :workers, size: 50)
       Actor.current.link @workers
+      @jobs_mutex = Mutex.new
+      @job_to_worker_mutex = Mutex.new
+      @worker_to_job_mutex = Mutex.new
       @jobs = {}
       @job_to_worker = {}
       @worker_to_job = {}
@@ -135,7 +138,9 @@ module TaxGenerator
     #
     # @api public
     def all_workers_finished?
-      @jobs.all? { |_job_id, job| job['status'] == 'finished' }
+      @jobs_mutex.synchronize do
+        @jobs.all? { |_job_id, job| job['status'] == 'finished' }
+      end
     end
 
     #  registers all the jobs so that the managers can have access to them at any time
@@ -148,7 +153,9 @@ module TaxGenerator
     def register_jobs(*jobs)
       jobs.pmap do |job|
         job = job.stringify_keys
-        @jobs[job['atlas_id']] = job
+        @jobs_mutex.synchronize do
+          @jobs[job['atlas_id']] = job
+        end
       end
     end
 
@@ -165,8 +172,10 @@ module TaxGenerator
       # jobs need to be added into the manager before starting task to avoid adding new key while iterating
       register_jobs(*jobs)
       current_actor = Actor.current
-      @jobs.pmap do |_job_id, job|
-        @workers.async.work(job, current_actor) if @workers.alive?
+      @jobs_mutex.synchronize do
+        @jobs.pmap do |_job_id, job|
+          @workers.async.work(job, current_actor) if @workers.alive?
+        end
       end
     end
 
@@ -216,8 +225,36 @@ module TaxGenerator
       terminate
     end
 
+    # registeres a worker inside the job_to_worker storage using the 'atlas_id' key from the job hash
+    # @param  [TaxGenerator::FileCreator]  worker the worker that needs to be registered
+    # @param  [Hash]  job the job that will be used to register the worker
+    #
+    # @return [void]
+    #
+    # @api public
+    def register_job_to_worker(job, worker)
+      @job_to_worker_mutex.synchronize do
+        @job_to_worker[job['atlas_id']] = worker
+      end
+    end
+
+    # registeres a job to a worker, using the mailbox address of the worker (which is unique)
+    # @param  [TaxGenerator::FileCreator]  worker the worker that will be used to registerr the job
+    # @param  [Hash]  job the job that willbe registered to a worker
+    #
+    # @return [void]
+    #
+    # @api public
+    def register_worker_to_job(job, worker)
+      @worker_to_job_mutex.synchronize do
+        @worker_to_job[worker.mailbox.address] = job
+      end
+    end
+
     #  registers the worker so that the current actor has access to it at any given time and starts the worker
     # @see TaxGenerator::FileCreator#start_work
+    # @see #register_job_to_worker
+    # @see #register_worker_to_job
     #
     # @param  [Hash]  job the job that the worker will work
     # @param  [TaxGenerator::FileCreator]  worker the worker that will create the file
@@ -226,8 +263,8 @@ module TaxGenerator
     #
     # @api public
     def register_worker_for_job(job, worker)
-      @job_to_worker[job['atlas_id']] = worker
-      @worker_to_job[worker.mailbox.address] = job
+      register_job_to_worker(job, worker)
+      register_worker_to_job(job, worker)
       log_message("worker #{worker.job_id} registed into manager")
       Actor.current.link worker
       worker.async.start_work
@@ -252,6 +289,32 @@ module TaxGenerator
       end
     end
 
+    # fetches the job from a worker
+    # @param  [TaxGenerator::FileCreator]  worker the worker that died
+    #
+    # @return [void]
+    #
+    # @api public
+    def get_job_from_worker(worker)
+      @worker_to_job_mutex.synchronize do
+        @worker_to_job[worker.mailbox.address]
+      end
+    end
+
+    # deletes the worker from the worker_to_job storage
+    # @param  [TaxGenerator::FileCreator]  worker the worker that died
+    #
+    # @return [void]
+    #
+    # @api public
+    def delete_from_worker_to_job(worker)
+      mailbox = worker.mailbox.address
+      @worker_to_job_mutex.synchronize do
+        @worker_to_job.delete(mailbox)
+      end
+      mailbox
+    end
+
     # logs the message about working being dead if a worker crashes
     # @param  [TaxGenerator::FileCreator]  worker the worker that died
     # @param  [String]  reason the reason for which the worker died
@@ -260,10 +323,10 @@ module TaxGenerator
     #
     # @api public
     def worker_died(worker, reason)
-      mailbox_address = worker.mailbox.address
-      job = @worker_to_job.delete(mailbox_address)
+      job = get_job_from_worker(worker)
+      mailbox = delete_from_worker_to_job(worker)
       return if reason.blank? || job.blank?
-      log_message("worker job #{job['atlas_id']} with mailbox #{mailbox_address.inspect} died  for reason:  #{log_error(reason)}", log_method: 'fatal')
+      log_message("worker job #{job['atlas_id']} with mailbox #{mailbox.inspect} died  for reason:  #{log_error(reason)}", log_method: 'fatal')
     end
   end
 end

data/lib/tax_generator/version.rb

@@ -17,7 +17,7 @@ module TaxGenerator
     # minor release version
     MINOR = 5
     # tiny release version
-    TINY = 1
+    TINY = 2
     # prelease version ( set this only if it is a prelease)
     PRE = nil
 

data/spec/lib/tax_generator/classes/file_creator_spec.rb

@@ -77,7 +77,7 @@ describe TaxGenerator::FileCreator do
     end
 
     it 'fetch_atlas_details' do
-      subject.taxonomy.expects(:[]).with(subject.job_id).returns(fake_node)
+      subject.stubs(:atlas_node).returns(fake_node)
       TaxGenerator::Destination.expects(:new).with(first_destination).returns(first_destination)
       first_destination.stubs(:to_hash).returns({})
       actual = subject.fetch_atlas_details

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tax_generator
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - bogdanRada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2016-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri