cequel 1.0.0.pre.1 → 1.0.0.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b840b678aaff8377efff196f7e011a37939fbbc
-  data.tar.gz: b0726b2298165f250f382cf13177c425dd819fcd
+  metadata.gz: 7888f93ffd3d74bdfef143a9c8d18c6c9f2f4ba1
+  data.tar.gz: 831e5a90a03cf1c22ddf08421284107254aa59a6
 SHA512:
-  metadata.gz: 5606d970c9051fa1e45168b0f249c1e2ebe0be2009fb8ab0270af1d75151c96ee990978c73affe468d85394190dfc2d1abf3516c57c86a4edf20266882e4b47f
-  data.tar.gz: 98d44471f0dfc64ee16bd31168d76793647a22afb6c17d7fe91b85e38bf65ea88f7017486a91d04a5d8b6804153fe6dd7cda133943eb4514e894b046c98e26bb
+  metadata.gz: 41a8585f9c78171c34944551914e4e06b44fabe615b9192901782b6653be345314c63ad4e4b5b048818bb10e1d4085aad24006285a9bd573489153b24719ccc3
+  data.tar.gz: 90297a4b794c2eb265ffdc7659f80c1b90ef8870c1d04ff910d4d015e425a47395b8151fa72c8cf85266538e5e7fe3c495b9433751776eb727ee5983f986314c

data/lib/cequel.rb

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

data/lib/cequel/model.rb

@@ -8,6 +8,7 @@ require 'cequel/model/collection'
 require 'cequel/model/persistence'
 require 'cequel/model/record_set'
 require 'cequel/model/scoped'
+require 'cequel/model/secondary_indexes'
 require 'cequel/model/associations'
 require 'cequel/model/association_collection'
 require 'cequel/model/belongs_to_association'
@@ -15,6 +16,7 @@ require 'cequel/model/has_many_association'
 require 'cequel/model/mass_assignment'
 require 'cequel/model/callbacks'
 require 'cequel/model/validations'
+require 'cequel/model/dirty'
 
 require 'cequel/model/base'
 

data/lib/cequel/model/base.rb

@@ -9,9 +9,11 @@ module Cequel
       include Cequel::Model::Persistence
       include Cequel::Model::Associations
       extend Cequel::Model::Scoped
+      extend Cequel::Model::SecondaryIndexes
       include Cequel::Model::MassAssignment
       include Cequel::Model::Callbacks
       include Cequel::Model::Validations
+      include Cequel::Model::Dirty
       extend ActiveModel::Naming
       include ActiveModel::Serializers::JSON
       include ActiveModel::Serializers::Xml
@@ -41,6 +43,14 @@ module Cequel
         instance_eval(&block) if block
       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) ?

data/lib/cequel/model/collection.rb

@@ -10,6 +10,7 @@ module Cequel
       extend Forwardable
 
       def_delegators :@model, :loaded?, :updater, :deleter
+      def_delegators :__getobj__, :clone, :dup
 
       attr_reader :column_name
 
@@ -50,7 +51,9 @@ module Cequel
       private
 
       def to_modify(&block)
-        if loaded? then block.()
+        if loaded?
+          @model.__send__("#{@column_name}_will_change!")
+          block.()
         else modifications << block
         end
         self
@@ -175,6 +178,7 @@ module Cequel
         updater.set_add(column_name, object)
         to_modify { super }
       end
+      alias_method :<<, :add
 
       def clear
         deleter.delete_columns(column_name)

data/lib/cequel/model/dirty.rb

