batsir 0.1.0 → 0.3.7

data/spec/batsir/strategies/strategy_spec.rb

@@ -0,0 +1,28 @@
+require File.join( File.dirname(__FILE__), "..", "..",  "spec_helper" )
+
+describe Batsir::Strategies::Strategy do
+  let( :strategy_class ) {
+    Batsir::Strategies::Strategy
+  }
+
+  class MockContext
+    def execute(message)
+    end
+  end
+
+  class DefunctMockContext; end
+
+  it 'has an #execute method' do
+    strategy_class.instance_methods.map{|im| im.to_s}.should include "execute"
+  end
+
+  it 'has an accessable context' do
+    c = MockContext.new
+    strategy_class.new(c).context.should == c
+  end
+
+  it 'detects an incorrect context object being passed' do
+    c = DefunctMockContext.new
+    lambda{strategy_class.new(c)}.should raise_error Batsir::Errors::ExecuteMethodNotImplementedError
+  end
+end

data/spec/batsir/support/bunny_mocks.rb

@@ -8,9 +8,22 @@ module Bunny
     yield @instance
   end
 
+  def self.new(options = {})
+    @instance = BunnyInstance.new(options)
+    @instance
+  end
+
+  class Consumer
+    def initialize(channel, queue, consumer_tag = 'test', no_ack = true, exclusive = false, arguments = {})
+      @channel = channel
+      @queue = queue
+    end
+  end
+
   class BunnyInstance
     attr_accessor :queues
     attr_accessor :options
+    attr_accessor :channel
     attr_accessor :exchange
 
     def initialize(options = {})
@@ -18,27 +31,66 @@ module Bunny
       @queues = {}
     end
 
+    def start
+      @channel = create_channel
+      self
+    end
+
     def exchange(exchange = nil)
-      @exchange = BunnyExchange.new(exchange) if exchange
+      @exchange = BunnyExchange.new(self, exchange) if exchange
       @exchange
     end
 
-    def queue(queue)
+    def queue(queue, options = {})
       @queues[queue] = BunnyQueue.new
     end
+
+    def create_channel
+      self
+    end
+
+    def connection
+      self
+    end
+
+    def host
+      @options[:host]
+    end
+
+    def port
+      @options[:port]
+    end
+
+    def user
+      @options[:user]
+    end
+
+    def pass
+      @options[:pass]
+    end
+
+    def vhost
+      @options[:vhost]
+    end
+
+    def number
+      1
+    end
   end
 
   class BunnyExchange
     attr_accessor :name
     attr_accessor :key
     attr_accessor :message
+    attr_accessor :channel
 
-    def initialize(name)
+    def initialize(channel, name)
+      @channel = channel
       @name = name
     end
 
     def publish(message, options = {})
-      @key = options[:key]
+      @key = options[:routing_key] || options[:key]
       @message = message
     end
   end
@@ -48,15 +100,36 @@ module Bunny
     attr_accessor :block
     attr_accessor :bound_exchange
     attr_accessor :bound_key
+    attr_accessor :consumer
+
+    def initialize
+      @bindings = []
+    end
 
     def bind(exchange, options)
       @bound_exchange = exchange
-      @bound_key = options[:key]
+
+      @bound_key = options[:routing_key] || options[:key]
+      @bindings << {:exchange => @bound_exchange.name, :routing_key => @bound_key}
     end
 
     def subscribe(*args, &block)
       @arguments = *args
       @block = block
     end
+
+    def subscribe_with(consumer, opts = {:block => false})
+      @block ||= opts[:block]
+      @consumer = consumer
+      @consumer
+    end
+
+    def name
+      @bound_key
+    end
+
+    def channel
+      @bound_exchange.channel
+    end
   end
 end

data/spec/batsir/transformers/field_transformer_spec.rb

@@ -5,51 +5,52 @@ describe Batsir::Transformers::FieldTransformer do
     Batsir::Transformers::FieldTransformer
   end
 
-  it "should accept an options hash in its initializer" do
+  it "accepts an options hash in its initializer" do
     transformer_instance = transformer_class.new( {} )
     transformer_instance.should_not be_nil
     transformer_instance.should be_a transformer_class
   end
 
