cequel 1.0.0.pre.2 → 1.0.0.pre.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7888f93ffd3d74bdfef143a9c8d18c6c9f2f4ba1
-  data.tar.gz: 831e5a90a03cf1c22ddf08421284107254aa59a6
+  metadata.gz: 2f70439ec577904a2fbe7a6c8f8689f45636e800
+  data.tar.gz: b0ede82f2cdafba89f308d1f744252803d824c56
 SHA512:
-  metadata.gz: 41a8585f9c78171c34944551914e4e06b44fabe615b9192901782b6653be345314c63ad4e4b5b048818bb10e1d4085aad24006285a9bd573489153b24719ccc3
-  data.tar.gz: 90297a4b794c2eb265ffdc7659f80c1b90ef8870c1d04ff910d4d015e425a47395b8151fa72c8cf85266538e5e7fe3c495b9433751776eb727ee5983f986314c
+  metadata.gz: d5d46692ee7904443fb60418ff003d1c04c14f7b947b1685e08ba73945839028e09371b81368532881f3f230160314d946db1238d1652077cb6d4a11d6ffe52e
+  data.tar.gz: 7ac1535e9338974c0b8e545c7715810b763c8f02f3e98225c94bef6bf3502287c33fcd67c422e272371248cd7d22cdc12a71cc1a24b6305f7ae48f496670ebfa

data/lib/cequel.rb

@@ -7,7 +7,7 @@ require 'cequel/metal'
 require 'cequel/schema'
 require 'cequel/type'
 require 'cequel/util'
-require 'cequel/model'
+require 'cequel/record'
 
 module Cequel
   def self.connect(configuration = nil)

data/lib/cequel/record.rb

@@ -0,0 +1,62 @@
+require 'active_model'
+
+require 'cequel'
+require 'cequel/record/errors'
+require 'cequel/record/schema'
+require 'cequel/record/properties'
+require 'cequel/record/collection'
+require 'cequel/record/persistence'
+require 'cequel/record/record_set'
+require 'cequel/record/scoped'
+require 'cequel/record/secondary_indexes'
+require 'cequel/record/associations'
+require 'cequel/record/association_collection'
+require 'cequel/record/belongs_to_association'
+require 'cequel/record/has_many_association'
+require 'cequel/record/mass_assignment'
+require 'cequel/record/callbacks'
+require 'cequel/record/validations'
+require 'cequel/record/dirty'
+
+require 'cequel/record'
+
+if defined? Rails
+  require 'cequel/record/railtie'
+end
+
+module Cequel
+
+  module Record
+
+    extend ActiveSupport::Concern
+    extend Forwardable
+
+    included do
+      include Properties
+      include Schema
+      include Persistence
+      include Associations
+      include Scoped
+      extend SecondaryIndexes
+      include MassAssignment
+      include Callbacks
+      include Validations
+      include Dirty
+      extend ActiveModel::Naming
+      include ActiveModel::Serializers::JSON
+      include ActiveModel::Serializers::Xml
+
+    end
+
+    class <<self
+      attr_accessor :connection
+
+      def establish_connection(configuration)
+        self.connection = Cequel.connect(configuration)
+      end
+
+    end
+
+  end
+
+end

data/lib/cequel/{model → record}/association_collection.rb

@@ -1,6 +1,6 @@
 module Cequel
 
-  module Model
+  module Record
 
     class AssociationCollection < DelegateClass(RecordSet)
 

data/lib/cequel/{model → record}/associations.rb

@@ -1,6 +1,6 @@
 module Cequel
 
-  module Model
+  module Record
 
     module Associations
 

data/lib/cequel/{model → record}/belongs_to_association.rb

@@ -1,6 +1,6 @@
 module Cequel
 
-  module Model
+  module Record
 
     class BelongsToAssociation
 

data/lib/cequel/{model → record}/callbacks.rb

@@ -1,6 +1,6 @@
 module Cequel
 
-  module Model
+  module Record
 
     module Callbacks
 

data/lib/cequel/{model → record}/collection.rb

@@ -2,7 +2,7 @@ require 'delegate'
 
 module Cequel
 
-  module Model
+  module Record
 
     module Collection
 

data/lib/cequel/{model → record}/dirty.rb

@@ -1,6 +1,6 @@
 module Cequel
 
-  module Model
+  module Record
 
     module Dirty
 

data/lib/cequel/{model → record}/errors.rb

