datastax_rails 2.0.18 → 2.1.23

data/spec/factories/hobbies.rb

@@ -1,5 +1,6 @@
 FactoryGirl.define do
   factory(:hobby) do
+    uuid_key
     name 'Biking'
     complexity 2.0
   end

data/spec/factories/jobs.rb

@@ -0,0 +1,7 @@
+FactoryGirl.define do
+  factory(:job) do
+    uuid_key
+    person
+    sequence(:position_number)
+  end
+end

data/spec/factories/people.rb

@@ -1,5 +1,6 @@
 FactoryGirl.define do
   factory(:person) do
     name 'John'
+    uuid_key
   end
 end

data/spec/factories/person_roles.rb

@@ -0,0 +1,7 @@
+FactoryGirl.define do
+  factory(:person_role) do
+    person
+    role
+    uuid_key
+  end
+end

data/spec/factories/roles.rb

@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory(:role) do
+    name 'ADMIN'
+    uuid_key
+  end
+end

data/spec/factories/uuid_keys.rb

@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  trait(:uuid_key) do
+    id { ::Cql::TimeUuid::Generator.new.next }
+    created_at { Time.now }
+  end
+end

data/spec/feature/associations_spec.rb

@@ -0,0 +1,26 @@
+# This spec is used for association tests that don't necessarily fit in a single type
+require 'spec_helper'
+
+describe DatastaxRails::Base do
+  context 'associations' do
+    context 'many-to-many joins' do
+      let(:person) { create(:person) }
+      let(:role) { create(:role) }
+      let(:role2) { create(:role, name: 'GUEST') }
+
+      before do
+        create(:person_role, person: person, role: role)
+        create(:person_role, person: person, role: role2)
+        Person.commit_solr
+        Role.commit_solr
+        PersonRole.commit_solr
+        DatastaxRails::Base.log_solr_queries = true
+        DatastaxRails::Base.log_cql_queries = true
+      end
+
+      it 'collects the far-side records' do
+        expect(Role.find(person.person_roles.map(&:role_id)).compact).to eq([role, role2])
+      end
+    end
+  end
+end

data/spec/support/models.rb

@@ -4,6 +4,7 @@ class Person < DatastaxRails::Base
   has_one :job
   has_many :cars, dependent: :destroy
   has_and_belongs_to_many :hobbies
+  has_many :person_roles, dependent: :destroy
 
   uuid :id
   text :name, sortable: true
@@ -94,6 +95,87 @@ class Default < DatastaxRails::Base
   boolean :bool, default: true
   boolean :bool2, default: false
   boolean :bool3
+  integer :version, default: 1
+  float :complexity, default: 0.0
+  uuid :previous_id, default: '00000000-0000-0000-0000-000000000000'
+  date :epoch, default: Date.parse('1970-01-01')
+  datetime :epoch2, default: Time.parse('1970-01-01 00:00:00')
+  map :m
+  map :m2, default: { 'test' => 'string' }
+  set :s
+  set :s2, default: ['unique string']
+  list :l
+  list :l2, default: ['ordered string']
+end
+
+class Role < DatastaxRails::Base
+  self.column_family = 'roles'
+
+  has_many :person_roles, dependent: :destroy
+
+  uuid :id
+  string :name
+  timestamps
+end
+
+class PersonRole < DatastaxRails::Base
+  self.column_family = 'person_roles'
+
+  belongs_to :person
+  belongs_to :role
+
+  uuid :id
+  uuid :person_id
+  uuid :role_id
+  timestamps
+end
+
+class CollectionOverride < DatastaxRails::Base
+  self.column_family = 'collection_overrides'
+
+  uuid :id
+  list :list1
+  list :list2
+  set :set1
+  set :set2
+  map :map1
+  map :map2
+
+  def list1
+    read_attribute(:list1).tap do |l|
+      l.each(&:upcase!)
+    end
+  end
+
+  def list2
+    read_attribute(:list2).map(&:upcase)
+  end
+
+  def set1
+    read_attribute(:set1).tap do |s|
+      s.each(&:upcase!)
+    end
+  end
+
+  def set2
+    read_attribute(:set2).map(&:upcase).to_set
+  end
+
+  def map1
+    read_attribute(:map1).tap do |m|
+      m.each { |k, v| m[k] = v.upcase }
+    end
+  end
+
+  def map2
+    ret = {}
+    read_attribute(map2).each do |k, v|
+      ret[k] = v.upcase
+    end
+    ret
+  end
+
+  timestamps
 end
 
 class CoreMetadata < DatastaxRails::DynamicModel

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datastax_rails
 version: !ruby/object:Gem::Version
