tax_generator 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18cb322618a66792931dece02a7ee66078c56f3d
-  data.tar.gz: f94a7f55687d90e2a40bb7fd3527afffa035bb4a
+  metadata.gz: c747d61bb720bf5072dc9e9ec0870d11974e31c3
+  data.tar.gz: 971979df05fb6b2d3632f24b93c62ed318745ad4
 SHA512:
-  metadata.gz: 26f93898da8b74174afd41bffd5308c7f9446766cce6166eb6c89001bf3fbb34f8620fd78ee14293cc5c64d6e8cc5d1ec4ae08f3348756c9075e5240436c20e5
-  data.tar.gz: 05e310ba1f4dec94e32be4923197dd7eb36d9f9fcc85a3779daa68eb5a150cf1a9b45429116e255d343674aaa20e829e98cd991e419e2a1faf6bf209af395cce
+  metadata.gz: d0463ac2a1ce210da8b8e5ae4ea3348695c3d50e3e4a2bd526c7a05d8abe161cbdb26e02cd9bdceea1e7eed70928d563b5558bfa26d886899ce97be379916dc8
+  data.tar.gz: 94489169e099c7bf427d3693571c31ee7e508f680f1a078e8ef73c903f7fba861e82feae9f9db37341199ac80de6e440c9cfb16d26b18e11b983c3cb5014f49f

data/.travis.yml

@@ -0,0 +1,15 @@
+sudo: false
+cache: bundler
+language: ruby
+before_install:
+  - "echo 'gem: --no-ri --no-rdoc' > ~/.gemrc"
+  - gem install bundler
+rvm:
+- 2.0.0
+- 2.1.5
+- 2.2.2
+- 2.2.3
+env:
+ - RAILS_ENV=test RACK_ENV=test
+notifications:
+  email: false

data/README.md

@@ -1,7 +1,7 @@
 tax_generator
 =============
 
