cequel-migrations-rails 0.2.3 → 0.2.4

data/lib/cequel-migrations-rails/version.rb

@@ -1,7 +1,7 @@
 module Cequel
   module Migrations
     module Rails
-      VERSION = "0.2.3"
+      VERSION = "0.2.4"
     end
   end
 end

data/lib/cequel/migration.rb

@@ -10,8 +10,20 @@ module Cequel
       db.execute(cql_string)
     end
 
+    def self.cequel_conf_path
+      File.join(::Rails.root, "config", "cequel.yml")
+    end
+
+    def self.cequel_conf_file
+      File.open(self.cequel_conf_path)
+    end
+
+    def self.cequel_conf
+      YAML::load(self.cequel_conf_file)
+    end
+
     def self.cequel_env_conf
-      YAML::load(File.open(File.join(::Rails.root,"config", "cequel.yml")))[::Rails.env]
+      self.cequel_conf[::Rails.env]
     end
 
   private
@@ -25,7 +37,7 @@ module Cequel
 
     def thrift_options
       if self.class.cequel_env_conf['thrift']
-        return self.class.cequel_env_conf['thrift'].inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
+        return self.class.cequel_env_conf['thrift'].inject({}) { |obj,(k,v)| obj[k.to_sym] = v; obj }
       else
         return {}
       end

data/spec/fixtures/config/cequel.yml

@@ -0,0 +1,16 @@
+development:
+  host: 'capture.services.dev:9160'
+  keyspace: capture_api_dev
+  strategy_class: SimpleStrategy
+  strategy_options:
+    replication_factor: 1
+  thrift:
+    connect_timeout: 5
+    timeout: 10
+test:
+  host: 'capture.services.dev:9160'
+  keyspace: capture_api_test
+  strategy_class: SimpleStrategy
+  strategy_options:
+    replication_factor: 1
+  thrift: ~

data/spec/lib/cequel/migration_spec.rb

@@ -8,7 +8,7 @@ describe Cequel::Migration do
   describe "#new" do
     it "create a cassandra-cql database connection for the host & keyspace specified in the environment's config" do
       migration_class.stub(:cequel_env_conf).and_return({ 'host' => 'somehost', 'keyspace' => 'somekeyspace' })
-      CassandraCQL::Database.should_receive(:new).with('somehost', { :keyspace => 'somekeyspace' })
+      CassandraCQL::Database.should_receive(:new).with('somehost', { :keyspace => 'somekeyspace' }, {})
       migration
     end
   end
@@ -22,4 +22,106 @@ describe Cequel::Migration do
       migration.execute("some cql string")
     end
   end
+
+  describe ".cequel_conf_path" do
+    it "returns the path to the cequel conf file" do
+      ::Rails.stub(:root).and_return('/foo/bar')
+      migration_class.cequel_conf_path.should eq('/foo/bar/config/cequel.yml')
+    end
+  end
+
+  describe ".cequel_conf_file" do
+    it "returns the file object of the file at the cequel_conf_path" do
+      conf_path = stub
+      conf_file = stub
+      migration_class.stub(:cequel_conf_path).and_return(conf_path)
+      File.should_receive(:open).with(conf_path).and_return(conf_file)
+      migration_class.cequel_conf_file.should eq(conf_file)
+    end
+  end
+
+  describe ".cequel_conf" do
+    it "returns the hash result of YAML loading the cequel.yml conf file" do
+      conf_file = stub
+      conf_hash = stub
+      migration_class.stub(:cequel_conf_file).and_return(conf_file)
+      ::YAML.should_receive(:load).with(conf_file).and_return(conf_hash)
+      migration_class.cequel_conf.should eq(conf_hash)
+    end
+  end
+
+  describe ".cequel_env_conf" do
+    it "gets the cequel conf" do
+      migration_class.should_receive(:cequel_conf).and_return({})
+      migration_class.cequel_env_conf
+    end
+
+    it "grabs the Rails.env section of the config" do
+      conf = mock
+      ::Rails.stub(:env).and_return('blue')
+      conf.should_receive(:[]).with('blue')
+      migration_class.stub(:cequel_conf).and_return(conf)
+      migration_class.cequel_env_conf
+    end
+
+    context "when the environment is found in the config" do
+      before do
+        ::Rails.stub(:root).and_return(File.expand_path('../../../fixtures', __FILE__))
+        ::Rails.stub(:env).and_return('development')
+      end
+
+      it "returns that environments portion of the config as a hash" do
+        migration_class.cequel_env_conf.should eq({
+          "host"=>"capture.services.dev:9160",
+          "keyspace"=>"capture_api_dev",
+          "strategy_class"=>"SimpleStrategy",
+          "strategy_options"=>{
+            "replication_factor"=>1
+          },
+          "thrift"=>{
+            "connect_timeout"=>5,
+            "timeout"=>10
+          }
+        })
+      end
+    end
+
+    context "when the environment is NOT found in the config" do
+      before do
+        ::Rails.stub(:root).and_return(File.expand_path('../../../fixtures', __FILE__))
+        ::Rails.stub(:env).and_return('nonexistentenvironment')
+      end
+
+      it "returns nil" do
+        migration_class.cequel_env_conf.should be_nil
+      end
+    end
+  end
+
+  describe "#thrift_options" do
+    context "when the environment is found in the config" do
+      before do
+        ::Rails.stub(:root).and_return(File.expand_path('../../../fixtures', __FILE__))
+        ::Rails.stub(:env).and_return('development')
+      end
+
+      context "when thrift options are found in the config" do
+        it "returns the thrift options as a hash" do
+          CassandraCQL::Database.stub(:new).and_return(stub.as_null_object)
+          migration.send(:thrift_options).should eq({:connect_timeout=>5, :timeout=>10})
+        end
+      end
+
+      context "when thrift options are NOT found in the config" do
+        before do
+          ::Rails.stub(:env).and_return('test')
+        end
+
+        it "returns an empty hash" do
+          CassandraCQL::Database.stub(:new).and_return(stub.as_null_object)
+          migration.send(:thrift_options).should eq({})
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cequel-migrations-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-05 00:00:00.000000000 Z
+date: 2013-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shearwater
@@ -98,6 +98,7 @@ files:
 - lib/generators/cequel/migration/templates/migration.rb
 - lib/generators/cequel/migrations/install/install_generator.rb
 - lib/generators/cequel/migrations/install/templates/cequel/migrate/.gitkeep
+- spec/fixtures/config/cequel.yml
 - spec/lib/cequel-migrations-rails/cql_manager_spec.rb
 - spec/lib/cequel/migration_spec.rb
 - spec/spec_helper.rb
@@ -126,6 +127,7 @@ signing_key:
 specification_version: 3
 summary: A Rails plugin that provides migration support for Cequel.
 test_files:
+- spec/fixtures/config/cequel.yml
 - spec/lib/cequel-migrations-rails/cql_manager_spec.rb
 - spec/lib/cequel/migration_spec.rb
 - spec/spec_helper.rb