@@ -1,6 +1,6 @@
 module Cequel
 
-  module Model
+  module Record
 
     MissingAttributeError = Class.new(ArgumentError)
     UnknownAttributeError = Class.new(ArgumentError)

data/lib/cequel/{model → record}/has_many_association.rb

@@ -1,6 +1,6 @@
 module Cequel
 
-  module Model
+  module Record
 
     class HasManyAssociation
 

data/lib/cequel/{model → record}/mass_assignment.rb

@@ -6,7 +6,7 @@ end
 
 module Cequel
 
-  module Model
+  module Record
 
     module MassAssignment
 

data/lib/cequel/{model → record}/persistence.rb

@@ -1,13 +1,17 @@
 module Cequel
 
-  module Model
+  module Record
 
     module Persistence
 
       extend ActiveSupport::Concern
+      extend Forwardable
 
       module ClassMethods
 
+        extend Forwardable
+        def_delegator 'Cequel::Record', :connection
+
         def create(attributes = {}, &block)
           new(attributes, &block).tap { |record| record.save }
         end
@@ -18,6 +22,8 @@ module Cequel
 
       end
 
+      def_delegator 'self.class', :connection
+
       def key_attributes
         @attributes.slice(*self.class.key_column_names)
       end
@@ -29,7 +35,7 @@ module Cequel
       def exists?
         load!
         true
-      rescue Cequel::Model::RecordNotFound
+      rescue RecordNotFound
         false
       end
       alias :exist? :exists?
@@ -46,7 +52,7 @@ module Cequel
       def load!
         load.tap do
           if transient?
-            raise Cequel::Model::RecordNotFound,
+            raise RecordNotFound,
               "Couldn't find #{self.class.name} with #{key_attributes.inspect}"
           end
         end
@@ -99,7 +105,7 @@ module Cequel
       end
 
       def create
-        inserter.execute
+        metal_scope.insert(attributes.reject { |attr, value| value.nil? })
         loaded!
         persisted!
       end
@@ -112,10 +118,6 @@ module Cequel
         end
       end
 
-      def inserter
-        @inserter ||= metal_scope.inserter
-      end
-
       def updater
         @updater ||= metal_scope.updater
       end
@@ -135,9 +137,7 @@ module Cequel
 
       def write_attribute(attribute, value)
         super.tap do
-          if !persisted?
-            inserter.insert(attribute => value) unless value.nil?
-          elsif !self.class.key_column_names.include?(attribute.to_sym)
+          unless new_record?
             if value.nil?
               deleter.delete_columns(attribute)
             else

data/lib/cequel/{model → record}/properties.rb

@@ -1,49 +1,68 @@
 module Cequel
 
-  module Model
+  module Record
 
     module Properties
 
       extend ActiveSupport::Concern
 
+      included do
+        class_attribute :default_attributes, :instance_writer => false
+        self.default_attributes = {}
+
+        class <<self; alias_method :new_empty, :new; end
+        extend ConstructorMethods
+
+        attr_reader :collection_proxies
+        private :collection_proxies
+      end
+
+      module ConstructorMethods
+
+        def new(*args, &block)
+          new_empty.tap do |record|
+            record.__send__(:initialize_new_record, *args)
+            yield record if block_given?
+          end
+        end
+
+      end
+
       module ClassMethods
 
         protected
 
-        def key(name, type)
+        def key(name, type, options = {})
           def_accessors(name)
-          table_schema.add_key(name, type)
-          set_attribute_default(name, nil)
+          if options.fetch(:auto, false)
+            unless Type[type].is_a?(Cequel::Type::Uuid)
+              raise ArgumentError, ":auto option only valid for UUID columns"
+            end
+            default = -> { CassandraCQL::UUID.new } if options.fetch(:auto, false)
+          end
+          set_attribute_default(name, default)
         end
 
         def column(name, type, options = {})
           def_accessors(name)
-          table_schema.add_data_column(name, type, options[:index])
           set_attribute_default(name, options[:default])
         end
 
         def list(name, type, options = {})
           def_collection_accessors(name, List)
-          table_schema.add_list(name, type)
           set_attribute_default(name, options.fetch(:default, []))
         end
 
         def set(name, type, options = {})
           def_collection_accessors(name, Set)
-          table_schema.add_set(name, type)
           set_attribute_default(name, options.fetch(:default, ::Set[]))
         end
 
         def map(name, key_type, value_type, options = {})
           def_collection_accessors(name, Map)
