waffle 0.2.1 → 0.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/Gemfile CHANGED
@@ -2,4 +2,4 @@ source "http://rubygems.org"
2
2
 
3
3
  gem 'rake'
4
4
  gem 'mocha'
5
- gem 'waffle', :git => 'git://github.com/peanut/waffle.git'
5
+ gem 'waffle', :git => 'git://github.com/peanut/waffle.git'
@@ -11,7 +11,13 @@ module Waffle
11
11
  @config_hash = {'transport' => 'rabbitmq', 'url' => nil, 'encoder' => 'json'}
12
12
 
13
13
  if defined? Rails
14
- @config_hash.merge! YAML.load_file("#{Rails.root}/config/#{Rails.env}.waffle.yml")
14
+ if File.exists? "#{Rails.root}/config/waffle.yml"
15
+ loaded_config = YAML.load_file("#{Rails.root}/config/waffle.yml")
16
+
17
+ if loaded_config[Rails.env]
18
+ @config_hash.merge! loaded_config[Rails.env]
19
+ end
20
+ end
15
21
  end
16
22
  end
17
23
 
@@ -9,6 +9,7 @@ module Waffle
9
9
  def occured(*args)
10
10
  self.instance.occured(*args)
11
11
  end
12
+ alias :occurred :occured
12
13
  end
13
14
 
14
15
  def transport
@@ -1,5 +1,5 @@
1
1
  module Waffle
2
2
 
3
- VERSION = '0.2.1'
3
+ VERSION = '0.2.2'
4
4
 
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: waffle
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.1
4
+ version: 0.2.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-03-22 00:00:00.000000000Z
12
+ date: 2012-03-29 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: bunny
16
- requirement: &74030980 !ruby/object:Gem::Requirement
16
+ requirement: &75349830 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *74030980
24
+ version_requirements: *75349830
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: yajl-ruby
27
- requirement: &74030450 !ruby/object:Gem::Requirement
27
+ requirement: &75349560 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
32
32
  version: '0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *74030450
35
+ version_requirements: *75349560
36
36
  description: Client part of Patty statistics server
37
37
  email: alexander.lomakin@gmail.com
38
38
  executables: []