datastax_rails 1.2.3 → 2.0.3

data/spec/datastax_rails/relation/batches_spec.rb

@@ -10,12 +10,12 @@ describe DatastaxRails::Relation do
     Hobby.commit_solr
   end
   
-  ['cassandra', 'solr'].each do |method|
+  ['cassandra', 'solr'].each do |access_method|
     describe "#find_each" do
-      it "returns each record one at a time with #{method}" do
+      it "returns each record one at a time with #{access_method}" do
         sleep(1)
         missed_hobbies = ('a'..'l').to_a
-        @relation.send('with_'+method).find_each(:batch_size => 5) do |hobby|
+        @relation.send('with_'+access_method).find_each(:batch_size => 5) do |hobby|
           missed_hobbies.delete_if {|h| h == hobby.name}
         end
         missed_hobbies.should be_empty
@@ -23,9 +23,9 @@ describe DatastaxRails::Relation do
     end
     
     describe "#find_in_batches" do
-      it "returns records in batches of the given size with #{method}" do
+      it "returns records in batches of the given size with #{access_method}" do
         count = 12
-        @relation.send('with_'+method).find_in_batches(:batch_size => 5) do |batch|
+        @relation.send('with_'+access_method).find_in_batches(:batch_size => 5) do |batch|
           batch.size.should <= 5
           count -= batch.size
         end

data/spec/datastax_rails/relation/finder_methods_spec.rb

@@ -53,26 +53,6 @@ describe DatastaxRails::Relation do
     end
   end
 
-  describe "#find_by_" do
-    it "finds a record by an attribute" do
-      Boat.create(:name => 'Spooner')
-      Boat.commit_solr
-      Boat.find_all_by_name('Spooner').should_not be_nil
-    end
-
-    it "finds a record by an attribute with a space in it" do
-      Boat.create(:name => 'Water Lily')
-      Boat.commit_solr
-      Boat.find_by_name('Water Lily').should_not be_nil
-    end
-
-    it "finds a record by an attribute with a colon in it" do
-      Boat.create(:name => 'Dumb: Name')
-      Boat.commit_solr
-      Boat.find_by_name('Dumb: Name').should_not be_nil
-    end
-  end
-  
   describe "#find_by" do
     it "finds a record by an attribute" do
       Boat.create(:name => 'Spooner')

data/spec/datastax_rails/relation/search_methods_spec.rb

@@ -65,6 +65,14 @@ describe DatastaxRails::Relation do
     end
   end
   
+  describe "#select" do
+    it "returns maps from solr automatically" do
+      Hobby.create!(:name => "legos", :components => {'squares' => 4, 'rectangles' => 6})
+      @relation.commit_solr
+      res = @relation.select(:components).with_solr.first.components.should have_key('squares')
+    end
+  end
+  
   describe "#slow_order" do
     it "should manually order items coming from Cassandra" do
       %w[john jason michael tony billy jim phil].each_with_index do |name,i|

data/spec/datastax_rails/relation_spec.rb

@@ -166,4 +166,11 @@ describe DatastaxRails::Relation do
       results = Person.group(:nickname).count.should eq(6)
     end
   end
+  
+  describe "#downcase_query" do
+    it "downcases a solr query while leaving operators untouched" do
+      solr_query = "This Query needs to be DOWNCASED AND it also searches DATES [2010-09-09T10:42:12Z TO 2011-08-08T09:23:34Z] OR maybe it just breaks"
+      expect(@relation.downcase_query(solr_query)).to eq("this query needs to be downcased AND it also searches dates [2010-09-09T10:42:12Z TO 2011-08-08T09:23:34Z] OR maybe it just breaks")
+    end
+  end
 end

data/spec/datastax_rails/schema/migrator_spec.rb

@@ -12,7 +12,7 @@ describe DatastaxRails::Schema::Migrator do
       end
       
       it "calls #create_payload_column_family" do
-        expect(subject).to receive(:create_payload_column_family).with(CarPayload)
+        expect(subject).to receive(:create_cql3_column_family).with(CarPayload)
         subject.migrate_one(CarPayload)
       end
     end
@@ -23,7 +23,7 @@ describe DatastaxRails::Schema::Migrator do
       end
       
       it "does not call #create_payload_column_family" do
-        expect(subject).not_to receive(:create_payload_column_family).with(CarPayload)
+        expect(subject).not_to receive(:create_cql2_column_family).with(CarPayload)
         subject.migrate_one(CarPayload)
       end
     end
