gotime-cassandra_object 4.10.1 → 4.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a094a6b0709d5666b254585cf07f2e8889abf318
-  data.tar.gz: f13ccf6c6431c0f576110ef956b18eb809367bd5
+  metadata.gz: dc64be77dc2226fed23bcf8c42c485481c9ce89c
+  data.tar.gz: 01fe5ae6645ce36caf4b5825b31ac985be16a55d
 SHA512:
-  metadata.gz: b6fa0ffb1d1c554e906be4adf20ae4c1a0dac7148fa7bff4d15f9574750946f2f41d4833b86058f0d62825529a4a5d6f1e24dc19c8912afd86d2185ac48bbcd5
-  data.tar.gz: 5060c16d39315b8cc1c98855582450715ac3e30162ab9328a148e2fac2bdc6b401f44fd29fbbc2df2b66864fb5b08187c08079a48042f477dea4f9ea9793be94
+  metadata.gz: 115a5fb6f7a9286afcec5c80f6bca49c63c86ad6be6a879f4d06446d41bb8c66f251d6ad9400e7c3d5392ed5a2e6070e67450d690339d76e140468984b007516
+  data.tar.gz: 9cab61d72f194b8a66fb4251b107cc3862e07cf580d54c9d5094b71dbe54d041a2a32d8719cc2dc5b38222284c96ab787e9a2449cce4c54f79a46577e9346fbd

data/.travis.yml

@@ -1,7 +1,8 @@
 language: ruby
-services:
-  - cassandra
 rvm:
-  - 1.9.2
   - 1.9.3
+  - 2.0.0
 env: CQLSH=/usr/local/cassandra/bin/cqlsh
+before_install:
+  - echo "127.0.0.1 "hostname | sudo tee /etc/hosts
+  - sudo service cassandra start

data/Gemfile

@@ -3,6 +3,7 @@ gemspec
 
 gem 'rake'
 gem 'mocha'
+gem 'thin'
 
 # group :development, :test do
 #   gem 'pry'

data/gotime-cassandra_object.gemspec

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

data/lib/cassandra_object/attribute_methods/typecasting.rb

@@ -7,12 +7,12 @@ module CassandraObject
         class_attribute :attribute_definitions
         self.attribute_definitions = {}
 
-        %w(array boolean date float integer json string time).each do |type|
+        %w(array boolean date float hash_t integer json string time).each do |type|
           instance_eval <<-EOV, __FILE__, __LINE__ + 1
             def #{type}(*args)
               options = args.extract_options!
               args.each do |name|
