waffle 0.1.3 → 0.2.1

data/Gemfile

@@ -1,4 +1,5 @@
 source "http://rubygems.org"
 
 gem 'rake'
+gem 'mocha'
 gem 'waffle', :git => 'git://github.com/peanut/waffle.git'

data/README.md

@@ -8,18 +8,20 @@ An abstract flow publisher and subscriber.
 
 Insert in your Rails Gemfile:
 
-    gem 'waffle', '~> 0.1.3'
+    gem 'waffle', '~> 0.2.1'
 
 and create config file:
 
     # production.waffle.yml
-    strategy: rabbitmq
+    transport: rabbitmq
+    encoder: marshal
     url: amqp://anyhost.com:5678
 
 or if RabbitMQ on local machine
 
     # production.waffle.yml
-    strategy: rabbitmq
+    transport: rabbitmq
+    encoder: marshal
 
 ## Usage
 

data/lib/waffle/base.rb

@@ -1,20 +1,20 @@
 module Waffle
   class Base
 
-    def initialize(strategy = nil)
-      @strategy = strategy
+    def initialize(transport = nil)
+      @transport = transport
     end
 
     def publish(flow = 'events', message = '')
       begin
-        @strategy.publish flow, message
+        @transport.publish flow, message
       rescue
         nil
       end
     end
 
     def subscribe(flow = '', &block)
-      @strategy.subscribe flow, &block
+      @transport.subscribe flow, &block
     end
 
   end

data/lib/waffle/config.rb

@@ -0,0 +1,31 @@
+require 'singleton'
+require 'yaml'
+
+module Waffle
+  class Config
+    include Singleton
+
+    attr_reader :config_hash
+
+    def initialize
+      @config_hash = {'transport' => 'rabbitmq', 'url' => nil, 'encoder' => 'json'}
+
+      if defined? Rails
+        @config_hash.merge! YAML.load_file("#{Rails.root}/config/#{Rails.env}.waffle.yml")
+      end
+    end
+
+    class << self
+
+      def method_missing(m, *args, &block)
+        if self.instance.config_hash.has_key?(m.to_s)
+          self.instance.config_hash[m.to_s]
+        else
+          super
+        end
+      end
+
+    end
+
+  end
+end

data/lib/waffle/encoders/json.rb

@@ -0,0 +1,21 @@
+require 'yajl'
+
+module Waffle
+  module Encoders
+    class Json
+
+      class << self
+
+        def encode(message = nil)
+          Yajl::Encoder.encode message
+        end
+
+        def decode(message = '')
+          Yajl::Parser.parse message
+        end
+
+      end
+
+    end
+  end
+end

data/lib/waffle/encoders/marshal.rb

@@ -0,0 +1,19 @@
+module Waffle
+  module Encoders
+    class Marshal
+
+      class << self
+
+        def encode(message = nil)
+          ::Marshal.dump message
+        end
+
+        def decode(message = '')
+          ::Marshal.restore message
+        end
+
+      end
+
+    end
+  end
+end

data/lib/waffle/event.rb

@@ -11,12 +11,12 @@ module Waffle
       end
     end
 
-    def config
-      @config ||= Waffle::Configuration.new
+    def transport
+      @transport ||= Waffle::Base.new eval("Waffle::Transports::#{Waffle::Config.transport.capitalize}").new
     end
 
-    def transport
-      @transport ||= Waffle::Base.new eval("Waffle::Strategies::#{config.strategy.capitalize}").new(config)
+    def encoder
+      @encoder ||= eval("Waffle::Encoders::#{Waffle::Config.encoder.capitalize}")
     end
 
     def occured(event_name = 'event', event_data = nil)
@@ -26,7 +26,7 @@ module Waffle
 
       event_data.merge!({'occured_at' => Time.now})
 
-      transport.publish event_name, Waffle::Utils.encode(event_data)
+      transport.publish event_name, encoder.encode(event_data)
     end
 
   end

data/lib/waffle/{strategies → transports}/rabbitmq.rb

@@ -1,16 +1,18 @@
 require 'bunny'
 
 module Waffle
-  module Strategies
+  module Transports
     class Rabbitmq
 
-      def initialize(configuration = nil)
-        raise ArgumentError unless configuration && configuration.is_a?(Waffle::Configuration)
-
-        @bunny = Bunny.new configuration.url
+      def initialize
+        @bunny = Bunny.new Waffle::Config.url
         @bunny.start
       end
 
+      def encoder
+        @encoder ||= eval("Waffle::Encoders::#{Waffle::Config.encoder.capitalize}")
+      end
+
       def publish(flow = 'events', message = '')
         @exchange = @bunny.exchange flow
         @exchange.publish message
@@ -22,7 +24,7 @@ module Waffle
         @queue.bind @exchange
 
         @queue.subscribe do |message|
-          yield Waffle::Utils.decode(message[:payload])
+          yield encoder.decode(message[:payload])
         end
       end
 

data/lib/waffle/version.rb

@@ -1,5 +1,5 @@
 module Waffle
 
-  VERSION = '0.1.3'
+  VERSION = '0.2.1'
 
 end

data/lib/waffle.rb

@@ -1,13 +1,15 @@
 require 'waffle/version'
-require 'waffle/utils'
 require 'waffle/base'