-          table_schema.add_map(name, key_type, value_type)
           set_attribute_default(name, options.fetch(:default, {}))
         end
 
-        def table_property(name, value)
-          table_schema.add_property(name, value)
-        end
-
         private
 
         def def_accessors(name)
@@ -92,6 +111,11 @@ module Cequel
 
       end
 
+      def initialize(&block)
+        @attributes, @collection_proxies = {}, {}
+        instance_eval(&block) if block
+      end
+
       def attribute_names
         @attributes.keys
       end
@@ -108,13 +132,30 @@ module Cequel
         end
       end
 
+      def ==(other)
+        if key_values.any? { |value| value.nil? }
+          super
+        else
+          self.class == other.class && key_values == other.key_values
+        end
+      end
+
+      def inspect
+        inspected_attributes = attributes.each_pair.map do |attr, value|
+          inspected_value = value.is_a?(CassandraCQL::UUID) ?
+            value.to_guid :
+            value.inspect
+          "#{attr}: #{inspected_value}"
+        end
+        "#<#{self.class} #{inspected_attributes.join(", ")}>"
+      end
+
       protected
-      delegate :table_schema, :to => 'self.class'
 
       def read_attribute(name)
         @attributes.fetch(name)
       rescue KeyError
-        if table_schema.column(name)
+        if self.class.reflect_on_column(name)
           raise MissingAttributeError, "missing attribute: #{name}"
         else
           raise UnknownAttributeError, "unknown attribute: #{name}"
@@ -122,7 +163,7 @@ module Cequel
       end
 
       def write_attribute(name, value)
-        column = table_schema.column(name)
+        column = self.class.reflect_on_column(name)
         raise UnknownAttributeError,
           "unknown attribute: #{name}" unless column
         @attributes[name] = value.nil? ? nil : column.cast(value)
@@ -138,6 +179,19 @@ module Cequel
         collection_proxies.delete(name)
       end
 
+      def initialize_new_record(attributes = {})
+        dynamic_defaults = default_attributes.
+          select { |name, value| value.is_a?(Proc) }
+        @attributes = Marshal.load(Marshal.dump(
+          default_attributes.except(*dynamic_defaults.keys)))
+          dynamic_defaults.each { |name, p| @attributes[name] = p.() }
+          @new_record = true
+          yield self if block_given?
+          self.attributes = attributes
+          loaded!
+          self
+      end
+
     end
 
   end

data/lib/cequel/{model → record}/railtie.rb

@@ -1,10 +1,10 @@
 module Cequel
 
-  module Model
+  module Record
 
     class Railtie < Rails::Railtie
 
-      config.cequel = Cequel::Model::Base
+      config.cequel = Record
 
       initializer "cequel.configure_rails" do
         app_name = Rails.application.railtie_name.sub(/_application$/, '')
@@ -31,7 +31,7 @@ module Cequel
           retry
         end
         connection.logger = Rails.logger
-        Cequel::Model::Base.connection = connection
+        Record.connection = connection
       end
     end
 

data/lib/cequel/{model → record}/record_set.rb

@@ -1,8 +1,8 @@
 module Cequel
 
-  module Model
+  module Record
 
-    class RecordSet
+    class RecordSet < SimpleDelegator
 
       extend Forwardable
       extend Cequel::Util::HashAccessors
@@ -14,17 +14,10 @@ module Cequel
         {:scoped_key_values => [], :select_columns => []}
       end
 
-      def self.create(clazz, attributes = {})
-        attributes = default_attributes.merge!(attributes)
-        if attributes[:scoped_key_values].length >= clazz.partition_key_columns.length
-          SinglePartitionRecordSet.new(clazz, attributes)
-        else
-          RecordSet.new(clazz, attributes)
-        end
-      end
-
-      def initialize(clazz, attributes)
+      def initialize(clazz, attributes = {})
+        attributes = self.class.default_attributes.merge!(attributes)
         @clazz, @attributes = clazz, attributes
+        super(clazz)
       end
 
       def all
@@ -95,10 +88,40 @@ module Cequel
         )
       end
 
