cassandra_migrations 0.0.3 → 0.0.4

data/lib/cassandra_migrations/cassandra/queries.rb

@@ -73,6 +73,8 @@ module CassandraMigrations
           "'#{value.strftime('%Y-%m-%d %H:%M:%S%z')}'"
         elsif value.is_a?(String)
           "'#{value}'"          
+	elsif value.is_a?(Hash)
+          "{ #{value.reduce([]) {|sum, (key, value)| sum << "'#{key}': '#{value}'" }.join(", ") } }"
         else
           value.to_s
         end

data/lib/cassandra_migrations/cassandra.rb

@@ -51,6 +51,7 @@ module CassandraMigrations
 
     def self.execute(cql)
       connect_to_server unless client
+      Rails.logger.try(:info, "\e[1;35m [Cassandra Migrations] \e[0m #{cql.to_s}")
       result = client.execute(cql)
       QueryResult.new(result) if result
     end  

data/lib/cassandra_migrations/config.rb

@@ -14,7 +14,7 @@ module CassandraMigrations
 
     def self.load_config
       begin
-        self.config = YAML.load_file(Rails.root.join("config", "cassandra.yml"))[Rails.env]
+        self.config = YAML.load(ERB.new(File.new(Rails.root.join("config", "cassandra.yml")).read).result)[Rails.env]
       
         if config.nil?
           raise Errors::MissingConfigurationError, "No configuration for #{Rails.env} environment! Complete your config/cassandra.yml."

data/spec/cassandra_migrations/config_spec.rb

@@ -32,5 +32,17 @@ describe CassandraMigrations::Config do
       CassandraMigrations::Config.keyspace
     }.to raise_exception CassandraMigrations::Errors::MissingConfigurationError
   end
+  
+  it 'should allow ERB in the config file' do
+    Rails.stub(:root).and_return Pathname.new("spec/fixtures/with_erb")
+    Rails.stub(:env).and_return ActiveSupport::StringInquirer.new("test")
+    
+    CassandraMigrations::Config.keyspace.should == 'cassandra_migrations_test'
+    
+    CassandraMigrations::Config.config = nil
+    ENV.stub(:[]).with("CI").and_return("true")
+    
+    CassandraMigrations::Config.keyspace.should == 'cassandra_migrations_ci'
+  end
 end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassandra_migrations
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-21 00:00:00.000000000 Z
+date: 2013-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cql-rb