gotime-cassandra_object 2.3.4 → 2.3.5

data/README.rdoc

@@ -1,2 +1,44 @@
 == Cassandra Object
 
+Cassandra Object uses ActiveModel to mimic much of the behavior in ActiveRecord.
+
+
+== Defining Models
+
+  class Widget < CassandraObject::Base
+    key :uuid
+    attribute :name, type: :string
+    attribute :description, type: :string
+    attribute :price, type: :integer
+
+    validates :name, presence: :true
+
+    before_create do
+      self.description = "#{name} is the best product ever"
+    end
+  end
+
+== Creating and updating records
+
+Cassandra Object has equivalent methods as ActiveRecord:
+
+  widget = Widget.new
+  widget.valid?
+  widget = Widget.create(name: 'Acme', price: 100)
+  widget.update_attribute(:price, 1200)
+  widget.update_attributes(price: 1200, name: 'Acme Corporation')
+  widget.attributes = {price: 300}
+  widget.price_was
+  widget.save
+  widget.save!
+
+== Finding records
+
+  widget = Widget.find(uuid)
+  widget = Widget.first
+  widgets = Widget.all
+  Widget.find_each do |widget|
+    ...
+  end
+
+CQL is currently not supported

data/gotime-cassandra_object.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'gotime-cassandra_object'
-  s.version = '2.3.4'
+  s.version = '2.3.5'
   s.description = 'Cassandra ActiveModel'
   s.summary = 'Cassandra ActiveModel'
 
@@ -18,9 +18,8 @@ Gem::Specification.new do |s|
   s.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ['lib']
 
-  s.add_runtime_dependency('rails', "~> 3.0")
+  s.add_runtime_dependency('activemodel', "~> 3.0")
   s.add_runtime_dependency('cassandra', "~> 0.11.3")
 
   s.add_development_dependency('bundler', "~> 1.0.0")
-end
-
+end

data/lib/cassandra_object.rb

@@ -1,4 +1,5 @@
-require 'rails/all'
+require 'active_support/all'
+require 'active_model'
 
 module CassandraObject
   extend ActiveSupport::Autoload
@@ -46,4 +47,4 @@ module CassandraObject
   end
 end
 
-require 'cassandra_object/railtie'
+require 'cassandra_object/railtie' if defined?(Rails)

data/lib/cassandra_object/callbacks.rb

@@ -4,7 +4,7 @@ module CassandraObject
 
     included do
       extend ActiveModel::Callbacks
-      define_model_callbacks :save, :create, :destroy, :update
+      define_model_callbacks :save, :create, :update, :destroy
     end
 
     def destroy #:nodoc:

data/lib/cassandra_object/finder_methods.rb

@@ -1,6 +1,7 @@
 module CassandraObject
   module FinderMethods
     extend ActiveSupport::Concern
+
     module ClassMethods
       def find(key)
         if !parse_key(key)
@@ -39,9 +40,7 @@ module CassandraObject
 
         ids = ids.compact.map(&:to_s).uniq
 
-        results = multi_get(ids).values.compact
-
-        results.size <= 1 && !expects_array ? results.first : results
+        multi_get(ids).values.compact
       end
 
       private

data/lib/cassandra_object/identity/abstract_key_factory.rb

@@ -20,16 +20,6 @@ module CassandraObject
       def parse(string)
         raise NotImplementedError, "#{self.class.name}#parse isn't implemented."
       end
-
-
-      # create should create a new key object from the cassandra format.
-      #
-      # @param  [String] the result of calling key.to_s
-      # @return [CassandraObject::Identity::Key] the key
-      #
-      def create(string)
-        raise NotImplementedError, "#{self.class.name}#create isn't implemented."
-      end
     end
   end
 end

data/lib/cassandra_object/identity/custom_key_factory.rb

@@ -36,14 +36,6 @@ module CassandraObject
       def next_key(object)
         CustomKey.new(object.send(@method))
       end
-
-      def parse(paramized_key)
-        CustomKey.new(paramized_key)
-      end
-
-      def create(paramized_key)
-        CustomKey.new(paramized_key)
-      end
     end
   end
 end

data/lib/cassandra_object/identity/natural_key_factory.rb

@@ -41,10 +41,6 @@ module CassandraObject
       def parse(paramized_key)
         NaturalKey.new(paramized_key)
       end
-
-      def create(paramized_key)
-        NaturalKey.new(paramized_key)
-      end
     end
   end
 end

data/lib/cassandra_object/identity/uuid_key_factory.rb

@@ -28,11 +28,6 @@ module CassandraObject
       rescue
         nil
       end
-      
-      # create should create a new key object from the cassandra format.
-      def create(string)
-        UUID.new(string)
-      end
     end
   end
 end

data/lib/cassandra_object/validations.rb

@@ -13,7 +13,7 @@ module CassandraObject
     
     included do
       define_model_callbacks :validation
-      define_callbacks :validate, :scope => :name
+      define_callbacks :validate, scope: :name
     end
     
     module ClassMethods

data/test/callbacks_test.rb

@@ -0,0 +1,47 @@
+require 'test_helper'
+
+class CassandraObject::CallbacksTest < CassandraObject::TestCase
+  class TestIssue < CassandraObject::Base
+    self.column_family = 'Issues'
+    key :uuid
+    attribute :description, type: :string
+
+    %w(after_save after_create after_update after_destroy).each do |method|
+      send(method) do
+        callback_history << method
+      end
+    end
+
+    def reset_callback_history
+      @callback_history = []
+    end
+
+    def callback_history
+      @callback_history ||= []
+    end
+  end
+
+  test 'create' do
+    issue = TestIssue.create
+
+    assert_equal ['after_create', 'after_save'], issue.callback_history
+  end
+
+  test 'update' do
+    issue = TestIssue.create
+    issue.reset_callback_history
+
+    issue.update_attribute :description, 'foo'
+
+    assert_equal ['after_update', 'after_save'], issue.callback_history
+  end
+
+  test 'destroy' do
+    issue = TestIssue.create
+    issue.reset_callback_history
+
+    issue.destroy
+
+    assert_equal ['after_destroy'], issue.callback_history
+  end
+end

data/test/test_helper.rb

@@ -1,9 +1,8 @@
-# lib = File.expand_path("#{File.dirname(__FILE__)}/../lib")
-# $:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
-# require File.expand_path('../../lib/cassandra_object', __FILE__)
+require 'rubygems'
+require 'bundler/setup'
+require 'test/unit'
 require 'cassandra/0.8'
 require 'cassandra_object'
-require 'rails/test_help'
 
 class Issue < CassandraObject::Base
   key :uuid

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 2.3.4
+  version: 2.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-10 00:00:00.000000000Z
+date: 2011-08-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
-  requirement: &2165457380 !ruby/object:Gem::Requirement
+  name: activemodel
+  requirement: &2168989460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165457380
+  version_requirements: *2168989460
 - !ruby/object:Gem::Dependency
   name: cassandra
-  requirement: &2165456920 !ruby/object:Gem::Requirement
+  requirement: &2168985520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.11.3
   type: :runtime
   prerelease: false
-  version_requirements: *2165456920
+  version_requirements: *2168985520
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2165456060 !ruby/object:Gem::Requirement
+  requirement: &2168984360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +44,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2165456060
+  version_requirements: *2168984360
 description: Cassandra ActiveModel
 email: gems@gotime.com
 executables: []
@@ -117,6 +117,7 @@ files:
 - test/attributes_test.rb
 - test/base_test.rb
 - test/batches_test.rb
+- test/callbacks_test.rb
 - test/connection_test.rb
 - test/consistency_test.rb
 - test/finder_methods_test.rb
@@ -165,6 +166,7 @@ test_files:
 - test/attributes_test.rb
 - test/base_test.rb
 - test/batches_test.rb
+- test/callbacks_test.rb
 - test/connection_test.rb
 - test/consistency_test.rb
 - test/finder_methods_test.rb