-[![Gem Version](https://badge.fury.io/rb/tax_generator.svg)](http://badge.fury.io/rb/tax_generator) [![Gem Downloads](https://ruby-gem-downloads-badge.herokuapp.com/tax_generator?type=total)](https://github.com/bogdanRada/tax_generator)
+[![Gem Version](https://badge.fury.io/rb/tax_generator.svg)](http://badge.fury.io/rb/tax_generator) [![Gem Downloads](https://ruby-gem-downloads-badge.herokuapp.com/tax_generator?type=total)](https://github.com/bogdanRada/tax_generator) [![Analytics](https://ga-beacon.appspot.com/UA-72570203-1/bogdanRada/tax_generator)](https://github.com/bogdanRada/tax_generator)
 
 Description
 -----------

data/lib/tax_generator/all.rb

@@ -10,8 +10,8 @@ require 'active_support/core_ext/module/delegation'
 require 'slop'
 require 'nokogiri'
 require 'tree'
-require 'celluloid/autostart'
-require 'celluloid/pmap'
+require 'concurrent'
+require 'concurrent-edge'
 
 require 'logger'
 require 'fileutils'
@@ -20,6 +20,7 @@ require 'erb'
 require 'tilt'
 require 'tilt/erb'
 require 'thread'
+require 'securerandom'
 
 %w(classes helpers).each do |folder_name|
   Gem.find_files("tax_generator/#{folder_name}/**/*.rb").each { |path| require path }

data/lib/tax_generator/classes/file_creator.rb

@@ -1,4 +1,5 @@
 require_relative '../helpers/application_helper'
+require_relative '../helpers/methodic_actor'
 module TaxGenerator
   # class used to create the files
   #
@@ -14,9 +15,9 @@ module TaxGenerator
   #   @return [TaxGenerator::TaxonomyTree] the taxonomy tree holding all the nodes from the taxonomy xml document
   # @!attribute output_folder
   #   @return [String] the output folder where the new files will be created
-  class FileCreator
-    include Celluloid
-    include Celluloid::Logger
+  class FileCreator < Concurrent::Actor::RestartingContext
+    include Concurrent::Async
+    include MethodicActor
     include TaxGenerator::ApplicationHelper
 
     attr_reader :processor, :job, :job_id, :destination, :taxonomy, :output_folder
@@ -40,12 +41,13 @@ module TaxGenerator
     # @return [void]
     #
     # @api public
-    def work(job, manager)
+    def initialize(*args)
+      job = args[0]
+      @processor = args[1]
       job = job.stringify_keys
       @job = job
-      @processor = manager
       process_job(job)
-      @processor.register_worker_for_job(job, Actor.current)
+      processor.register_worker_for_job(job, self)
     end
 
     #  processes the job information by retrieving keys from the hash

data/lib/tax_generator/classes/processor.rb

@@ -18,14 +18,22 @@ module TaxGenerator
   # @!attribute worker_to_job
   #   @return [Hash] each key from the list is the workers mailbox address, and the value is the job being handled by the worker
   class Processor
-    include Celluloid
-    include Celluloid::Logger
-    include Celluloid::Notifications
+    include Concurrent::Async
     include TaxGenerator::ApplicationHelper
 
-    attr_reader :options, :worker_supervisor, :workers, :taxonomy, :jobs, :job_to_worker, :worker_to_job
+    QUEUES = Concurrent::Map.new do |hash, queue_name| #:nodoc:
+      hash.compute_if_absent(queue_name) {
+        Concurrent::ThreadPoolExecutor.new(
+          min_threads: 10, # create 10 threads at startup
+          max_threads: 50, # create at most 50 threads
+          max_queue: 0, # unbounded queue of work waiting for an available thread
+        )
+      }
+    end
+
+    attr_reader :options, :taxonomy, :jobs, :job_to_worker, :worker_to_job
 
-    trap_exit :worker_died
+    #trap_exit :worker_died
 
     #  receives a list of options that are used to determine the input files and output and input folders
     #
@@ -41,11 +49,7 @@ module TaxGenerator
     #
     # @api public
     def initialize(options = {})
-      Celluloid.boot
       @options = options.is_a?(Hash) ? options.symbolize_keys : {}
-      @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
@@ -54,279 +58,280 @@ module TaxGenerator
       @worker_to_job = {}
     end
 
-    #  returns the input folder from the options list
-    # otherwise the default path
-    #
-    # @return [String]
-    #
-    # @api public
-    def input_folder
-      @options.fetch(:input_dir, "#{root}/data/input")
-    end
+    def enqueue(job_data, queue: 'default') #:nodoc:
+      QUEUES[queue].post(job_data) { |job|
+        TaxGenerator::FileCreator.spawn(name: "worker_#{job['atlas_id']}", args: [job, self])
+      }
+      end
 
-    #  returns the taxonomy filename from the option list
-    # otherwise the default filename
-    #
-    # @return [String]
-    #
-    # @api public
-    def taxonomy_file_name
-      @options.fetch(:taxonomy_filename, 'taxonomy.xml')
-    end
+      # otherwise the default path
+      #
+      # @return [String]
+      #
+      # @api public
+      #  returns the input folder from the options list
+      def input_folder
+        @options.fetch(:input_dir, "#{root}/data/input")
+      end
 
-    #  returns the destinations filename from the option list
-    # otherwise the default filename
-    #
-    # @return [String]
-    #
-    # @api public
-    def destinations_file_name
-      @options.fetch(:destinations_filename, 'destinations.xml')
-    end
+      #  returns the taxonomy filename from the option list
+      # otherwise the default filename
+      #
+      # @return [String]
+      #
+      # @api public
+      def taxonomy_file_name
+        @options.fetch(:taxonomy_filename, 'taxonomy.xml')
+      end
 
-    #  returns the output folder path from the option list
-    # otherwise the default path
-    #
-    # @return [String]
-    #
-    # @api public
-    def output_folder
-      @options.fetch(:output_dir, "#{root}/data/output")
-    end
+      #  returns the destinations filename from the option list
+      # otherwise the default filename
+      #
+      # @return [String]
+      #
+      # @api public
+      def destinations_file_name
+        @options.fetch(:destinations_filename, 'destinations.xml')
+      end
 
-    #  returns the full path to the taxonomy file
-    #
-    # @return [String]
-    #
-    # @api public
-    def taxonomy_file_path
-      File.join(input_folder, taxonomy_file_name)
-    end
+      #  returns the output folder path from the option list
+      # otherwise the default path
+      #
+      # @return [String]
+      #
+      # @api public
+      def output_folder
+        @options.fetch(:output_dir, "#{root}/data/output")
+      end
 
-    #  returns the full path to the destinations file
-    #
-    # @return [String]
-    #
-    # @api public
-    def destinations_file_path
-      File.join(input_folder, destinations_file_name)
-    end
+      #  returns the full path to the taxonomy file
+      #
+      # @return [String]
+      #
+      # @api public
+      def taxonomy_file_path
+        File.join(input_folder, taxonomy_file_name)
+      end
 
-    #  returns the full path to the static folder
-    #
-    # @return [String]
-    #
-    # @api public
-    def static_output_dir
-      File.join(output_folder, 'static')
-    end
+      #  returns the full path to the destinations file
+      #
+      # @return [String]
+      #
+      # @api public
+      def destinations_file_path
+        File.join(input_folder, destinations_file_name)
+      end
 
-    # cleans the output folder and re-creates it and the static folder
-    #
-    # @return [void]
-    #
-    # @api public
-    def prepare_output_dirs
-      FileUtils.rm_rf Dir["#{output_folder}/**/*"]
-      create_directories(output_folder, static_output_dir)
-      FileUtils.cp_r(Dir["#{File.join(root, 'templates', 'static')}/*"], static_output_dir)
-    end
+      #  returns the full path to the static folder
+      #
+      # @return [String]
+      #
+      # @api public
+      def static_output_dir
+        File.join(output_folder, 'static')
+      end
 
-    #  checks if all workers finished and returns true or false
-    #
-    # @return [Boolean]
-    #
-    # @api public
-    def all_workers_finished?
-      @jobs_mutex.synchronize do
-        @jobs.all? { |_job_id, job| job['status'] == 'finished' }
+      # cleans the output folder and re-creates it and the static folder
+      #
+      # @return [void]
+      #
+      # @api public
+      def prepare_output_dirs
+        FileUtils.rm_rf Dir["#{output_folder}/**/*"]
+        create_directories(output_folder, static_output_dir)
+        FileUtils.cp_r(Dir["#{File.join(root, 'templates', 'static')}/*"], static_output_dir)
       end
-    end
 
-    #  registers all the jobs so that the managers can have access to them at any time
-    #
-    # @param  [Array] jobs the jobs that will be registered
-    #
-    # @return [void]
-    #
-    # @api public
-    def register_jobs(*jobs)
-      jobs.pmap do |job|
-        job = job.stringify_keys
+      #  checks if all workers finished and returns true or false
+      #
+      # @return [Boolean]
+      #
+      # @api public
+      def all_workers_finished?
         @jobs_mutex.synchronize do
-          @jobs[job['atlas_id']] = job
+          @jobs.all? { |_job_id, job| job['status'] == 'finished' }
         end
       end
-    end
 
-    #  registers all the jobs, and then delegates them to workers
-    # @see #register_jobs
-    # @see TaxGenerator::FileCreator#work
-    #
-    # @param  [Array] jobs the jobs that will be delegated to the workers
-    #
-    # @return [void]
-    #
-    # @api public
-    def delegate_job(*jobs)
-      # 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_mutex.synchronize do
-        @jobs.pmap do |_job_id, job|
-          @workers.async.work(job, current_actor) if @workers.alive?
+      #  registers all the jobs so that the managers can have access to them at any time
+      #
+      # @param  [Array] jobs the jobs that will be registered
+      #
+      # @return [void]
+      #
+      # @api public
+      def register_jobs(*jobs)
+        jobs.each do |job|
+          job = job.stringify_keys
+          @jobs_mutex.synchronize do
+            @jobs[job['atlas_id']] = job
+          end
         end
       end
-    end
 
-    #  parses the destinations xml document, gets each destination and adds a new job for that
-    # destination in the job list and then returns it
-    # @see #nokogiri_xml
-    #
-    # @return [Array<Hash>]
-    #
-    # @api public
-    def fetch_file_jobs
-      jobs = []
-      count = 0
-      @taxonomy.document.xpath('.//taxonomy').pmap do |_taxonomy_node|
-        count += 1
-        jobs << { atlas_id: count, taxonomy: @taxonomy, destination: nil, output_folder: output_folder }
+      #  registers all the jobs, and then delegates them to workers
+      # @see #register_jobs
+      # @see TaxGenerator::FileCreator#work
+      #
+      # @param  [Array] jobs the jobs that will be delegated to the workers
+      #
+      # @return [void]
+      #
+      # @api public
+      def delegate_job(*jobs)
+        # jobs need to be added into the manager before starting task to avoid adding new key while iterating
+        register_jobs(*jobs)
+        @jobs_mutex.synchronize do
+          @jobs.each do |_job_id, job|
+            enqueue(job)
+          end
+        end
       end
-      nokogiri_xml(destinations_file_path).xpath('//destination').pmap do |destination|
-        atlas_id = destination.attributes['atlas_id']
-        jobs << { atlas_id: atlas_id.value, taxonomy: @taxonomy, destination: destination, output_folder: output_folder }
+
+      #  parses the destinations xml document, gets each destination and adds a new job for that
+      # destination in the job list and then returns it
+      # @see #nokogiri_xml
+      #
+      # @return [Array<Hash>]
+      #
+      # @api public
+      def fetch_file_jobs
+        jobs = []
+        @taxonomy.taxonomies.each do |taxonomy_node|
+          jobs << { atlas_id: taxonomy_node.name, taxonomy: @taxonomy, destination: nil, output_folder: output_folder }
+        end
+        nokogiri_xml(destinations_file_path).xpath('//destination').each do |destination|
+          atlas_id = destination.attributes['atlas_id']
+          jobs << { atlas_id: atlas_id.value, taxonomy: @taxonomy, destination: destination, output_folder: output_folder }
+        end
+        jobs
       end
-      jobs
-    end
 
-    #  fetches the jobs for file generation, then delegates the jobs to workers and waits untill workers finish
-    # @see #fetch_file_jobs
-    # @see #delegate_job
-    # @see #wait_jobs_termination
-    #
-    # @return [void]
-    #
-    # @api public
-    def generate_files
-      jobs = fetch_file_jobs
-      delegate_job(*jobs)
-      wait_jobs_termination
-    end
+      #  fetches the jobs for file generation, then delegates the jobs to workers and waits untill workers finish
+      # @see #fetch_file_jobs
+      # @see #delegate_job
+      # @see #wait_jobs_termination
+      #
+      # @return [void]
+      #
+      # @api public
+      def generate_files
+        jobs = fetch_file_jobs
+        delegate_job(*jobs)
+        wait_jobs_termination
+      end
 
-    #  retrieves the information about the node from the tree and generates for each destination a new File
-    # @see #create_file
-    #
-    # @return [void]
-    #
-    # @api public
-    def wait_jobs_termination
-      sleep(0.1) until all_workers_finished?
-      terminate
-    end
+      #  retrieves the information about the node from the tree and generates for each destination a new File
+      # @see #create_file
+      #
+      # @return [void]
+      #
+      # @api public
+      def wait_jobs_termination
+        sleep(0.1) until all_workers_finished?
+      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
+      # 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
-    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
+      # 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.name] = job
+        end
       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
-    #
-    # @return [void]
-    #
-    # @api public
-    def register_worker_for_job(job, worker)
-      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
-    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
+      #
+      # @return [void]
+      #
+      # @api public
+      def register_worker_for_job(job, worker)
+        register_job_to_worker(job, worker)
+        register_worker_to_job(job, worker)
+        log_message("worker #{worker.job_id} registed into manager")
+        worker.tell(:start_work)
+      end
 
-    # generates the taxonomy tree , prints it and generates the files
-    # @see TaxGenerator::TaxonomyTree#new
-    # @see Tree::TreeNode#print_tree
-    # @see #generate_files
-    #
-    # @return [void]
-    #
-    # @api public
-    def work
-      prepare_output_dirs
-      if File.directory?(input_folder) && File.file?(taxonomy_file_path) && File.file?(destinations_file_path)
-        @taxonomy = TaxGenerator::TaxonomyTree.new(taxonomy_file_path)
-        @taxonomy.print_tree
-        generate_files
-      else
-        log_message('Please provide valid options', log_method: 'fatal')
+      # generates the taxonomy tree , prints it and generates the files
+      # @see TaxGenerator::TaxonomyTree#new
+      # @see Tree::TreeNode#print_tree
+      # @see #generate_files
+      #
+      # @return [void]
+      #
+      # @api public
+      def work
+        prepare_output_dirs
+        if File.directory?(input_folder) && File.file?(taxonomy_file_path) && File.file?(destinations_file_path)
+          @taxonomy = TaxGenerator::TaxonomyTree.new(taxonomy_file_path)
+          @taxonomy.print_tree
+          generate_files
+        else
+          log_message('Please provide valid options', log_method: 'fatal')
+        end
       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]
+      # 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.name]
+        end
       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)
+      # 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)
+        name = worker.name
+        @worker_to_job_mutex.synchronize do
+          @worker_to_job.delete(name)
+        end
+        name
       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
-    #
-    # @return [void]
-    #
-    # @api public
-    def worker_died(worker, reason)
-      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.inspect} died  for reason:  #{log_error(reason)}", log_method: 'fatal')
+      # 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
+      #
+      # @return [void]
+      #
+      # @api public
+      def worker_died(worker, reason)
+        job = get_job_from_worker(worker)
+        worker_name = delete_from_worker_to_job(worker)
+        return if reason.blank? || job.blank?
+        log_message("worker job #{job['atlas_id']} with name #{worker_name.inspect} died  for reason:  #{log_error(reason)}", log_method: 'fatal')
+      end
     end
   end
-end

data/lib/tax_generator/classes/taxonomy_tree.rb

@@ -9,7 +9,7 @@ module TaxGenerator
   #   @return [Nokogiri::XML] the xml document used to build the tree
   class TaxonomyTree
     include TaxGenerator::ApplicationHelper
-    attr_reader :root_node, :document
+    attr_reader :root_node, :document, :taxonomies
 
     #  receives a file path that will be parsed and used to build the tree
     # @see Tree::TreeNode#new
@@ -23,6 +23,7 @@ module TaxGenerator
     def initialize(file_path)
       @document = nokogiri_xml(file_path)
       @root_node = TaxGenerator::TaxonomyNode.new('ROOT', 'ROOT')
+      @taxonomies = []
       find_taxonomies
     end
 
@@ -35,11 +36,10 @@ module TaxGenerator
     #
     # @api public
     def find_taxonomies
-      count = 0
-      @document.xpath('.//taxonomy').pmap do |taxonomy_node|
-        count += 1
+      @document.xpath('.//taxonomy').each do |taxonomy_node|
         taxonomy_name = taxonomy_node.at_xpath('.//taxonomy_name')
-        tax_node = insert_node(count.to_s, taxonomy_name.content, @root_node)
+        tax_node = insert_node(SecureRandom.uuid, taxonomy_name.content, @root_node)
+        @taxonomies << tax_node
         add_node(taxonomy_node, tax_node, skip_add: true)
       end
     end
@@ -110,7 +110,7 @@ module TaxGenerator
     def add_node(taxonomy_node, node, options = {})
       tax_node = options[:skip_add].present? ? node : add_taxonomy_node(taxonomy_node, node)
       return unless taxonomy_node.children.any?
-      taxonomy_node.xpath('./node').pmap do |child_node|
+      taxonomy_node.xpath('./node').each do |child_node|
         add_node(child_node, tax_node) if tax_node.present?
       end
     end

data/lib/tax_generator/helpers/application_helper.rb

@@ -49,26 +49,12 @@ module TaxGenerator
     #
     # @api public
     def create_directories(*args)
-      args.pmap do |argument|
+      args.each do |argument|
         FileUtils.mkdir_p(argument) unless File.directory?(argument)
       end
     end
 
-    # sets the exception handler for celluloid actors
-    #
-    #
-    # @return [void]
-    #
-    # @api public
-    def set_celluloid_exception_handling
-      Celluloid.logger = app_logger
-      Celluloid.task_class = Celluloid::TaskThread
-      Celluloid.exception_handler do |ex|
-        unless ex.is_a?(Interrupt)
-          log_error(ex)
-        end
-      end
-    end
+
 
     # Reads a file and interpretes it as ERB
     #
@@ -133,7 +119,6 @@ module TaxGenerator
     #
     # @api public
     def execute_with_rescue
-      set_celluloid_exception_handling
       yield if block_given?
     rescue Interrupt
       rescue_interrupt

data/lib/tax_generator/helpers/methodic_actor.rb

@@ -0,0 +1,6 @@
+module MethodicActor
+  def on_message(message)
+    method, *args = message
+    self.send(method, *args)
+  end
+end

data/lib/tax_generator/version.rb

@@ -15,9 +15,9 @@ module TaxGenerator
     # major release version
     MAJOR = 0
     # minor release version
-    MINOR = 5
+    MINOR = 6
     # tiny release version
-    TINY = 2
+    TINY = 0
     # prelease version ( set this only if it is a prelease)
     PRE = nil
 

data/tax_generator.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |s|
   s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
 
   s.add_runtime_dependency 'nokogiri', '~> 1.6', '>= 1.6.7'
-  s.add_runtime_dependency 'celluloid', '~> 0.16', '~> 0.16.0'
-  s.add_runtime_dependency 'celluloid-pmap', '~> 0.2', '~> 0.2.2'
+  s.add_runtime_dependency 'concurrent-ruby', '~> 1.0', '>= 1.0'
+  s.add_runtime_dependency 'concurrent-ruby-edge', '~> 0.2' , '>= 0.2'
   s.add_runtime_dependency 'slop', '~> 4.2', '>= 4.2.1'
   s.add_runtime_dependency 'activesupport', '~> 4.2', '>= 4.2.5'
   s.add_runtime_dependency 'rubytree', '~> 0.9', '>= 0.9.6'
@@ -31,8 +31,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'simplecov-summary', '~> 0.0.4', '>= 0.0.4'
   s.add_development_dependency 'mocha', '~> 1.1', '>= 1.1'
 
-  s.add_development_dependency 'rubocop', '~> 0.33', '>= 0.33'
-  s.add_development_dependency 'reek', '~> 3.7', '>= 3.7'
+  s.add_development_dependency 'concurrent-ruby-ext', '~> 1.0' , '>= 1.0'
+
   s.add_development_dependency 'yard', '~> 0.8', '>= 0.8.7'
   s.add_development_dependency 'yard-rspec', '~> 0.1', '>= 0.1'
   s.add_development_dependency 'redcarpet', '~> 3.3', '>= 3.3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tax_generator
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - bogdanRada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-05 00:00:00.000000000 Z
+date: 2016-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -31,35 +31,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.6.7
 - !ruby/object:Gem::Dependency
-  name: celluloid
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
-    - - "~>"
+        version: '1.0'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
-    - - "~>"
+        version: '1.0'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: celluloid-pmap
+  name: concurrent-ruby-edge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -67,9 +67,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: slop
   requirement: !ruby/object:Gem::Requirement
@@ -251,45 +251,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.33'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.33'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.33'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.33'
-- !ruby/object:Gem::Dependency
-  name: reek
+  name: concurrent-ruby-ext
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -404,6 +384,7 @@ files:
 - ".reek"
 - ".rspec"
 - ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -424,6 +405,7 @@ files:
 - lib/tax_generator/classes/taxonomy_tree.rb
 - lib/tax_generator/cli.rb
 - lib/tax_generator/helpers/application_helper.rb
+- lib/tax_generator/helpers/methodic_actor.rb
 - lib/tax_generator/version.rb
 - spec/lib/tax_generator/application_spec.rb
 - spec/lib/tax_generator/classes/destination_spec.rb
@@ -456,7 +438,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Tax generator is a simple XML processor and generator of HTMl files and generates