-  it "should be possible to set a field mapping using the 'fields' option" do
+  it "can set a field mapping using the 'fields' option" do
     field_mapping = {:foo => :bar}
     transformer = transformer_class.new( :fields => field_mapping )
     transformer.fields.should == field_mapping
   end
 
-  it "should use the fields mapping given in an options hash to transform the message using #transform" do
-    field_mapping = {:foo => :bar}
+  it "uses the fields mapping given in an options hash to transform the message using #transform" do
+    field_mapping = {:foo => 'bar'}
     transformer = transformer_class.new( :fields => field_mapping )
 
-    message = {:bar => "bar"}
+    message = {'bar' => 123}
     transformed_message = transformer.transform(message)
-    transformed_message.should have_key :foo
-    transformed_message.should_not have_key :bar
-    transformed_message[:foo].should == "bar"
+    transformed_message.should have_key 'foo'
+    transformed_message.should_not have_key :foo
+    transformed_message.should_not have_key 'bar'
+    transformed_message['foo'].should == 123
   end
 
-  it "should be possible to use symbols and string based keys and values all the same" do
+  it "can use symbols and string based keys and values all the same" do
     field_mapping = {:foo => "bar", "john" => :doe}
     transformer = transformer_class.new( :fields => field_mapping )
 
     message = {:bar => "foo", "doe" => :john}
     transformed_message = transformer.transform(message)
-    transformed_message[:foo].should == "foo"
-    transformed_message[:john].should == :john
+    transformed_message['foo'].should == 'foo'
+    transformed_message['john'].should == :john
   end
 
-  it "should remove options not in the fields option when a fields option is given" do
+  it "removes options not in the fields option when a fields option is given" do
     field_mapping = {:foo => :bar}
     transformer = transformer_class.new( :fields => field_mapping )
 
-    message = {:bar => "bar", :john => :doe}
+    message = {'bar' => "bar", 'john' => :doe}
     transformed_message = transformer.transform(message)
-    transformed_message.should have_key :foo
-    transformed_message.should_not have_key :bar
-    transformed_message.should_not have_key :john
+    transformed_message.should have_key 'foo'
+    transformed_message.should_not have_key 'bar'
+    transformed_message.should_not have_key 'john'
   end
 
-  it "should not remove fields when no mapping is given" do
+  it "does not remove fields when no mapping is given, but enforces the no_symbol_keys principle" do
     transformer = transformer_class.new
 
     message = {:bar => "bar", :john => :doe}
@@ -58,16 +59,15 @@ describe Batsir::Transformers::FieldTransformer do
     transformed_message.should have_key :john
   end
 
-  it "should correctly handle more complex field mapping" do
+  it "correctly handles more complex field mapping" do
     field_mapping = {:id => :old_id}
     transformer = transformer_class.new( :fields => field_mapping )
 
     message = {:id => 2, :old_id => 1, :john => :doe}
     transformed_message = transformer.transform(message)
 
-    transformed_message.should have_key :id
-    transformed_message.should_not have_key :old_id
-    transformed_message.should_not have_key :john
+    transformed_message.should have_key 'id'
+    transformed_message.should_not have_key 'old_id'
+    transformed_message.should_not have_key 'john'
   end
-
 end

data/spec/batsir/transformers/json_input_transformer_spec.rb

@@ -1,17 +1,17 @@
 require File.join( File.dirname(__FILE__), "..", "..", "spec_helper" )
 
 describe Batsir::Transformers::JSONInputTransformer do
-  it "should be a Batsir::Transformers::Transformer" do
+  it "is a Batsir::Transformers::Transformer" do
     subject.should be_a Batsir::Transformers::Transformer
   end
 
-  it "should transform the input to a ruby object" do
+  it "transforms the input to a ruby object" do
     some_json = '{"foo" : "bar"}'
     result = subject.transform(some_json)
     result.should be_a Hash
   end
 
-  it "should transform the input using string names" do
+  it "transforms the input using string names" do
     some_json = '{"foo" : "bar"}'
     result = subject.transform(some_json)
 
