gotime-cassandra_object 4.1.0 → 4.2.0

data/README.rdoc

@@ -61,4 +61,12 @@ Cassandra Object has equivalent methods as ActiveRecord:
     ...
   end
 
-CQL is currently not supported
+== Scoping
+
+Some lightweight scoping features are available:
+
+  Widget.where('color' => 'red')
+  Widget.select(['name', 'color'])
+  Widget.limit(10)
+
+  

data/gotime-cassandra_object.gemspec

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

data/lib/cassandra_object/base.rb

@@ -31,9 +31,7 @@ module CassandraObject
     include Connection
     include Identity
     include Inspect
-    include FinderMethods
     include Persistence
-    include Batches
     include AttributeMethods
     include Validations
     include AttributeMethods::Dirty
@@ -43,6 +41,7 @@ module CassandraObject
     include Callbacks, ActiveModel::Observing
     include Timestamps
     include Savepoints
+    include Scoping
 
     include Serialization
 

data/lib/cassandra_object/log_subscriber.rb

@@ -1,37 +1,29 @@
 module CassandraObject
   class LogSubscriber < ActiveSupport::LogSubscriber
-    def multi_get(event)
-      name = '%s multi_get (%.1fms)' % [event.payload[:column_family], event.duration]
-
-      debug "  #{name}  (#{event.payload[:keys].size}) #{event.payload[:keys].join(" ")}"
-    end
-
-    def remove(event)
-      name = '%s remove (%.1fms)' % [event.payload[:column_family], event.duration]
-
-      message = "  #{name}  #{event.payload[:key]}"
-      message << " #{Array(event.payload[:attributes]).inspect}" if event.payload[:attributes]
-
-      debug message
+    def initialize
+      super
+      @odd_or_even = false
     end
 
-    def truncate(event)
-      name = '%s truncate (%.1fms)' % [event.payload[:column_family], event.duration]
-
-      debug "  #{name}  #{event.payload[:column_family]}"
-    end
+    def cql(event)
+      payload = event.payload
+      name = '%s (%.1fms)' % [payload[:name], event.duration]
+      cql = payload[:cql].squeeze(' ')
 
-    def insert(event)
-      name = '%s insert (%.1fms)' % [event.payload[:column_family], event.duration]
+      if odd?
+        name = color(name, CYAN, true)
+        cql  = color(cql, nil, true)
+      else
+        name = color(name, MAGENTA, true)
+      end
 
-      debug "  #{name}  #{event.payload[:key]} #{event.payload[:attributes].inspect}"
+      debug "  #{name}  #{cql}"
     end
 
-    def get_range(event)
-      name = '%s get_range (%.1fms)' % [event.payload[:column_family], event.duration]
-      
-      debug "  #{name}  (#{event.payload[:count]}) '#{event.payload[:start]}' => '#{event.payload[:finish]}'"
+    def odd?
+      @odd_or_even = !@odd_or_even
     end
   end
 end
+
 CassandraObject::LogSubscriber.attach_to :cassandra_object

data/lib/cassandra_object/{batches.rb → scope/batches.rb}

@@ -1,8 +1,6 @@
 module CassandraObject
-  module Batches
-    extend ActiveSupport::Concern
-
-    module ClassMethods
+  class Scope
+    module Batches
       def find_each(options = {})
         find_in_batches(options) do |records|
           records.each { |record| yield record }
@@ -13,8 +11,8 @@ module CassandraObject
         batch_size = options.delete(:batch_size) || 1000
         start_key = nil
 
-        statement = "select * from #{column_family} limit #{batch_size + 1}"
-        records = instantiate_from_cql statement
+        scope = limit(batch_size + 1)
+        records = scope.to_a
 
         while records.any?
           if records.size > batch_size
@@ -26,8 +24,7 @@ module CassandraObject
           yield records
           break if next_record.nil?
 
-          statement = "SELECT * FROM #{column_family} WHERE KEY >= ? LIMIT #{batch_size + 1}"
-          records = instantiate_from_cql statement, next_record.id
+          records = scope.where("KEY >= #{next_record.id}").to_a
         end
       end
     end

data/lib/cassandra_object/scope/finder_methods.rb

@@ -0,0 +1,47 @@
+module CassandraObject
+  class Scope
+    module FinderMethods
+      def find(ids)
+        if ids.is_a?(Array)
+          find_some(ids)
+        else
+          find_one(ids)
+        end
+      end
+
+      def find_by_id(ids)
+        find(ids)
+      rescue CassandraObject::RecordNotFound
+        nil
+      end
+
+      def all
+        to_a
+      end
+
+      def first
+        limit(1).to_a.first
+      end
+
+      private
+        def find_one(id)
+          if id.blank?
+            raise CassandraObject::RecordNotFound, "Couldn't find #{self.name} with key #{id.inspect}"
+          elsif record = where('KEY' => id).first
+            record
+          else
+            raise CassandraObject::RecordNotFound
+          end
+        end
+
+        def find_some(ids)
+          ids = ids.flatten
+          return [] if ids.empty?
+
+          ids = ids.compact.map(&:to_s).uniq
+
+          where("KEY in (#{ids * ','})").to_a
+        end
+    end
+  end
+end

