cequel 3.0.2 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1697dbd75c69854dffccbe95b14689a6f5d4453
-  data.tar.gz: 62a729f6421425b0fdf188fca359498520f09ac1
+  metadata.gz: 6b2ad23f8a516eb2960f68a69b5d33d87ba81b99
+  data.tar.gz: 794306c91044e4e766694c0f029a3eba596e5552
 SHA512:
-  metadata.gz: 13716de6aa85d3007df82a7330f1cca8e0cc46f08b4ac477a0381222bd01301b58a439e58c15a19561361cb26221fff6be7cc5c02ebba495b4ded5724efbf8e0
-  data.tar.gz: 8ed5d80b009c48845ff74e3d2ccca6001408525131591caf6eb1aee4df9e77dc18112bb88f8ff4c1495c31917485a4a7415bf0ac9d6721a741e63946e6ebcf6b
+  metadata.gz: 68ae5930111f56d55bdedcef4e1999d21483e6c2a223961f5a249b05f9f4b25ee966e88cc7f4092276e0fb5e6b76769b285abd979cb340c0c35c4b8dab51aa78
+  data.tar.gz: a5ca1b83b34b2b6a00ebfa9bed2e075ebe4e569f0254563e6d5c432c25f1c51d01bb1e2ea536c58ac89635b727909d5c8d28ad4777f32cc9e43f70c8d820d131

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.0.4
+- support ruby 2.5 and rails 5.2 (https://github.com/cequel/cequel/pull/401)
+
 ## 3.0.2
 - support rails 5.1 (https://github.com/cequel/cequel/pull/389)
 - various small changes

data/CONTRIBUTING.md

@@ -41,23 +41,35 @@ bundle exec rake test
 
 ### Using Docker
 
-Cequel's test suite runs against a live Cassandra instance. The easiest way to
-get one is to use Docker, `docker run --rm -p 9042:9042 cassandra`.
+Cequel's test suite, including a development bash environment, container, and Cassandra
+instance is setup for use through Docker Compose.
 
-### Using different ports
+The local folder is mapped into the docker container. So, you can use your IDE of choice
+to make edits, leveraging the docker-compose to provide Cassandra and an lightweight container for
+running tests.
 
-You can configure the cequel test suite to use a different port by setting the `CEQUEL_TEST_PORT` environment variable. Example:
-1. `docker run --rm -p 33333:9042 cassandra` in one terminal
-1. `rake test CEQUEL_TEST_PORT=33333` in another termainal
+To use, update the docker-compose.yml with your personal details (for Git compatibility) and then:
+```bash
+docker-compose run dev
+```
+This will drop you to a bash prompt in the `/cequel/` folder.  From there, you can run
+tests using familiar RSpec commands.
 
 ### Cassandra versions
 
 Cequel is tested against a large range of Ruby, Rails, and Cassandra
-versions; for most patches, you can just run the tests using the
+versions; for most patches, you can develop the tests using the
 latest version of all of them. If you're messing with the
 `Cequel::Schema` or `Cequel::Type` modules, you'll want to test at
 least against the first and latest releases of 2.1, 2.2 and 3 series.
 
+If want to use a specific version of Cassandra in development do this: 
+
+```bash
+docker-compose down
+CASSANDRA_VERSION=3.10 docker-compose run dev
+```
+
 ## And finally
 
 **THANK YOU!**

data/Dockerfile

@@ -0,0 +1,29 @@
+FROM ruby:alpine
+
+# Put the basic system setup in a layer of its own so we don't have
+# rebuild it all the time.
+RUN apk add --update build-base tzdata bash bash-completion git \
+    && rm -rf /var/cache/apk/*
+
+WORKDIR /cequel
+
+# Make it nicer to run tests.. now "ber" instead of "bundle exec rspec" and "bi" instead of "bundle install"
+RUN echo 'alias be="bundle exec"' >> ~/.bashrc \
+    && echo 'alias ber="bundle exec rspec"' >> ~/.bashrc \
+    && echo 'alias bi="bundle install"' >> ~/.bashrc
+
+# Put the bundle in a layer of its own. The bundle doesn't change
+# that often to copy just the Gemfiles and bundle to build a layer
+# that rarely changes
+COPY ./Gemfile* /cequel/
+COPY ./cequel.gemspec /cequel/
+RUN mkdir -p /cequel/lib/cequel/
+COPY ./lib/cequel/version.rb /cequel/lib/cequel/
+RUN gem install bundler \
+    && bundle install
+
+
+COPY ./* /cequel/
+
+
+

data/Gemfile.lock

@@ -1,18 +1,18 @@
 PATH
   remote: .
   specs:
-    cequel (3.0.2)
+    cequel (3.0.4)
       activemodel (>= 4.0)
       cassandra-driver (~> 3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.1.4)
-      activesupport (= 5.1.4)
-    activesupport (5.1.4)
+    activemodel (5.2.1)
+      activesupport (= 5.2.1)
+    activesupport (5.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     addressable (2.4.0)
@@ -25,7 +25,7 @@ GEM
     byebug (2.7.0)
       columnize (~> 0.3)
       debugger-linecache (~> 1.2)
-    cassandra-driver (3.2.0)
+    cassandra-driver (3.2.3)
       ione (~> 1.2)
     coderay (1.1.2)
     columnize (0.9.0)
@@ -49,7 +49,7 @@ GEM
       net-http-persistent (~> 2.9)
       net-http-pipeline
     highline (1.7.8)
-    i18n (0.9.1)
+    i18n (1.1.1)
       concurrent-ruby (~> 1.0)
     ione (1.2.4)
     json (2.1.0)
@@ -60,7 +60,7 @@ GEM
       addressable (~> 2.3)
       spoon (~> 0.0.1)
     method_source (0.9.0)
-    minitest (5.10.3)
+    minitest (5.11.3)
     multi_json (1.12.2)
     multipart-post (2.0.0)
     net-http-persistent (2.9.4)
@@ -327,7 +327,7 @@ GEM
       typhoeus (~> 0.6, >= 0.6.8)
     typhoeus (0.8.0)
       ethon (>= 0.8.0)
-    tzinfo (1.2.4)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
     unicode-display_width (1.3.0)
     websocket (1.2.4)
@@ -357,4 +357,4 @@ DEPENDENCIES
   yard (~> 0.6)
 
 BUNDLED WITH
-   1.14.6
+   1.17.1

data/README.md

@@ -594,7 +594,8 @@ you require this functionality.
 ## Compatibility ##
 
 ### Rails ###
-
+* 5.2
+* 5.1
 * 5.0
 * 4.2
 * 4.1
@@ -602,7 +603,7 @@ you require this functionality.
 
 ### Ruby ###
 
-* Ruby 2.3, 2.2, 2.1, 2.0
+* Ruby 2.5, 2,4, 2.3, 2.2, 2.1, 2.0
 
 ### Cassandra ###
 

data/lib/cequel/metal/batch_manager.rb

@@ -55,13 +55,14 @@ module Cequel
         end
       end
 
+      def current_batch
+        ::Thread.current[batch_key]
+      end
+
       private
 
       attr_reader :keyspace
 
-      def current_batch
-        ::Thread.current[batch_key]
-      end
 
       def current_batch=(batch)
         ::Thread.current[batch_key] = batch

data/lib/cequel/metal/data_set.rb

@@ -696,12 +696,8 @@ module Cequel
         end
       end
 
-      protected
-
       attr_writer :row_limit, :query_consistency, :query_page_size, :query_paging_state, :allow_filtering
 
-      private
-
       def results
         @results ||= execute_cql(cql)
       end
@@ -730,6 +726,8 @@ module Cequel
         Deleter.new(self, &block)
       end
 
+      private
+
       def initialize_copy(source)
         super
         @select_columns = source.select_columns.clone

data/lib/cequel/record/associations.rb

@@ -188,8 +188,6 @@ module Cequel
         end
       end
 
-      private
-
       def read_parent_association
         ivar_name = parent_association.instance_variable_name
         if instance_variable_defined?(ivar_name)

data/lib/cequel/record/collection.rb

@@ -218,7 +218,7 @@ module Cequel
       #   @param elements [Array] new elements to replace in this range
       #
       def []=(*args)
-        if args[0].is_a?(Fixnum) && args.count == 2
+        if args[0].is_a?(Integer) && args.count == 2
           # single element set/replace
           elem = cast_element(args[1])
 
@@ -231,7 +231,7 @@ module Cequel
           # multi-element set/replace
           range = if args[0].is_a?(Range)
                     args[0]
-                  elsif args[0].is_a?(Fixnum) && args[1].is_a?(Fixnum)
+                  elsif args[0].is_a?(Integer) && args[1].is_a?(Integer)
                     args[0]..(args[0]+args[1]-1)
                   else
                     Kernel.raise ArgumentError, "[i]=elem or [i,count]=elems or [a..b]=elems"

data/lib/cequel/record/dirty.rb

@@ -47,8 +47,12 @@ module Cequel
       def save(options = {})
         super.tap do |success|
           if success
-            @previously_changed = changes
-            @changed_attributes.clear
+            if self.respond_to?(:changes_applied)
+              changes_applied
+            else
+              @previously_changed = changes
+              @changed_attributes.clear
+            end
           end
         end
       end

data/lib/cequel/record/persistence.rb

@@ -82,7 +82,7 @@ module Cequel
       # @since 1.0.0
       #
       def key_attributes
-        @attributes.slice(*self.class.key_column_names)
+        @cequel_attributes.slice(*self.class.key_column_names)
       end
 
       #
@@ -160,7 +160,7 @@ module Cequel
       # @since 1.0.0
       #
       def loaded?(column = nil)
-        !!@loaded && (column.nil? || @attributes.key?(column.to_sym))
+        !!@loaded && (column.nil? || @cequel_attributes.key?(column.to_sym))
       end
 
       #
@@ -260,6 +260,16 @@ module Cequel
         self
       end
 
+      def updater
+        raise ArgumentError, "Can't get updater for new record" if new_record?
+        @updater ||= Metal::Updater.new(metal_scope)
+      end
+
+      def deleter
+        raise ArgumentError, "Can't get deleter for new record" if new_record?
+        @deleter ||= Metal::Deleter.new(metal_scope)
+      end
+
       protected
 
       def persisted!
@@ -291,16 +301,6 @@ module Cequel
       end
       instrument :update, data: ->(rec) { {table_name: rec.table_name} }
 
-      def updater
-        raise ArgumentError, "Can't get updater for new record" if new_record?
-        @updater ||= Metal::Updater.new(metal_scope)
-      end
-
-      def deleter
-        raise ArgumentError, "Can't get deleter for new record" if new_record?
-        @deleter ||= Metal::Deleter.new(metal_scope)
-      end
-
       private
 
       def_delegators 'self.class', :connection, :table
@@ -361,17 +361,17 @@ module Cequel
       end
 
       def attributes_for_create
-        @attributes.each_with_object({}) do |(column, value), attributes|
+        @cequel_attributes.each_with_object({}) do |(column, value), attributes|
           attributes[column] = value unless value.nil?
         end
       end
 
       def attributes_for_update
-        @attributes_for_update ||= {}
+        @cequel_attributes_for_update ||= {}
       end
 
       def attributes_for_deletion
-        @attributes_for_deletion ||= []
+        @cequel_attributes_for_deletion ||= []
       end
 
       def assert_keys_present!

data/lib/cequel/record/properties.rb

@@ -281,7 +281,7 @@ module Cequel
 
       # @private
       def initialize(attributes = {}, record_collection = nil)
-        @attributes, @record_collection = attributes, record_collection
+        @cequel_attributes, @record_collection = attributes, record_collection
         @collection_proxies = {}
       end
 
@@ -289,7 +289,7 @@ module Cequel
       # @return [Array<Symbol>] list of names of attributes on this record
       #
       def attribute_names
-        @attributes.keys
+        @cequel_attributes.keys
       end
 
       #
@@ -367,7 +367,7 @@ module Cequel
       protected
 
       def read_attribute(name)
-        @attributes.fetch(name)
+        @cequel_attributes.fetch(name)
       rescue KeyError
         if self.class.reflect_on_column(name)
           fail MissingAttributeError, "missing attribute: #{name}"
@@ -382,7 +382,7 @@ module Cequel
         end
 
         send("#{name}_will_change!") unless value === read_attribute(name)
-        @attributes[name] = value
+        @cequel_attributes[name] = value
       end
 
       private
@@ -397,14 +397,14 @@ module Cequel
       end
 
       def init_attributes(new_attributes)
-        @attributes = {}
+        @cequel_attributes = {}
         new_attributes.each_pair do |name, value|
           if value.nil?
             value = empty_attributes.fetch(name.to_sym) { -> {} }.call
           end
-          @attributes[name.to_sym] = value
+          @cequel_attributes[name.to_sym] = value
         end
-        @attributes
+        @cequel_attributes
       end
 
       def initialize_new_record(attributes = {})

data/lib/cequel/record/record_set.rb

@@ -123,7 +123,7 @@ module Cequel
       #
       def initialize(target_class, attributes = {})
         attributes = self.class.default_attributes.merge!(attributes)
-        @target_class, @attributes = target_class, attributes
+        @target_class, @cequel_attributes = target_class, attributes
         super(target_class)
       end
 
@@ -705,19 +705,49 @@ module Cequel
         entries
       end
 
-      protected
+      def attributes
+        cequel_attributes
+      end
+
+      def attributes=(attrs)
+        self.cequel_attributes = attr
+      end
+
+      attr_accessor :cequel_attributes
+
+      def unscoped_key_names
+        unscoped_key_columns.map { |column| column.name }
+      end
+
+      def order_by_column
+        if target_class.clustering_columns.any?
+          target_class.clustering_columns.first
+        end
+      end
 
-      attr_reader :attributes
-      hattr_reader :attributes, :select_columns, :scoped_key_values,
+      def scoped_key_names
+        scoped_key_columns.map { |column| column.name }
+      end
+
+      hattr_inquirer :attributes, :reversed
+
+      def ascends_by?(column)
+        !descends_by?(column)
+      end
+
+      def descends_by?(column)
+        column.clustering_column? &&
+          (reversed? ^ (column.clustering_order == :desc))
+      end
+
+
+      hattr_reader :cequel_attributes, :select_columns, :scoped_key_values,
                    :row_limit, :lower_bound, :upper_bound,
                    :scoped_indexed_column, :query_consistency,
                    :query_page_size, :query_paging_state,
                    :allow_filtering
-      protected :select_columns, :scoped_key_values, :row_limit, :lower_bound,
-                :upper_bound, :scoped_indexed_column, :query_consistency,
-                :query_page_size, :query_paging_state, :allow_filtering
-      hattr_inquirer :attributes, :reversed
-      protected :reversed?
+
+      protected
 
       def next_batch_from(row)
         range_key_value = row[range_key_name]
@@ -728,15 +758,6 @@ module Cequel
         end
       end
 
-      def ascends_by?(column)
-        !descends_by?(column)
-      end
-
-      def descends_by?(column)
-        column.clustering_column? &&
-          (reversed? ^ (column.clustering_order == :desc))
-      end
-
       def find_nested_batches_from(row, options, &block)
         return unless next_range_key_column
 
@@ -836,10 +857,6 @@ module Cequel
         scoped(scoped_indexed_column: {column_name => column.cast(value)})
       end
 
-      def scoped_key_names
-        scoped_key_columns.map { |column| column.name }
-      end
-
       def scoped_key_columns
         target_class.key_columns.first(scoped_key_values.length)
       end
@@ -848,10 +865,6 @@ module Cequel
         target_class.key_columns.drop(scoped_key_values.length)
       end
 
-      def unscoped_key_names
-        unscoped_key_columns.map { |column| column.name }
-      end
-
       def range_key_column
         unscoped_key_columns.first
       end
@@ -913,12 +926,6 @@ module Cequel
         end
       end
 
-      def order_by_column
-        if target_class.clustering_columns.any?
-          target_class.clustering_columns.first
-        end
-      end
-
       def selects_collection_columns?
         select_columns.any? do |column_name|
           target_class.reflect_on_column(column_name).collection_column?

data/lib/cequel/record/scoped.rb

@@ -60,7 +60,7 @@ module Cequel
 
       def initialize_new_record(*)
         super
-        @attributes.merge!(self.class.current_scope.scoped_key_attributes)
+        @cequel_attributes.merge!(self.class.current_scope.scoped_key_attributes)
       end
     end
   end

data/lib/cequel/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
 module Cequel
   # The current version of the library
-  VERSION = '3.0.2'
+  VERSION = '3.0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cequel
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.4
 platform: ruby
 authors:
 - Mat Brown
@@ -26,10 +26,11 @@ authors:
 - Tamara Temple
 - Long On
 - Lucas Mundim
+- William Flanagan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-11 00:00:00.000000000 Z
+date: 2018-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -207,12 +208,12 @@ description: |
 email: mat.a.brown@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- README.md
+extra_rdoc_files: []
 files:
 - Appraisals
 - CHANGELOG.md
 - CONTRIBUTING.md
+- Dockerfile
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -342,7 +343,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - Cassandra >= 2.0.0
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Full-featured, ActiveModel-compliant ORM for Cassandra using CQL3