datastax_rails 2.0.12 → 2.0.15

data/spec/support/datastax_test_hook.rb

@@ -4,11 +4,11 @@ require 'datastax_rails/base'
 module DatastaxRails
   class Base
     class_attribute :recorded_classes
-    
+
     def save_with_record_class(*args)
       DatastaxRails::Base.recorded_classes[self.class] = nil
       save_without_record_class(*args)
     end
     alias_method_chain :save, :record_class
   end
-end
+end

data/spec/support/default_consistency_shared_examples.rb

@@ -1,19 +1,19 @@
 require 'spec_helper'
 
 shared_examples_for 'default_consistency' do
-  let(:prepared_statement) {double("PreparedStatement")}
-  before { DatastaxRails::Base.connection.stub(:prepare => prepared_statement)}
-  
-  it "should default to QUORUM" do
-    cql = DatastaxRails::Cql::Select.new(model_class, ["*"])
-    DatastaxRails::Base.connection.should_receive(:execute).with(prepared_statement, :consistency => :quorum)
+  let(:prepared_statement) { double('PreparedStatement') }
+  before { allow(DatastaxRails::Base.connection).to receive(:prepare).and_return(prepared_statement) }
+
+  it 'should default to QUORUM' do
+    cql = DatastaxRails::Cql::Select.new(model_class, ['*'])
+    expect(prepared_statement).to receive(:execute).with(consistency: :quorum)
     cql.execute
   end
-  
-  it "should default to level specified by model class" do
-    model_class.stub(:default_consistency => 'LOCAL_QUORUM')
-    cql = DatastaxRails::Cql::Select.new(model_class, ["*"])
-    DatastaxRails::Base.connection.should_receive(:execute).with(prepared_statement, :consistency => :local_quorum)
+
+  it 'should default to level specified by model class' do
+    allow(model_class).to receive(:default_consistency).and_return('LOCAL_QUORUM')
+    cql = DatastaxRails::Cql::Select.new(model_class, ['*'])
+    expect(prepared_statement).to receive(:execute).with(consistency: :local_quorum)
     cql.execute
   end
 end

data/spec/support/models.rb

@@ -1,89 +1,88 @@
 class Person < DatastaxRails::Base
-  self.column_family = "people"
-  
+  self.column_family = 'people'
+
   has_one :job
-  has_many :cars, :dependent => :destroy
+  has_many :cars, dependent: :destroy
   has_and_belongs_to_many :hobbies
-  
+
   uuid :id
-  text :name, :sortable => true
+  text :name, sortable: true
   date :birthdate
   string :nickname
   set :email_addresses
   map :str_
   timestamps
-  
-  validates :name, :presence => true, :uniqueness => :true
+
+  validates :name, presence: true, uniqueness: :true
 end
 
 class Car < DatastaxRails::Base
-  self.column_family = "cars"
-  
+  self.column_family = 'cars'
+
   belongs_to :person
-  
+
   uuid :id
   string :name
   uuid :person_id
   uuid :car_payload_id
   datetime :last_serviced_at
-  map :oil_changes, :holds => :timestamp
+  map :oil_changes, holds: :timestamp
   timestamps
 end
 
 class CarPayload < DatastaxRails::PayloadModel
-  self.column_family = "car_payloads"
+  self.column_family = 'car_payloads'
 end
 
 class AuditLog < DatastaxRails::WideStorageModel
   include DatastaxRails::CassandraOnlyModel
-  self.column_family = "audit_logs"
+  self.column_family = 'audit_logs'
   self.primary_key = :uuid
   self.cluster_by  = :created_at
   self.create_options = 'CLUSTERING ORDER BY (created_at DESC)'
-  
-  uuid       :uuid
-  string     :message
-  string     :user, :cql_index => true
+
+  uuid :uuid
+  string :message
+  string :user, cql_index: true
   timestamps
 end
 
 class Job < DatastaxRails::Base
-  self.column_family = "jobs"
-  
+  self.column_family = 'jobs'
+
   belongs_to :person
-  
+
   uuid :id
   string :title
   integer :position_number
   uuid :person_id
-  list :former_positions, :holds => :integer
+  list :former_positions, holds: :integer
   timestamps
-  
-  validates :position_number, :uniqueness => true, :allow_blank => true
+
+  validates :position_number, uniqueness: true, allow_blank: true
 end
 
 class Boat < DatastaxRails::Base