@@ -0,0 +1,62 @@
+module Cequel
+
+  module Model
+
+    module Dirty
+
+      extend ActiveSupport::Concern
+
+      included { include ActiveModel::Dirty }
+
+      module ClassMethods
+
+        def key(name, *)
+          define_attribute_method(name)
+          super
+        end
+
+        def column(name, *)
+          define_attribute_method(name)
+          super
+        end
+
+        def set(name, *)
+          define_attribute_method(name)
+          super
+        end
+
+        def list(name, *)
+          define_attribute_method(name)
+          super
+        end
+
+        def map(name, *)
+          define_attribute_method(name)
+          super
+        end
+
+      end
+
+      def save(options = {})
+        super.tap do |success|
+          if success
+            @previously_changed = changes
+            @changed_attributes.clear
+          end
+        end
+      end
+
+      private
+
+      def write_attribute(name, value)
+        if loaded? && value != read_attribute(name)
+          __send__("#{name}_will_change!")
+        end
+        super
+      end
+
+    end
+
+  end
+
+end

data/lib/cequel/model/errors.rb

@@ -7,6 +7,7 @@ module Cequel
     RecordNotFound = Class.new(StandardError)
     InvalidRecordConfiguration = Class.new(StandardError)
     RecordInvalid = Class.new(StandardError)
+    IllegalQuery = Class.new(StandardError)
 
   end
 

data/lib/cequel/model/record_set.rb

@@ -5,14 +5,26 @@ module Cequel
     class RecordSet
 
       extend Forwardable
+      extend Cequel::Util::HashAccessors
       include Enumerable
 
       Bound = Struct.new(:value, :inclusive)
 
-      def initialize(clazz)
-        @clazz = clazz
-        @select_columns = []
-        @scoped_key_values = []
+      def self.default_attributes
+        {: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)
+        @clazz, @attributes = clazz, attributes
       end
 
       def all
@@ -21,18 +33,29 @@ module Cequel
 
       def select(*columns)
         return super if block_given?
-        scoped { |record_set| record_set.select_columns.concat(columns) }
+        scoped { |attributes| attributes[:select_columns].concat(columns) }
       end
 
       def limit(count)
-        scoped { |record_set| record_set.row_limit = count }
+        scoped(:row_limit => count)
+      end
+
+      def where(column_name, value)
+        column = clazz.table_schema.column(column_name)
+        raise IllegalQuery,
+          "Can't scope by more than one indexed column in the same query" if scoped_indexed_column
+        raise ArgumentError,
+          "No column #{column_name} configured for #{clazz.name}" unless column
+        raise ArgumentError,
+          "Use the `at` method to restrict scope by primary key" unless column.data_column?
+        raise ArgumentError,
+          "Can't scope by non-indexed column #{column_name}" unless column.indexed?
+        scoped(scoped_indexed_column: {column_name => value})
       end
 
       def at(*scoped_key_values)
-        record_set_class = next_key_column.partition_key? ?
-          RecordSet : SortableRecordSet
-        scoped(record_set_class) do |record_set|
-          record_set.scoped_key_values.concat(scoped_key_values)
+        scoped do |attributes|
+          attributes[:scoped_key_values].concat(scoped_key_values)
         end
       end
 
@@ -58,22 +81,18 @@ module Cequel
       end
 
       def after(start_key)
-        scoped do |record_set|
-          record_set.lower_bound = Bound.new(start_key, false)
-        end
+        scoped(lower_bound: Bound.new(start_key, false))
       end
 
       def before(end_key)
-        scoped do |record_set|
-          record_set.upper_bound = Bound.new(end_key, false)
-        end
+        scoped(upper_bound: Bound.new(end_key, false))
       end
 
       def in(range)
-        scoped do |record_set|
-          record_set.lower_bound = Bound.new(range.first, true)
-          record_set.upper_bound = Bound.new(range.last, !range.exclude_end?)
-        end
+        scoped(
+          lower_bound: Bound.new(range.first, true),
+          upper_bound: Bound.new(range.last, !range.exclude_end?)
+        )
       end
 
       def first(count = nil)
@@ -116,29 +135,17 @@ module Cequel
         end
       end
 
-      protected
-      attr_accessor :row_limit
-      attr_reader :select_columns, :scoped_key_values,
-        :lower_bound, :upper_bound
-
-      def reversed?
-        false
-      end
-
-      def lower_bound=(bound)
-        @lower_bound = bound
-      end
-
-      def upper_bound=(bound)
-        @upper_bound = bound
-      end
-
       def data_set
         @data_set ||= construct_data_set
       end
 
+      protected
+      attr_reader :attributes
+      hattr_reader :attributes, :select_columns, :scoped_key_values, :row_limit,
+        :lower_bound, :upper_bound, :scoped_indexed_column
+
       def next_batch_from(row)
-        reversed? ? before(row[range_key_name]) : after(row[range_key_name])
+        after(row[range_key_name])
       end
 
       def find_nested_batches_from(row, options, &block)
@@ -176,23 +183,10 @@ module Cequel
         scoped_key_columns.map { |column| column.name }
       end
 
-      def chain_from(collection)
-        @select_columns = collection.select_columns.dup
-        @scoped_key_values = collection.scoped_key_values.dup
-        @lower_bound = collection.lower_bound
-        @upper_bound = collection.upper_bound
-        @row_limit = collection.row_limit
-        self
-      end
-
       private
       attr_reader :clazz
       def_delegators :clazz, :connection
 
-      def scoped(record_set_class = self.class, &block)
-        record_set_class.new(clazz).chain_from(self).tap(&block)
-      end
-
       def next_key_column
         clazz.key_columns[scoped_key_values.length + 1]
       end
@@ -217,6 +211,7 @@ module Cequel
           fragment = construct_bound_fragment(upper_bound, '<')
           data_set = data_set.where(fragment, upper_bound.value)
         end
+        data_set = data_set.where(scoped_indexed_column) if scoped_indexed_column
         data_set
       end
 
@@ -225,43 +220,41 @@ module Cequel
         "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 SortableRecordSet < RecordSet
+    class SinglePartitionRecordSet < RecordSet
 
-      def initialize(clazz)
-        super
-        @reversed = false
-      end
+      hattr_inquirer :attributes, :reversed
 
       def from(start_key)
-        scoped do |record_set|
-          record_set.lower_bound = Bound.new(start_key, true)
-        end
+        scoped(lower_bound: Bound.new(start_key, true))
       end
 
       def upto(end_key)
-        scoped do |record_set|
-          record_set.upper_bound = Bound.new(end_key, true)
-        end
+        scoped(upper_bound: Bound.new(end_key, true))
       end
 
       def reverse
-        scoped { |scope| scope.reversed = !reversed? }
+        scoped(reversed: !reversed?)
       end
 
       def last
         reverse.first
       end
 
-      def chain_from(collection)
-        super
-        @reversed = collection.reversed?
-        self
+      # @api private
+      def next_batch_from(row)
+        reversed? ? before(row[range_key_name]) : super
       end
 
       protected
-      attr_writer :reversed
 
       def construct_data_set
         data_set = super
@@ -269,10 +262,6 @@ module Cequel
         data_set
       end
 
-      def reversed?
-        @reversed
-      end
-
       def construct_bound_fragment(bound, base_operator)
         operator = bound.inclusive ? "#{base_operator}=" : base_operator
         "#{range_key_name} #{operator} ?"

data/lib/cequel/model/schema.rb

@@ -9,7 +9,8 @@ module Cequel
       module ClassMethods
         extend Forwardable
 
-        def_delegators :table_schema, :key_columns, :key_column_names
+        def_delegators :table_schema, :key_columns, :key_column_names,
+          :partition_key_columns, :clustering_columns
 
         def synchronize_schema
           Cequel::Schema::TableSynchronizer.

data/lib/cequel/model/scoped.rb

@@ -9,7 +9,7 @@ module Cequel
       def_delegators :current_scope, *RecordSet.instance_methods(false)
 
       def current_scope
-        RecordSet.new(self)
+        RecordSet.create(self)
       end
 
     end

data/lib/cequel/model/secondary_indexes.rb

