superstore 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b55da8bff8e33c782eadee982fd89de1bedb6034
-  data.tar.gz: 2fd37acbc35ca272443648625d863d3a234027f9
+  metadata.gz: 0aaa4fd0c0350717dab4ba5efa5f43d8e7e7799e
+  data.tar.gz: 3c758d1dbc28252434ef29a7df84490b1fa1fe7f
 SHA512:
-  metadata.gz: 69bba39bfbff615067e0ea35b799359c2632bb431826ab0f772f51dad1778d37582f09065f96a68c6013c957b336f2841a91116ccb3678d8e5d854cf6b327ada
-  data.tar.gz: 5be815d4e7650c5c6e361184c5dc72b32d578fa577e3f922c5776f3f73ee657720a98e110e73f0268f3a6a7a5981c336463aa700049726cc891fa3c08981cf97
+  metadata.gz: d7fd816b474c34f3f86b1e69a6bb57d85abd77d8a839124c72a5d0b50923af81680acd67eb806a0e2d2ceb822d3afd21106a16f51a7412f850dedb04f3b25e41
+  data.tar.gz: c566b225cf435c521df390f93507ddc919b294657803fe75a78130f5fb04e88e14b347650bb83a1f087e9bf957f2128e8bcfca5d9748e4aad4a20f7255d23040

data/lib/superstore/adapters/cassandra_adapter.rb

@@ -54,7 +54,10 @@ module Superstore
       def connection
         @connection ||= begin
           thrift_options = (config[:thrift] || {})
-          CassandraCQL::Database.new(servers, {keyspace: config[:keyspace]}, thrift_options)
+          CassandraCQL::Database.new(
+            servers,
+            {keyspace: config[:keyspace], username: username, password: password, cql_version: '2.0.0'},
+            thrift_options)
         end
       end
 
@@ -129,10 +132,13 @@ module Superstore
       end
 
       def schema_execute(cql, keyspace)
-        schema_db = CassandraCQL::Database.new(Superstore::Base.adapter.servers, {keyspace: keyspace}, {connect_timeout: 30, timeout: 30})
+        schema_db = CassandraCQL::Database.new(
+          servers,
+          {keyspace: keyspace, username: username, password: password, cql_version: '2.0.0'},
+          {connect_timeout: 30, timeout: 30}
+        )
         schema_db.execute cql
       end
-      # /SCHEMA
 
       def consistency
         @consistency ||= config[:consistency]
@@ -168,6 +174,14 @@ module Superstore
 
       private
 
+        def username
+          config[:username].presence
+        end
+
+        def password
+          config[:password].presence
+        end
+
         def sanitize(statement, *bind_vars)
           CassandraCQL::Statement.sanitize(statement, bind_vars).force_encoding(Encoding::UTF_8)
         end

data/lib/superstore/railtie.rb

@@ -8,7 +8,8 @@ module Superstore
       ActiveSupport.on_load :superstore do
         pathnames = [Rails.root.join('config', 'superstore.yml'), Rails.root.join('config', 'cassandra.yml')]
         if pathname = pathnames.detect(&:exist?)
-          config = YAML.load(pathname.read)
+          config = ERB.new(pathname.read).result
+          config = YAML.load(config)
 
           if config = config[Rails.env]
             self.config = config.symbolize_keys!

data/superstore.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'superstore'
-  s.version = '1.1.1'
+  s.version = '1.1.2'
   s.description = 'ActiveModel for many attributes'
   s.summary = 'Cassandra ActiveModel'
   s.authors = ["Michael Koziarski", "gotime"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: superstore
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Michael Koziarski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-16 00:00:00.000000000 Z
+date: 2014-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel