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

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

@@ -1,11 +1,12 @@
 require File.expand_path('../spec_helper', __FILE__)
 
-describe Cequel::Model::Schema do
+describe Cequel::Record::Schema do
   after { cequel.schema.drop_table(:posts) }
   subject { cequel.schema.read_table(:posts) }
 
   let(:model) do
-    Class.new(Cequel::Model::Base) do
+    Class.new do
+      include Cequel::Record
       self.table_name = 'posts'
 
       key :permalink, :text

data/spec/examples/record/scoped_spec.rb

@@ -0,0 +1,13 @@
+require_relative 'spec_helper'
+
+describe Cequel::Record::Scoped do
+  model :Post do
+    key :blog_subdomain, :text
+    key :id, :uuid, auto: true
+    column :name, :text
+  end
+
+  it 'should use current scoped key values to populate new record' do
+    Post['bigdata'].new.blog_subdomain.should == 'bigdata'
+  end
+end

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

@@ -1,6 +1,6 @@
 require_relative 'spec_helper'
 
-describe Cequel::Model::SecondaryIndexes do
+describe Cequel::Record::SecondaryIndexes do
   model :Post do
     key :blog_subdomain, :text
     key :permalink, :text

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

@@ -3,7 +3,7 @@ require_relative 'spec_helper'
 describe 'serialization' do
   model :Post do
     key :blog_subdomain, :text
-    key :id, :uuid
+    key :id, :uuid, auto: true
     column :title, :text
     column :body, :text
   end

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

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

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

@@ -1,6 +1,6 @@
 require_relative 'spec_helper'
 
-describe Cequel::Model::Validations do
+describe Cequel::Record::Validations do
   model :Post do
     key :permalink, :text
     column :title, :text
@@ -55,7 +55,7 @@ describe Cequel::Model::Validations do
   describe '#save!' do
     it 'should raise error and not persist model if invalid' do
       expect { invalid_post.save!  }.
-        to raise_error(Cequel::Model::RecordInvalid)
+        to raise_error(Cequel::Record::RecordInvalid)
     end
 
     it 'should persist model and return self if valid' do
@@ -67,7 +67,7 @@ describe Cequel::Model::Validations do
   describe '#update_attributes!' do
     it 'should raise error and not update data in the database' do
       expect { invalid_post.update_attributes!(:body => 'My Post') }.
-        to raise_error(Cequel::Model::RecordInvalid)
+        to raise_error(Cequel::Record::RecordInvalid)
     end
 
     it 'should return successfully and update data in the database if valid' do
@@ -80,7 +80,7 @@ describe Cequel::Model::Validations do
     it 'should raise RecordInvalid and not persist model if invalid' do
       expect do
         Post.create!(:permalink => 'cequel', :body => 'Cequel')
-      end.to raise_error(Cequel::Model::RecordInvalid)
+      end.to raise_error(Cequel::Record::RecordInvalid)
     end
 
     it 'should persist record to database if valid' do

data/spec/examples/spec_helper.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../../environment', __FILE__)
-require 'cequel/model'
+require 'cequel'
 
 Dir.glob(File.expand_path('../../support/**/*.rb', __FILE__)).each do |file|
   require file
@@ -27,7 +27,7 @@ RSpec.configure do |config|
       CREATE KEYSPACE #{keyspace}
       WITH REPLICATION = {'class': 'SimpleStrategy', 'replication_factor': 1}
     CQL
-    Cequel::Model::Base.connection = cequel
+    Cequel::Record.connection = cequel
   end
 
   config.after(:all) do

data/spec/support/helpers.rb

@@ -13,7 +13,8 @@ module Cequel
           before :all do
             metadata = self.class.metadata
             metadata[:models].each do |name, (options, block)|
-              clazz = Class.new(Cequel::Base) do
+              clazz = Class.new do
+                include Cequel::Record
                 self.table_name = name.to_s.tableize
                 class_eval(&block)
               end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cequel
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.2
+  version: 1.0.0.pre.3
 platform: ruby
 authors:
 - Mat Brown
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-21 00:00:00.000000000 Z
+date: 2013-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -149,26 +149,25 @@ files:
 - lib/cequel/metal/updater.rb
 - lib/cequel/metal/writer.rb
 - lib/cequel/metal.rb
-- lib/cequel/model/association_collection.rb
-- lib/cequel/model/associations.rb
-- lib/cequel/model/base.rb
-- 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
-- lib/cequel/model/persistence.rb
-- lib/cequel/model/properties.rb
-- lib/cequel/model/railtie.rb
-- 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
+- lib/cequel/record/association_collection.rb
+- lib/cequel/record/associations.rb
+- lib/cequel/record/belongs_to_association.rb
+- lib/cequel/record/callbacks.rb
+- lib/cequel/record/collection.rb
+- lib/cequel/record/dirty.rb
+- lib/cequel/record/errors.rb
+- lib/cequel/record/has_many_association.rb
+- lib/cequel/record/mass_assignment.rb
+- lib/cequel/record/persistence.rb
+- lib/cequel/record/properties.rb
+- lib/cequel/record/railtie.rb
+- lib/cequel/record/record_set.rb
+- lib/cequel/record/schema.rb
+- lib/cequel/record/scoped.rb
+- lib/cequel/record/secondary_indexes.rb
+- lib/cequel/record/validations.rb
+- lib/cequel/record.rb
 - lib/cequel/schema/column.rb
 - lib/cequel/schema/create_table_dsl.rb
 - lib/cequel/schema/keyspace.rb
@@ -186,39 +185,29 @@ files:
 - 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