@@ -19,4 +19,9 @@ describe Batsir::Transformers::JSONInputTransformer do
     result["foo"].should_not be_nil
     result["foo"].should == "bar"
   end
+
+  it "should throw a TransformError when the input is malformed" do
+    test = Batsir::Transformers::JSONInputTransformer.new
+    expect{ test.transform("1") }.to raise_error Batsir::Errors::TransformError
+  end
 end

data/spec/batsir/transformers/json_output_transformer_spec.rb

@@ -1,11 +1,11 @@
 require File.join( File.dirname(__FILE__), "..", "..", "spec_helper" )
 
 describe Batsir::Transformers::JSONOutputTransformer do
-  it "should be a Batsir::Transformers::Transformer" do
+  it "is a Batsir::Transformers::Transformer" do
     subject.should be_a Batsir::Transformers::Transformer
   end
 
-  it "should transform a hash to a valid json hash" do
+  it "transforms a hash to a valid json hash" do
     some_hash = {:foo => :bar}
     some_hash.should be_a Hash
 

data/spec/batsir/transformers/transformer_spec.rb

@@ -5,18 +5,32 @@ describe Batsir::Transformers::Transformer do
     Batsir::Transformers::Transformer
   end
 
-  it "should accept an options hash in its initializer" do
+  it "accepts an options hash in its initialiser" do
     transformer_instance = transformer_class.new( {} )
     transformer_instance.should_not be_nil
     transformer_instance.should be_a transformer_class
   end
 
-  it "should have a #transform method" do
+  it "has a #transform method" do
     transformer_class.instance_methods.map{|m| m.to_s}.should include "transform"
   end
 
-  it "should return the message by default" do
+  it "has an #execute method" do
+    transformer_class.instance_methods.map{|m| m.to_s}.should include "execute"
+  end
+
+  it 'raises an error when the #execute method is not implemented' do
+    message = {:foo => :bar}
+    lambda{transformer_class.new.transform(message)}.should raise_error NotImplementedError
+  end
+
+  it "can transform the message" do
+    class Autobot < Batsir::Transformers::Transformer
+      def execute(message)
+        message = "transform"
+      end
+    end
     message = {:foo => :bar}
-    transformer_class.new.transform(message).should == message
+    Autobot.new.transform(message).should == "transform"
   end
 end

data/spec/spec_helper.rb

@@ -11,12 +11,16 @@ require 'rspec/core'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
+
 require 'batsir'
 require 'batsir/support/mock_filters'
 require 'batsir/support/bunny_mocks'
 Celluloid.logger.level = Logger::ERROR
 RSpec.configure do |config|
-  config.after(:each) do
-    Celluloid.shutdown
+  config.before(:each) do
+    Celluloid.boot
   end
+#  config.after(:each) do
+#    Celluloid.shutdown
+#  end
 end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: batsir
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.7
   prerelease: 
 platform: ruby
 authors:
 - J.W. Koelewijn
+- Bram de Vries
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-28 00:00:00.000000000 Z
+date: 2013-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -43,12 +44,28 @@ dependencies:
     - - ! '>='
       - !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
+  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
@@ -56,17 +73,33 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: celluloid
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.14.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.14.1
+- !ruby/object:Gem::Dependency
+  name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,9 +107,9 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.5.4
 - !ruby/object:Gem::Dependency
-  name: sidekiq
+  name: bunny
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -92,7 +125,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bunny
+  name: json
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -108,7 +141,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: log4r
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -124,64 +157,86 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: ! "Batsir uses so called stages to define operation queues. These operation
-  queus\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"
+  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"
 email: jwkoelewijn@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
+- CHANGES.md
 - LICENSE.txt
 - README.md
 files:
 - .document
 - .rspec
 - .travis.yml
+- CHANGES.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- VERSION
 - 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/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
@@ -204,7 +259,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1524934688976294279
+      hash: 3965214533793542389
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -213,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.22
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Batsir is an execution platform for stage based operation queue execution

data/VERSION

@@ -1 +0,0 @@
-0.1.0