-  self.column_family = "boats"
-  
+  self.column_family = 'boats'
+
   uuid :id
   string :name
   integer :registration
-  boolean :financed
   timestamps
-  
-  validates :name, :uniqueness => true
+
+  validates :name, uniqueness: true
   default_scope order(:name)
 end
 
 class Hobby < DatastaxRails::Base
-  self.column_family = "hobbies"
-  
+  self.column_family = 'hobbies'
+
   has_and_belongs_to_many :people
-  
+
   uuid :id
   string :name
   float :complexity
-  map :components, :holds => :integer
+  map :components, holds: :integer
   timestamps
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datastax_rails
 version: !ruby/object:Gem::Version
-  version: 2.0.12
+  version: 2.0.15
 platform: ruby
 authors:
 - Jason M. Kusar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-03 00:00:00.000000000 Z
+date: 2014-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -92,6 +92,20 @@ dependencies:
         version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -132,6 +146,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: factory_girl_rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Ruby-on-Rails interface to Datastax Enterprise. Intended for use with
   the DSE search nodes.
 email:
@@ -168,7 +196,6 @@ files:
 - lib/datastax_rails/associations/singular_association.rb
 - lib/datastax_rails/attribute_assignment.rb
 - lib/datastax_rails/attribute_methods.rb
-- lib/datastax_rails/attribute_methods/before_type_cast.rb
 - lib/datastax_rails/attribute_methods/definition.rb
 - lib/datastax_rails/attribute_methods/dirty.rb
 - lib/datastax_rails/attribute_methods/primary_key.rb
@@ -203,7 +230,6 @@ files:
 - lib/datastax_rails/errors.rb
 - lib/datastax_rails/grouped_collection.rb
 - lib/datastax_rails/inheritance.rb
-- lib/datastax_rails/log_subscriber.rb
 - lib/datastax_rails/payload_model.rb
 - lib/datastax_rails/persistence.rb
 - lib/datastax_rails/railtie.rb
@@ -250,6 +276,7 @@ files:
 - spec/datastax_rails/column_spec.rb
 - spec/datastax_rails/connection/statement_cache_spec.rb
 - spec/datastax_rails/cql/base_spec.rb
+- spec/datastax_rails/cql/delete_spec.rb
 - spec/datastax_rails/cql/select_spec.rb
 - spec/datastax_rails/cql/update_spec.rb
 - spec/datastax_rails/dynamic_model_spec.rb
@@ -269,6 +296,7 @@ files:
 - spec/datastax_rails/types/dynamic_map_spec.rb
 - spec/datastax_rails/types/dynamic_set_spec.rb
 - spec/datastax_rails/validations/uniqueness_spec.rb
+- spec/datastax_rails/wide_storage_model_spec.rb
 - spec/datastax_rails_spec.rb
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
@@ -298,7 +326,6 @@ files:
 - spec/dummy/config/solr/articles-schema.xml.erb
 - spec/dummy/config/sunspot.yml
 - spec/dummy/db/test.sqlite3
-- spec/dummy/ks/migrate/20111117224534_models.rb
 - spec/dummy/ks/schema.json
 - spec/dummy/log/development.log
 - spec/dummy/log/production.log
@@ -308,6 +335,9 @@ files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/script/rails
+- spec/factories/audit_logs.rb
+- spec/factories/hobbies.rb
+- spec/factories/people.rb
 - spec/feature/dynamic_fields_spec.rb
 - spec/feature/overloaded_tables_spec.rb
 - spec/spec.opts
@@ -344,6 +374,7 @@ test_files:
 - spec/support/default_consistency_shared_examples.rb
 - spec/support/datastax_test_hook.rb
 - spec/datastax_rails/dynamic_model_spec.rb
+- spec/datastax_rails/wide_storage_model_spec.rb
 - spec/datastax_rails/attribute_methods_spec.rb
 - spec/datastax_rails/scoping/default_spec.rb
 - spec/datastax_rails/associations_spec.rb
@@ -355,6 +386,7 @@ test_files:
 - spec/datastax_rails/schema/migrator_spec.rb
 - spec/datastax_rails/schema/solr_spec.rb
 - spec/datastax_rails/validations/uniqueness_spec.rb