-                attribute(name, options.merge(:type => :#{type}))
+                attribute(name, options.merge(:type => :#{type == 'hash_t' ? 'hash' : type}))
               end
             end
           EOV

data/lib/cassandra_object/persistence.rb

@@ -9,11 +9,8 @@ module CassandraObject
     module ClassMethods
       def remove(id)
         statement = "DELETE FROM #{column_family}#{write_option_string} WHERE "
-        if id.is_a?(Array)
-          statement += "KEY IN (?)"
-        else
-          statement += "KEY = ?"
-        end
+        statement += id.is_a?(Array) ? "KEY IN (?)" : "KEY = ?"
+
         execute_batchable_cql statement, id
       end
 

data/lib/cassandra_object/scope.rb

@@ -18,9 +18,17 @@ module CassandraObject
     end
 
     private
+
+      def scoping
+        previous, klass.current_scope = klass.current_scope, self
+        yield
+      ensure
+        klass.current_scope = previous
+      end
+
       def method_missing(method_name, *args, &block)
         if klass.respond_to?(method_name)
-          klass.send(method_name, *args, &block)
+          scoping { klass.send(method_name, *args, &block) }
         elsif Array.method_defined?(method_name)
           to_a.send(method_name, *args, &block)
         else

data/lib/cassandra_object/scoping.rb

@@ -12,7 +12,15 @@ module CassandraObject
 
     module ClassMethods
       def scope
-        Scope.new(self)
+        self.current_scope ||= Scope.new(self)
+      end
+
+      def current_scope
+        Thread.current["#{self}_current_scope"]
+      end
+
+      def current_scope=(new_scope)
+        Thread.current["#{self}_current_scope"] = new_scope
       end
     end
   end

data/lib/cassandra_object/types.rb

@@ -2,6 +2,7 @@ CassandraObject::Type.register(:array,          CassandraObject::Types::ArrayTyp
 CassandraObject::Type.register(:boolean,        CassandraObject::Types::BooleanType)
 CassandraObject::Type.register(:date,           CassandraObject::Types::DateType)
 CassandraObject::Type.register(:float,          CassandraObject::Types::FloatType)
+CassandraObject::Type.register(:hash,           CassandraObject::Types::HashType)
 CassandraObject::Type.register(:integer,        CassandraObject::Types::IntegerType)
 CassandraObject::Type.register(:json,           CassandraObject::Types::JsonType)
 CassandraObject::Type.register(:time,           CassandraObject::Types::TimeType)

data/lib/cassandra_object/types/hash_type.rb

@@ -0,0 +1,52 @@
+module CassandraObject
+  module Types
+    class HashType < BaseType
+      class DirtyHash < Hash
+        attr_accessor :record, :name, :options
+        def initialize(record, name, hash, options)
+          @record   = record
+          @name     = name.to_s
+          @options  = options
+
+          self.merge!(hash)
+          @init_hash = self.hash
+          @init_value = hash
+        end
+
+        def []=(obj, val)
+          modifying { super }
+        end
+
+        def delete(obj)
+          modifying { super }
+        end
+
+        private
+        def modifying
+          result = yield
+
+          if !record.changed_attributes.key?(name) && @init_hash != self.hash
+            record.changed_attributes[name] = @init_value
+          end
+
+          record.send("#{name}=", self)
+
+          result
+        end
+      end
+
+      def encode(hash)
+        ActiveSupport::JSON.encode(hash)
+      end
+
+      def decode(str)
+        ActiveSupport::JSON.decode(str)
+      end
+
+      def wrap(record, name, value)
+        DirtyHash.new(record, name, Hash(value), options)
+      end
+
+    end
+  end
+end

data/lib/cassandra_object/types/json_type.rb

@@ -1,40 +1,6 @@
 module CassandraObject
   module Types
     class JsonType < BaseType
-      class DirtyHash < Hash
-        attr_accessor :record, :name, :options
-        def initialize(record, name, hash, options)
-          @record   = record
-          @name     = name.to_s
-          @options  = options
-
-          self.merge!(hash)
-          @init_hash = self.hash
-          @init_value = hash
-        end
-
-        def []=(obj, val)
-          modifying do super end
-        end
-
-        def delete(obj)
-          modifying do super end
-        end
-
-        private
-        def modifying
-          result = yield
-
-          if !record.changed_attributes.key?(name) && @init_hash != self.hash
-            record.changed_attributes[name] = @init_value
-          end
-
-          record.send("#{name}=", self)
-
-          result
-        end
-      end
-
       def encode(hash)
         ActiveSupport::JSON.encode(hash)
       end
@@ -42,11 +8,6 @@ module CassandraObject
       def decode(str)
         ActiveSupport::JSON.decode(str)
       end
-
-      def wrap(record, name, value)
-        DirtyHash.new(record, name, Hash(value), options)
-      end
-
     end
   end
 end

data/lib/gotime-cassandra_object.rb

@@ -53,6 +53,7 @@ module CassandraObject
     autoload :BooleanType
     autoload :DateType
     autoload :FloatType
+    autoload :HashType
     autoload :IntegerType
     autoload :JsonType
     autoload :StringType

data/test/support/issue.rb

@@ -2,4 +2,8 @@ class Issue < CassandraObject::Base
   string :description
   string :title
   before_create { self.description ||= 'funny' }
+
+  def self.for_key key
+    where('KEY' => key)
+  end
 end

data/test/unit/attribute_methods_test.rb

@@ -30,11 +30,14 @@ class CassandraObject::AttributeMethodsTest < CassandraObject::TestCase
     assert_equal 'foo', issue.description
   end
 
-  # class ChildIssue < Issue
-  # end
+  class ChildIssue < Issue
+    def title=(val)
+      self[:title] = val + ' lol'
+    end
+  end
 
-  test 'inheritence' do
-    issue = Issue.new(title: 'hey')
+  test 'override' do
+    issue = ChildIssue.new(title: 'hey')
 
     assert_equal 'hey lol', issue.title
   end

data/test/unit/scope/query_methods_test.rb

@@ -23,4 +23,10 @@ class CassandraObject::Scope::QueryMethodsTest < CassandraObject::TestCase
       Issue.all
     end
   end
+
+  test "chaining where with scope" do
+    issue = Issue.create title: 'abc', description: 'def'
+    query = Issue.select(:title).for_key(issue.id)
+    assert_match /^SELECT KEY,title/, query.to_cql
+  end
 end

data/test/unit/types/hash_type_test.rb

@@ -0,0 +1,77 @@
+require 'test_helper'
+
+class CassandraObject::Types::HashTypeTest < CassandraObject::Types::TestCase
+  test 'encode' do
+    assert_equal({a: 'b'}.to_json, coder.encode(a: 'b'))
+    assert_equal '-3', coder.encode(-3)
+  end
+
+  test 'decode' do
+    assert_equal({'a' => 'b'}, coder.decode({'a' => 'b'}.to_json))
+  end
+
+  test 'setting marks dirty' do
+    record = temp_object do
+      string :name
+      hash_t :stuff
+
+    end.new name: 'abcd', stuff: Hash[a: 1, b: 2]
+
+    record.save!
+    assert !record.stuff_changed?
+
+    record.stuff[:c] = 3
+
+    assert record.stuff_changed?
+    assert_equal Hash[a: 1, b: 2, c: 3], record.stuff
+  end
+
+  test 'hash change marks dirty' do
+    record = temp_object do
+      string :name
+      hash_t :stuff
+
+    end.new name: 'abcd', stuff: Hash[a: 1, b: 2, v: {}]
+
+    record.save!
+    assert !record.stuff_changed?
+
+    record.stuff[:v][:data] = 69
+    record.stuff[:v] = record.stuff[:v]
+
+    assert record.stuff_changed?
+    assert_equal Hash[a: 1, b: 2, v: Hash[data: 69]], record.stuff
+  end
+
+  test 'hash no change does not dirty' do
+    record = temp_object do
+      string :name
+      hash_t :stuff
+
+    end.new name: 'abcd', stuff: Hash[a: 1, b: 2, v: {data: 69}]
+
+    record.save!
+    assert !record.stuff_changed?
+
+    record.stuff[:v][:data] = 69
+    record.stuff[:v] = record.stuff[:v]
+
+    assert !record.stuff_changed?
+    assert_equal Hash[a: 1, b: 2, v: Hash[data: 69]], record.stuff
+  end
+
+  test 'delete marks dirty' do
+    record = temp_object do
+      string :name
+      hash_t :stuff
+
+    end.new name: 'abcd', stuff: Hash[a: 1, b: 2]
+
+    record.stuff.delete :b
+
+    assert record.stuff_changed?
+    assert_equal Hash[a: 1], record.stuff
+  end
+
+
+end

data/test/unit/types/json_type_test.rb

@@ -10,67 +10,13 @@ class CassandraObject::Types::JsonTypeTest < CassandraObject::Types::TestCase
     assert_equal({'a' => 'b'}, coder.decode({'a' => 'b'}.to_json))
   end
 
-  test 'setting marks dirty' do
-    record = temp_object do
-      string :name
-      json :stuff
-
-    end.new name: 'abcd', stuff: Hash[a: 1, b: 2]
-
-    record.save!
-    assert !record.stuff_changed?
-
-    record.stuff[:c] = 3
-
-    assert record.stuff_changed?
-    assert_equal Hash[a: 1, b: 2, c: 3], record.stuff
-  end
-
-  test 'hash change marks dirty' do
-    record = temp_object do
-      string :name
-      json :stuff
-
-    end.new name: 'abcd', stuff: Hash[a: 1, b: 2, v: {}]
-
-    record.save!
-    assert !record.stuff_changed?
-
-    record.stuff[:v][:data] = 69
-    record.stuff[:v] = record.stuff[:v]
-
-    assert record.stuff_changed?
-    assert_equal Hash[a: 1, b: 2, v: Hash[data: 69]], record.stuff
-  end
-
-  test 'hash no change does not dirty' do
-    record = temp_object do
-      string :name
-      json :stuff
-
-    end.new name: 'abcd', stuff: Hash[a: 1, b: 2, v: {data: 69}]
-
-    record.save!
-    assert !record.stuff_changed?
-
-    record.stuff[:v][:data] = 69
-    record.stuff[:v] = record.stuff[:v]
-
-    assert !record.stuff_changed?
-    assert_equal Hash[a: 1, b: 2, v: Hash[data: 69]], record.stuff
+  test 'encode array' do
+    assert_equal(['a', 'b'].to_json, coder.encode(['a', 'b']))
+    assert_equal '-3', coder.encode(-3)
   end
 
-  test 'delete marks dirty' do
-    record = temp_object do
-      string :name
-      json :stuff
-
-    end.new name: 'abcd', stuff: Hash[a: 1, b: 2]
-
-    record.stuff.delete :b
-
-    assert record.stuff_changed?
-    assert_equal Hash[a: 1], record.stuff
+  test 'decode array' do
+    assert_equal(['a', 'b'], coder.decode(['a', 'b'].to_json))
   end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 4.10.1
+  version: 4.10.2
 platform: ruby
 authors:
 - Michael Koziarski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-09 00:00:00.000000000 Z
+date: 2013-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -122,6 +122,7 @@ files:
 - lib/cassandra_object/types/boolean_type.rb
 - lib/cassandra_object/types/date_type.rb
 - lib/cassandra_object/types/float_type.rb
+- lib/cassandra_object/types/hash_type.rb
 - lib/cassandra_object/types/integer_type.rb
 - lib/cassandra_object/types/json_type.rb
 - lib/cassandra_object/types/string_type.rb
@@ -163,6 +164,7 @@ files:
 - test/unit/types/boolean_type_test.rb
 - test/unit/types/date_type_test.rb
 - test/unit/types/float_type_test.rb
+- test/unit/types/hash_type_test.rb
 - test/unit/types/integer_type_test.rb
 - test/unit/types/json_type_test.rb
 - test/unit/types/string_type_test.rb