@@ -0,0 +1,31 @@
+module Cequel
+
+  module Model
+
+    module SecondaryIndexes
+
+      def column(name, type, options = {})
+        super
+        name = name.to_sym
+        if options[:index]
+          instance_eval <<-RUBY, __FILE__, __LINE__+1
+            def with_#{name}(value)
+              all.where(#{name.inspect}, value)
+            end
+
+            def find_by_#{name}(value)
+              with_#{name}(value).first
+            end
+
+            def find_all_by_#{name}(value)
+              with_#{name}(value).to_a
+            end
+          RUBY
+        end
+      end
+
+    end
+
+  end
+
+end

data/lib/cequel/model/validations.rb

@@ -14,7 +14,7 @@ module Cequel
 
       module ClassMethods
 
-        def create!(attributes, &block)
+        def create!(attributes = {}, &block)
           new(attributes, &block).save!
         end
 

data/lib/cequel/schema/column.rb

@@ -10,6 +10,22 @@ module Cequel
         @name, @type = name, type
       end
 
+      def key?
+        partition_key? || clustering_column?
+      end
+
+      def partition_key?
+        false
+      end
+
+      def clustering_column?
+        false
+      end
+
+      def data_column?
+        !key?
+      end
+
       def to_cql
         "#{@name} #{@type}"
       end
@@ -53,8 +69,8 @@ module Cequel
         "#{@name} #{@clustering_order}"
       end
 
-      def partition_key?
-        false
+      def clustering_column?
+        true
       end
 
     end

data/lib/cequel/schema/table.rb

@@ -8,7 +8,7 @@ module Cequel
 
       attr_reader :name,
                   :columns,
-                  :partition_keys,
+                  :partition_key_columns,
                   :clustering_columns,
                   :data_columns,
                   :properties
@@ -16,13 +16,13 @@ module Cequel
 
       def initialize(name)
         @name = name
-        @partition_keys, @clustering_columns, @data_columns = [], [], []
+        @partition_key_columns, @clustering_columns, @data_columns = [], [], []
         @columns, @columns_by_name = [], {}
         @properties = ActiveSupport::HashWithIndifferentAccess.new
       end
 
       def add_key(name, type, clustering_order = nil)
-        if @partition_keys.empty?
+        if @partition_key_columns.empty?
           unless clustering_order.nil?
             raise ArgumentError,
               "Can't set clustering order for partition key #{name}"
@@ -35,7 +35,7 @@ module Cequel
 
       def add_partition_key(name, type)
         column = PartitionKey.new(name, type(type))
-        @partition_keys << add_column(column)
+        @partition_key_columns << add_column(column)
       end
 
       def add_clustering_column(name, type, clustering_order = nil)
@@ -71,7 +71,7 @@ module Cequel
       end
 
       def key_columns
-        @partition_keys + @clustering_columns
+        @partition_key_columns + @clustering_columns
       end
 
       def key_column_names
@@ -79,7 +79,7 @@ module Cequel
       end
 
       def partition_key(name)
-        @partition_keys.find { |column| column.name == name }
+        @partition_key_columns.find { |column| column.name == name }
       end
 
       def clustering_column(name)

data/lib/cequel/schema/table_synchronizer.rb

@@ -86,15 +86,15 @@ module Cequel
       end
 
       def each_key_pair(&block)
-        if existing.partition_keys.length != updated.partition_keys.length
+        if existing.partition_key_columns.length != updated.partition_key_columns.length
           raise InvalidSchemaMigration,
-            "Existing partition keys #{existing.partition_keys.map { |key| key.name }.join(',')} differ from specified partition keys #{updated.partition_keys.map { |key| key.name }.join(',')}"
+            "Existing partition keys #{existing.partition_key_columns.map { |key| key.name }.join(',')} differ from specified partition keys #{updated.partition_key_columns.map { |key| key.name }.join(',')}"
         end
         if existing.clustering_columns.length != updated.clustering_columns.length
           raise InvalidSchemaMigration,
             "Existing clustering keys #{existing.clustering_columns.map { |key| key.name }.join(',')} differ from specified clustering keys #{updated.clustering_columns.map { |key| key.name }.join(',')}"
         end
-        existing.partition_keys.zip(updated.partition_keys, &block)
+        existing.partition_key_columns.zip(updated.partition_key_columns, &block)
         existing.clustering_columns.zip(updated.clustering_columns, &block)
       end
 

data/lib/cequel/schema/table_writer.rb

@@ -51,7 +51,8 @@ module Cequel
       end
 
       def keys_cql
-        partition_cql = table.partition_keys.map { |key| key.name }.join(', ')
+        partition_cql = table.partition_key_columns.
+          map { |key| key.name }.join(', ')
         if table.clustering_columns.any?
           nonpartition_cql =
             table.clustering_columns.map { |key| key.name }.join(', ')

data/lib/cequel/util.rb

@@ -0,0 +1,46 @@
+module Cequel
+
+  module Util
+
+    module HashAccessors
+
+      def hattr_reader(hash, *attributes)
+        attributes.each do |attribute|
+          module_eval <<-RUBY, __FILE__, __LINE__+1
+            def #{attribute}
+              #{hash}[#{attribute.to_sym.inspect}]
+            end
+          RUBY
+        end
+      end
+
+      def hattr_inquirer(hash, *attributes)
+        attributes.each do |attribute|
+          module_eval <<-RUBY, __FILE__, __LINE__+1
+            def #{attribute}?
+              !!#{hash}[#{attribute.to_sym.inspect}]
+            end
+          RUBY
+        end
+      end
+
+      def hattr_writer(hash, *attributes)
+        attributes.each do |attribute|
+          module_eval <<-RUBY, __FILE__, __LINE__+1
+            def #{attribute}=(value)
+              #{hash}[#{attribute.to_sym.inspect}] = value
+            end
+          RUBY
+        end
+      end
+
+      def hattr_accessor(hash, *attributes)
+        hattr_reader(hash, *attributes)
+        hattr_writer(hash, *attributes)
+      end
+
+    end
+
+  end
+  
+end

data/lib/cequel/version.rb

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

data/spec/examples/model/dirty_spec.rb

@@ -0,0 +1,68 @@
+require File.expand_path('../spec_helper', __FILE__)
+
+describe Cequel::Model::Dirty do
+  model :Post do
+    key :permalink, :text
+    column :title, :text
+    set :categories, :text
+  end
+
+  context 'loaded model' do
+    let(:post) do
+      Post.create!(
+        permalink: 'cequel',
+        title: 'Cequel',
+        categories: Set['Libraries']
+      )
+    end
+
+    it 'should not have changed attributes by default' do
+      post.changed_attributes.should be_empty
+    end
+
+    it 'should have changed attributes if attributes change' do
+      post.title = 'Cequel ORM'
+      post.changed_attributes.
+        should == {:title => 'Cequel'}.with_indifferent_access
+    end
+
+    it 'should not have changed attributes if attribute set to the same thing' do
+      post.title = 'Cequel'
+      post.changed_attributes.should be_empty
+    end
+
+    it 'should support *_changed? method' do
+      post.title = 'Cequel ORM'
+      post.title_changed?.should be_true
+    end
+
+    it 'should not have changed attributes after save' do
+      post.title = 'Cequel ORM'
+      post.save
+      post.changed_attributes.should be_empty
+    end
+
+    it 'should have previous changes after save' do
+      post.title = 'Cequel ORM'
+      post.save
+      post.previous_changes.
+        should == { :title => ['Cequel', 'Cequel ORM'] }.with_indifferent_access
+    end
+
+    it 'should detect changes to collections' do
+      post.categories << 'Gems'
+      post.changes.should ==
+        {categories: [Set['Libraries'], Set['Libraries', 'Gems']]}.
+        with_indifferent_access
+    end
+  end
+
+  context 'unloaded model' do
+    let(:post) { Post['cequel'] }
+
+    it 'should not track changes' do
+      post.title = 'Cequel'
+      post.changes.should be_empty
+    end
+  end
+end

data/spec/examples/model/record_set_spec.rb

@@ -12,13 +12,15 @@ describe Cequel::Model::RecordSet do
     key :permalink, :text
     column :title, :text
     column :body, :text
-    column :author_id, :uuid
+    column :author_id, :uuid, :index => true
+    column :author_name, :text, :index => true
     list :tags, :text
     set :categories, :text
     map :shares, :text, :int
   end
 
   let(:subdomains) { [] }
+  let(:uuids) { Array.new(2) { CassandraCQL::UUID.new }}
 
   before do
     cequel.batch do
@@ -36,7 +38,8 @@ describe Cequel::Model::RecordSet do
           :blog_subdomain => 'cassandra',
           :permalink => "cequel#{i}",
           :title => "Cequel #{i}",
-          :body => "Post number #{i}"
+          :body => "Post number #{i}",
+          :author_id => uuids[i%2]
         )
         cequel[:posts].insert(
           :blog_subdomain => 'postgres',
@@ -276,6 +279,34 @@ describe Cequel::Model::RecordSet do
     end
   end
 
+  describe '#where' do
+    it 'should correctly query for secondary indexed columns' do
+      Post.where(:author_id, uuids.first).map(&:permalink).
+        should == %w(cequel0 cequel2 cequel4)
+    end
+
+    it 'should raise ArgumentError if column is not recognized' do
+      expect { Post.where(:bogus, 'Business') }.
+        to raise_error(ArgumentError)
+    end
+
+    it 'should raise ArgumentError if column is not indexed' do
+      expect { Post.where(:title, 'Cequel 0') }.
+        to raise_error(ArgumentError)
+    end
+
+    it 'should raise ArgumentError if column is a key' do
+      expect { Post.where(:permalink, 'cequel0') }.
+        to raise_error(ArgumentError)
+    end
+
+    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)
+    end
+  end
+
   describe '#count' do
     it 'should count records' do
       Blog.count.should == 3