-require 'waffle/configuration'
+require 'waffle/config'
 require 'waffle/event'
 
 module Waffle
-  module Strategies
-
-    autoload :Rabbitmq, 'waffle/strategies/rabbitmq'
+  module Transports
+    autoload :Rabbitmq, 'waffle/transports/rabbitmq'
+  end
 
+  module Encoders
+    autoload :Json, 'waffle/encoders/json'
+    autoload :Marshal, 'waffle/encoders/marshal'
   end
 end

data/test/test_config.rb

@@ -0,0 +1,11 @@
+require 'test/unit'
+require 'waffle/config'
+
+class RabbitmqTest < Test::Unit::TestCase
+
+  def test_config_options_mapping
+    assert_equal Waffle::Config.transport, 'rabbitmq'
+    assert_equal Waffle::Config.encoder, 'json'
+  end
+
+end

data/test/test_rabbitmq.rb

@@ -1,23 +1,20 @@
 require 'test/unit'
-require 'waffle/configuration'
-require 'waffle/strategies/rabbitmq'
+require 'mocha'
+require 'bunny'
+require 'waffle/transports/rabbitmq'
 
 class RabbitmqTest < Test::Unit::TestCase
 
-  def test_bad_initialization
-    assert_raise ArgumentError do
-      Waffle::Strategies::Rabbitmq.new
-    end
-
-    assert_raise ArgumentError do
-      Waffle::Strategies::Rabbitmq.new 'crap'
-    end
+  def test_publish
+    Bunny.setup nil
+    Bunny::Exchange.any_instance.stubs(:publish).returns(nil)
+    assert_equal nil, Waffle::Transports::Rabbitmq.new.publish('events', 'message')
   end
 
-  def test_good_initialization
-    assert_nothing_raised do
-      Waffle::Strategies::Rabbitmq.new Waffle::Configuration.new
-    end
+  def test_subscribe
+    Bunny.setup nil
+    Bunny::Queue.any_instance.stubs(:subscribe).returns(nil)
+    assert_equal nil, Waffle::Transports::Rabbitmq.new.subscribe{ |m| puts m }
   end
 
 end

data/waffle.gemspec

@@ -10,8 +10,6 @@ Gem::Specification.new do |s|
   s.authors  = ['Alexander Lomakin']
   s.email    = 'alexander.lomakin@gmail.com'
 
-  s.homepage = ''
-
   s.summary     = 'Abstract flow publisher and subscriber'
   s.description = 'Client part of Patty statistics server'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: waffle
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-21 00:00:00.000000000Z
+date: 2012-03-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
-  requirement: &72738890 !ruby/object:Gem::Requirement
+  requirement: &74030980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72738890
+  version_requirements: *74030980
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &72738230 !ruby/object:Gem::Requirement
+  requirement: &74030450 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72738230
+  version_requirements: *74030450
 description: Client part of Patty statistics server
 email: alexander.lomakin@gmail.com
 executables: []
@@ -45,15 +45,16 @@ files:
 - Rakefile
 - lib/waffle.rb
 - lib/waffle/base.rb
-- lib/waffle/configuration.rb
+- lib/waffle/config.rb
+- lib/waffle/encoders/json.rb
+- lib/waffle/encoders/marshal.rb
 - lib/waffle/event.rb
-- lib/waffle/strategies/rabbitmq.rb
-- lib/waffle/utils.rb
+- lib/waffle/transports/rabbitmq.rb
 - lib/waffle/version.rb
+- test/test_config.rb
 - test/test_rabbitmq.rb
-- test/test_utils.rb
 - waffle.gemspec
-homepage: ''
+homepage: http://github.com/peanut/waffle
 licenses: []
 post_install_message: 
 rdoc_options: []

data/lib/waffle/configuration.rb

@@ -1,25 +0,0 @@
-require 'yaml'
-
-module Waffle
-  class Configuration
-
-    def initialize(custom_params = {})
-      @configuration = {'strategy' => 'rabbitmq', 'url' => nil}
-
-      if defined? Rails
-        @configuration.merge! YAML.load_file("#{Rails.root}/config/#{Rails.env}.waffle.yml")
-      end
-
-      @configuration.merge! custom_params
-    end
-
-    def method_missing(m, *args, &block)
-      if @configuration.has_key? m.to_s
-        @configuration[m.to_s]
-      else
-        super
-      end
-    end
-
-  end
-end

data/lib/waffle/utils.rb

@@ -1,19 +0,0 @@
-require 'yajl'
-
-module Waffle
-  class Utils
-
-    class << self
-
-      def encode(message = nil)
-        Yajl::Encoder.encode message
-      end
-
-      def decode(message = '')
-        Yajl::Parser.parse message
-      end
-
-    end
-
-  end
-end

data/test/test_utils.rb

@@ -1,16 +0,0 @@
-require 'test/unit'
-require 'waffle/utils'
-
-class UtilsTest < Test::Unit::TestCase
-
-  def test_encode
-    encoded_msg = Waffle::Utils.encode({'a' => 1, 'b' => 2})
-    assert_equal('{"a":1,"b":2}', encoded_msg)
-  end
-
-  def test_decode
-    decoded_msg = Waffle::Utils.decode('{"a":1,"b":2}')
-    assert_equal({'a' => 1, 'b' => 2}, decoded_msg)
-  end
-
-end