@@ -33,11 +33,11 @@ describe DatastaxRails::Schema::Migrator do
     context 'when column family does not exist' do
       before(:each) do
         subject.stub(:column_family_exists?).and_return(false)
-        subject.stub(:create_wide_storage_column_family)
+        subject.stub(:create_cql3_column_family)
       end
       
       it "calls #create_wide_storage_column_family" do
-        expect(subject).to receive(:create_wide_storage_column_family).with(AuditLog)
+        expect(subject).to receive(:create_cql3_column_family).with(AuditLog)
         subject.migrate_one(AuditLog)
       end
       
@@ -53,7 +53,7 @@ describe DatastaxRails::Schema::Migrator do
       end
       
       it "does not call #create_wide_storage_column_family" do
-        expect(subject).not_to receive(:create_wide_storage_column_family).with(AuditLog)
+        expect(subject).not_to receive(:create_cql3_column_family).with(AuditLog)
         subject.migrate_one(AuditLog)
       end
       
@@ -65,11 +65,6 @@ describe DatastaxRails::Schema::Migrator do
   end
   
   describe 'normal models' do 
-    it "calls #check_key_name" do
-      expect(subject).to receive(:check_key_name).with(Person).and_return(0)
-      subject.migrate_one(Person)
-    end
-    
     it "calls #check_missing_schema" do
       expect(subject).to receive(:check_missing_schema).with(Person).and_return(0)
       subject.migrate_one(Person)

data/spec/datastax_rails/schema/solr_spec.rb

@@ -23,7 +23,7 @@ describe DatastaxRails::Schema::Solr do
   
   describe "#generate_solr_schema" do
     it "uses a custom config if one is present" do
-      model = mock_model("Article", :column_family => 'articles', :name => 'Article', :attribute_definitions => {})
+      model = mock_model("Article", :column_family => 'articles', :name => 'Article', :attribute_definitions => {}, :primary_key => 'id', :<= => false)
       expect(subject.generate_solr_schema(model)).to match(/This is my custom schema/)
     end
   end

data/spec/datastax_rails/types/dynamic_list_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe DatastaxRails::Types::DynamicList do
+  subject {described_class.new(double("record", :changed_attributes => {}, :attributes => {}), 'list', [])}
+  
+  before(:each) do
+    subject << "Test String 1"
+    subject << "Another Test String"
+    subject << "Test String 1"
+  end
+  
+  it { should eq(["Test String 1", "Another Test String", "Test String 1"])}
+  its('record.changed_attributes') { should include('list' => []) }
+  its('record.attributes') { should include('list' => ["Test String 1", "Another Test String", "Test String 1"])}
+  
+  it "preserves ordering" do
+    subject[1] = "Test String 2"
+    subject.should eq(["Test String 1", "Test String 2", "Test String 1"])
+  end
+end

data/spec/datastax_rails/types/dynamic_map_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe DatastaxRails::Types::DynamicMap do
+  subject {described_class.new(double("record", :changed_attributes => {}, :attributes => {}), 'map', {})}
+  
+  before(:each) do
+    subject['mapkey'] = "Test String"
+  end
+  
+  its(['mapkey']) { should eq("Test String")}
+  its('record.changed_attributes') { should include('map' => {}) }
+  its('record.attributes') { should include('map' => {'mapkey' => 'Test String'})}
+  
+  it "automatically maps key names when setting values" do
+    subject['test'] = 'Test String'
+    expect(subject).to have_key('maptest')
+  end
+  
+  it "automatically maps key names when reading values" do
+    expect(subject['key']).to eq('Test String')
+  end
+end

data/spec/datastax_rails/types/dynamic_set_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe DatastaxRails::Types::DynamicSet do
+  subject {described_class.new(double("record", :changed_attributes => {}, :attributes => {}), 'set', [])}
+  
+  before(:each) do
+    subject << "Test String 1"
+    subject << "Another Test String"
+    subject.add("Test String 1")
+    subject << nil
+  end
+  
+  it { should eq(Set.new(["Test String 1", "Another Test String", nil]))}
+  its('record.changed_attributes') { should include('set' => Set.new) }
+  its('record.attributes') { should include('set' => Set.new(["Test String 1", "Another Test String", nil]))}
+end

data/spec/dummy/config/application.rb

@@ -1,6 +1,7 @@
 require File.expand_path('../boot', __FILE__)
 
-require 'rails/all'
+require 'active_model/railtie'
+
 Bundler.require
 require "datastax_rails"
 

data/spec/dummy/config/datastax.yml

@@ -1,5 +1,6 @@
 productiont:
-  servers: ["127.0.0.1:9160"]
+  servers: ["127.0.0.1"]
+  port: 9042
   keyspace: "datastax_rails_development"
   strategy_options: {"RS": "3"}
   connection_options:
@@ -11,7 +12,8 @@ productiont:
     path: /solr
 
 development:
-  servers: ["127.0.0.1:9160"]
+  servers: ["127.0.0.1"]
+  port: 9042
   keyspace: "datastax_rails_development"
   strategy_class: "org.apache.cassandra.locator.SimpleStrategy"
   strategy_options: {"replication_factor": "1"}
@@ -22,7 +24,8 @@ development:
     path: /solr
     
 test:
-  servers: ["127.0.0.1:9160"]
+  servers: ["127.0.0.1"]
+  port: 9042
   keyspace: "datastax_rails_test"
   strategy_class: "org.apache.cassandra.locator.SimpleStrategy"
   strategy_options: {"replication_factor": "1"}

data/spec/dummy/config/environments/development.rb

@@ -5,16 +5,15 @@ Dummy::Application.configure do
   # every request.  This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
-
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
+  
+  config.eager_load = false
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
-  config.action_controller.perform_caching = false
+  #config.action_controller.perform_caching = false
 
   # Don't care if the mailer can't send
-  config.action_mailer.raise_delivery_errors = false
+  #config.action_mailer.raise_delivery_errors = false
 
   # Print deprecation notices to the Rails logger
   config.active_support.deprecation = :log

data/spec/dummy/config/environments/test.rb

@@ -13,12 +13,8 @@ Dummy::Application.configure do
   config.serve_static_assets = true
   config.static_cache_control = "public, max-age=3600"
 
-  # Log error messages when you accidentally call methods on nil
-  config.whiny_nils = true
-
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
-  config.action_controller.perform_caching = false
 
   # Raise exceptions instead of rendering exception templates
   config.action_dispatch.show_exceptions = false
@@ -29,7 +25,6 @@ Dummy::Application.configure do
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
-  config.action_mailer.delivery_method = :test
 
   # Use SQL instead of Active Record's schema dumper when creating the test database.
   # This is necessary if your schema can't be completely dumped by the schema dumper,

data/spec/dummy/log/development.log

@@ -24175,3 +24175,21 @@ SELECT updated_at,birthdate,nickname,created_at,name FROM people USING CONSISTEN
   cars insert (11.8ms)  ec46e0da-c18e-11e2-8c1e-12c5f0df414b {"updated_at"=>"2013-05-20T21:57:18Z", "last_serviced_at"=>nil}
 Connecting to database specified by database.yml
 Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to node at localhost:9042
+Connected to node df32aa34-e727-4f93-903d-1f0c2c9c9fe5 at localhost:9042 in data center DC1
+Looking for additional nodes
+No additional nodes found
+Cluster connection complete
+Connection to node df32aa34-e727-4f93-903d-1f0c2c9c9fe5 at localhost:9042 in data center DC1 unexpectedly closed
+DEPRECATION WARNING: Proc#bind is deprecated and will be removed in future versions. (called from __pry__ at (pry):7)
+DEPRECATION WARNING: Proc#bind is deprecated and will be removed in future versions. (called from __pry__ at (pry):9)

data/spec/dummy/log/test.log

@@ -15565,3 +15565,39 @@ Connecting to database specified by database.yml
 Connecting to database specified by database.yml
 Connecting to database specified by database.yml
 Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml

data/spec/feature/dynamic_fields_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+feature "Dynamic Fields" do
+  scenario "map entries dynamically populate solr fields" do
+    Person.create!(:name => 'Steve', :str_ => {'str_favorite_color' => 'blue'})
+    Person.commit_solr
+    expect(Person.where(:str_favorite_color => 'blue')).to have(1).entry
+  end
+end

data/spec/feature/overloaded_tables_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+feature "Table Overloads" do
+  scenario "models writing to the same column family do not collide" do
+    core_meta = CoreMetadata.new
+    core_meta.strings[:source] = "BBC"
+    core_meta.strings[:author] = "John"
+    core_meta.timestamps[:published_at] = Time.now
+    core_meta.save
+    
+    team_meta = TeamMetadata.new
+    team_meta.id = core_meta.id
+    team_meta.strings[:source] = "TV"
+    team_meta.strings[:medium] = 'television'
+    team_meta.dates[:published_on] = Date.today
+    team_meta.save
+    
+    CoreMetadata.commit_solr
+    
+    
+    expect(CoreMetadata.fulltext('BBC')).to have(1).entry
+    expect(CoreMetadata.fulltext('TV')).to have(0).entries
+  end
+end

data/spec/spec_helper.rb

@@ -29,7 +29,7 @@ RSpec.configure do |config|
   
   config.after(:each) do
     DatastaxRails::Base.recorded_classes.keys.each do |klass|
-      DatastaxRails::Base.connection.connection.truncate(klass.column_family.to_s)
+      DatastaxRails::Base.connection.execute("TRUNCATE #{klass.column_family.to_s}")
     end
   end
   

data/spec/support/default_consistency_shared_examples.rb

@@ -3,14 +3,14 @@ require 'spec_helper'
 shared_examples_for 'default_consistency' do
   it "should default to QUORUM" do
     cql = DatastaxRails::Cql::Select.new(@model_class, ["*"])
-    DatastaxRails::Base.connection.should_receive(:execute_cql_query).with(an_instance_of(String), :consistency => CassandraCQL::Thrift::ConsistencyLevel::QUORUM)
+    DatastaxRails::Base.connection.should_receive(:execute).with(anything, :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_cql_query).with(an_instance_of(String), :consistency => CassandraCQL::Thrift::ConsistencyLevel::LOCAL_QUORUM)
+    DatastaxRails::Base.connection.should_receive(:execute).with(anything, :consistency => :local_quorum)
     cql.execute
   end
 end

data/spec/support/models.rb

@@ -5,10 +5,12 @@ class Person < DatastaxRails::Base
   has_many :cars, :dependent => :destroy
   has_and_belongs_to_many :hobbies
   
-  key :uuid
+  uuid :id
   text :name, :sortable => true
   date :birthdate
   string :nickname
+  set :email_addresses
+  map :str_
   timestamps
   
   before_create :set_variable2
@@ -35,11 +37,12 @@ class Car < DatastaxRails::Base
   
   belongs_to :person
   
-  key :uuid
+  uuid :id
   string :name
-  string :person_id
-  string :car_payload_id
-  time :last_serviced_at
+  uuid :person_id
+  uuid :car_payload_id
+  datetime :last_serviced_at
+  map :oil_changes, :holds => :timestamp
   timestamps
 end
 
@@ -48,14 +51,15 @@ class CarPayload < DatastaxRails::PayloadModel
 end
 
 class AuditLog < DatastaxRails::WideStorageModel
+  include DatastaxRails::CassandraOnlyModel
   self.column_family = "audit_logs"
+  self.primary_key = :uuid
+  self.cluster_by  = :created_at
+  self.create_options = 'CLUSTERING ORDER BY (created_at DESC)'
   
-  key :natural, :attributes => [:uuid]
-  cluster_by :created_at
-  
-  string     :uuid
+  uuid       :uuid
   string     :message
-  string     :user, :indexed => :cassandra
+  string     :user, :cql_index => true
   timestamps
 end
 
@@ -64,10 +68,11 @@ class Job < DatastaxRails::Base
   
   belongs_to :person
   
-  key :uuid
+  uuid :id
   string :title
   integer :position_number
-  string :person_id
+  uuid :person_id
+  list :former_positions, :holds => :integer
   timestamps
   
   validates :position_number, :uniqueness => true, :allow_blank => true
@@ -76,7 +81,7 @@ end
 class Boat < DatastaxRails::Base
   self.column_family = "boats"
   
-  key :uuid
+  uuid :id
   string :name
   integer :registration
   timestamps
@@ -90,8 +95,17 @@ class Hobby < DatastaxRails::Base
   
   has_and_belongs_to_many :people
   
-  key :uuid
+  uuid :id
   string :name
   float :complexity
+  map :components, :holds => :integer
   timestamps
 end
+
+class CoreMetadata < DatastaxRails::DynamicModel
+  self.group_by = 'core'
+end
+
+class TeamMetadata < DatastaxRails::DynamicModel
+  self.group_by = 'team'
+end