datastax_rails 2.0.12 → 2.0.15

data/spec/datastax_rails/schema/solr_spec.rb

@@ -2,33 +2,33 @@ require 'spec_helper'
 
 describe DatastaxRails::Schema::Solr do
   subject do
-    DatastaxRails::Schema::Migrator.new('datastax_rails_test').tap{|m| m.verbose = false}
+    DatastaxRails::Schema::Migrator.new('datastax_rails_test').tap { |m| m.verbose = false }
   end
-  
-  describe "#reindex_solr" do
-    it "calls curl to post the reindex command" do
+
+  describe '#reindex_solr' do
+    it 'calls curl to post the reindex command' do
       url = "#{DatastaxRails::Base.solr_base_url}/admin/cores?action=RELOAD&name=datastax_rails_test.people&reindex=true&deleteAll=false"
       expect(subject).to receive(:`).with("curl -s -X POST '#{url}'")
       subject.reindex_solr(Person)
     end
   end
-  
-  describe "#create_solr_core" do
-    it "calls curl to post the solr create core command" do
+
+  describe '#create_solr_core' do
+    it 'calls curl to post the solr create core command' do
       url = "#{DatastaxRails::Base.solr_base_url}/admin/cores?action=CREATE&name=datastax_rails_test.people"
       expect(subject).to receive(:`).with("curl -s -X POST '#{url}'")
       subject.create_solr_core(Person)
     end
   end
-  
-  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 => {}, :primary_key => 'id', :<= => false)
+
+  describe '#generate_solr_schema' do
+    it 'uses a custom config if one is present' do
+      model = double('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
-  
-  describe "#upload_solr_configuration" do
-    
+
+  describe '#upload_solr_configuration' do
+
   end
-end
+end

data/spec/datastax_rails/scoping/default_spec.rb

@@ -1,16 +1,16 @@
 require 'spec_helper.rb'
 
 describe DatastaxRails::Base do
-  context "Scoping" do
-    context "Default" do
-      it "applies the default scope" do
-        Boat.create(:name => 'WindDancer', :registration => 1)
-        Boat.create(:name => 'Misty', :registration => 2)
-        Boat.create(:name => 'Voyager', :registration => 3)
-        Boat.create(:name => 'Aquacadabra', :registration => 4)
+  context 'Scoping' do
+    context 'Default' do
+      it 'applies the default scope' do
+        Boat.create(name: 'WindDancer', registration: 1)
+        Boat.create(name: 'Misty', registration: 2)
+        Boat.create(name: 'Voyager', registration: 3)
+        Boat.create(name: 'Aquacadabra', registration: 4)
         Boat.commit_solr
-        
-        Boat.where(:registration => [1,2,3,4]).collect(&:name).should == ['Aquacadabra', 'Misty', 'Voyager', 'WindDancer']
+
+        expect(Boat.where(registration: [1, 2, 3, 4]).map(&:name)).to eq(%w(Aquacadabra Misty Voyager WindDancer))
       end
     end
   end

data/spec/datastax_rails/types/dynamic_list_spec.rb

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

data/spec/datastax_rails/types/dynamic_map_spec.rb

@@ -1,22 +1,22 @@
 require 'spec_helper'
 
 describe DatastaxRails::Types::DynamicMap do
-  subject {described_class.new(double("record", :changed_attributes => {}, :attributes => {}), 'map', {})}
-  
+  subject { described_class.new(double('record', changed_attributes: {}, attributes: {}), 'map', {}) }
+
   before(:each) do
-    subject['mapkey'] = "Test String"
+    subject['mapkey'] = 'Test String'
   end
-  
-  its(['mapkey']) { should eq("Test String")}
+
+  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
+  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
+
+  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

@@ -1,16 +1,28 @@
 require 'spec_helper'
 
 describe DatastaxRails::Types::DynamicSet do
-  subject {described_class.new(double("record", :changed_attributes => {}, :attributes => {}), 'set', [])}
-  
+  let(:set) { described_class.new(double('record', changed_attributes: {}, attributes: {}), 'set', []) }
+  subject { set }
   before(:each) do
-    subject << "Test String 1"
-    subject << "Another Test String"
-    subject.add("Test String 1")
-    subject << nil
+    set << 'Test String 1'
+    set << 'Another Test String'
+    set.add('Test String 1')
+    set << nil
+  end
+
+  it { is_expected.to eq(Set.new(['Test String 1', 'Another Test String', nil])) }
+  its('record.changed_attributes') { is_expected.to include('set' => Set.new) }
+  its('record.attributes') { is_expected.to include('set' => Set.new(['Test String 1', 'Another Test String', nil])) }
+
+  context 'updating an existing record' do
+    subject { FactoryGirl.build_stubbed(:person, email_addresses: Set.new(['john@example.com'])) }
+
+    before do
+      subject.changed_attributes.clear
+      subject.email_addresses << 'john@compuserve.com'
+    end
+
+    it { is_expected.to be_changed }
+    its(:changed_attributes) { is_expected.to include('email_addresses' => Set.new(['john@example.com'])) }
   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/datastax_rails/validations/uniqueness_spec.rb

@@ -1,43 +1,43 @@
 require 'spec_helper'
 
 describe DatastaxRails::Base do
-  describe "uniqueness validation" do
-    it "should validate uniqueness" do
+  describe 'uniqueness validation' do
+    it 'should validate uniqueness' do
       Person.commit_solr
-      Person.create!(:name => "Jason")
+      Person.create!(name: 'Jason')
       Person.commit_solr
       Person.commit_solr
-      person = Person.new(:name => "Jason")
-      person.should_not be_valid
-      person.name = "John"
-      person.should be_valid
+      person = Person.new(name: 'Jason')
+      expect(person).not_to be_valid
+      person.name = 'John'
+      expect(person).to be_valid
     end
-    
-    it "should allow an update to a model without triggering a uniqueness error" do
+
+    it 'should allow an update to a model without triggering a uniqueness error' do
       Person.commit_solr
-      p=Person.create!(:name => "Jason", :birthdate => Date.strptime("10/19/1985", '%m/%d/%Y'))
+      p = Person.create!(name: 'Jason', birthdate: Date.strptime('10/19/1985', '%m/%d/%Y'))
       Person.commit_solr
-      p.birthdate = Date.strptime("10/19/1980", '%m/%d/%Y')
+      p.birthdate = Date.strptime('10/19/1980', '%m/%d/%Y')
       p.save!
     end
-    
-    it "should not break when negative numbers are entered" do
-      j = Job.new(:title => 'Mouseketeer', :position_number => -1)
-      j.should be_valid
+
+    it 'should not break when negative numbers are entered' do
+      j = Job.new(title: 'Mouseketeer', position_number: -1)
+      expect(j).to be_valid
     end
-    
-    it "should not enforce uniqueness of blanks if specified" do
-      Job.create!(:title => 'Engineer')
+
+    it 'should not enforce uniqueness of blanks if specified' do
+      Job.create!(title: 'Engineer')
       Job.commit_solr
-      j = Job.new(:title => 'Analyst')
-      j.should be_valid
+      j = Job.new(title: 'Analyst')
+      expect(j).to be_valid
     end
-    
-    it "should enforce uniqueness of blanks if not instructed otherwise" do
-      Boat.create!(:name => nil)
+
+    it 'should enforce uniqueness of blanks if not instructed otherwise' do
+      Boat.create!(name: nil)
       Boat.commit_solr
-      b=Boat.new
-      b.should_not be_valid
+      b = Boat.new
+      expect(b).not_to be_valid
     end
   end
 end

data/spec/datastax_rails/wide_storage_model_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe DatastaxRails::WideStorageModel do
+  subject { build_stubbed(:audit_log) }
+
+  context '#id_for_update' do
+    subject { super().id_for_update }
+    it { is_expected.to have_key('uuid') }
+    it { is_expected.to have_key('created_at') }
+  end
+end

data/spec/datastax_rails_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
 
 describe DatastaxRails do
-  
-end
+
+end

data/spec/dummy/config/application.rb

@@ -3,7 +3,7 @@ require File.expand_path('../boot', __FILE__)
 require 'active_model/railtie'
 
 Bundler.require
-require "datastax_rails"
+require 'datastax_rails'
 
 module Dummy
   class Application < Rails::Application
@@ -30,7 +30,7 @@ module Dummy
     # config.i18n.default_locale = :de
 
     # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = "utf-8"
+    config.encoding = 'utf-8'
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
@@ -42,4 +42,3 @@ module Dummy
     config.assets.version = '1.0'
   end
 end
-

data/spec/dummy/config/boot.rb

@@ -7,4 +7,4 @@ if File.exist?(gemfile)
   Bundler.setup
 end
 
-$:.unshift File.expand_path('../../../../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)

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

@@ -5,15 +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
-  
+
   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

@@ -11,7 +11,7 @@ Dummy::Application.configure do
 
   # Configure static asset server for tests with Cache-Control for performance
   config.serve_static_assets = true
-  config.static_cache_control = "public, max-age=3600"
+  config.static_cache_control = 'public, max-age=3600'
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true

data/spec/dummy/config/initializers/session_store.rb

@@ -1,6 +1,6 @@
 # Be sure to restart your server when you modify this file.
 
-Dummy::Application.config.session_store :cookie_store, :key => '_dummy_session'
+Dummy::Application.config.session_store :cookie_store, key: '_dummy_session'
 
 # Use the database for sessions instead of the cookie-based default,
 # which shouldn't be used to store highly confidential information

data/spec/dummy/config/initializers/wrap_parameters.rb

@@ -5,7 +5,7 @@
 
 # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
 ActiveSupport.on_load(:action_controller) do
-  wrap_parameters :format => [:json]
+  wrap_parameters format: [:json]
 end
 
 # Disable root element in JSON by default.

data/spec/factories/audit_logs.rb

@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory(:audit_log) do
+    message 'Updated something'
+    user 'jimbob'
+  end
+end

data/spec/factories/hobbies.rb

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

data/spec/factories/people.rb

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

data/spec/feature/dynamic_fields_spec.rb

@@ -1,9 +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'})
+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
+    expect(Person.where(str_favorite_color: 'blue').entries.size).to eq(1)
   end
 end

data/spec/feature/overloaded_tables_spec.rb

@@ -1,24 +1,23 @@
 require 'spec_helper'
 
-feature "Table Overloads" do
-  scenario "models writing to the same column family do not collide" do
+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.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[: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
+
+    expect(CoreMetadata.fulltext('BBC').entries.size).to eq(1)
+    expect(CoreMetadata.fulltext('TV').entries.size).to eq(0)
   end
-end
+end

data/spec/spec_helper.rb

@@ -1,42 +1,45 @@
 # configure Rails Envinronment
-ENV["RAILS_ENV"] = "test"
-require File.expand_path("../dummy/config/environment.rb",  __FILE__)
+ENV['RAILS_ENV'] = 'test'
+require File.expand_path('../dummy/config/environment.rb',  __FILE__)
 
 require 'rspec/rails'
+require 'rspec/its'
+require 'factory_girl_rails'
 
-ENGINE_RAILS_ROOT=File.join(File.dirname(__FILE__), '../')
+ENGINE_RAILS_ROOT = File.join(File.dirname(__FILE__), '../')
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
-Dir[File.expand_path(File.join(ENGINE_RAILS_ROOT, "spec/support/**/*.rb"))].each {|f| require f }
+Dir[File.expand_path(File.join(ENGINE_RAILS_ROOT, 'spec/support/**/*.rb'))].each { |f| require f }
 
 RSpec.configure do |config|
+  config.include FactoryGirl::Syntax::Methods
+
   config.alias_it_should_behave_like_to :it_has_behavior, 'has behavior:'
-  
+
   # Use a focus tag to filter specific specs. This helps if you need to
   # focus on one spec instead of the whole suite.
   config.filter_run focus: true
   config.run_all_when_everything_filtered = true
-  
+
   # Filter slow specs. Add a :slow tag to the spec to keep it from
   # running unless the SLOW_SPECS environment variable is set.
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   # config.filter_run_excluding :slow unless ENV['SLOW_SPECS']
-  
+
   config.before(:each) do
     DatastaxRails::Base.recorded_classes = {}
     DatastaxRails::Base.statement_cache.clear
   end
-  
+
   config.after(:each) do
     DatastaxRails::Base.recorded_classes.keys.each do |klass|
-      DatastaxRails::Base.connection.execute("TRUNCATE #{klass.column_family.to_s}")
+      DatastaxRails::Base.connection.execute("TRUNCATE #{klass.column_family}")
     end
   end
-  
+
   # config.after(:all) do
-    # DatastaxRails::Base.models.each do |m|
-      # DatastaxRails::Cql::Truncate.new(m).execute
-    # end
+  # DatastaxRails::Base.models.each do |m|
+  # DatastaxRails::Cql::Truncate.new(m).execute
+  # end
   # end
 end