data/spec/examples/model/schema_spec.rb

@@ -20,7 +20,7 @@ describe Cequel::Model::Schema do
   context 'new model with simple primary key' do
     before { model.synchronize_schema }
 
-    its(:partition_keys) { should == [Cequel::Schema::Column.new(:permalink, :text)] }
+    its(:partition_key_columns) { should == [Cequel::Schema::Column.new(:permalink, :text)] }
     its(:data_columns) { should include(Cequel::Schema::Column.new(:title, :text)) }
     its(:data_columns) { should include(Cequel::Schema::List.new(:categories, :text)) }
     its(:data_columns) { should include(Cequel::Schema::Set.new(:tags, :text)) }

data/spec/examples/model/secondary_index_spec.rb

@@ -0,0 +1,45 @@
+require_relative 'spec_helper'
+
+describe Cequel::Model::SecondaryIndexes do
+  model :Post do
+    key :blog_subdomain, :text
+    key :permalink, :text
+    column :title, :text
+    column :author_id, :uuid, :index => true
+  end
+
+  let(:uuids) { Array.new(2) { CassandraCQL::UUID.new }}
+
+  let!(:posts) do
+    3.times.map do |i|
+      Post.create! do |post|
+        post.blog_subdomain = 'bigdata'
+        post.permalink = "cequel#{i}"
+        post.title = "Cequel #{i}"
+        post.author_id = uuids[i%2]
+      end
+    end
+  end
+
+  it 'should create secondary index in schema' do
+    cequel.schema.read_table(:posts).data_columns.
+      find { |column| column.name == :author_id }.index_name.
+      should be
+  end
+
+  it 'should expose scope to query by secondary index' do
+    Post.with_author_id(uuids.first).map(&:permalink).
+      should == %w(cequel0 cequel2)
+  end
+
+  it 'should expose method to retrieve first result by secondary index' do
+    Post.find_by_author_id(uuids.first).should == posts.first
+  end
+
+  it 'should expose method to eagerly retrieve all results by secondary index' do
+    posts = Post.find_all_by_author_id(uuids.first)
+    disallow_queries!
+    posts.map(&:permalink).should == %w(cequel0 cequel2)
+  end
+
+end