-  version: 2.0.18
+  version: 2.1.23
 platform: ruby
 authors:
 - Jason M. Kusar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-12 00:00:00.000000000 Z
+date: 2014-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -231,6 +231,9 @@ files:
 - lib/datastax_rails/errors.rb
 - lib/datastax_rails/grouped_collection.rb
 - lib/datastax_rails/inheritance.rb
+- lib/datastax_rails/instrumentation.rb
+- lib/datastax_rails/instrumentation/controller_runtime.rb
+- lib/datastax_rails/instrumentation/log_subscriber.rb
 - lib/datastax_rails/locale/en.yml
 - lib/datastax_rails/payload_model.rb
 - lib/datastax_rails/persistence.rb
@@ -272,6 +275,7 @@ files:
 - spec/datastax_rails/associations/collection_association_spec.rb
 - spec/datastax_rails/associations/has_many_association_spec.rb
 - spec/datastax_rails/associations_spec.rb
+- spec/datastax_rails/attribute_methods/read_spec.rb
 - spec/datastax_rails/attribute_methods/typecasting_spec.rb
 - spec/datastax_rails/attribute_methods_spec.rb
 - spec/datastax_rails/autosave_association_spec.rb
@@ -297,6 +301,7 @@ files:
 - spec/datastax_rails/schema/migrator_spec.rb
 - spec/datastax_rails/schema/solr_spec.rb
 - spec/datastax_rails/scoping/default_spec.rb
+- spec/datastax_rails/serialization_spec.rb
 - spec/datastax_rails/types/dynamic_list_spec.rb
 - spec/datastax_rails/types/dynamic_map_spec.rb
 - spec/datastax_rails/types/dynamic_set_spec.rb
@@ -334,7 +339,6 @@ files:
 - spec/dummy/db/test.sqlite3
 - spec/dummy/ks/schema.json
 - spec/dummy/log/development.log
-- spec/dummy/log/production.log
 - spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -343,7 +347,12 @@ files:
 - spec/dummy/script/rails
 - spec/factories/audit_logs.rb
 - spec/factories/hobbies.rb
+- spec/factories/jobs.rb
 - spec/factories/people.rb
+- spec/factories/person_roles.rb
+- spec/factories/roles.rb
+- spec/factories/uuid_keys.rb
+- spec/feature/associations_spec.rb
 - spec/feature/dynamic_fields_spec.rb
 - spec/feature/overloaded_tables_spec.rb
 - spec/spec.opts
@@ -392,7 +401,9 @@ 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/serialization_spec.rb
 - spec/datastax_rails/attribute_methods/typecasting_spec.rb
+- spec/datastax_rails/attribute_methods/read_spec.rb
 - spec/datastax_rails/cql/delete_spec.rb
 - spec/datastax_rails/cql/update_spec.rb
 - spec/datastax_rails/cql/base_spec.rb
@@ -414,13 +425,13 @@ test_files:
 - spec/datastax_rails/associations/belongs_to_association_spec.rb
 - spec/datastax_rails/callbacks_spec.rb
 - spec/feature/dynamic_fields_spec.rb
+- spec/feature/associations_spec.rb
 - spec/feature/overloaded_tables_spec.rb
 - spec/spec.opts
 - spec/datastax_rails_spec.rb
 - spec/spec_helper.rb
 - spec/dummy/log/test.log
 - spec/dummy/log/development.log
-- spec/dummy/log/production.log
 - spec/dummy/Rakefile
 - spec/dummy/public/favicon.ico
 - spec/dummy/public/500.html
@@ -456,7 +467,11 @@ test_files:
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/ks/schema.json
 - spec/dummy/db/test.sqlite3
+- spec/factories/uuid_keys.rb
 - spec/factories/hobbies.rb
 - spec/factories/people.rb
 - spec/factories/audit_logs.rb
+- spec/factories/roles.rb
+- spec/factories/person_roles.rb
+- spec/factories/jobs.rb
 has_rdoc: 

data/spec/dummy/log/production.log

@@ -1,2 +0,0 @@
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml