gotime-cassandra_object 0.9.1 → 2.0.0

data/Gemfile

@@ -1,2 +1,2 @@
-source :gemcutter
+source "http://rubygems.org"
 gemspec

data/Gemfile.lock

@@ -1,39 +1,87 @@
 PATH
   remote: .
   specs:
-    gotime-cassandra_object (0.8.1)
-      activemodel (~> 3)
-      activesupport (~> 3)
-      cassandra
+    gotime-cassandra_object (0.9.1)
+      cassandra (~> 0.11.3)
+      rails (~> 3.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.5)
-      activesupport (= 3.0.5)
+    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)
-      i18n (~> 0.4)
-    activesupport (3.0.5)
+      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.9.0)
+    cassandra (0.11.3)
       json
       rake
       simple_uuid (>= 0.1.0)
-      thrift_client (>= 0.6.0)
-    git (1.2.5)
+      thrift_client (>= 0.6.3)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
     i18n (0.5.0)
-    jeweler (1.5.1)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
-    json (1.5.1)
-    rake (0.8.7)
-    rcov (0.9.9)
-    shoulda (2.11.3)
+    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)
-    thrift (0.5.0)
-    thrift_client (0.6.0)
-      thrift (~> 0.5.0)
+    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
@@ -41,6 +89,3 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0.0)
   gotime-cassandra_object!
-  jeweler (~> 1.5.1)
-  rcov
-  shoulda

data/Rakefile

@@ -1,43 +1,15 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
-
+require 'rubygems'
+require 'bundler/setup'
+require 'rake'
 require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "cassandra_object #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
 
-task :cleanup do
-  unless defined?(CassandraObject)
-    $: << 'test'
-    $: << 'lib'
-    require 'test_helper'
-  end
-  puts "Clearing keyspace! ..."
-  CassandraObject::Base.connection.clear_keyspace!
-  puts "Cleared"
-end
+# require File.expand_path('../lib/cassandra_object', __FILE__)
 
-task :default=>[:test, :cleanup] do
-end
+task default: :test
 
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
+end

data/gotime-cassandra_object.gemspec

@@ -2,25 +2,25 @@
 
 Gem::Specification.new do |s|
   s.name = 'gotime-cassandra_object'
-  s.version = '0.9.1'
+  s.version = '2.0.0'
   s.description = 'Cassandra ActiveModel'
   s.summary = 'Cassandra ActiveModel'
+
+  s.required_ruby_version     = '>= 1.9.2'
   s.required_rubygems_version = '>= 1.3.5'
+
   s.authors = ["Michael Koziarski", "gotime"]
   s.email = 'gems@gotime.com'
   s.homepage = 'http://github.com/gotime/cassandra_object'
+
   s.extra_rdoc_files = ["README.markdown"]
   s.files       = `git ls-files`.split("\n")
   s.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ['lib']
 
-  s.add_runtime_dependency('activesupport', "~> 3.0")
-  s.add_runtime_dependency('activemodel', "~> 3.0")
+  s.add_runtime_dependency('rails', "~> 3.0")
   s.add_runtime_dependency('cassandra', "~> 0.11.3")
 
-  s.add_development_dependency('shoulda')
   s.add_development_dependency('bundler', "~> 1.0.0")
-  s.add_development_dependency('jeweler', "~> 1.5.1")
-  s.add_development_dependency('rcov')
 end
 

data/lib/cassandra_object.rb

@@ -1,12 +1,10 @@
-require 'rubygems'
-require 'i18n'
-require 'active_support'
-require 'active_model'
+require 'rails/all'
 
 module CassandraObject
   extend ActiveSupport::Autoload
 
   autoload :Base
+  autoload :Connection
   autoload :Attributes
   autoload :Dirty
   autoload :Consistency
@@ -22,8 +20,8 @@ module CassandraObject
   autoload :Collection
   autoload :Types
   autoload :Mocking
-  autoload :FindEach
-  autoload :FindWithIds
+  autoload :Batches
+  autoload :FinderMethods
   autoload :Timestamps
 
   autoload :Schema
@@ -32,11 +30,7 @@ module CassandraObject
     extend ActiveSupport::Autoload
     autoload :Keyspace
     autoload :ColumnFamily
-
-    require 'cassandra_object/tasks/ks'
-  end
-
-  module Generators
-    require 'cassandra_object/generators/migration_generator'
   end
 end
+
+require 'cassandra_object/railtie'

data/lib/cassandra_object/associations.rb

@@ -17,7 +17,7 @@ module CassandraObject
       end
 
       def relationships_column_family
-        @relationships_column_family || "#{column_family.singularize}Relationships"
+        @relationships_column_family || "#{name}Relationships"
       end
 
       def column_family_configuration

data/lib/cassandra_object/attributes.rb

@@ -1,6 +1,5 @@
 module CassandraObject
   class Attribute
-
     attr_reader :name, :converter, :expected_type
     def initialize(name, owner_class, converter, expected_type, options)
       @name          = name.to_s
@@ -14,10 +13,6 @@ module CassandraObject
       return value if value.nil?
       value.kind_of?(expected_type) ? value : converter.decode(value)
     end