-- spec/examples/model/naming_spec.rb
-- spec/examples/model/persistence_spec.rb
-- 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
-- spec/examples/model/validations_spec.rb
+- spec/examples/record/associations_spec.rb
+- spec/examples/record/callbacks_spec.rb
+- spec/examples/record/dirty_spec.rb
+- spec/examples/record/list_spec.rb
+- spec/examples/record/map_spec.rb
+- spec/examples/record/mass_assignment_spec.rb
+- spec/examples/record/naming_spec.rb
+- spec/examples/record/persistence_spec.rb
+- spec/examples/record/properties_spec.rb
+- spec/examples/record/record_set_spec.rb
+- spec/examples/record/schema_spec.rb
+- spec/examples/record/scoped_spec.rb
+- spec/examples/record/secondary_index_spec.rb
+- spec/examples/record/serialization_spec.rb
+- spec/examples/record/set_spec.rb
+- spec/examples/record/spec_helper.rb
+- spec/examples/record/validations_spec.rb
 - spec/examples/schema/table_reader_spec.rb
 - spec/examples/schema/table_synchronizer_spec.rb
 - spec/examples/schema/table_updater_spec.rb
 - spec/examples/schema/table_writer_spec.rb
 - spec/examples/spec_helper.rb
 - spec/examples/type_spec.rb
-- spec/models/asset.rb
-- spec/models/asset_observer.rb
-- spec/models/blog.rb
-- spec/models/blog_posts.rb
-- spec/models/category.rb
-- spec/models/comment.rb
-- spec/models/comment_counts.rb
-- spec/models/photo.rb
-- spec/models/post.rb
-- spec/models/post_comments.rb
-- spec/models/post_observer.rb
 - spec/shared/readable_dictionary.rb
 - spec/support/helpers.rb
 - spec/support/result_stub.rb
@@ -249,22 +238,23 @@ specification_version: 4
 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
-- spec/examples/model/naming_spec.rb
-- spec/examples/model/persistence_spec.rb
-- 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
-- spec/examples/model/validations_spec.rb
+- spec/examples/record/associations_spec.rb
+- spec/examples/record/callbacks_spec.rb
+- spec/examples/record/dirty_spec.rb
+- spec/examples/record/list_spec.rb
+- spec/examples/record/map_spec.rb
+- spec/examples/record/mass_assignment_spec.rb
+- spec/examples/record/naming_spec.rb
+- spec/examples/record/persistence_spec.rb
+- spec/examples/record/properties_spec.rb
+- spec/examples/record/record_set_spec.rb
+- spec/examples/record/schema_spec.rb
+- spec/examples/record/scoped_spec.rb
+- spec/examples/record/secondary_index_spec.rb
+- spec/examples/record/serialization_spec.rb
+- spec/examples/record/set_spec.rb
+- spec/examples/record/spec_helper.rb
+- spec/examples/record/validations_spec.rb
 - spec/examples/schema/table_reader_spec.rb
 - spec/examples/schema/table_synchronizer_spec.rb
 - spec/examples/schema/table_updater_spec.rb

data/lib/cequel/model.rb

@@ -1,30 +0,0 @@
-require 'active_model'
-
-require 'cequel'
-require 'cequel/model/errors'
-require 'cequel/model/schema'
-require 'cequel/model/properties'
-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'
-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'
-
-if defined? Rails
-  require 'cequel/model/railtie'
-end
-
-module Cequel
-  module Model
-  end
-end

data/lib/cequel/model/base.rb

@@ -1,84 +0,0 @@
-module Cequel
-
-  module Model
-
-    class Base
-
-      include Cequel::Model::Properties
-      include Cequel::Model::Schema
-      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
-
-      class_attribute :table_name, :connection, :default_attributes,
-        :instance_writer => false
-
-      def self.inherited(base)
-        base.table_name = base.name.tableize.to_sym unless base.name.nil?
-        base.default_attributes = {}
-      end
-
-      def self.establish_connection(configuration)
-        self.connection = Cequel.connect(configuration)
-      end
-
-      class <<self; alias_method :new_empty, :new; end
-      def self.new(*args, &block)
-        new_empty.tap do |record|
-          record.__send__(:initialize_new_record, *args)
-          yield record if block_given?
-        end
-      end
-
-      def initialize(&block)
-        @attributes, @collection_proxies = {}, {}
-        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) ?
-            value.to_guid :
-            value.inspect
-          "#{attr}: #{inspected_value}"
-        end
-        "#<#{self.class} #{inspected_attributes.join(", ")}>"
-      end
-
-      protected
-      attr_reader :collection_proxies
-
-      private
-
-      def initialize_new_record(attributes = {})
-        @attributes = Marshal.load(Marshal.dump(default_attributes))
-        @new_record = true
-        yield self if block_given?
-        self.attributes = attributes #XXX this should really be in Properties
-        loaded!
-        self
-      end
-
-    end
-
-  end
-
-  Base = Model::Base
-
-end

data/lib/cequel/model/schema.rb

@@ -1,34 +0,0 @@
-module Cequel
-
-  module Model
-
-    module Schema
-
-      extend ActiveSupport::Concern
-
-      module ClassMethods
-        extend Forwardable
-
-        def_delegators :table_schema, :key_columns, :key_column_names,
-          :partition_key_columns, :clustering_columns
-
-        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
-
-      end
-
-    end
-
-  end
-
-end

data/lib/cequel/model/scoped.rb

@@ -1,19 +0,0 @@
-module Cequel
-
-  module Model
-
-    module Scoped
-
-      extend Forwardable
-
-      def_delegators :current_scope, *RecordSet.instance_methods(false)
-
-      def current_scope
-        RecordSet.create(self)
-      end
-
-    end
-
-  end
-
-end