extendi-cassandra_object 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efe17be3c5e2444bff2078ff198a4103e590a436
-  data.tar.gz: 5bfd5a2ec7ab2393478ca07102627d62707422b2
+  metadata.gz: d93715ace91da1509d264e53261d2a4b7b987cda
+  data.tar.gz: a479704c0f24f7285e1ef46df855d8fb8410d404
 SHA512:
-  metadata.gz: 19d0cd635b148b38e5c9a85faab5595d65b45c94ec32387e3f7b2188e6e3cc3b5924e8bc63ad3d957ad25ab1ac5ca57cfe1d7fd02bed8429070e9c24cfa48cd0
-  data.tar.gz: 3b63a775a8af44163f983b5d933407aa977c5e33ea92f165723909fe806c07499600fca99eee34a98c8e4e175c5d88c40a686c400f2c5a1cb8a24fd3becfb0a3
+  metadata.gz: 578aa46f8dd1702f6f7224c427c058804300c01da45a529ab8401ca79bd837117a8001d8f1f7d97dc11c1139ccd58fe8f1a7dd12c59e2f2f49d02644b2209ebb
+  data.tar.gz: 89ff7cc0bd118cd69d8be51015ab25ba5070ef4f32ccb4798583a1bc646c37756e142e72849140c966794fc32a3e4cda80556d792afa29cad66534484751de4d

data/README.md

