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

data/lib/cequel/record/schema.rb

@@ -0,0 +1,76 @@
+module Cequel
+
+  module Record
+
+    module Schema
+
+      extend ActiveSupport::Concern
+      extend Forwardable
+
+      included do
+        class_attribute :table_name, :instance_writer => false
+        self.table_name = name.tableize.to_sym unless name.nil?
+      end
+
+      module ClassMethods
+        extend Forwardable
+
+        def_delegators :table_schema, :key_columns, :key_column_names,
+          :partition_key_columns, :clustering_columns
+        def_delegator :table_schema, :column, :reflect_on_column
+
+        def synchronize_schema
+          Cequel::Schema::TableSynchronizer.
+            apply(connection, read_schema, table_schema)
+        end
+
+        def read_schema
+          connection.schema.read_table(table_name)
+        end
+
+        def table_schema
+          @table_schema ||= Cequel::Schema::Table.new(table_name)
+        end
+
+        protected
+
+        def key(name, type, options = {})
+          super
+          table_schema.add_key(name, type)
+        end
+
+        def column(name, type, options = {})
+          super
+          table_schema.add_data_column(name, type, options[:index])
+        end
+
+        def list(name, type, options = {})
+          super
+          table_schema.add_list(name, type)
+        end
+
+        def set(name, type, options = {})
+          super
+          table_schema.add_set(name, type)
+        end
+
+        def map(name, key_type, value_type, options = {})
+          super
+          table_schema.add_map(name, key_type, value_type)
+        end
+
+        def table_property(name, value)
+          table_schema.add_property(name, value)
+        end
+
+      end
+
+      protected
+      def_delegator 'self.class', :table_schema
+      protected :table_schema
+
+    end
+
+  end
+
+end

data/lib/cequel/record/scoped.rb

@@ -0,0 +1,53 @@
+module Cequel
+
+  module Record
+
+    module Scoped
+
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+
+        extend Forwardable
+
+        def_delegators :current_scope,
+          *(RecordSet.public_instance_methods(false) - Object.instance_methods)
+
+        def current_scope
+          delegating_scope || RecordSet.new(self)
+        end
+
+        def with_scope(record_set)
+          previous_scope = delegating_scope
+          self.delegating_scope = record_set
+          yield
+        ensure
+          self.delegating_scope = previous_scope
+        end
+
+        protected
+
+        def delegating_scope
+          Thread.current[delegating_scope_key]
+        end
+
+        def delegating_scope=(delegating_scope)
+          Thread.current[delegating_scope_key] = delegating_scope
+        end
+
+        def delegating_scope_key
+          @delegating_scope_key ||= :"#{name}::delegating_scope"
+        end
+
+      end
+
+      def initialize_new_record(*)
+        super
+        @attributes.merge!(self.class.current_scope.scoped_key_attributes)
+      end
+
+    end
+
+  end
+
+end

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

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

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

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

data/lib/cequel/schema/table.rb

@@ -34,13 +34,15 @@ module Cequel
       end
 
       def add_partition_key(name, type)
-        column = PartitionKey.new(name, type(type))
-        @partition_key_columns << add_column(column)
+        PartitionKey.new(name, type(type)).tap do |column|
+          @partition_key_columns << add_column(column)
+        end
       end
 
       def add_clustering_column(name, type, clustering_order = nil)
-        column = ClusteringColumn.new(name, type(type), clustering_order)
-        @clustering_columns << add_column(column)
+        ClusteringColumn.new(name, type(type), clustering_order).tap do |column|
+          @clustering_columns << add_column(column)
+        end
       end
 
       def add_data_column(name, type, index_name)
@@ -50,20 +52,27 @@ module Cequel
       end
 
       def add_list(name, type)
-        @data_columns << add_column(List.new(name, type(type)))
+        List.new(name, type(type)).tap do |column|
+          @data_columns << add_column(column)
+        end
       end
 
       def add_set(name, type)
-        @data_columns << add_column(Set.new(name, type(type)))
+        Set.new(name, type(type)).tap do |column|
+          @data_columns << add_column(column)
+        end
       end
 
       def add_map(name, key_type, value_type)
-        @data_columns <<
-          add_column(Map.new(name, type(key_type), type(value_type)))
+        Map.new(name, type(key_type), type(value_type)).tap do |column|
+          @data_columns << add_column(column)
+        end
       end
 
       def add_property(name, value)
