waffle 0.5.1 → 0.6.0

data/.gitignore

@@ -0,0 +1,3 @@
+.bundle
+/vendor/bundle
+Gemfile.lock

data/Gemfile

@@ -1,15 +1,3 @@
 source "http://rubygems.org"
 
-gem 'rake'
-
-group :development, :test do
-  gem 'pry'
-  gem 'yajl-ruby', require: 'yajl'
-  gem 'bunny'
-  gem "hiredis", "~> 0.3.1", :platforms => :ruby
-  gem "redis", "~> 2.2.0", require: RUBY_PLATFORM =~ /mingw|mswin/ ? 'redis' : ["redis/connection/hiredis", "redis"]
-end
-
-group :test do
-  gem 'rspec'
-end
+gemspec

data/README.md

@@ -6,23 +6,26 @@ An abstract flow publisher and subscriber.
 
 It supports the following transports: 
 
-- RabbitMQ.
-- Redis. 
+- RabbitMQ
+- Redis
 
 ## Configuration
 
 Insert in your Gemfile:
 
+    gem 'bunny' # for RabbitMQ transport
+    gem 'hiredis' # for Redis transport
+    gem 'redis', require: ['redis', 'redis/connection/hiredis'] # for Redis transport
     gem 'waffle', :gem => 'git://github.com/undr/waffle.git'
 
-and create config file:
+Create config file:
 
     production:
       transport: rabbitmq
       encoder: marshal
       url: amqp://anyhost.com:5678
 
-and load config file:
+and load it:
 
     Waffle.configure(:path => 'config/waffle.yml')
 

data/lib/waffle.rb

@@ -1,13 +1,12 @@
 $LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
 require 'rubygems'
-require 'bundler'
-environment = defined?(Rails) && Rails.respond_to?(:env) ? Rails.env : (ENV['RACK_ENV'] || 'development')
-Bundler.require :default, environment.to_sym
+require 'bundler/setup'
 require 'waffle/version'
+require 'multi_json'
 require 'time'
 
 module Waffle
-  extend self 
+  extend self
   module Transports
     autoload :Base, 'waffle/transports/base'
     autoload :Rabbitmq, 'waffle/transports/rabbitmq' if defined?(Bunny)
@@ -27,7 +26,7 @@ module Waffle
   end
 
   module Encoders
-    autoload :Json, 'waffle/encoders/json' if defined?(Yajl)
+    autoload :Json, 'waffle/encoders/json'
     autoload :Marshal, 'waffle/encoders/marshal'
   end
 

data/lib/waffle/encoders/json.rb

@@ -1,15 +1,13 @@
-require 'yajl'
-
 module Waffle
   module Encoders
     module Json
       module_function
       def encode message
-        Yajl::Encoder.encode(message)
+        ::MultiJson.encode(message)
       end
 
       def decode message
-        Yajl::Parser.parse(message)
+        ::MultiJson.decode(message)
       end
     end
   end

data/lib/waffle/version.rb

@@ -1,3 +1,3 @@
 module Waffle
-  VERSION = '0.5.1'
+  VERSION = '0.6.0'
 end

data/spec/spec_helper.rb

@@ -1,7 +1,9 @@
 $LOAD_PATH.unshift File.expand_path("../..", __FILE__)
 ENV['RACK_ENV'] = 'test'
 
-require "rspec"
+require 'rspec'
+require 'redis'
+require 'bunny'
 require 'waffle'
 
 RSpec.configure do |config|

data/spec/waffle_spec.rb

@@ -47,7 +47,7 @@ describe Waffle do
       specify{Waffle.config.transport.should == 'redis'}
     end
   end
-  
+
   context do
     before do
       Waffle.configure

data/waffle.gemspec

@@ -1,11 +1,11 @@
 $:.push File.expand_path("../lib", __FILE__)
 
-require "waffle/version"
+require 'waffle/version'
 
 Gem::Specification.new do |s|
   s.name = 'waffle'
   s.version = Waffle::VERSION
-  s.rubyforge_project = "waffle"
+  s.rubyforge_project = 'waffle'
 
   s.homepage = 'http://github.com/undr/waffle'
   s.authors = ['Alexander Lomakin', 'Andrey Lepeshkin']
@@ -15,5 +15,12 @@ Gem::Specification.new do |s|
   s.description = 'Abstract flow publisher and subscriber'
 
   s.files = `git ls-files`.split("\n")
-  s.add_dependency("rake")
+  s.add_runtime_dependency 'rake'
+  s.add_runtime_dependency 'multi_json'
+
+  s.add_development_dependency 'pry'
+  s.add_development_dependency 'bunny'
+  s.add_development_dependency 'hiredis'
+  s.add_development_dependency 'redis'
+  s.add_development_dependency 'rspec'
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: waffle
 version: !ruby/object:Gem::Version
-  version: 0.5.1
   prerelease: 
+  version: 0.6.0
 platform: ruby
 authors:
 - Alexander Lomakin
@@ -10,24 +10,120 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-08 00:00:00.000000000 Z
+date: 2012-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  prerelease: false
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
     none: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
   prerelease: false
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  type: :development
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
     none: false
+  prerelease: false
+  name: bunny
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  prerelease: false
+  name: hiredis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  prerelease: false
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  prerelease: false
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  type: :development
 description: Abstract flow publisher and subscriber
 email:
 - alexander.lomakin@gmail.com
@@ -36,11 +132,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
 - .rspec
-- .rvmrc
 - .travis.yml
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
 - config/config.rb
@@ -69,20 +164,23 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
       segments:
       - 0
-      hash: 332701600399495824
-required_rubygems_version: !ruby/object:Gem::Requirement
+      hash: 2032572459978125397
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2032572459978125397
+  none: false
 requirements: []
 rubyforge_project: waffle
 rubygems_version: 1.8.24

data/.rvmrc

@@ -1 +0,0 @@
-rvm use ruby-1.9.3-p125@waffle --create

data/Gemfile.lock

@@ -1,36 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    bunny (0.7.9)
-    coderay (1.0.6)
-    diff-lcs (1.1.3)
-    hiredis (0.3.2)
-    method_source (0.7.1)
-    pry (0.9.9.6)
-      coderay (~> 1.0.5)
-      method_source (~> 0.7.1)
-      slop (>= 2.4.4, < 3)
-    rake (0.9.2.2)
-    redis (2.2.2)
-    rspec (2.10.0)
-      rspec-core (~> 2.10.0)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.1)
-    rspec-expectations (2.10.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
-    slop (2.4.4)
-    yajl-ruby (1.1.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bunny
-  hiredis (~> 0.3.1)
-  pry
-  rake
-  redis (~> 2.2.0)
-  rspec
-  yajl-ruby