gotime-cassandra_object 2.2.2 → 2.2.3

data/.gitignore

@@ -1,10 +1,2 @@
-pkg
-.yardoc
-doc/
-bin/*
-vendor/gems/*
-!vendor/gems/cache/
-.bundle
-
-*.swp
-*.swo
+Gemfile.lock
+*.gem

data/gotime-cassandra_object.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'gotime-cassandra_object'
-  s.version = '2.2.2'
+  s.version = '2.2.3'
   s.description = 'Cassandra ActiveModel'
   s.summary = 'Cassandra ActiveModel'
 

data/lib/cassandra_object.rb

@@ -12,7 +12,6 @@ module CassandraObject
   autoload :Callbacks
   autoload :Validations
   autoload :Identity
-  autoload :Indexes
   autoload :Serialization
   autoload :Associations
   autoload :Migrations

data/lib/cassandra_object/attributes.rb

@@ -87,11 +87,11 @@ module CassandraObject
 
     private
       def attribute(name)
-        read_attribute(name.to_sym)
+        read_attribute(name)
       end
     
       def attribute=(name, value)
-        write_attribute(name.to_sym, value)
+        write_attribute(name, value)
       end
   end
 end

data/lib/cassandra_object/base.rb

@@ -35,7 +35,6 @@ module CassandraObject
     include Attributes
     include Persistence
     include Callbacks
-    include Indexes
     include Dirty
     include Validations
     include Associations

data/lib/cassandra_object/connection.rb

@@ -9,11 +9,11 @@ module CassandraObject
     module ClassMethods
       DEFAULT_OPTIONS = {
         servers: "127.0.0.1:9160",
-        thrift: {} 
+        thrift: {}
       }
       def establish_connection(spec)
         spec.reverse_merge!(DEFAULT_OPTIONS)
-        self.connection = Cassandra.new(spec[:keyspace], spec[:servers], spec[:thrift])
+        self.connection = Cassandra.new(spec[:keyspace], spec[:servers], spec[:thrift].symbolize_keys!)
       end
     end
   end

data/lib/cassandra_object/persistence.rb

@@ -33,14 +33,14 @@ module CassandraObject
       def instantiate(key, attributes)
         # remove any attributes we don't know about. we would do this earlier, but we want to make such
         #  attributes available to migrations
-        attributes.delete_if{|k,_| !model_attributes.keys.include?(k)}
+        attributes.delete_if { |k,_| model_attributes[k].nil? }
 
         allocate.tap do |object|
           object.instance_variable_set("@schema_version", attributes.delete('schema_version'))
           object.instance_variable_set("@key", parse_key(key))
           object.instance_variable_set("@new_record", false)
           object.instance_variable_set("@destroyed", false)
-          object.instance_variable_set("@attributes", decode_columns_hash(attributes).with_indifferent_access)
+          object.instance_variable_set("@attributes", decode_columns_hash(attributes))
         end
       end
 
@@ -55,10 +55,7 @@ module CassandraObject
       end
 
       def decode_columns_hash(attributes)
-        attributes.inject(Hash.new) do |memo, (column_name, value)|
-          memo[column_name.to_s] = model_attributes[column_name].converter.decode(value)
-          memo
-        end
+        Hash[attributes.map { |k, v| [k.to_s, model_attributes[k].converter.decode(v)] }]
       end
       
       def column_family_configuration

data/test/connection_test.rb

@@ -14,7 +14,7 @@ class CassandraObject::ConnectionTest < CassandraObject::TestCase
     assert_not_equal CassandraObject::Base.connection, TestObject.connection
     assert_equal 'place_directory_development', TestObject.connection.keyspace
     assert_equal ["192.168.0.100:9160"], TestObject.connection.servers
-    assert_equal 10, TestObject.connection.thrift_client_options['timeout']
+    assert_equal 10, TestObject.connection.thrift_client_options[:timeout]
   end
 
   test 'establish_connection defaults' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-27 00:00:00.000000000Z
+date: 2011-07-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2152750980 !ruby/object:Gem::Requirement
+  requirement: &2169327880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152750980
+  version_requirements: *2169327880
 - !ruby/object:Gem::Dependency
   name: cassandra
-  requirement: &2152750520 !ruby/object:Gem::Requirement
+  requirement: &2169327380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.11.3
   type: :runtime
   prerelease: false
-  version_requirements: *2152750520
+  version_requirements: *2169327380
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152750060 !ruby/object:Gem::Requirement
+  requirement: &2169326780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +44,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2152750060
+  version_requirements: *2169326780
 description: Cassandra ActiveModel
 email: gems@gotime.com
 executables: []
@@ -55,7 +55,6 @@ files:
 - .gitignore
 - CHANGELOG
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - MIT-LICENSE
 - README.markdown
@@ -85,7 +84,6 @@ files:
 - lib/cassandra_object/identity/key.rb
 - lib/cassandra_object/identity/natural_key_factory.rb
 - lib/cassandra_object/identity/uuid_key_factory.rb
-- lib/cassandra_object/indexes.rb
 - lib/cassandra_object/log_subscriber.rb
 - lib/cassandra_object/migrations.rb
 - lib/cassandra_object/migrations/migration.rb

data/Gemfile.lock

@@ -1,91 +0,0 @@
-PATH
-  remote: .
-  specs:
-    gotime-cassandra_object (2.2.1)
-      cassandra (~> 0.11.3)
-      rails (~> 3.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    abstract (1.0.0)
-    actionmailer (3.0.9)
-      actionpack (= 3.0.9)
-      mail (~> 2.2.19)
-    actionpack (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.9)
-      activesupport (= 3.0.9)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
-    activesupport (3.0.9)
-    arel (2.0.10)
-    builder (2.1.2)
-    cassandra (0.11.3)
-      json
-      rake
-      simple_uuid (>= 0.1.0)
-      thrift_client (>= 0.6.3)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    i18n (0.5.0)
-    json (1.5.3)
-    mail (2.2.19)
-      activesupport (>= 2.3.6)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.16)
-    polyglot (0.3.1)
-    rack (1.2.3)
-    rack-mount (0.6.14)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
-      rack (>= 1.0)
-    rails (3.0.9)
-      actionmailer (= 3.0.9)
-      actionpack (= 3.0.9)
-      activerecord (= 3.0.9)
-      activeresource (= 3.0.9)
-      activesupport (= 3.0.9)
-      bundler (~> 1.0)
-      railties (= 3.0.9)
-    railties (3.0.9)
-      actionpack (= 3.0.9)
-      activesupport (= 3.0.9)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.4)
-    rake (0.9.2)
-    rdoc (3.8)
-    simple_uuid (0.1.1)
-    thor (0.14.6)
-    thrift (0.6.0)
-    thrift_client (0.6.3)
-      thrift (~> 0.6.0)
-    treetop (1.4.9)
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.29)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.0.0)
-  gotime-cassandra_object!

data/lib/cassandra_object/indexes.rb

@@ -1,129 +0,0 @@
-module CassandraObject
-  module Indexes
-    extend ActiveSupport::Concern
-    
-    included do
-      class_inheritable_accessor :indexes
-    end
-    
-    class UniqueIndex
-      def initialize(attribute_name, model_class, options)
-        @attribute_name = attribute_name
-        @model_class    = model_class
-      end
-      
-      def find(attribute_value)
-        # first find the key value
-        key = @model_class.connection.get(column_family, attribute_value.to_s, 'key')
-        # then pass to get
-        if key
-          @model_class.get(key.to_s)
-        else
-          @model_class.connection.remove(column_family, attribute_value.to_s)
-          nil
-        end
-      end
-      
-      def write(record)
-        @model_class.connection.insert(column_family, record.send(@attribute_name).to_s, {'key'=>record.key.to_s})
-      end
-      
-      def remove(record)
-        @model_class.connection.remove(column_family, record.send(@attribute_name).to_s)
-      end
-      
-      def column_family
-        @model_class.column_family + "By" + @attribute_name.to_s.camelize 
-      end
-      
-      def column_family_configuration
-        {:Name=>column_family, :CompareWith=>"UTF8Type"}
-      end
-    end
-    
-    class Index
-      def initialize(attribute_name, model_class, options)
-        @attribute_name = attribute_name
-        @model_class    = model_class
-        @reversed       = options[:reversed]
-      end
-      
-      def find(attribute_value, options = {})
-        cursor = CassandraObject::Cursor.new(@model_class, column_family, attribute_value.to_s, @attribute_name.to_s, :start_after=>options[:start_after], :reversed=>@reversed)
-        cursor.validator do |object|
-          object.send(@attribute_name) == attribute_value
-        end
-        cursor.find(options[:limit] || 100)
-      end
-      
-      def write(record)
-        @model_class.connection.insert(column_family, record.send(@attribute_name).to_s, {@attribute_name.to_s=>{new_key=>record.key.to_s}})
-      end
-      
-      def remove(record)
-      end
-      
-      def column_family
-        @model_class.column_family + "By" + @attribute_name.to_s.camelize 
-      end
-      
-      def new_key
-        SimpleUUID::UUID.new
-      end
-      
-      def column_family_configuration
-        {:Name=>column_family, :CompareWith=>"UTF8Type", :ColumnType=>"Super", :CompareSubcolumnsWith=>"TimeUUIDType"}
-      end
-      
-    end
-    
-    module ClassMethods
-      def column_family_configuration
-        if indexes
-          super + indexes.values.map(&:column_family_configuration)
-        else
-          super
-        end
-      end
-      
-      def index(attribute_name, options = {})
-        self.indexes ||= {}.with_indifferent_access
-        if options.delete(:unique)
-          self.indexes[attribute_name] = UniqueIndex.new(attribute_name, self, options)
-          class_eval <<-eom
-            def self.find_by_#{attribute_name}(value)
-              indexes[:#{attribute_name}].find(value)
-            end
-            
-            after_save do |record|
-              self.indexes[:#{attribute_name}].write(record)
-              true
-            end
-              
-            after_destroy do |record|
-              record.class.indexes[:#{attribute_name}].remove(record)
-              true
-            end
-          eom
-        else
-          self.indexes[attribute_name] = Index.new(attribute_name, self, options)
-          class_eval <<-eom
-            def self.find_all_by_#{attribute_name}(value, options = {})
-              self.indexes[:#{attribute_name}].find(value, options)
-            end
-            
-            after_save do |record|
-              record.class.indexes[:#{attribute_name}].write(record)
-              true
-            end
-              
-            after_destroy do |record|
-              record.class.indexes[:#{attribute_name}].remove(record)
-              true
-            end
-          eom
-        end
-      end
-    end
-  end
-end