data/spec/examples/model/spec_helper.rb

@@ -1,2 +1 @@
 require File.expand_path('../../spec_helper', __FILE__)
-require 'cequel/model'

data/spec/examples/schema/table_reader_spec.rb

@@ -14,11 +14,11 @@ describe Cequel::Schema::TableReader do
     end
 
     it 'should read name correctly' do
-      table.partition_keys.first.name.should == :permalink
+      table.partition_key_columns.first.name.should == :permalink
     end
 
     it 'should read type correctly' do
-      table.partition_keys.first.type.should be_a(Cequel::Type::Text)
+      table.partition_key_columns.first.type.should be_a(Cequel::Type::Text)
     end
 
     it 'should have no nonpartition keys' do
@@ -38,11 +38,11 @@ describe Cequel::Schema::TableReader do
     end
 
     it 'should read partition key name' do
-      table.partition_keys.map(&:name).should == [:blog_subdomain]
+      table.partition_key_columns.map(&:name).should == [:blog_subdomain]
     end
 
     it 'should read partition key type' do
-      table.partition_keys.map(&:type).should == [Cequel::Type::Text.instance]
+      table.partition_key_columns.map(&:type).should == [Cequel::Type::Text.instance]
     end
 
     it 'should read non-partition key name' do
@@ -124,11 +124,11 @@ describe Cequel::Schema::TableReader do
     end
 
     it 'should read partition key names' do