-
-    def define_methods!
-      @owner_class.define_attribute_methods(true)
-    end
   end
 
   module Attributes
@@ -26,68 +21,83 @@ module CassandraObject
 
     module ClassMethods
       def attribute(name, options)
-        
+        if model_attributes.empty?
+          self.model_attributes = {}.with_indifferent_access
+        end
+
         unless type_mapping = attribute_types[options[:type]]
-          type_mapping =  { :expected_type => options[:type], 
-                            :converter => options[:converter] }.with_indifferent_access
+          type_mapping = {
+            expected_type: options[:type], 
+            converter: options[:converter]
+          }.with_indifferent_access
         end
-        
-        new_attr = Attribute.new(name, self, type_mapping[:converter], type_mapping[:expected_type], options)
-        write_inheritable_hash(:model_attributes, {name => new_attr}.with_indifferent_access)
-        new_attr.define_methods!
+
+        model_attributes[name] = Attribute.new(name, self, type_mapping[:converter], type_mapping[:expected_type], options)
       end
 
-      def define_attribute_methods(force = false)
-        return unless model_attributes
-        undefine_attribute_methods if force
+      def define_attribute_methods
         super(model_attributes.keys)
       end
-      
+
       def register_attribute_type(name, expected_type, converter)
-        attribute_types[name] = { :expected_type => expected_type, :converter => converter }.with_indifferent_access
+        attribute_types[name] = { expected_type: expected_type, converter: converter }.with_indifferent_access
       end
     end
 
     included do
-      class_inheritable_hash :model_attributes
+      class_attribute :model_attributes
+      self.model_attributes = {}.with_indifferent_access
+
       attribute_method_suffix("", "=")
       
       cattr_accessor :attribute_types
       self.attribute_types = {}.with_indifferent_access
     end
 
-    module InstanceMethods
-      def write_attribute(name, value)
-        if ma = self.class.model_attributes[name]
-          @attributes[name.to_s] = ma.check_value!(value)
-        else
-          raise NoMethodError, "Unknown attribute #{name.inspect}"
-        end
+    def write_attribute(name, value)
+      if ma = self.class.model_attributes[name]
+        @attributes[name.to_s] = ma.check_value!(value)
+      else
+        raise NoMethodError, "Unknown attribute #{name.inspect}"
       end
+    end
+
+    def read_attribute(name)
+      @attributes[name.to_s]
+    end
 
-      def read_attribute(name)
-        @attributes[name.to_s]
+    def attributes=(attributes)
+      attributes.each do |(name, value)|
+        send("#{name}=", value)
       end
+    end
 
-      def attributes=(attributes)
-        attributes.each do |(name, value)|
-          send("#{name}=", value)
-        end
+    def method_missing(method_id, *args, &block)
+      if !self.class.attribute_methods_generated?
+        self.class.define_attribute_methods
+        send(method_id, *args, &block)
+      else
+        super
       end
+    end
 
-      protected
-        def attribute_method?(name)
-          !!model_attributes[name.to_sym]
-        end
+    def respond_to?(*args)
+      self.class.define_attribute_methods unless self.class.attribute_methods_generated?
+      super
+    end
 
-      private
-        def attribute(name)
-          read_attribute(name.to_sym)
-        end
+    protected
+      def attribute_method?(name)
+        !!model_attributes[name.to_sym]
+      end
 
-        def attribute=(name, value)
-          write_attribute(name.to_sym, value)
-        end
-    end
+    private
+      def attribute(name)
+        read_attribute(name.to_sym)
+      end
+    
+      def attribute=(name, value)
+        write_attribute(name.to_sym, value)
+      end
   end
 end

data/lib/cassandra_object/base.rb

@@ -1,24 +1,10 @@
-require 'cassandra/0.7'
+require 'cassandra/0.8'
 require 'set'
 
 require 'cassandra_object/log_subscriber'
 
 module CassandraObject
   class Base
-    class_inheritable_accessor :connection
-    class_inheritable_writer :connection_class
-
-    def self.connection_class
-      read_inheritable_attribute(:connection_class) || Cassandra
-    end
-
-    module ConnectionManagement
-      def establish_connection(*args)
-        self.connection = connection_class.new(*args)
-      end
-    end
-    extend ConnectionManagement
-
     module Naming
       def column_family=(column_family)
         @column_family = column_family
@@ -43,6 +29,7 @@ module CassandraObject
     extend ActiveModel::Naming
     extend ActiveSupport::DescendantsTracker
     
+    include Connection
     include Callbacks
     include Identity
     include Attributes
@@ -51,8 +38,8 @@ module CassandraObject
     include Dirty
     include Validation
     include Associations
-    include FindEach
-    include FindWithIds
+    include Batches
+    include FinderMethods
 
     attr_reader :attributes
     attr_accessor :key

data/lib/cassandra_object/batches.rb

@@ -0,0 +1,13 @@
+module CassandraObject
+  module Batches
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def find_each
+        connection.each(column_family) do |k, v|
+          yield instantiate(k, v)
+        end
+      end
+    end
+  end
+end