batsir 0.3.7.1 → 0.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: aac6353a29dcec93634b97450bf731b01a6a081c
+  data.tar.gz: a20726b6fffaf409f04fc0882ecd74538e0e3ddb
+SHA512:
+  metadata.gz: 4800a37b000ee355229ebcf4c898e53fda8930edcf4fde588e58d51f593e94f9d6eb54787f19a770593c187effe353dab39dedcf60163ddc099cccbc0afd96a7
+  data.tar.gz: f26e3943c0819bccaa16ce68e5397bd34b845ed6ca62eb146d992dbf04cfca6fa7a61d22aae8b31caf7e0ce7a39addad35bcb98d114c611c9ea06f99f229f4c2

data/CHANGES.md

@@ -1,3 +1,12 @@
+0.4.0
+-----------
+- Removes support for MRI 1.9.3
+- Worker class compilation has been refactored
+- Limits Celluloid < 0.16.0
+  Higher versions may prevent Sidekiq from cleanly shutting down.
+- Removes bunny and sidekiq constraints
+
+
 0.3.7
 -----------
 - AMQP queues are now durable by default.

data/README.md

@@ -2,7 +2,7 @@
 [![Code Climate](https://codeclimate.com/github/jwkoelewijn/batsir.png)](https://codeclimate.com/github/jwkoelewijn/batsir)
 [![Build Status](https://secure.travis-ci.org/jwkoelewijn/batsir.png?branch=master)](http://travis-ci.org/jwkoelewijn/batsir)
 
-![Batsir Logo](/jwkoelewijn/batsir/blob/master/batsir.png)
+![Batsir Logo](/batsir.png)
 
 # Batsir
 Batsir is an execution platform for stage based filter queue execution.

data/lib/batsir/compiler/stage_worker_compiler.rb

@@ -9,6 +9,30 @@ module Batsir
 
       def compile
         klazz_name = "#{stage.name.capitalize.gsub(' ','')}Worker"
+        compile_worker_class(klazz_name)
+      end
+
+      def compile_worker_class(klazz_name)
+        worker_class(klazz_name) do |code|
+          stage.filter_declarations.each do |filter_declaration|
+            add_filter(filter_declaration, code)
+          end
+
+          stage.conditional_notifiers.each do |conditional_notifier_declaration|
+            conditional_notifier_declaration.compile(code, self)
+          end
+
+          stage.notifiers.each do |notifier, options_set|
+            options_set.each do |options|
+              new_notifier(notifier, options, code)
+              add_transformers_to_notifier(code)
+              add_notifier(code)
+            end
+          end
+        end
+      end
+
+      def worker_class(klazz_name, &block)
         code = <<-EOF
           class #{klazz_name}
             def self.stage_name
@@ -27,27 +51,7 @@ module Batsir
               @filter_queue = Batsir::FilterQueue.new
         EOF
 
-        stage.filter_declarations.each do |filter_declaration|
-          code << <<-EOF
-              @filter_queue.add #{filter_declaration.filter.to_s}.new(#{filter_declaration.options.to_s})
-          EOF
-        end
-
-        stage.conditional_notifiers.each do |conditional_notifier_declaration|
-          conditional_notifier_declaration.compile(code, self)
-        end
-
-        stage.notifiers.each do |notifier, options_set|
-          options_set.each do |options|
-            code << <<-EOF
-              notifier = #{notifier.to_s}.new(#{options.to_s})
-            EOF
-
-            self.add_transformers_to_notifier("notifier", code)
-
-            self.add_notifier("notifier", code)
-          end
-        end
+        yield code
 
         code << <<-EOF
             end
@@ -59,26 +63,37 @@ module Batsir
           #{klazz_name}.sidekiq_options(:queue => Batsir::Config.sidekiq_queue)
           #{klazz_name}
         EOF
-        code
       end
 
-      def add_transformers_to_notifier(notifier_name, code)
+      def add_filter(filter_declaration, code)
+        code << <<-EOF
+            @filter_queue.add #{filter_declaration.filter.to_s}.new(#{filter_declaration.options.to_s})
+        EOF
+      end
+
+      def new_notifier(notifier, options, code)
+        code << <<-EOF
+          notifier = #{notifier.to_s}.new(#{options.to_s})
+        EOF
+      end
+
+      def add_transformers_to_notifier(code)
         if stage.notifier_transformers.any?
           stage.notifier_transformers.each do |transformer_declaration|
             code << <<-EOF
-              #{notifier_name}.add_transformer #{transformer_declaration.transformer}.new(#{transformer_declaration.options.to_s})
+              notifier.add_transformer #{transformer_declaration.transformer}.new(#{transformer_declaration.options.to_s})
             EOF
           end
         else
           code << <<-EOF
-              #{notifier_name}.add_transformer Batsir::Transformers::JSONOutputTransformer.new
+              notifier.add_transformer Batsir::Transformers::JSONOutputTransformer.new
           EOF
         end
       end
 
-      def add_notifier(notifier_name, code)
+      def add_notifier(code)
         code << <<-EOF
-              @filter_queue.add_notifier #{notifier_name}
+              @filter_queue.add_notifier notifier
         EOF
       end
     end

data/lib/batsir/dsl/conditional_notifier_declaration.rb

@@ -13,18 +13,18 @@ module Batsir
         @notifier_declarations << NotifierConditionDeclaration.new(condition, notifier_class, options)
       end
 
-      def compile(output, stage_worker)
-        output << <<-EOF
-              conditional_notifier = Batsir::Notifiers::ConditionalNotifier.new
+      def compile(code, stage_worker)
+        code << <<-EOF
+              notifier = Batsir::Notifiers::ConditionalNotifier.new
         EOF
         notifier_declarations.each do |notifier_declaration|
-          output << <<-EOF
+          code << <<-EOF
               condition = ->(message){#{notifier_declaration.condition}}
-              conditional_notifier.add_notifier condition, #{notifier_declaration.notifier}.new(#{notifier_declaration.options.to_s})
+              notifier.add_notifier condition, #{notifier_declaration.notifier}.new(#{notifier_declaration.options.to_s})
           EOF
         end
-        stage_worker.add_transformers_to_notifier("conditional_notifier", output)
-        stage_worker.add_notifier( "conditional_notifier", output)
+        stage_worker.add_transformers_to_notifier(code)
+        stage_worker.add_notifier(code)
       end
     end
   end

data/lib/batsir/version.rb

@@ -1,9 +1,9 @@
 module Batsir
   module Version
     MAJOR = 0
-    MINOR = 3
-    PATCH = 7
-    BUILD = 1
+    MINOR = 4
+    PATCH = 0
+    BUILD = nil
   end
 
   VERSION = [Version::MAJOR, Version::MINOR, Version::PATCH, Version::BUILD].compact.join('.')

metadata

@@ -1,173 +1,143 @@
 --- !ruby/object:Gem::Specification
 name: batsir
 version: !ruby/object:Gem::Version
-  version: 0.3.7.1
-  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors:
 - J.W. Koelewijn
 - Bram de Vries
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-10-24 00:00:00.000000000 Z
+date: 2014-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: blockenspiel
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
+        version: 0.4.3
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: celluloid
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - <
       - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: jeweler
+        version: 0.16.0
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: 0.16.0
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: sidekiq
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: bunny
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: blockenspiel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.4.3
-  type: :runtime
+        version: '0'
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: json
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.4.3
-- !ruby/object:Gem::Dependency
-  name: celluloid
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.14.1
-  type: :runtime
+        version: '0'
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: log4r
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.14.1
-- !ruby/object:Gem::Dependency
-  name: sidekiq
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.5.4
-  type: :runtime
+        version: '0'
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: bundler
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.4
-- !ruby/object:Gem::Dependency
-  name: bunny
+        version: '1.7'
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.7
-  type: :runtime
+        version: '1.7'
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rake
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.7
-- !ruby/object:Gem::Dependency
-  name: json
+        version: '10.0'
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: '10.0'
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: log4r
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: ! "Batsir uses so called stages to define operation queues. These operation
-  queues\n    consist of several operations that will be executed one after the other.
-  Each stage\n    is defined by its name and the queue on which it will listen. Once
-  a message is received\n    on the queue, it is dispatched to a worker in a seperate
-  thread that will pass the message\n    to each operation in the operation queue.\n
-  \   Operation queues can have 4 different operations, 1 common operation type, and
-  3 special\n    purpose operations: retrieval operations (which are always executed
-  before all other operations),\n    persistence operations (which are always executed
-  after the common operations, but before the\n    notification operations) and notification
-  operations (which will always be executed last)\n    This makes it possible to create
-  chains of stages to perform tasks that depend on each\n    other, but otherwise
-  have a low coupling"
+  type: :development
+description:
 email: jwkoelewijn@gmail.com
 executables: []
 extensions: []
@@ -176,100 +146,60 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
-- .document
-- .rspec
-- .travis.yml
+- README.md
 - CHANGES.md
-- Gemfile
 - LICENSE.txt
-- README.md
-- Rakefile
-- batsir.gemspec
-- batsir.png
 - lib/batsir.rb
-- lib/batsir/acceptors/acceptor.rb
-- lib/batsir/acceptors/amqp_acceptor.rb
 - lib/batsir/amqp.rb
 - lib/batsir/amqp_consumer.rb
 - lib/batsir/chain.rb
-- lib/batsir/compiler/stage_worker_compiler.rb
 - lib/batsir/config.rb
-- lib/batsir/dsl/conditional_notifier_declaration.rb
-- lib/batsir/dsl/dsl_mappings.rb
 - lib/batsir/errors.rb
 - lib/batsir/filter.rb
 - lib/batsir/filter_queue.rb
 - lib/batsir/log.rb
 - lib/batsir/logger.rb
 - lib/batsir/logo.rb
-- lib/batsir/notifiers/amqp_notifier.rb
-- lib/batsir/notifiers/conditional_notifier.rb
-- lib/batsir/notifiers/notifier.rb
 - lib/batsir/registry.rb
 - lib/batsir/stage.rb
 - lib/batsir/stage_worker.rb
+- lib/batsir/version.rb
+- lib/batsir/acceptors/acceptor.rb
+- lib/batsir/acceptors/amqp_acceptor.rb
+- lib/batsir/compiler/stage_worker_compiler.rb
+- lib/batsir/dsl/conditional_notifier_declaration.rb
+- lib/batsir/dsl/dsl_mappings.rb
+- lib/batsir/notifiers/amqp_notifier.rb
+- lib/batsir/notifiers/conditional_notifier.rb
+- lib/batsir/notifiers/notifier.rb
 - lib/batsir/strategies/retry_strategy.rb
 - lib/batsir/strategies/strategy.rb
 - lib/batsir/transformers/field_transformer.rb
 - lib/batsir/transformers/json_input_transformer.rb
 - lib/batsir/transformers/json_output_transformer.rb
 - lib/batsir/transformers/transformer.rb
-- lib/batsir/version.rb
-- spec/batsir/acceptors/acceptor_spec.rb
-- spec/batsir/acceptors/amqp_acceptor_spec.rb
-- spec/batsir/acceptors/shared_examples.rb
-- spec/batsir/amqp_spec.rb
-- spec/batsir/chain_spec.rb
-- spec/batsir/config_spec.rb
-- spec/batsir/dsl/chain_mapping_spec.rb
-- spec/batsir/dsl/conditional_notifier_mapping_spec.rb
-- spec/batsir/dsl/stage_mapping_spec.rb
-- spec/batsir/filter_queue_spec.rb
-- spec/batsir/filter_spec.rb
-- spec/batsir/log_spec.rb
-- spec/batsir/logger_spec.rb
-- spec/batsir/notifiers/amqp_notifier_spec.rb
-- spec/batsir/notifiers/conditional_notifier_spec.rb
-- spec/batsir/notifiers/notifier_spec.rb
-- spec/batsir/notifiers/shared_examples.rb
-- spec/batsir/registry_spec.rb
-- spec/batsir/stage_spec.rb
-- spec/batsir/stage_worker_spec.rb
-- spec/batsir/strategies/retry_strategy_spec.rb
-- spec/batsir/strategies/strategy_spec.rb
-- spec/batsir/support/bunny_mocks.rb
-- spec/batsir/support/mock_filters.rb
-- spec/batsir/transformers/field_transformer_spec.rb
-- spec/batsir/transformers/json_input_transformer_spec.rb
-- spec/batsir/transformers/json_output_transformer_spec.rb
-- spec/batsir/transformers/transformer_spec.rb
-- spec/spec_helper.rb
 homepage: http://github.com/jwkoelewijn/batsir
 licenses:
 - MIT
-post_install_message: 
+metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4266903318134081756
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.25
-signing_key: 
-specification_version: 3
-summary: Batsir is an execution platform for stage based operation queue execution
+rubyforge_project:
+rubygems_version: 2.1.9
+signing_key:
+specification_version: 4
+summary: Batsir is a platform for stage based operation queue execution
 test_files: []

data/.document

@@ -1,5 +0,0 @@
-lib/**/*.rb
-bin/*
-- 
-features/**/*.feature
-LICENSE.txt

data/.rspec

@@ -1,3 +0,0 @@
---colour
---backtrace
---format documentation

data/.travis.yml

@@ -1,18 +0,0 @@
-language: ruby
-
-jdk:
-  - oraclejdk7
-
-rvm:
-  - 1.9.3
-  - 2.0.0
-  - jruby-19mode
-  - rbx-19mode
-  - ruby-head
-  - jruby-head
-
-matrix:
-  allow_failures:
-    - rvm: rbx-19mode
-    - rvm: ruby-head
-    - rvm: jruby-head

data/Gemfile

@@ -1,19 +0,0 @@
-source "https://rubygems.org"
-
-gem "bundler",      "> 1.0.0"
-gem "jeweler"
-gem "rdoc"
-gem "blockenspiel", ">= 0.4.3"
-gem "celluloid",    "~> 0.14.1"
-gem "sidekiq",      ">= 2.5.4"
-gem "bunny",        "~> 0.10.7"
-gem "json"
-gem "log4r"
-#gem "hot_bunnies", :git => "https://github.com/ruby-amqp/hot_bunnies.git"
-
-group :development do
-end
-
-group :test do
-  gem "rspec"
-end

data/Rakefile

@@ -1,62 +0,0 @@
-# encoding: utf-8
-
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'lib'))
-
-require 'rake'
-require 'jeweler'
-require 'batsir/version'
-
-version = Batsir::VERSION
-
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "batsir"
-  gem.version = version
-  gem.homepage = "http://github.com/jwkoelewijn/batsir"
-  gem.license = "MIT"
-  gem.summary = %Q{Batsir is an execution platform for stage based operation queue execution}
-  gem.description = %Q{Batsir uses so called stages to define operation queues. These operation queues
-    consist of several operations that will be executed one after the other. Each stage
-    is defined by its name and the queue on which it will listen. Once a message is received
-    on the queue, it is dispatched to a worker in a seperate thread that will pass the message
-    to each operation in the operation queue.
-    Operation queues can have 4 different operations, 1 common operation type, and 3 special
-    purpose operations: retrieval operations (which are always executed before all other operations),
-    persistence operations (which are always executed after the common operations, but before the
-    notification operations) and notification operations (which will always be executed last)
-    This makes it possible to create chains of stages to perform tasks that depend on each
-    other, but otherwise have a low coupling}
-  gem.email = "jwkoelewijn@gmail.com"
-  gem.authors = ["J.W. Koelewijn", "Bram de Vries"]
-  gem.extra_rdoc_files << "CHANGES.md"
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
-
-require 'rspec/core/rake_task'
-
-desc "Run specs"
-RSpec::Core::RakeTask.new do |t|
-  t.pattern = 'spec/**/*_spec.rb'
-end
-
-task :default => :spec
-
-require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "batsir #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('CHANGES*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end