+- spec/datastax_rails/cql/delete_spec.rb
 - spec/datastax_rails/cql/update_spec.rb
 - spec/datastax_rails/cql/base_spec.rb
 - spec/datastax_rails/cql/select_spec.rb
@@ -412,7 +444,9 @@ test_files:
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/ks/migrate/20111117224534_models.rb
 - spec/dummy/ks/schema.json
 - spec/dummy/db/test.sqlite3
+- spec/factories/hobbies.rb
+- spec/factories/people.rb
+- spec/factories/audit_logs.rb
 has_rdoc: 

data/lib/datastax_rails/attribute_methods/before_type_cast.rb

@@ -1,71 +0,0 @@
-module DatastaxRails
-  module AttributeMethods
-    # = Datastax Rails Attribute Methods Before Type Cast
-    #
-    # <tt>Datastax Rails::AttributeMethods::BeforeTypeCast</tt> provides a way to
-    # read the value of the attributes before typecasting and deserialization.
-    #
-    #   class Task < DatastaxRails::Base
-    #   end
-    #
-    #   task = Task.new(id: '1', completed_on: '2012-10-21')
-    #   task.id           # => 1
-    #   task.completed_on # => Sun, 21 Oct 2012
-    #
-    #   task.attributes_before_type_cast
-    #   # => {"id"=>"1", "completed_on"=>"2012-10-21", ... }
-    #   task.read_attribute_before_type_cast('id')           # => "1"
-    #   task.read_attribute_before_type_cast('completed_on') # => "2012-10-21"
-    #
-    # In addition to #read_attribute_before_type_cast and #attributes_before_type_cast,
-    # it declares a method for all attributes with the <tt>*_before_type_cast</tt>
-    # suffix.
-    #
-    #   task.id_before_type_cast           # => "1"
-    #   task.completed_on_before_type_cast # => "2012-10-21"
-    module BeforeTypeCast
-      extend ActiveSupport::Concern
-
-      included do
-        attribute_method_suffix "_before_type_cast"
-      end
-
-      # Returns the value of the attribute identified by +attr_name+ before
-      # typecasting and deserialization.
-      #
-      #   class Task < DatastaxRails::Base
-      #   end
-      #
-      #   task = Task.new(id: '1', completed_on: '2012-10-21')
-      #   task.read_attribute('id')                            # => 1
-      #   task.read_attribute_before_type_cast('id')           # => '1'
-      #   task.read_attribute('completed_on')                  # => Sun, 21 Oct 2012
-      #   task.read_attribute_before_type_cast('completed_on') # => "2012-10-21"
-      #   task.read_attribute_before_type_cast(:completed_on)  # => "2012-10-21"
-      def read_attribute_before_type_cast(attr_name)
-        @attributes[attr_name.to_s]
-      end
-
-      # Returns a hash of attributes before typecasting and deserialization.
-      #
-      #   class Task < DatastaxRails::Base
-      #   end
-      #
-      #   task = Task.new(title: nil, is_done: true, completed_on: '2012-10-21')
-      #   task.attributes
-      #   # => {"id"=>nil, "title"=>nil, "is_done"=>true, "completed_on"=>Sun, 21 Oct 2012, "created_at"=>nil, "updated_at"=>nil}
-      #   task.attributes_before_type_cast
-      #   # => {"id"=>nil, "title"=>nil, "is_done"=>true, "completed_on"=>"2012-10-21", "created_at"=>nil, "updated_at"=>nil}
-      def attributes_before_type_cast
-        @attributes
-      end
-
-      private
-
-      # Handle *_before_type_cast for method_missing.
-      def attribute_before_type_cast(attribute_name)
-        read_attribute_before_type_cast(attribute_name)
-      end
-    end
-  end
-end

data/spec/dummy/ks/migrate/20111117224534_models.rb

@@ -1,20 +0,0 @@
-class Models < CassandraObject::Schema::Migration
-  MODELS = [:people, :cars, :jobs, :boats, :hobbies]
-  
-  def self.up
-    MODELS.each do |m|
-      create_column_family m do |cf|
-        cf.comment = m.to_s.titleize
-        cf.comparator_type = :string
-        cf.column_type = 'Standard'
-      end
-    end
-  end
-
-  def self.down
-    MODELS.each do |m|
-      drop_column_family m
-    end
-  end
-
-end