extendi-cassandra_object 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d93715ace91da1509d264e53261d2a4b7b987cda
-  data.tar.gz: a479704c0f24f7285e1ef46df855d8fb8410d404
+  metadata.gz: 1c695a26258a09bfb86224196d5c93da0818e572
+  data.tar.gz: 8468bb80f340fcb1cd5e4961ab990a6d83a21f83
 SHA512:
-  metadata.gz: 578aa46f8dd1702f6f7224c427c058804300c01da45a529ab8401ca79bd837117a8001d8f1f7d97dc11c1139ccd58fe8f1a7dd12c59e2f2f49d02644b2209ebb
-  data.tar.gz: 89ff7cc0bd118cd69d8be51015ab25ba5070ef4f32ccb4798583a1bc646c37756e142e72849140c966794fc32a3e4cda80556d792afa29cad66534484751de4d
+  metadata.gz: f29534bf48f32c976755bbc9be2a188812f04124a93c9e307cc68079709b3ba12826bb80f4cdda343f71a46d7bbaf8a32a19c83d459a6b5945d99f796ca4e6f3
+  data.tar.gz: 3650b6aa1245a03db2866eae5702514a37118e688876456f6706cda8f96c91cfb85278a6631c3891d625ec6e0eb1e0457479cf537311099711e13bda0ae5c67d

data/.travis.yml

@@ -1,11 +1,16 @@
 language: ruby
 rvm:
-  - 2.3.3
   - 2.4.0
+  - 2.4.1
+  - 2.4.2
+  - 2.5.1
 env:
   - CASSANDRA_VERSION=2.1.2
   - CASSANDRA_VERSION=3.0.10
   - CASSANDRA_VERSION=3.9
+  - CASSANDRA_VERSION=2.1.2 ACTIVEMODEL_VERSION='< 5'
+  - CASSANDRA_VERSION=3.0.10 ACTIVEMODEL_VERSION='< 5'
+  - CASSANDRA_VERSION=3.9 ACTIVEMODEL_VERSION='< 5'
 
 jdk:
   - oraclejdk8
@@ -20,4 +25,5 @@ before_install:
 install:
   - ccm create -n 1 -v $CASSANDRA_VERSION -i 127.0.0. -s -b test-cluster
   - ccm start
+  - if [ -n "$ACTIVEMODEL_VERSION" ];then bundle add activemodel --version "$ACTIVEMODEL_VERSION"; fi
   - bundle install

data/README.md