-      table.partition_keys.map(&:name).should == [:blog_subdomain, :permalink]
+      table.partition_key_columns.map(&:name).should == [:blog_subdomain, :permalink]
     end
 
     it 'should read partition key types' do
-      table.partition_keys.map(&:type).
+      table.partition_key_columns.map(&:type).
         should == [Cequel::Type::Text.instance, Cequel::Type::Ascii.instance]
     end
 
@@ -153,11 +153,11 @@ describe Cequel::Schema::TableReader do
     end
 
     it 'should read partition key names' do
-      table.partition_keys.map(&:name).should == [:blog_subdomain, :permalink]
+      table.partition_key_columns.map(&:name).should == [:blog_subdomain, :permalink]
     end
 
     it 'should read partition key types' do
-      table.partition_keys.map(&:type).
+      table.partition_key_columns.map(&:type).
         should == [Cequel::Type::Text.instance, Cequel::Type::Ascii.instance]
     end
 

data/spec/examples/schema/table_writer_spec.rb

@@ -19,11 +19,11 @@ describe Cequel::Schema::TableWriter do
       end
 
       it 'should create key alias' do
-        table.partition_keys.map(&:name).should == [:permalink]
+        table.partition_key_columns.map(&:name).should == [:permalink]
       end
 
       it 'should set key validator' do
-        table.partition_keys.map(&:type).should == [Cequel::Type[:ascii]]
+        table.partition_key_columns.map(&:type).should == [Cequel::Type[:ascii]]
       end
 
       it 'should set non-key columns' do
@@ -42,11 +42,11 @@ describe Cequel::Schema::TableWriter do
       end
 
       it 'should create key alias' do
-        table.partition_keys.map(&:name).should == [:blog_subdomain]
+        table.partition_key_columns.map(&:name).should == [:blog_subdomain]
       end
 
       it 'should set key validator' do
-        table.partition_keys.map(&:type).should == [Cequel::Type[:ascii]]
+        table.partition_key_columns.map(&:type).should == [Cequel::Type[:ascii]]
       end
 
       it 'should create non-partition key components' do
@@ -68,11 +68,11 @@ describe Cequel::Schema::TableWriter do
       end
 
       it 'should create all partition key components' do
-        table.partition_keys.map(&:name).should == [:blog_subdomain, :permalink]
+        table.partition_key_columns.map(&:name).should == [:blog_subdomain, :permalink]
       end
 
       it 'should set key validators' do
-        table.partition_keys.map(&:type).
+        table.partition_key_columns.map(&:type).
           should == [Cequel::Type[:ascii], Cequel::Type[:ascii]]
       end
     end
