waffle 0.2.1 → 0.2.2

data/Gemfile

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

data/lib/waffle/config.rb

@@ -11,7 +11,13 @@ module Waffle
       @config_hash = {'transport' => 'rabbitmq', 'url' => nil, 'encoder' => 'json'}
 
       if defined? Rails
-        @config_hash.merge! YAML.load_file("#{Rails.root}/config/#{Rails.env}.waffle.yml")
+        if File.exists? "#{Rails.root}/config/waffle.yml"
+          loaded_config = YAML.load_file("#{Rails.root}/config/waffle.yml")
+
+          if loaded_config[Rails.env]
+            @config_hash.merge! loaded_config[Rails.env]
+          end
+        end
       end
     end
 

data/lib/waffle/event.rb

@@ -9,6 +9,7 @@ module Waffle
       def occured(*args)
         self.instance.occured(*args)
       end
+      alias :occurred :occured
     end
 
     def transport

data/lib/waffle/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: waffle
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-22 00:00:00.000000000Z
+date: 2012-03-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
-  requirement: &74030980 !ruby/object:Gem::Requirement
+  requirement: &75349830 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74030980
+  version_requirements: *75349830
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &74030450 !ruby/object:Gem::Requirement
+  requirement: &75349560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74030450
+  version_requirements: *75349560
 description: Client part of Patty statistics server
 email: alexander.lomakin@gmail.com
 executables: []