@@ -113,6 +113,21 @@ class Widget < CassandraObject::BaseSchema
   end
 end
 ```
+### Custom config
+
+You can define a custom configuration for the cassandra connection, allowing you to have multiple cassandra endpoints fromt he same application
+
+```ruby
+class Widget < CassandraObject::BaseSchema
+  string :name
+  
+  def self.custom_config
+    #return custom cassandra configuration  
+    { }
+  end
+end
+```
+ 
 ## Using with Cassandra
   
 Add a config/cassandra.yml:

data/extendi-cassandra_object.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'extendi-cassandra_object'
-  s.version = '1.0.6'
+  s.version = '1.0.7'
   s.description = 'Cassandra ActiveModel'
   s.summary = 'Cassandra ActiveModel'
   s.authors = ['Duccio Giovannelli', 'gotime']

data/lib/cassandra_object/adapters/cassandra_schemaless_adapter.rb

@@ -46,7 +46,11 @@ module CassandraObject
         def where_string_async(id)
           conditions = []
           conditions << "#{@adapter.primary_key_column} = '#{id}'" if !id.nil?
-          conditions += @scope.select_values.select { |sv| sv != :column1 }.map { |sv| 'column1 = ?' }
+          select_values = @scope.select_values.select { |sv| sv != :column1 }
+          if select_values.size > 0
+            select_str = select_values.size > 1 ? "column1 IN (#{select_values.map { |sv| '?' }.join(',')})" : 'column1 = ?'
+            conditions << select_str
+          end
           conditions += @scope.where_values.select.each_with_index { |_, i| i.even? }
           return conditions.any? ? "WHERE #{conditions.join(' AND ')}" : nil
         end

data/lib/cassandra_object/base_schema.rb

@@ -1,7 +1,7 @@
 module CassandraObject
   class BaseSchema < Base
     def self.adapter
-      @adapter ||= CassandraObject::Adapters::CassandraAdapter.new(Base.config)
+      @adapter ||= CassandraObject::Adapters::CassandraAdapter.new(self.config)
     end
 
     def self.schema_type

data/lib/cassandra_object/base_schemaless.rb

@@ -1,7 +1,7 @@
 module CassandraObject
   class BaseSchemaless < Base
     def self.adapter
-      @adapter ||= CassandraObject::Adapters::CassandraSchemalessAdapter.new(Base.config)
+      @adapter ||= CassandraObject::Adapters::CassandraSchemalessAdapter.new(self.config)
     end
 
     def self.schema_type

data/lib/cassandra_object/base_schemaless_dynamic.rb

@@ -1,7 +1,7 @@
 module CassandraObject
   class BaseSchemalessDynamic < Base
     def self.adapter
-      @adapter ||= CassandraObject::Adapters::CassandraSchemalessAdapter.new(Base.config)
+      @adapter ||= CassandraObject::Adapters::CassandraSchemalessAdapter.new(self.config)
     end
 
     def self.schema_type

data/lib/cassandra_object/model.rb

@@ -17,6 +17,7 @@ module CassandraObject
     end
 
     def config
+      return self.custom_config if self.methods(false).include?(:custom_config)
       @@config
     end
 

data/test/support/cassandra.rb

@@ -29,6 +29,7 @@ CassandraObject::Schema.create_keyspace 'cassandra_object_test'
 CassandraObject::Schemaless.create_column_family 'Issues'
 CassandraObject::Schema.create_column_family 'IssueSchemas', {attributes: 'id text, title text, description text, field float, intero int, created_at timestamp, updated_at timestamp, PRIMARY KEY (id)', options: {}}
 CassandraObject::Schemaless.create_column_family 'IssueDynamics'
+CassandraObject::Schemaless.create_column_family 'IssuesCustomConfig'
 CassandraObject::Schema.create_column_family 'IssueSchemaFathers', {attributes: 'id text, title text, field float, created_at timestamp, updated_at timestamp, PRIMARY KEY (id)', options: {}}
 CassandraObject::Schema.create_column_family 'IssueSchemaChildren', {attributes: 'id text, title text, description text, field float, created_at timestamp, updated_at timestamp, issue_schema_father_id text, PRIMARY KEY (id)', options: {}}
 CassandraObject::BaseSchemaless.adapter.consistency = :quorum

data/test/support/issue_custom_config.rb

@@ -0,0 +1,33 @@
+class IssueCustomConfig < CassandraObject::BaseSchemalessDynamic
+  string :description
+  string :title
+
+  before_create { self.description ||= 'funny' }
+
+  self.allow_filtering = true
+
+  def self.for_key key
+    where_ids(key)
+  end
+
+  # must be different to general config to test funcionality!
+  def self.custom_config
+    {
+        keyspace: 'cassandra_object_test',
+        hosts: ['127.0.0.1'],
+        compression: :lz4,
+        connect_timeout: 2,
+        timeout: 30,
+        consistency: :quorum,
+        protocol_version: 3,
+        page_size: 12345,
+        trace: true,
+        connections_per_local_node: 4,
+        schema_refresh_delay: 0.1,
+        schema_refresh_timeout: 0.1,
+        # connections_per_remote_node: nil,
+        # logger: Logger.new($stderr)
+    }
+  end
+
+end

data/test/test_helper.rb

@@ -8,6 +8,7 @@ require 'cassandra_object'
 require 'support/cassandra'
 require 'support/issue'
 require 'support/issue_dynamic'
+require 'support/issue_custom_config'
 require 'support/issue_schema'
 require 'support/issue_schema_child'
 require 'support/issue_schema_father'

data/test/unit/base_test.rb

@@ -17,4 +17,10 @@ class CassandraObject::BaseTest < CassandraObject::TestCase
     assert_equal 'CassandraObject::BaseTest::Sons', Son.column_family
     assert_equal 'CassandraObject::BaseTest::Sons', Grandson.column_family
   end
+
+  test 'custom cassandra configuration' do
+    assert_equal IssueCustomConfig.config, IssueCustomConfig.custom_config
+    assert_not_equal CassandraObject::Base.config, IssueCustomConfig.config
+  end
+
 end

data/test/unit/scope/query_methods_test.rb

@@ -10,6 +10,15 @@ class CassandraObject::Scope::QueryMethodsTest < CassandraObject::TestCase
     assert_nil found_issue.description
   end
 
+  test 'multi select' do
+    original_issue = Issue.create title: 'foo', description: 'bar'
+    found_issue =  Issue.select(:title, :description).find(original_issue.id)
+
+    assert_equal 'foo', found_issue.title
+    assert_equal 'bar', found_issue.description
+    assert_equal original_issue.id, found_issue.id
+  end
+
   test 'select with block' do
     foo_issue = Issue.create title: 'foo'
     Issue.create title: 'bar'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: extendi-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Duccio Giovannelli
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-29 00:00:00.000000000 Z
+date: 2017-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -134,6 +134,7 @@ files:
 - lib/cassandra_object/validations.rb
 - test/support/cassandra.rb
 - test/support/issue.rb
+- test/support/issue_custom_config.rb
 - test/support/issue_dynamic.rb
 - test/support/issue_schema.rb
 - test/support/issue_schema_child.rb