whi-cassie 1.2.0 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc03cb8a9fdac75018c3c31a5466a681a7e57f4584c5d3c4540d012da48c8bc9
-  data.tar.gz: 7576c9d2d998329cc918cc8c7dad45eda0012d420c123b7cfb9412c82873ab24
+  metadata.gz: 8c87e681cda4e500a2f9cb34eee05a806525cce81305f2732ff6b33bd9c13170
+  data.tar.gz: 4edfe67aa1bba47bac102cd3b1b181240bab73469e45d16c0a1cc922467c74e8
 SHA512:
-  metadata.gz: c60020caa9c11330c2c5713bbd0962cf1682f07f351815b60975b608af50031627a08c27d50e1175ffc02d44da368cc64e71f7a337164cf1dddd75da415e6dc6
-  data.tar.gz: 2690d2fb060d226a11d81cba9db78251bce6ca0a744e27ddd1975e82b2db7376bc247c58b6a1af895da0b81a2d21e1e3b6f3eda64234e52a973b3d0ce221743b
+  metadata.gz: 8b1e1b1e0f674740d0f217a608ae1f024fff3c2529b6a29028b46cb6cbbbc6a077c2dc0b4fb8e2c0b0fa5dd6fa6cc233df74c76ce302378a738583c2fa3ea6a6
+  data.tar.gz: e192c9f23cd323468b47dbc20762e63dc891c6837e6863eb56ea2abee7611d5b50289795dc9da5b6061c9b62495833df5c61599ff7feec15ca00a31a89dbee83

data/.github/workflows/continuous_integration.yml

@@ -13,33 +13,52 @@ env:
   BUNDLE_JOBS: 3
   BUNDLE_RETRY: 3
 jobs:
+  standard:
+    name: StandardRB
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v2
+      - name: set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.0
+      - name: install dependencies
+        run:  bundle install
+      - name: standardrb
+        if:   matrix.job == 'standardrb'
+        run:  bundle exec rake standard
+
   specs:
     name: ${{ matrix.job }} ruby-${{ matrix.ruby }} ${{ matrix.activemodel && format('activemodel-{0}', matrix.activemodel) }} cassandra-${{ matrix.cassandra_version }}
     runs-on: ubuntu-latest
     services:
       cassandra:
-        image: cassandra:${{ matrix.cassandra_version }}
+        image: cassandra:${{ matrix.cassandra_version || 'latest' }}
         ports:
           - 9042:9042
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.7]
-        activemodel: [6]
+        ruby: ["3.1"]
+        activemodel: ["original"]
         job: [rspec]
-        cassandra_version: ["4.0"]
+        cassandra_version: ["latest"]
         include:
-          - ruby: 2.6
-            activemodel: 5
+          - ruby: "2.6"
+            activemodel: "5"
             job: rspec
             cassandra_version: "3"
-          - ruby: 2.4
-            activemodel: 4
+          - ruby: "2.4"
+            activemodel: "4"
             job: rspec
             cassandra_version: "2"
-          - ruby: 2.7
-            job: standardrb
-            cassandra_version: "latest"
+          - ruby: "2.7"
+            activemodel: "6"
+            job: rspec
+          - ruby: "3.0"
+            activemodel: "7"
+            job: rspec
     steps:
       - name: checkout
         uses: actions/checkout@v2
@@ -58,6 +77,3 @@ jobs:
       - name: specs
         if:   matrix.job == 'rspec'
         run:  bundle exec rake spec
-      - name: standardrb
-        if:   matrix.job == 'standardrb'
-        run:  bundle exec rake standard

data/.gitignore

@@ -4,3 +4,6 @@ rdoc
 *.rbc
 .tm_properties
 .DS_Store