+      def from(start_key)
+        unless single_partition?
+          raise IllegalQuery,
+            "Can't construct exclusive range on partition key #{range_key_name}"
+        end
+        scoped(lower_bound: Bound.new(start_key, true))
+      end
+
+      def upto(end_key)
+        unless single_partition?
+          raise IllegalQuery,
+            "Can't construct exclusive range on partition key #{range_key_name}"
+        end
+        scoped(upper_bound: Bound.new(end_key, true))
+      end
+
+      def reverse
+        unless single_partition?
+          raise IllegalQuery,
+            "Can't reverse without scoping to partition key #{range_key_name}"
+        end
+        scoped(reversed: !reversed?)
+      end
+
       def first(count = nil)
         count ? limit(count).entries : limit(1).each.first
       end
 
+      def last(count = nil)
+        reverse.first(count).tap do |results|
+          results.reverse! if count
+        end
+      end
+
       def count
         data_set.count
       end
@@ -139,13 +162,27 @@ module Cequel
         @data_set ||= construct_data_set
       end
 
+      def scoped_key_attributes
+        Hash[scoped_key_columns.map { |col| col.name }.zip(scoped_key_values)]
+      end
+
+      def_delegators :entries, :inspect
+
+      def ==(other)
+        entries == other.to_a
+      end
+
       protected
       attr_reader :attributes
       hattr_reader :attributes, :select_columns, :scoped_key_values, :row_limit,
         :lower_bound, :upper_bound, :scoped_indexed_column
+      protected :select_columns, :scoped_key_values, :row_limit, :lower_bound,
+        :upper_bound, :scoped_indexed_column
+      hattr_inquirer :attributes, :reversed
+      protected :reversed?
 
       def next_batch_from(row)
-        after(row[range_key_name])
+        reversed? ? before(row[range_key_name]) : after(row[range_key_name])
       end
 
       def find_nested_batches_from(row, options, &block)
@@ -167,12 +204,12 @@ module Cequel
         end
       end
 
-      def range_key
+      def range_key_column
         clazz.key_columns[scoped_key_values.length]
       end
 
       def range_key_name
-        range_key.name
+        range_key_column.name
       end
 
       def scoped_key_columns
@@ -183,9 +220,18 @@ module Cequel
         scoped_key_columns.map { |column| column.name }
       end
 
+      def single_partition?
+        scoped_key_values.length >= clazz.partition_key_columns.length
+      end
+
       private
       attr_reader :clazz
       def_delegators :clazz, :connection
+      private :connection
+
+      def method_missing(method, *args, &block)
+        clazz.with_scope(self) { super }
+      end
 
       def next_key_column
         clazz.key_columns[scoped_key_values.length + 1]
@@ -211,60 +257,24 @@ module Cequel
           fragment = construct_bound_fragment(upper_bound, '<')
           data_set = data_set.where(fragment, upper_bound.value)
         end
+        data_set = data_set.order(range_key_name => :desc) if reversed?
         data_set = data_set.where(scoped_indexed_column) if scoped_indexed_column
         data_set
       end
 
       def construct_bound_fragment(bound, base_operator)
         operator = bound.inclusive ? "#{base_operator}=" : base_operator
-        "TOKEN(#{range_key_name}) #{operator} TOKEN(?)"
+        single_partition? ?
+          "#{range_key_name} #{operator} ?" :
+          "TOKEN(#{range_key_name}) #{operator} TOKEN(?)"
+
       end
 
       def scoped(new_attributes = {}, &block)
         attributes_copy = Marshal.load(Marshal.dump(attributes))
         attributes_copy.merge!(new_attributes)
         attributes_copy.tap(&block) if block
-        RecordSet.create(clazz, attributes_copy)
-      end
-
-    end
-
-    class SinglePartitionRecordSet < RecordSet
-
-      hattr_inquirer :attributes, :reversed
-
-      def from(start_key)
-        scoped(lower_bound: Bound.new(start_key, true))
-      end
-
-      def upto(end_key)
-        scoped(upper_bound: Bound.new(end_key, true))
-      end
-
-      def reverse
-        scoped(reversed: !reversed?)
-      end
-
-      def last
-        reverse.first
-      end
-
-      # @api private
-      def next_batch_from(row)
-        reversed? ? before(row[range_key_name]) : super
-      end
-
-      protected
-
-      def construct_data_set
-        data_set = super
-        data_set = data_set.order(range_key_name => :desc) if reversed?
-        data_set
-      end
-
-      def construct_bound_fragment(bound, base_operator)
-        operator = bound.inclusive ? "#{base_operator}=" : base_operator
-        "#{range_key_name} #{operator} ?"
+        RecordSet.new(clazz, attributes_copy)
       end
 
     end