waffle 0.3.4 → 0.3.5

data/lib/waffle/config.rb

@@ -10,15 +10,22 @@ module Waffle
     def initialize
       @config_hash = {'transport' => 'rabbitmq', 'url' => nil, 'encoder' => 'json'}
 
+      filename = "config/waffle.yml"
+
       if defined? Rails
-        if File.exists? "#{Rails.root}/config/waffle.yml"
-          loaded_config = YAML.load_file("#{Rails.root}/config/waffle.yml")
+        fielname = "#{Rails.root}/config/waffle.yml"
+      end
+
+      if File.exists?(filename)
+        loaded_config = YAML.load_file filename
 
-          if loaded_config[Rails.env]
-            @config_hash.merge! loaded_config[Rails.env]
-          end
+        if defined?(Rails) && loaded_config[Rails.env]
+          @config_hash.merge! loaded_config[Rails.env]
+        else
+          @config_hash.merge! loaded_config
         end
       end
+
     end
 
     class << self

data/lib/waffle/version.rb

@@ -1,5 +1,5 @@
 module Waffle
 
-  VERSION = '0.3.4'
+  VERSION = '0.3.5'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: waffle
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
-  requirement: &76785160 !ruby/object:Gem::Requirement
+  requirement: &75330640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *76785160
+  version_requirements: *75330640
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &76783560 !ruby/object:Gem::Requirement
+  requirement: &75330060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *76783560
+  version_requirements: *75330060
 description: Client part of Patty statistics server
 email: alexander.lomakin@gmail.com
 executables: []