data/lib/cassandra_object/scope/query_methods.rb

@@ -0,0 +1,79 @@
+module CassandraObject
+  class Scope
+    module QueryMethods
+      def select!(value)
+        self.select_values += Array.wrap(value)
+        self
+      end
+
+      def select(value)
+        clone.select! value
+      end
+
+      def where!(*values)
+        self.where_values += values.flatten
+        self
+      end
+
+      def where(*values)
+        clone.where! values
+      end
+
+      def limit!(value)
+        self.limit_value = value
+        self
+      end
+
+      def limit(value)
+        clone.limit! value
+      end
+
+      def to_a
+        statement = [
+          "select #{select_string} from #{klass.column_family}",
+          where_string,
+          limit_string
+        ].delete_if(&:blank?) * ' '
+
+        instantiate_from_cql(statement)
+      end
+
+      private
+        def select_string
+          if select_values.any?
+            select_values * ','
+          else
+            '*'
+          end
+        end
+
+        def where_string
+          if where_values.any?
+            wheres = []
+
+            where_values.map do |where_value|
+              if where_value.is_a?(String)
+                wheres << where_value
+              elsif where_value.is_a?(Hash)
+                where_value.each do |column, value|
+                  wheres << "#{column} = #{value}"
+                end
+              end
+            end
+
+            "WHERE #{wheres * ' AND '}"
+          else
+            ''
+          end
+        end
+
+        def limit_string
+          if limit_value
+            "limit #{limit_value}"
+          else
+            ""
+          end
+        end
+    end
+  end
+end

data/lib/cassandra_object/scope.rb

@@ -0,0 +1,48 @@
+require 'cassandra_object/scope/batches'
+require 'cassandra_object/scope/finder_methods'
+require 'cassandra_object/scope/query_methods'
+
+module CassandraObject
+  class Scope
+    include Batches, FinderMethods, QueryMethods
+
+    attr_accessor :klass
+    attr_accessor :limit_value, :select_values, :where_values
+
+    def initialize(klass)
+      @klass = klass
+
+      @limit_value = nil
+      @select_values = []
+      @where_values = []
+    end
+
+    private
+      def method_missing(method_name, *args, &block)
+        if klass.respond_to?(method_name)
+          klass.send(method_name, *args, &block)
+        elsif Array.method_defined?(method_name)
+          to_a.send(method_name, *args, &block)
+        else
+          super
+        end
+      end
+
+      def instantiate_from_cql(cql_string, *args)
+        results = []
+        klass.execute_cql(cql_string, *args).fetch do |cql_row|
+          results << instantiate_cql_row(cql_row)
+        end
+        results.compact!
+        results
+      end
+
+      def instantiate_cql_row(cql_row)
+        attributes = cql_row.to_hash
+        key = attributes.delete('KEY')
+        if attributes.any?
+          instantiate(key, attributes)
+        end
+      end
+  end
+end

data/lib/cassandra_object/scoping.rb

@@ -0,0 +1,19 @@
+module CassandraObject
+  module Scoping
+    extend ActiveSupport::Concern
+
+    included do
+      singleton_class.class_eval do
+        delegate :find, :find_by_id, :first, :all, to: :scope
+        delegate :find_each, :find_in_batches, to: :scope
+        delegate :select, :where, to: :scope
+      end
+    end
+
+    module ClassMethods
+      def scope
+        Scope.new(self)
+      end
+    end
+  end
+end

data/lib/gotime-cassandra_object.rb

@@ -15,10 +15,10 @@ module CassandraObject
   autoload :Identity
   autoload :Inspect
   autoload :Serialization
-  autoload :Batches
-  autoload :FinderMethods
   autoload :Savepoints
   autoload :Schema
+  autoload :Scope
+  autoload :Scoping
   autoload :Timestamps
   autoload :Type
 

data/test/unit/log_subscriber_test.rb

@@ -0,0 +1,6 @@
+require "test_helper"
+require "active_support/log_subscriber/test_helper"
+
+class CassandraObject::LogSubscriberTest < CassandraObject::TestCase
+  include ActiveSupport::LogSubscriber::TestHelper
+end

data/test/unit/scope/query_methods_test.rb

