believer 0.2.16 → 0.2.17

data/lib/believer/environment/base_env.rb

@@ -20,9 +20,16 @@ module Believer
       }
 
       # Creates a new environment using the provided configuration
-      # @param config [Hash] the configuration
+      # @param config [Object] the configuration. If it's a hash use it as the configuration. If it's a String, assume
+      # it's a YAML file and load it as a Hash
       def initialize(config = nil)
-        @configuration = config.dup unless config.nil?
+        unless config.nil?
+          if config.is_a?(Hash)
+            @configuration = config.dup
+          elsif config.is_a?(String)
+            @configuration = load_config_from_file(config)
+          end
+        end
       end
 
       def logger
@@ -83,6 +90,14 @@ module Believer
         connection
       end
 
+      protected
+      def load_config_from_file(config_file)
+        return nil if config_file.nil?
+        cfg = HashWithIndifferentAccess.new(YAML::load(File.open(config_file.to_s)))
+        puts "Loaded config from file #{config_file.to_s}: #{cfg}"
+        cfg
+      end
+
     end
 
   end

data/lib/believer/environment/merb_env.rb

@@ -9,7 +9,7 @@ module Believer
 
       def load_configuration
         config_file = File.join(Merb.root, 'config', 'believer.yml')
-        config = HashWithIndifferentAccess.new(YAML::load(File.open(config_file.to_s)))
+        config = load_config_from_file(config_file)
         env_config = config[Merb.environment]
         env_config
       end

data/lib/believer/environment/rails_env.rb

@@ -9,7 +9,7 @@ module Believer
 
       def load_configuration
         config_file = File.join(Rails.root, 'config', 'believer.yml')
-        config = HashWithIndifferentAccess.new(YAML::load(File.open(config_file.to_s)))
+        config = load_config_from_file(config_file)
         env_config = config[Rails.env]
         env_config
       end

data/lib/believer/test/database.rb

@@ -22,7 +22,9 @@ module Believer
         keyspace.create({})
         connection.use(env.connection_configuration[:keyspace])
 
-        classes = options[:classes]
+        ::Believer::Base.environment = env
+
+            classes = options[:classes]
         classes.each do |cl|
           if cl.is_a?(String)
             clazz = cl.split('::').inject(Kernel) { |scope, const_name| scope.const_get(const_name) }

data/lib/believer/version.rb

@@ -1,5 +1,5 @@
 module Believer
   module Version
-    VERSION = '0.2.16'
+    VERSION = '0.2.17'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: believer
 version: !ruby/object:Gem::Version
-  version: 0.2.16
+  version: 0.2.17
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-15 00:00:00.000000000 Z
+date: 2013-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel