gotime-cassandra_object 4.10.4 → 4.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 721e97034ca554b1891149cefcf4ced8a268494c
-  data.tar.gz: a0681f45de661d989e8dba2744ef3a57fd079746
+  metadata.gz: 7065981f0726fd662b2d6a42d8b2c8938e56b974
+  data.tar.gz: cbd7d2ba31303203624b2bce28c5fc3b61737d38
 SHA512:
-  metadata.gz: 59686c33844856c912b04a222c0b075d72dbc49112c1e7c2ae9efc65342183b014a63a0f53d3c5624fff58dd908213faac2ac6a1fb66252c2550187addcd8e02
-  data.tar.gz: f7d0975b82c5f8d247aa575bf821eddefa9696c7e998ab4cb450255367474caf91df3b2adc74ab0552725900c162131adfd3a59207d9ed6988dbf2a669a4ac6f
+  metadata.gz: 32474823df1bbb7ffe2b750896c88174b28310fe1f26212d848fabbb29a267215e41c2367cde0f0706fb748362730a1d806d3ae5d9cb76f227f9aebca1c28b62
+  data.tar.gz: 735e41f64fc8e187f047ab3ceef93fb607a1db4b4e4fd1bccd0bd11e1b2c0db487a1b413f82bbf146a7be1dcc6e63a40c6eb05f3ddf543142c59f43aa43c431f

data/gotime-cassandra_object.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'gotime-cassandra_object'
-  s.version = '4.10.4'
+  s.version = '4.10.5'
   s.description = 'Cassandra ActiveModel'
   s.summary = 'Cassandra ActiveModel'
   s.authors = ["Michael Koziarski", "gotime"]

data/lib/cassandra_object/base.rb

@@ -5,41 +5,6 @@ require 'cassandra_object/types'
 
 module CassandraObject
   class Base
-    class << self
-      def column_family=(column_family)
-        @column_family = column_family
-      end
-
-      def column_family
-        @column_family ||= base_class.name.pluralize
-      end
-
-      def base_class
-        class_of_active_record_descendant(self)
-      end
-
-      def config=(config)
-        @@config = config.is_a?(Hash) ? CassandraObject::Config.new(config) : config
-      end
-
-      def config
-        @@config
-      end
-
-      private
-
-        # Returns the class descending directly from ActiveRecord::Base or an
-        # abstract class, if any, in the inheritance hierarchy.
-        def class_of_active_record_descendant(klass)
-          if klass == Base || klass.superclass == Base
-            klass
-          elsif klass.superclass.nil?
-            raise "#{name} doesn't belong in a hierarchy descending from CassandraObject"
-          else
-            class_of_active_record_descendant(klass.superclass)
-          end
-        end
-    end
 
     extend ActiveModel::Naming
     include ActiveModel::Conversion
@@ -61,6 +26,7 @@ module CassandraObject
     include Savepoints
     include Scoping
     include Core
+    extend  Model
 
     include Serialization
   end

data/lib/cassandra_object/counter_base.rb

@@ -0,0 +1,73 @@
+module CassandraObject
+  class CounterBase
+    class << self
+      def base_class
+        self
+      end
+
+      def config
+        Base.config
+      end
+
+      def get(group, counter=nil)
+        cql_string = "SELECT #{select_counter(counter)} FROM #{column_family} WHERE KEY = ?" # Multiple keys at once doesn't result right
+
+        results = []
+        attributes = execute_cql(cql_string, group).fetch_hash
+        attributes.delete("KEY")
+        results << attributes
+
+        if !group.is_a?(Array) && results.size <= 1
+          results = results.first
+          if counter && !counter.is_a?(Array) && results.size <= 1
+            results = results.values.first
+          end
+        end
+        results
+      end
+
+      def update(group, counter, count=nil)
+        execute_cql "UPDATE #{column_family} SET #{counter_updates(counter, count)} WHERE KEY = '#{group}'"
+      end
+
+      private
+
+      def counter_updates(counter, count=nil)
+        if !count.nil?
+          counters = if counter.is_a?(Array); counter else [counter] end
+          counters.map do |c| "'#{c}' = '#{c}' #{incr_decr(count)}" end.join ', '
+        else
+          counter.map do |c, count| "'#{c}' = '#{c}' #{incr_decr(count)}" end.join ', '
+        end
+      end
+
+      def incr_decr(count)
+        if count >= 0
+          "+ #{count}"
+        else
+          "- #{count * -1}"
+        end
+      end
+
+      def select_counter(counter)
+        if counter.nil?
+          "*"
+        else
+          counter.is_a?(Array) ? counter.map do |c| "'#{c}'" end.join(",") : "'#{counter}'"
+        end
+      end
+
+    end
+
+    extend ActiveModel::Naming
+    include ActiveModel::Conversion
+    extend ActiveSupport::DescendantsTracker
+
+    include Connection
+    include Consistency
+    include Identity
+    include Inspect
+    extend  Model
+
+  end
+end

data/lib/cassandra_object/model.rb

@@ -0,0 +1,37 @@
+module CassandraObject
+  module Model
+    def column_family=(column_family)
+      @column_family = column_family
+    end
+
+    def column_family
+      @column_family ||= base_class.name.pluralize
+    end
+
+    def base_class
+      class_of_active_record_descendant(self)
+    end
+
+    def config=(config)
+      @@config = config.is_a?(Hash) ? CassandraObject::Config.new(config) : config
+    end
+
+    def config
+      @@config
+    end
+
+    private
+
+    # Returns the class descending directly from ActiveRecord::Base or an
+    # abstract class, if any, in the inheritance hierarchy.
+    def class_of_active_record_descendant(klass)
+      if klass == Base || klass.superclass == Base
+        klass
+      elsif klass.superclass.nil?
+        raise "#{name} doesn't belong in a hierarchy descending from CassandraObject"
+      else
+        class_of_active_record_descendant(klass.superclass)
+      end
+    end
+  end
+end

data/lib/gotime-cassandra_object.rb

@@ -14,8 +14,10 @@ module CassandraObject
   autoload :Connection
   autoload :Consistency
   autoload :Core
+  autoload :CounterBase
   autoload :Identity
   autoload :Inspect
+  autoload :Model
   autoload :Persistence
   autoload :Savepoints
   autoload :Schema

data/test/unit/counter_base_test.rb

@@ -0,0 +1,43 @@
+require 'test_helper'
+
+class CassandraObject::CounterBaseTest < CassandraObject::TestCase
+  class AppCounts < CassandraObject::CounterBase
+    self.column_family = 'AppCounts'
+  end
+
+  def setup
+    CassandraObject::Schema.create_column_family 'AppCounts', 'default_validation' => 'CounterColumnType', 'replicate_on_write' => 'true'
+  end
+
+  def teardown
+    CassandraObject::Schema.drop_column_family 'AppCounts'
+  end
+
+  test 'class_loading' do
+    assert_equal CassandraObject::CounterBase, CassandraObject::CounterBase
+  end
+
+  test 'single update' do
+
+    AppCounts.update('poop', 'smells', 0)
+
+    assert_equal 0, AppCounts.get("poop", "smells")
+
+    AppCounts.update('poop', 'smells', 60)
+
+    assert_equal 60, AppCounts.get("poop", "smells")
+
+    assert_equal Hash['smells' => 60], AppCounts.get("poop")
+
+  end
+
+  test 'multiple update' do
+
+    AppCounts.update('poop', {'hankey_sightings' => 3, 'christmas_days' => 5})
+
+    assert_equal Hash['hankey_sightings' => 3, 'christmas_days' => 5], AppCounts.get("poop")
+
+    assert_equal 5, AppCounts.get("poop", "christmas_days")
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 4.10.4
+  version: 4.10.5
 platform: ruby
 authors:
 - Michael Koziarski
@@ -98,10 +98,12 @@ files:
 - lib/cassandra_object/connection.rb
 - lib/cassandra_object/consistency.rb
 - lib/cassandra_object/core.rb
+- lib/cassandra_object/counter_base.rb
 - lib/cassandra_object/errors.rb
 - lib/cassandra_object/identity.rb
 - lib/cassandra_object/inspect.rb
 - lib/cassandra_object/log_subscriber.rb
+- lib/cassandra_object/model.rb
 - lib/cassandra_object/persistence.rb
 - lib/cassandra_object/railtie.rb
 - lib/cassandra_object/savepoints.rb
@@ -147,6 +149,7 @@ files:
 - test/unit/connection_test.rb
 - test/unit/consistency_test.rb
 - test/unit/core_test.rb
+- test/unit/counter_base_test.rb
 - test/unit/identity_test.rb
 - test/unit/inspect_test.rb
 - test/unit/log_subscriber_test.rb