-        @properties[name] = TableProperty.new(name, value)
+        TableProperty.new(name, value).tap do |property|
+          @properties[name] = property
+        end
       end
 
       def column(name)

data/lib/cequel/version.rb

@@ -1,3 +1,3 @@
 module Cequel
-  VERSION = '1.0.0.pre.2'
+  VERSION = '1.0.0.pre.3'
 end

data/spec/examples/{model → record}/associations_spec.rb

@@ -1,6 +1,6 @@
 require_relative 'spec_helper'
 
-describe Cequel::Model::Associations do
+describe Cequel::Record::Associations do
 
   model :Blog do
     key :subdomain, :text
@@ -16,7 +16,7 @@ describe Cequel::Model::Associations do
 
   model :Post do
     belongs_to :blog
-    key :id, :uuid
+    key :id, :uuid, auto: true
     column :title, :text
   end
 
@@ -60,20 +60,22 @@ describe Cequel::Model::Associations do
 
     it 'should not allow declaring belongs_to after key' do
       expect do
-        Class.new(Cequel::Model::Base) do
+        Class.new do
+          include Cequel::Record
           key :permalink, :text
           belongs_to :blog
         end
-      end.to raise_error(Cequel::Model::InvalidRecordConfiguration)
+      end.to raise_error(Cequel::Record::InvalidRecordConfiguration)
     end
 
     it 'should not allow declaring belongs_to more than once' do
       expect do
-        Class.new(Cequel::Model::Base) do
+        Class.new do
+          include Cequel::Record
           belongs_to :blog
           belongs_to :user
         end
-      end.to raise_error(Cequel::Model::InvalidRecordConfiguration)
+      end.to raise_error(Cequel::Record::InvalidRecordConfiguration)
     end
 
   end
@@ -84,7 +86,6 @@ describe Cequel::Model::Associations do
       3.times.map do |i|
         Post.new do |post|
           post.blog = blog
-          post.id = CassandraCQL::UUID.new
           post.title = "Post #{i}"
         end.tap(&:save)
       end
@@ -93,7 +94,6 @@ describe Cequel::Model::Associations do
       3.times.map do |i|
         Post.new do |post|
           post.blog_subdomain = 'mycat'
-          post.id = CassandraCQL::UUID.new
           post.title = "My Cat #{i}"
         end.tap(&:save)
       end

data/spec/examples/{model → record}/callbacks_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../spec_helper', __FILE__)
 
-describe Cequel::Model::Callbacks do
+describe Cequel::Record::Callbacks do
   model :Post do
     key :permalink, :text
     column :title, :text

data/spec/examples/{model → record}/dirty_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../spec_helper', __FILE__)
 
-describe Cequel::Model::Dirty do
+describe Cequel::Record::Dirty do
   model :Post do
     key :permalink, :text
     column :title, :text

data/spec/examples/{model → record}/list_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../spec_helper', __FILE__)
 
-describe Cequel::Model::List do
+describe Cequel::Record::List do
   model :Post do
     key :permalink, :text
     column :title, :text

data/spec/examples/{model → record}/map_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../spec_helper', __FILE__)
 
-describe Cequel::Model::Map do
+describe Cequel::Record::Map do
   model :Post do
     key :permalink, :text
     column :title, :text

data/spec/examples/{model → record}/mass_assignment_spec.rb

@@ -1,6 +1,6 @@
 require_relative 'spec_helper'
 
-describe Cequel::Model::MassAssignment do
+describe Cequel::Record::MassAssignment do
   context 'with strong parameters', :rails => '~> 4.0' do
     model :Post do
       key :permalink, :text

data/spec/examples/{model → record}/persistence_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../spec_helper', __FILE__)
 
-describe Cequel::Model::Persistence do
+describe Cequel::Record::Persistence do
   model :Blog do
     key :subdomain, :text
     column :name, :text

data/spec/examples/{model → record}/properties_spec.rb

@@ -1,7 +1,6 @@
-require 'cequel/model'
 require File.expand_path('../spec_helper', __FILE__)
 
-describe Cequel::Model::Properties do
+describe Cequel::Record::Properties do
 
   describe 'property accessors' do
     model :Post do