+.env
+Gemfile.lock
+gemfiles/*.lock

data/.ruby-version

@@ -0,0 +1 @@
+3.0.2

data/Appraisals

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+appraise "activemodel-7" do
+  gem "activemodel", "~> 7.0"
+end
+
 appraise "activemodel-6" do
   gem "activemodel", "~> 6.0"
 end

data/Gemfile

@@ -6,5 +6,5 @@ group :development, :test do
   gem "rake"
   gem "rspec"
   gem "appraisal"
-  gem "standard", "~>0.8.1"
+  gem "standard", "~>1.0"
 end

data/HISTORY.md

@@ -1,3 +1,16 @@
+## 1.3.2
+
+* Improved synchronization on reconnect logic.
+
+## 1.3.1
+
+* Remove automatic reconnect on I/O errors.
+* Handle race condition on connecting when already connected.
+
+## 1.3.0
+
+* Add update, update!, primary_key, and reload methods to models.
+
 ## 1.2.0
 
 * Update schema queries to support Cassandra 3.x+

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.3.2

data/gemfiles/.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_RETRY: "1"

data/gemfiles/activemodel_4.gemfile

@@ -8,7 +8,7 @@ group :development, :test do
   gem "rake"
   gem "rspec"
   gem "appraisal"
-  gem "standard", "~>0.8.1"
+  gem "standard", "~>1.0"
 end
 
 gemspec path: "../"

data/gemfiles/activemodel_5.gemfile

@@ -8,7 +8,7 @@ group :development, :test do
   gem "rake"
   gem "rspec"
   gem "appraisal"
-  gem "standard", "~>0.8.1"
+  gem "standard", "~>1.0"
 end
 
 gemspec path: "../"

data/gemfiles/activemodel_6.gemfile

@@ -8,7 +8,7 @@ group :development, :test do
   gem "rake"
   gem "rspec"
   gem "appraisal"
-  gem "standard", "~>0.8.1"
+  gem "standard", "~>1.0"
 end
 
 gemspec path: "../"

data/gemfiles/activemodel_7.gemfile

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activemodel", "~> 7.0"
+
+group :development, :test do
+  gem "rake"
+  gem "rspec"
+  gem "appraisal"
+  gem "standard", "~>1.0"
+end
+
+gemspec path: "../"

data/lib/cassie/model.rb

@@ -451,7 +451,7 @@ module Cassie::Model
       elsif type_class == Cassandra::Types::Set
         Set.new(value)
       elsif type_class == Cassandra::Types::Map
-        Hash[value]
+        value.to_h
       else
         type_class.new(value)
       end
@@ -531,6 +531,18 @@ module Cassie::Model
     end
   end
 
+  # Update a record with the specified attributes. Returns false the record is invalid.
+  def update(values)
+    self.attributes = values
+    save
+  end
+
+  # Update a record with the specified attributes and raise an error if it is invalid.
+  def update!(values)
+    self.attributes = values
+    save!
+  end
+
   # Returns a hash of column to values. Column names will be symbols.
   def attributes
     hash = {}
@@ -540,6 +552,25 @@ module Cassie::Model
     hash
   end
 
+  # Mass set attributes from a hash.
+  def attributes=(values)
+    values.each do |name, value|
+      send("#{name}=", value)
+    end
+  end
+
+  # Returns a hash representing the primary key value.
+  def primary_key
+    self.class.primary_key.each_with_object({}) { |name, hash|
+      hash[name] = send(name)
+    }
+  end
+
+  # Reloads the record in memory.
+  def reload
+    self.class.find(primary_key)
+  end
+
   # Subclasses can override this method to provide a TTL on the persisted record.
   def persistence_ttl
     nil

data/lib/cassie.rb

@@ -102,8 +102,10 @@ class Cassie
     cluster = Cassandra.cluster(cluster_config)
     logger&.info("Cassie.connect with #{config.sanitized_cluster} in #{((Time.now - start_time) * 1000).round}ms")
     @monitor.synchronize do
-      @session = cluster.connect(config.default_keyspace)
-      @prepared_statements = {}
+      unless @session
+        @session = cluster.connect(config.default_keyspace)
+        @prepared_statements = {}
+      end
     end
   end
 
@@ -126,7 +128,9 @@ class Cassie
   # like passenger or unicorn you should call this method after forking.
   def reconnect
     disconnect
-    connect
+    @monitor.synchronize do
+      connect unless connected?
+    end
   end
 
   # Prepare a CQL statement for repeate execution. Prepared statements
@@ -307,9 +311,6 @@ class Cassie
       end
 
       session.execute(statement, options || {})
-    rescue Cassandra::Errors::IOError => e
-      disconnect
-      raise e
     ensure
       if statement.is_a?(Cassandra::Statement) && !subscribers.empty?
         payload = Message.new(statement, options, Time.now - start_time)
@@ -330,7 +331,13 @@ class Cassie
   end
 
   def session
-    connect unless connected?
+    unless connected?
+      # Check again inside the monitor lock so we don't get in a race condition
+      # where another thread has already established the connection.
+      @monitor.synchronize do
+        connect unless connected?
+      end
+    end
     @session
   end
 

data/spec/cassie/model_spec.rb

@@ -133,7 +133,7 @@ describe Cassie::Model do
   describe "batch" do
     it "should delegate to Cassie.batch using the write consistency" do
       expect(Cassie::Thing.connection).to be_a(Cassie)
-      expect(Cassie::Thing.connection).to receive(:batch).with(consistency: :quorum).and_call_original
+      expect(Cassie::Thing.connection).to receive(:batch).and_call_original
       Cassie::Thing.batch {}
     end
   end
@@ -142,11 +142,15 @@ describe Cassie::Model do
     it "should get and set attributes" do
       record = Cassie::Thing.new(owner: 1, id: 2, val: "foo")
       expect(record.attributes).to eq({owner: 1, id: 2, val: "foo"})
+      record.attributes = {owner: 2, id: 3, val: "bar"}
+      expect(record.attributes).to eq({owner: 2, id: 3, val: "bar"})
     end
 
     it "should get and set attributes using human readable names" do
       record = Cassie::Thing.new(owner: 1, identifier: 2, value: "foo")
       expect(record.attributes).to eq({owner: 1, id: 2, val: "foo"})
+      record.attributes = {owner: 2, identifier: 3, val: "bar"}
+      expect(record.attributes).to eq({owner: 2, id: 3, val: "bar"})
     end
   end
 
@@ -194,6 +198,25 @@ describe Cassie::Model do
     end
   end
 
+  describe "update" do
+    it "should set attributes and save" do
+      record = Cassie::Thing.create(owner: 1, id: 2, val: "foo")
+      record.update(owner: 2)
+      record.reload
+      expect(record.owner).to eq 2
+      record.update!(owner: 3)
+      record.reload
+      expect(record.owner).to eq 3
+    end
+  end
+
+  describe "primary_key" do
+    it "should return the primary key as a hash" do
+      record = Cassie::Thing.create(owner: 1, id: 2, val: "foo")
+      expect(record.primary_key).to eq({owner: 1, id: 2})
+    end
+  end
+
   describe "destroy" do
     it "should delete a record from Cassandra calling any destroy callbacks" do
       Cassie::Thing.create(owner: 1, id: 2, val: "foo")

data/spec/spec_helper.rb

@@ -38,7 +38,7 @@ RSpec.configure do |config|
         break
       rescue Cassandra::Errors::NoHostsAvailable => e
         attempts += 1
-        raise e if attempts > 30
+        raise e if attempts > 60
         sleep(1)
       end
     end

data/whi-cassie.gemspec

@@ -19,5 +19,6 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.4"
   spec.add_dependency("cassandra-driver", "~>3.0")
   spec.add_dependency("activemodel", ">=4.0")
+  spec.add_dependency("sorted_set")
   spec.add_development_dependency "bundler", "~>2.0"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: whi-cassie
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.2
 platform: ruby
 authors:
 - We Heart It
 - Brian Durand
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-28 00:00:00.000000000 Z
+date: 2022-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cassandra-driver
@@ -39,6 +39,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: sorted_set
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -63,18 +77,20 @@ files:
 - ".github/dependabot.yml"
 - ".github/workflows/continuous_integration.yml"
 - ".gitignore"
+- ".ruby-version"
 - ".standard.yml"
 - Appraisals
 - Gemfile
-- Gemfile.lock
 - HISTORY.md
 - MIT-LICENSE
 - README.md
 - Rakefile
 - VERSION
+- gemfiles/.bundle/config
 - gemfiles/activemodel_4.gemfile
 - gemfiles/activemodel_5.gemfile
 - gemfiles/activemodel_6.gemfile
+- gemfiles/activemodel_7.gemfile
 - lib/cassie.rb
 - lib/cassie/config.rb
 - lib/cassie/model.rb
@@ -96,7 +112,7 @@ homepage: https://github.com/weheartit/cassie
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -111,8 +127,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Simple object mapper for Cassandra data tables specifically designed to work
   with the limitations and strengths of Cassandra.

data/Gemfile.lock

@@ -1,89 +0,0 @@
-PATH
-  remote: .
-  specs:
-    whi-cassie (1.2.0)
-      activemodel (>= 4.0)
-      cassandra-driver (~> 3.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (6.0.3.4)
-      activesupport (= 6.0.3.4)
-    activesupport (6.0.3.4)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    appraisal (2.3.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    ast (2.4.1)
-    cassandra-driver (3.2.5)
-      ione (~> 1.2)
-    concurrent-ruby (1.1.7)
-    diff-lcs (1.4.4)
-    i18n (1.8.5)
-      concurrent-ruby (~> 1.0)
-    ione (1.2.4)
-    minitest (5.14.2)
-    parallel (1.19.2)
-    parser (2.7.2.0)
-      ast (~> 2.4.1)
-    rainbow (3.0.0)
-    rake (13.0.1)
-    regexp_parser (1.8.2)
-    rexml (3.2.4)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.3)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.3)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.4)
-    rubocop (1.0.0)
-      parallel (~> 1.10)
-      parser (>= 2.7.1.5)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8)
-      rexml
-      rubocop-ast (>= 0.6.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.1.0)
-      parser (>= 2.7.1.5)
-    rubocop-performance (1.8.1)
-      rubocop (>= 0.87.0)
-      rubocop-ast (>= 0.4.0)
-    ruby-progressbar (1.10.1)
-    standard (0.8.1)
-      rubocop (= 1.0.0)
-      rubocop-performance (= 1.8.1)
-    thor (1.0.1)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.7.0)
-    zeitwerk (2.4.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal
-  bundler (~> 2.0)
-  rake
-  rspec
-  standard (~> 0.8.1)
-  whi-cassie!
-
-BUNDLED WITH
-   2.1.4