@@ -88,12 +88,12 @@ describe Cequel::Schema::TableWriter do
       end
 
       it 'should create all partition key components' do
-        table.partition_keys.map(&:name).
+        table.partition_key_columns.map(&:name).
           should == [:blog_subdomain, :permalink]
       end
 
       it 'should set key validators' do
-        table.partition_keys.map(&:type).
+        table.partition_key_columns.map(&:type).
           should == [Cequel::Type[:ascii], Cequel::Type[:ascii]]
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cequel
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.1
+  version: 1.0.0.pre.2
 platform: ruby
 authors:
 - Mat Brown
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-13 00:00:00.000000000 Z
+date: 2013-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -126,9 +126,10 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.6'
 description: |
-  Cequel is a lightweight query abstraction layer for Cassandra's CQL language. It
-  also provides Cequel::Model, which is an ActiveModel-compliant object-row mapper
-  for Cassandra. Cequel is heavily inspired by the Sequel library.
+  Cequel is an ActiveRecord-like domain model layer for Cassandra that exposes
+  the robust data modeling capabilities of CQL3, including parent-child
+  relationships via compound primary keys and in-memory atomic manipulation of
+  collection columns.
 email: mat.a.brown@gmail.com
 executables: []
 extensions: []
@@ -154,6 +155,7 @@ files:
 - lib/cequel/model/belongs_to_association.rb
 - lib/cequel/model/callbacks.rb
 - lib/cequel/model/collection.rb
+- lib/cequel/model/dirty.rb
 - lib/cequel/model/errors.rb
 - lib/cequel/model/has_many_association.rb
 - lib/cequel/model/mass_assignment.rb
@@ -163,6 +165,7 @@ files:
 - lib/cequel/model/record_set.rb
 - lib/cequel/model/schema.rb
 - lib/cequel/model/scoped.rb
+- lib/cequel/model/secondary_indexes.rb
 - lib/cequel/model/validations.rb
 - lib/cequel/model.rb
 - lib/cequel/new_relic_instrumentation.rb
@@ -178,12 +181,14 @@ files:
 - lib/cequel/schema/update_table_dsl.rb
 - lib/cequel/schema.rb
 - lib/cequel/type.rb
+- lib/cequel/util.rb
 - lib/cequel/version.rb
 - lib/cequel.rb
 - spec/environment.rb
 - spec/examples/metal/data_set_spec.rb
 - spec/examples/model/associations_spec.rb
 - spec/examples/model/callbacks_spec.rb
+- spec/examples/model/dirty_spec.rb
 - spec/examples/model/list_spec.rb
 - spec/examples/model/map_spec.rb
 - spec/examples/model/mass_assignment_spec.rb
@@ -192,6 +197,7 @@ files:
 - spec/examples/model/properties_spec.rb
 - spec/examples/model/record_set_spec.rb
 - spec/examples/model/schema_spec.rb
+- spec/examples/model/secondary_index_spec.rb
 - spec/examples/model/serialization_spec.rb
 - spec/examples/model/set_spec.rb
 - spec/examples/model/spec_helper.rb
@@ -240,11 +246,12 @@ rubyforge_project:
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: Query abstraction layer and object-row mapper for Cassandra and CQL
+summary: Full-featured, ActiveModel-compliant ORM for Cassandra using CQL3
 test_files:
 - spec/examples/metal/data_set_spec.rb
 - spec/examples/model/associations_spec.rb
 - spec/examples/model/callbacks_spec.rb
+- spec/examples/model/dirty_spec.rb
 - spec/examples/model/list_spec.rb
 - spec/examples/model/map_spec.rb
 - spec/examples/model/mass_assignment_spec.rb
@@ -253,6 +260,7 @@ test_files:
 - spec/examples/model/properties_spec.rb
 - spec/examples/model/record_set_spec.rb
 - spec/examples/model/schema_spec.rb
+- spec/examples/model/secondary_index_spec.rb
 - spec/examples/model/serialization_spec.rb
 - spec/examples/model/set_spec.rb
 - spec/examples/model/spec_helper.rb