@@ -125,4 +124,28 @@ describe Cequel::Model::Properties do
       Post.new.shares.should == {'facebook' => 0}
     end
   end
+
+  describe 'dynamic property generation' do
+    model :Post do
+      key :id, :uuid, auto: true
+      column :title, :text, default: -> { "Post #{Date.today}" }
+    end
+
+    it 'should auto-generate UUID key' do
+      Post.new.id.should be_a(CassandraCQL::UUID)
+    end
+
+    it 'should raise ArgumentError if auto specified for non-UUID' do
+      expect do
+        Class.new do
+          include Cequel::Record
+          key :subdomain, :text, auto: true
+        end
+      end.to raise_error(ArgumentError)
+    end
+
+    it 'should run default proc' do
+      Post.new.title.should == "Post #{Date.today}"
+    end
+  end
 end

data/spec/examples/{model → record}/record_set_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../spec_helper', __FILE__)
 
-describe Cequel::Model::RecordSet do
+describe Cequel::Record::RecordSet do
   model :Blog do
     key :subdomain, :text
     column :name, :text
@@ -17,6 +17,10 @@ describe Cequel::Model::RecordSet do
     list :tags, :text
     set :categories, :text
     map :shares, :text, :int
+
+    def self.latest(count)
+      reverse.limit(count)
+    end
   end
 
   let(:subdomains) { [] }
@@ -64,7 +68,7 @@ describe Cequel::Model::RecordSet do
 
       specify do
         expect { Blog.find('bogus') }.
-          to raise_error(Cequel::Model::RecordNotFound)
+          to raise_error(Cequel::Record::RecordNotFound)
       end
     end
 
@@ -82,7 +86,7 @@ describe Cequel::Model::RecordSet do
 
       specify do
         expect { Post['cequel'].find('bogus')}.
-          to raise_error(Cequel::Model::RecordNotFound)
+          to raise_error(Cequel::Record::RecordNotFound)
       end
     end
   end
@@ -181,7 +185,8 @@ describe Cequel::Model::RecordSet do
     end
 
     it 'should raise ArgumentError when called on partition key' do
-      expect { Post.from('cassandra') }.to raise_error(NoMethodError)
+      expect { Post.from('cassandra') }.
+        to raise_error(Cequel::Record::IllegalQuery)
     end
   end
 
@@ -228,7 +233,7 @@ describe Cequel::Model::RecordSet do
     end
 
     it 'should raise an error if range key is a partition key' do
-      expect { Post.all.reverse }.to raise_error(NoMethodError)
+      expect { Post.all.reverse }.to raise_error(Cequel::Record::IllegalQuery)
     end
   end
 
@@ -236,6 +241,11 @@ describe Cequel::Model::RecordSet do
     it 'should return the last instance' do
       Post.at('cassandra').last.title.should == "Cequel 4"
     end
+
+    it 'should return the last N instances if specified' do
+      Post.at('cassandra').last(3).map(&:title).
+        should == ["Cequel 2", "Cequel 3", "Cequel 4"]
+    end
   end
 
   describe '#first' do
@@ -268,7 +278,7 @@ describe Cequel::Model::RecordSet do
       it { should_not be_loaded(:description) }
       specify { expect { subject.name }.to_not raise_error }
       specify { expect { subject.description }.
-        to raise_error(Cequel::Model::MissingAttributeError) }
+        to raise_error(Cequel::Record::MissingAttributeError) }
     end
 
     context 'with block' do
@@ -303,7 +313,7 @@ describe Cequel::Model::RecordSet do
     it 'should raise IllegalQuery if applied twice' do
       expect { Post.where(:author_id, uuids.first).
         where(:author_name, 'Mat Brown') }.
-        to raise_error(Cequel::Model::IllegalQuery)
+        to raise_error(Cequel::Record::IllegalQuery)
     end
   end
 
@@ -313,4 +323,15 @@ describe Cequel::Model::RecordSet do
     end
   end
 
+  describe 'scope methods' do
+    it 'should delegate unknown methods to class singleton with current scope' do
+      Post['cassandra'].latest(3).map(&:permalink).
+        should == %w(cequel4 cequel3 cequel2)
+    end
+
+    it 'should raise NoMethodError if undefined method called' do
+      expect { Post['cassandra'].bogus }.to raise_error(NoMethodError)
+    end
+  end
+
 end