@@ -0,0 +1,12 @@
+require 'test_helper'
+
+class CassandraObject::QueryMethodsTest < CassandraObject::TestCase
+  test "select" do
+    issue = Issue.create title: 'foo', description: 'bar'
+
+    issue = Issue.select(:title).find(issue.id)
+
+    assert_equal 'foo', issue.title
+    assert_nil issue.description
+  end
+end

data/test/unit/scoping_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class CassandraObject::ScopingTest < CassandraObject::TestCase
+  test "scope" do
+    assert_kind_of CassandraObject::Scope, Issue.scope
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-13 00:00:00.000000000 Z
+date: 2012-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -98,7 +98,6 @@ files:
 - lib/cassandra_object/attribute_methods/primary_key.rb
 - lib/cassandra_object/attribute_methods/typecasting.rb
 - lib/cassandra_object/base.rb
-- lib/cassandra_object/batches.rb
 - lib/cassandra_object/belongs_to.rb
 - lib/cassandra_object/belongs_to/association.rb
 - lib/cassandra_object/belongs_to/builder.rb
@@ -106,7 +105,6 @@ files:
 - lib/cassandra_object/callbacks.rb
 - lib/cassandra_object/connection.rb
 - lib/cassandra_object/errors.rb
-- lib/cassandra_object/finder_methods.rb
 - lib/cassandra_object/identity.rb
 - lib/cassandra_object/inspect.rb
 - lib/cassandra_object/log_subscriber.rb
@@ -114,6 +112,11 @@ files:
 - lib/cassandra_object/railtie.rb
 - lib/cassandra_object/savepoints.rb
 - lib/cassandra_object/schema.rb
+- lib/cassandra_object/scope.rb
+- lib/cassandra_object/scope/batches.rb
+- lib/cassandra_object/scope/finder_methods.rb
+- lib/cassandra_object/scope/query_methods.rb
+- lib/cassandra_object/scoping.rb
 - lib/cassandra_object/serialization.rb
 - lib/cassandra_object/tasks/ks.rake
 - lib/cassandra_object/timestamps.rb
@@ -142,15 +145,18 @@ files:
 - test/unit/attribute_methods/typecasting_test.rb
 - test/unit/attribute_methods_test.rb
 - test/unit/base_test.rb
-- test/unit/batches_test.rb
 - test/unit/belongs_to_test.rb
 - test/unit/callbacks_test.rb
 - test/unit/connection_test.rb
-- test/unit/finder_methods_test.rb
 - test/unit/identity_test.rb
 - test/unit/inspect_test.rb
+- test/unit/log_subscriber_test.rb
 - test/unit/persistence_test.rb
 - test/unit/savepoints_test.rb
+- test/unit/scope/batches_test.rb
+- test/unit/scope/finder_methods_test.rb
+- test/unit/scope/query_methods_test.rb
+- test/unit/scoping_test.rb
 - test/unit/timestamps_test.rb
 - test/unit/types/array_type_test.rb
 - test/unit/types/base_type_test.rb

data/lib/cassandra_object/finder_methods.rb

@@ -1,68 +0,0 @@
-module CassandraObject
-  module FinderMethods
-    extend ActiveSupport::Concern
-
-    module ClassMethods
-      def find(ids)
-        if ids.is_a?(Array)
-          find_some(ids)
-        else
-          find_one(ids)
-        end
-      end
-
-      def find_by_id(ids)
-        find(ids)
-      rescue CassandraObject::RecordNotFound
-        nil
-      end
-
-      def all
-        instantiate_from_cql "select * from #{column_family}"
-      end
-
-      def first(options = {})
-        instantiate_from_cql("select * from #{column_family} limit 1").first
-      end
-
-      private
-
-      def instantiate_from_cql(cql_string, *args)
-        results = []
-        execute_cql(cql_string, *args).fetch do |cql_row|
-          results << instantiate_cql_row(cql_row)
-        end
-        results.compact!
-        results
-      end
-
-      def instantiate_cql_row(cql_row)
-        attributes = cql_row.to_hash
-        key = attributes.delete('KEY')
-        if attributes.any?
-          instantiate(key, attributes)
-        end
-      end
-      
-      def find_one(id)
-        if id.blank?
-          raise CassandraObject::RecordNotFound, "Couldn't find #{self.name} with key #{id.inspect}"
-        elsif record = instantiate_from_cql("select * from #{column_family} where KEY = ? limit 1", id).first
-          record
-        else
-          raise CassandraObject::RecordNotFound
-        end
-      end
-
-      def find_some(ids)
-        ids = ids.flatten
-        return [] if ids.empty?
-
-        ids = ids.compact.map(&:to_s).uniq
-
-        statement = "select * from #{column_family} where KEY in (#{Array.new(ids.size, '?') * ','})"
-        instantiate_from_cql statement, *ids
-      end
-    end
-  end
-end