@@ -190,3 +190,9 @@ cql_response return an hash where the key is the model key and values is an hash
   Widget.cql_response([:name, :color])
   Widget.cql_response.limit(10)
 ```
+
+## Running tests on MacOS
+
+* Run a cassandra node on localhost (i.e. `ccm start` if CCM is used)
+* Increase the limit of open files with `ulimit -Sn 2048`
+* Run the tests by running the default rake task or `bundle exec rake test`

data/extendi-cassandra_object.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'extendi-cassandra_object'
-  s.version = '1.0.7'
+  s.version = '1.0.8'
   s.description = 'Cassandra ActiveModel'
   s.summary = 'Cassandra ActiveModel'
   s.authors = ['Duccio Giovannelli', 'gotime']
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.test_files  = `git ls-files -- {test}/*`.split("\n")
   s.require_paths = ['lib']
 
-  s.add_runtime_dependency('activemodel', '>= 3.0')
+  s.add_runtime_dependency('activemodel', '<= 5.2')
   s.add_runtime_dependency('cassandra-driver', '>= 3.1.0')
   s.add_runtime_dependency('lz4-ruby', '>= 0.3.3')
 

data/lib/cassandra_object.rb

@@ -1,6 +1,7 @@
 require 'active_support/all'
 require 'active_model'
 require 'cassandra_object/errors'
+require 'initializers/cassandra'
 
 module CassandraObject
   extend ActiveSupport::Autoload

data/lib/cassandra_object/adapters/cassandra_adapter.rb

@@ -77,7 +77,9 @@ module CassandraObject
             :ssl,
             :timeout,
             :trace,
-            :username
+            :username,
+            :heartbeat_interval,
+            :idle_timeout
         ])
 
         {
@@ -85,16 +87,23 @@ module CassandraObject
             reconnection_policy: 'Cassandra::Reconnection::Policies::%s',
             retry_policy: 'Cassandra::Retry::Policies::%s'
         }.each do |policy_key, class_template|
-          if cluster_options[policy_key]
-            cluster_options[policy_key] = (class_template % [policy_key.classify]).constantize
+          params = cluster_options[policy_key]
+          if params
+            if params.is_a?(Hash)
+              cluster_options[policy_key] = (class_template % [params[:policy].classify]).constantize.new(*params[:params]||[])
+            else
+              cluster_options[policy_key] = (class_template % [params.classify]).constantize.new
+            end
           end
         end
 
         # Setting defaults
         cluster_options.merge!({
-                                   consistency: cluster_options[:consistency] || :quorum,
-                                   protocol_version: cluster_options[:protocol_version] || 3,
-                                   page_size: cluster_options[:page_size] || 10000
+                                heartbeat_interval: cluster_options[:heartbeat_interval] || 2,
+                                idle_timeout: cluster_options[:idle_timeout] || 5,
+                                consistency: cluster_options[:consistency] || :quorum,
+                                protocol_version: cluster_options[:protocol_version] || 3,
+                                page_size: cluster_options[:page_size] || 10000
                                })
         return cluster_options
       end

data/lib/cassandra_object/adapters/cassandra_schemaless_adapter.rb

@@ -90,7 +90,9 @@ module CassandraObject
             :ssl,
             :timeout,
             :trace,
-            :username
+            :username,
+            :heartbeat_interval,
+            :idle_timeout
         ])
 
 
@@ -99,17 +101,24 @@ module CassandraObject
             reconnection_policy: 'Cassandra::Reconnection::Policies::%s',
             retry_policy: 'Cassandra::Retry::Policies::%s'
         }.each do |policy_key, class_template|
-          if cluster_options[policy_key]
-            cluster_options[policy_key] = (class_template % [policy_key.classify]).constantize
+          params = cluster_options[policy_key]
+          if params
+            if params.is_a?(Hash)
+              cluster_options[policy_key] = (class_template % [params[:policy].classify]).constantize.new(*params[:params]||[])
+            else
+              cluster_options[policy_key] = (class_template % [params.classify]).constantize.new
+            end
           end
         end
 
         # Setting defaults
         cluster_options.merge!({
-                                   max_schema_agreement_wait: 1,
-                                   consistency: cluster_options[:consistency]||:quorum,
-                                   protocol_version: cluster_options[:protocol_version]||3,
-                                   page_size: cluster_options[:page_size] || 10000
+                                heartbeat_interval: cluster_options[:heartbeat_interval] || 2,
+                                idle_timeout: cluster_options[:idle_timeout] || 5,
+                                max_schema_agreement_wait: 1,
+                                consistency: cluster_options[:consistency]||:quorum,
+                                protocol_version: cluster_options[:protocol_version]||3,
+                                page_size: cluster_options[:page_size] || 10000
                                })
         return cluster_options
       end

data/lib/cassandra_object/attribute_methods.rb

@@ -40,20 +40,20 @@ module CassandraObject
     end
 
     def write_attribute(name, value)
-      @attributes[name.to_s] = self.class.typecast_attribute(self, name, value)
+      @model_attributes[name.to_s] = self.class.typecast_attribute(self, name, value)
     end
 
     def read_attribute(name)
-      @attributes[name.to_s]
+      @model_attributes[name.to_s]
     end
 
     def attribute_exists?(name)
-      @attributes.key?(name.to_s)
+      @model_attributes.key?(name.to_s)
     end
 
     def attributes
       results = {}
-      @attributes.each_key do |key|
+      @model_attributes.each_key do |key|
         results[key] = read_attribute(key)
       end
       results

data/lib/cassandra_object/attribute_methods/dirty.rb

@@ -6,30 +6,24 @@ module CassandraObject
 
       # Attempts to +save+ the record and clears changed attributes if successful.
       def save(*) #:nodoc:
-        if status = super
-          @previously_changed = changes
-          @changed_attributes = {}
-        end
+        status = super
+        changes_applied
         status
       end
 
       # <tt>reload</tt> the record and clears changed attributes.
       def reload
-        super.tap do
-          @previously_changed.try :clear
-          @changed_attributes.try :clear
-        end
+        super
+        clear_changes_information
+        self
       end
 
       def write_attribute(name, value)
         name = name.to_s
         old = read_attribute(name)
 
+        self.send("#{name}_will_change!") unless value == old
         super
-
-        unless attribute_changed?(name) || old == read_attribute(name)
-          changed_attributes[name] = old
-        end
       end
     end
   end

data/lib/cassandra_object/core.rb

@@ -5,11 +5,11 @@ module CassandraObject
     def initialize(attributes=nil)
       @new_record = true
       @destroyed = false
-      @attributes = {}
+      @model_attributes = {}
       self.attributes = attributes || {}
       attribute_definitions.each_value do |definition|
         unless definition.default.nil? || attribute_exists?(definition.name)
-          @attributes[definition.name] = definition.default
+          @model_attributes[definition.name] = definition.default
         end
       end
 
@@ -17,10 +17,10 @@ module CassandraObject
     end
 
     def initialize_dup(other)
-      @attributes = other.attributes
-      @attributes['created_at'] = nil
-      @attributes['updated_at'] = nil
-      @attributes.delete(self.class.primary_key)
+      @model_attributes = other.attributes
+      @model_attributes['created_at'] = nil
+      @model_attributes['updated_at'] = nil
+      @model_attributes.delete(self.class.primary_key)
       @id = nil
       @new_record = true
       @destroyed = false
@@ -60,4 +60,4 @@ module CassandraObject
       self == (comparison_object)
     end
   end
-end
+end

data/lib/cassandra_object/inspect.rb

@@ -3,7 +3,7 @@ module CassandraObject
     def inspect
       inspection = ["#{self.class.primary_key}: #{id.inspect}"]
 
-      @attributes.each do |attribute, value|
+      @model_attributes.each do |attribute, value|
         if value.present?
           inspection << "#{attribute}: #{attribute_for_inspect(value)}"
         end

data/lib/cassandra_object/persistence.rb

@@ -64,6 +64,7 @@ module CassandraObject
       end
 
       def insert_record(id, attributes)
+        attributes = attributes.dup
         attributes[self._key] = id if self.schema_type == :standard
         adapter.insert column_family, id, encode_attributes(attributes), self.ttl
       end
@@ -71,6 +72,7 @@ module CassandraObject
       def update_record(id, attributes)
         return if attributes.empty?
         if self.schema_type == :standard
+          attributes = attributes.dup
           attributes[self._key] = id
           id = self._key
         end
@@ -90,7 +92,7 @@ module CassandraObject
           object.instance_variable_set('@id', id) if id
           object.instance_variable_set('@new_record', false)
           object.instance_variable_set('@destroyed', false)
-          object.instance_variable_set('@attributes', typecast_persisted_attributes(object, attributes))
+          object.instance_variable_set('@model_attributes', typecast_persisted_attributes(object, attributes))
         end
       end
 
@@ -172,7 +174,7 @@ module CassandraObject
 
     def becomes(klass)
       became = klass.new
-      became.instance_variable_set('@attributes', @attributes)
+      became.instance_variable_set('@model_attributes', @model_attributes)
       became.instance_variable_set('@new_record', new_record?)
       became.instance_variable_set('@destroyed', destroyed?)
       became
@@ -180,7 +182,7 @@ module CassandraObject
 
     def reload
       clear_belongs_to_cache
-      @attributes = self.class.find(id).instance_variable_get('@attributes')
+      @model_attributes = self.class.find(id).instance_variable_get('@model_attributes')
       self
     end
 
@@ -196,7 +198,7 @@ module CassandraObject
     end
 
     def write(method)
-      changed_attributes = Hash[changed.map { |attr| [attr, read_attribute(attr)] }]
+      changed_attributes = changes.map {|k,change| [k, change.last] }.to_h
       self.class.send(method, id, changed_attributes)
     end
   end

data/lib/cassandra_object/scope/finder_methods.rb

@@ -38,15 +38,15 @@ module CassandraObject
 
       def find_one(id)
         if id.blank?
-          raise CassandraObject::RecordNotFound, "Couldn't find #{self.name} with key #{id.inspect}"
+          not_found(id)
         elsif self.schema_type == :dynamic_attributes
           record = where_ids(id).execute
-          raise CassandraObject::RecordNotFound if record.empty?
+          not_found(id) if record.empty?
           record
         elsif record = where_ids(id)[0]
           record
         else
-          raise CassandraObject::RecordNotFound
+          not_found(id)
         end
       end
 
@@ -56,6 +56,10 @@ module CassandraObject
         ids = ids.compact.map(&:to_s).uniq
         where_ids(ids).execute
       end
+
+      def not_found(id)
+        raise CassandraObject::RecordNotFound, "Couldn't find #{self.name} with key #{id.inspect}"
+      end
     end
   end
 end

data/lib/cassandra_object/types/string_type.rb

@@ -10,11 +10,11 @@ module CassandraObject
           str
         end
       end
-      
+
       def decode(str)
         begin
           (str.frozen? ? str.dup : str).force_encoding('UTF-8') if str
-        rescue Exception => e
+        rescue Exception
           str.to_s
         end
       end

data/lib/initializers/cassandra.rb

@@ -0,0 +1,13 @@
+## TODO: remove this patch when datastax/ruby-driver release 3.2.3 is out
+require 'ione'
+require 'cassandra'
+
+class Cassandra::Protocol::CqlProtocolHandler
+  class RequestPromise < Ione::Promise
+    old_constructor = instance_method(:initialize)
+    define_method(:initialize) do |request, timeout, scheduler|
+      @timer = nil
+      old_constructor.bind(self).(request, timeout, scheduler)
+    end
+  end
+end

data/test/support/cassandra.rb

@@ -13,6 +13,9 @@ CassandraObject::Base.config = {
   connections_per_local_node: 4,
   schema_refresh_delay: 0.1,
   schema_refresh_timeout: 0.1,
+  load_balancing_policy: 'RoundRobin',
+  reconnection_policy: { policy: 'Constant', params: [5] },
+  retry_policy: 'Default',
   # connections_per_remote_node: nil,
   # logger: Logger.new($stderr)
 }
@@ -55,6 +58,13 @@ end
 
 module ActiveSupport
   class TestCase
+
+    self.test_order = :random
+
+    def after_setup
+      CassandraObject::Base.created_records.clear if CassandraObject::Base.created_records.any?
+    end
+
     teardown do
       if CassandraObject::Base.created_records.any?
         CassandraObject::Base.delete_after_test

data/test/support/reconnection.rb

@@ -0,0 +1,37 @@
+module CassandraObject
+  ###
+  # Force reconnection in test
+  ##
+  module AdapterExtension
+    def execute(*args)
+      retries = 0
+      begin
+        super
+      rescue Cassandra::Errors::NoHostsAvailable, Cassandra::Errors::IOError
+        @connection = nil
+        retries += 1
+        retries < 2 ? retry : raise
+      end
+    end
+
+    def execute_async(*args)
+      retries = 0
+      begin
+        super
+      rescue Cassandra::Errors::NoHostsAvailable, Cassandra::Errors::IOError
+        @connection = nil
+        retries += 1
+        retries < 2 ? retry : raise
+      end
+    end
+  end
+
+  module Adapters
+    class CassandraAdapter < AbstractAdapter
+      prepend AdapterExtension
+    end
+    class CassandraSchemalessAdapter < AbstractAdapter
+      prepend AdapterExtension
+    end
+  end
+end

data/test/test_helper.rb

@@ -5,6 +5,7 @@ require 'rails/test_help'
 require 'mocha/setup'
 
 require 'cassandra_object'
+require 'support/reconnection'
 require 'support/cassandra'
 require 'support/issue'
 require 'support/issue_dynamic'

data/test/unit/log_subscriber_test.rb

@@ -16,7 +16,7 @@ class CassandraObject::LogSubscriberTest < CassandraObject::TestCase
 
     wait
 
-    assert_match 'SELECT * FROM Issues', @logger.logged(:debug)[0]
+    assert_match 'SELECT * FROM Issues', @logger.logged(:debug).last
   end
 
   def test_initializes_runtime

data/test/unit/persistence_schema_test.rb

@@ -118,17 +118,16 @@ class CassandraObject::PersistenceSchemaTest < CassandraObject::TestCase
   end
 
   test 'ttl' do
-    issue = IssueSchema.create(title: 'I rule', description: 'lololol', ttl: 1)
+    description_test = 'this is the one with ttl'
+    issue = IssueSchema.create(title: 'I rule', description: description_test, ttl: 1)
     assert_nothing_raised do
       IssueSchema.find(issue.id)
     end
-
     sleep 2
-
-    assert_raise CassandraObject::RecordNotFound do
-      IssueSchema.find(issue.id)
+    issue = IssueSchema.find(issue.id) rescue nil
+    unless issue.nil?
+      assert_not_equal issue.description, description_test
     end
-
   end
 
   test 'type tests' do
@@ -139,7 +138,7 @@ class CassandraObject::PersistenceSchemaTest < CassandraObject::TestCase
 
     from_db = IssueSchema.find(issue.id)
     assert_equal Float, from_db.field.class
-    assert_equal Fixnum, from_db.intero.class
+    assert_equal Integer, from_db.intero.class
     # TODO add other types
     # byebug
 

data/test/unit/persistence_test.rb

@@ -198,13 +198,17 @@ class CassandraObject::PersistenceTest < CassandraObject::TestCase
     assert_equal [], Issue.find(ids)
   end
 
-  test 'ttl' do
-    record = Issue.create({title: 'name', ttl: 1})
+  test 'ttl saves' do
+    record = Issue.create({title: 'name', ttl: 10})
     assert_nothing_raised do
       Issue.find(record.id)
     end
+  end
+
+  test 'ttl expires' do
+    record = Issue.create({title: 'othername', ttl: 2})
 
-    sleep 2
+    sleep 4
 
     assert_raise CassandraObject::RecordNotFound do
       Issue.find(record.id)

data/test/unit/timestamps_test.rb

@@ -4,8 +4,8 @@ class CassandraObject::TimestampsTest < CassandraObject::TestCase
   test 'timestamps set on create' do
     issue = Issue.create
 
-    assert_in_delta Time.now.to_i, issue.created_at.to_i, 3
-    assert_in_delta Time.now.to_i, issue.updated_at.to_i, 3
+    assert_in_delta Time.now.to_i, issue.created_at.to_i, 10
+    assert_in_delta Time.now.to_i, issue.updated_at.to_i, 10
   end
 
   test 'updated_at set on change' do
@@ -15,7 +15,7 @@ class CassandraObject::TimestampsTest < CassandraObject::TestCase
     issue.description = 'lol'
     issue.save
 
-    assert_in_delta Time.now.to_i, issue.updated_at.to_i, 3
+    assert_in_delta Time.now.to_i, issue.updated_at.to_i, 10
   end
 
   test 'created_at sets only if nil' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: extendi-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Duccio Giovannelli
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-20 00:00:00.000000000 Z
+date: 2018-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: cassandra-driver
   requirement: !ruby/object:Gem::Requirement
@@ -132,6 +132,7 @@ files:
 - lib/cassandra_object/types/time_type.rb
 - lib/cassandra_object/types/type_helper.rb
 - lib/cassandra_object/validations.rb
+- lib/initializers/cassandra.rb
 - test/support/cassandra.rb
 - test/support/issue.rb
 - test/support/issue_custom_config.rb
@@ -139,6 +140,7 @@ files:
 - test/support/issue_schema.rb
 - test/support/issue_schema_child.rb
 - test/support/issue_schema_father.rb
+- test/support/reconnection.rb
 - test/test_helper.rb
 - test/unit/active_model_test.rb
 - test/unit/adapters/adapter_test.rb
@@ -201,4 +203,3 @@ signing_key:
 specification_version: 4
 summary: Cassandra ActiveModel
 test_files: []
-has_rdoc: