schema_plus 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 020e3e1c91dcc48f913fa638609354eb5a79e38b
-  data.tar.gz: f14c7627f58133d2f6471dadd5833b05e5ca5119
+  metadata.gz: 98695abbf9f44e746dda323f7312d0b206b74b33
+  data.tar.gz: f9402bff3980025c1f6a1b6e052f9ec1cf0f2bfe
 SHA512:
-  metadata.gz: 81abbdb298150d9b7939c4099c25d1f61ffab212e1aa98a8cd65f5fee4eb9254d960d1463883c0401ff6f5219dfa90e9e4b179806d13237d6992f6e712c1807d
-  data.tar.gz: e6dae4e417d11adc36730be4e6b7a4ca98dc03c664bc3a65408162db64f0406afb6cff0108b37ce35cb871356745650bf376a6fd52ccba2a34ba28ed65b94faf
+  metadata.gz: 1ac7c8fb9f854adb5bd455b19e93427829dffab2ceccbf59044116f1bdee8783acb5d98ede537a9af118e1d44a7872e306700e8ae9f4153c4d523ba7c4da4803
+  data.tar.gz: 521da3cda682a2ab9dc0126a093c3f6b21e5a49a19d7dded7662a5c7d8729671f9a71aa672e01150d4078cf2b076d20974a7a41e825a4616f7c5fae3386bcb72

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## Change Log
 
+### 1.5.3
+
+* No longer limited to rails 4.1.1 (issue #159)
+* Bug fix: multiple competing indexes created for `t.references... index: :unique` (issue #157)
+* Now works with rspec 3 (thanks to [@robababa](https://github.com/robababa) (issue #160)
+* Improvements to ./runspecs (thanks to [@robababa](https://github.com/robababa) (issue #162)
+
 ### 1.5.2
 
 * For now, pin to rspec 2.* and limit rails to 4.1.1 (issue #158)

data/README.md

@@ -17,7 +17,7 @@ For added rails DRYness see also the gems
 
 SchemaPlus supports all combinations of:
 
-*   Rails/ActiveRecord 3.2, 4.0, and 4.1 (currently 4.1.1)
+*   Rails/ActiveRecord 3.2, 4.0, and 4.1
 *   PostgreSQL, MySQL (using mysql2 gem; mysql gem only supported with Rails
     3.2), or SQLite3 (using sqlite3 >= 3.7.7 which has foreign key support)
 *   MRI Ruby 1.9.3, 2.0.0, or 2.1.0

data/gemfiles/rails-4.1/Gemfile.base

@@ -1,3 +1,3 @@
 eval File.read File.expand_path('../../Gemfile.base', __FILE__)
 
-gem "rails", ">= 4.1.0.beta1", "<= 4.1.1"
+gem "rails", ">= 4.1.0.beta1"

data/lib/schema_plus/active_record/column_options_handler.rb

@@ -14,6 +14,7 @@ module SchemaPlus::ActiveRecord
 
       # create index if requested explicity or implicitly due to auto_index
       index = column_options[:index]
+      index = column_options[:_index] if column_options.include? :_index
       if index.nil? and fk_args && config.foreign_keys.auto_index?
         index = { :name => auto_index_name(table_name, column_name) }
       end

data/lib/schema_plus/active_record/connection_adapters/column.rb

@@ -55,7 +55,7 @@ module SchemaPlus
         # The default as_jon includes all instance variables.  but
         # @model can't be dumped (it contains circular references)
         def as_json(options=nil)
-          instance_values.except "model"
+          instance_values.except "model", "adapter"
         end
       end
     end

data/lib/schema_plus/active_record/connection_adapters/schema_statements.rb

@@ -11,6 +11,7 @@ module SchemaPlus::ActiveRecord::ConnectionAdapters
 
     def add_reference_with_schema_plus(table_name, ref_name, options = {}) #:nodoc:
       options[:references] = nil if options[:polymorphic]
+      options[:_index] = options.delete(:index) unless options[:polymorphic] # usurp index creation from AR
       add_reference_without_schema_plus(table_name, ref_name, options)
     end
 

data/lib/schema_plus/active_record/connection_adapters/table_definition.rb

@@ -109,6 +109,7 @@ module SchemaPlus::ActiveRecord::ConnectionAdapters
     def references_with_schema_plus(*args) #:nodoc:
       options = args.extract_options!
       options[:references] = nil if options[:polymorphic]
+      options[:_index] = options.delete(:index) unless options[:polymorphic] # usurp index creation from AR
       args << options
       references_without_schema_plus(*args)
     end
@@ -118,6 +119,7 @@ module SchemaPlus::ActiveRecord::ConnectionAdapters
     def belongs_to_with_schema_plus(*args) #:nodoc:
       options = args.extract_options!
       options[:references] = nil if options[:polymorphic]
+      options[:_index] = options.delete(:index) unless options[:polymorphic] # usurp index creation from AR
       args << options
       belongs_to_without_schema_plus(*args)
     end

data/lib/schema_plus/version.rb

@@ -1,3 +1,3 @@
 module SchemaPlus
-  VERSION = "1.5.2"
+  VERSION = "1.5.3"
 end

data/runspecs

@@ -89,8 +89,8 @@ else
     # rbenv, we already have various environment variables set up.  need
     # strip those out so that the forked shell can run a diifferent ruby
     # version than the one we're in now.
-    ENV['PATH'] = ENV['PATH'].split(':').reject{|dir| dir =~ %r{/rbenv/(?!shims)}}.join(':')
-    ENV['GEM_PATH'] = ENV['GEM_PATH'].split(':').reject{|dir| dir =~ %r{/rbenv}}.join(':')
+    ENV['PATH'] = ENV['PATH'].split(':').reject{|dir| dir =~ %r{/\.?rbenv/(?!shims)}}.join(':')
+    ENV['GEM_PATH'] = ENV['GEM_PATH'].split(':').reject{|dir| dir =~ %r{/\.?rbenv}}.join(':') unless ENV['GEM_PATH'].nil?
     ENV['RBENV_DIR'] = nil
     ENV['RBENV_HOOK_PATH'] = nil
 

data/schema_plus.gemspec

@@ -21,13 +21,13 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency("activerecord", ">= 3.2", "<= 4.1.1")
+  s.add_dependency("activerecord", ">= 3.2")
   s.add_dependency("valuable")
 
   s.add_development_dependency("rake")
-  s.add_development_dependency("rspec", "< 2.99")
+  s.add_development_dependency("rspec", "~> 3.0.0")
   s.add_development_dependency("rdoc")
   s.add_development_dependency("simplecov")
-  s.add_development_dependency("simplecov-gem-adapter")
+  s.add_development_dependency("simplecov-gem-profile")
 end
 

data/spec/column_default_spec.rb

@@ -0,0 +1,156 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+
+describe "Column definition" do
+  before(:each) do
+    define_schema(:auto_create => true) do
+      create_table :models, :force => true do |t|
+      end
+    end
+    class Model < ::ActiveRecord::Base ; end
+  end
+
+  subject {
+    Model.connection.execute("INSERT INTO models (dummy) values (1)")
+    Model.last.reload.test_column
+  }
+
+  context "text columns" do
+
+    before(:each) do
+      @nowish = /(#{Time.now.utc.to_s.sub(/:[^:]+$/, '')}|#{Time.now.to_s.sub(/:[^:]+$/,'')}).*/
+    end
+
+    context "just default passed" do
+      before(:each) do
+        define_test_column(:string, :default => "2011-12-11 00:00:00")
+      end
+
+      it "should use the normal default" do
+        is_expected.to eq "2011-12-11 00:00:00"
+      end
+    end
+
+    context "just default passed in hash" do
+      before(:each) do
+        define_test_column(:string, :default => { :value => "2011-12-11 00:00:00" })
+      end
+
+      it "should use the normal default" do
+        is_expected.to eq "2011-12-11 00:00:00"
+      end
+    end
+
+    context "default passed with no nulls" do
+      before(:each) do
+        define_test_column(:string, :default => "2011-12-11 00:00:00", null: false)
+      end
+
+      it "should use the normal default" do
+        is_expected.to eq "2011-12-11 00:00:00"
+      end
+    end
+
+    context "default passed in hash with no nulls" do
+      before(:each) do
+        define_test_column(:string, :default => { :value => "2011-12-11 00:00:00" }, null: false)
+      end
+
+      it "should use the normal default" do
+        is_expected.to eq "2011-12-11 00:00:00"
+      end
+    end
+
+    context "default function passed as :now" do
+      before(:each) do
+        begin
+          define_test_column(:string, :default => :now)
+        rescue ArgumentError => e
+          @raised_argument_error = e
+        end
+      end
+
+      if SchemaPlusHelpers.mysql?
+        it "should raise an error" do
+          expect(@raised_argument_error).to be_a ArgumentError
+        end
+      else
+        it "should use NOW() as the default" do
+          is_expected.to match @nowish
+        end
+      end
+    end
+
+    context "default function passed as now with no nulls" do
+      before(:each) do
+        begin
+          define_test_column(:string, :default => :now, null: false)
+        rescue ArgumentError => e
+          @raised_argument_error = e
+        end
+      end
+
+      if SchemaPlusHelpers.mysql?
+        it "should raise an error" do
+          expect(@raised_argument_error).to be_a ArgumentError
+        end
+      else
+        it "should use NOW() as the default" do
+          is_expected.to match @nowish
+        end
+      end
+    end
+
+    context "valid expr passed as default" do
+      if SchemaPlusHelpers.mysql?
+        it "raises an error" do
+          expect {
+            define_test_column(:string, :default => { :expr => "(replace('THIS IS A TEST', 'TEST', 'DOG'))" })
+          }.to raise_error ArgumentError
+        end
+      else
+        it "uses the expression" do
+          define_test_column(:string, :default => { :expr => "(replace('THIS IS A TEST', 'TEST', 'DOG'))" })
+          is_expected.to eq "THIS IS A DOG"
+        end
+      end
+    end
+
+  end
+
+  context "boolean column" do
+
+    context "passed as boolean false" do
+      before(:each) do
+        define_test_column :boolean, :default => false
+      end
+
+      it "should give the default as false" do
+        is_expected.to eq false
+      end
+    end
+
+    context "passed as boolean true" do
+      before(:each) do
+        define_test_column :boolean, :default => true
+      end
+
+      it "should give the default as true" do
+        is_expected.to eq true
+      end
+    end
+  end
+
+  private 
+
+  def define_test_column(type, *args)
+    ActiveRecord::Migration.suppress_messages do
+      ActiveRecord::Migration.create_table Model.table_name, :force => true do |t|
+        t.send type, :test_column, *args
+        t.integer :dummy
+      end
+    end
+    Model.reset_column_information
+    @column = Model.columns.first()
+  end
+end

data/spec/column_spec.rb

@@ -14,7 +14,7 @@ describe "Column" do
       @login = User.columns.find{|column| column.name == "login"}
     end
     it "works properly" do
-      JSON.parse(@login.to_json).should include("name" => "login", "type" => "string")
+      expect(JSON.parse(@login.to_json)).to include("name" => "login", "type" => "string")
     end
   end
 
@@ -28,12 +28,12 @@ describe "Column" do
       end
 
       it "should report not unique" do
-        @login.should_not be_unique
+        expect(@login).not_to be_unique
       end
 
       it "should report nil unique scope" do
         create_table(User, :login => { :index => true})
-        @login.unique_scope.should be_nil
+        expect(@login.unique_scope).to be_nil
       end
     end
 
@@ -44,11 +44,11 @@ describe "Column" do
       end
 
       it "should report unique" do
-        @login.should be_unique
+        expect(@login).to be_unique
       end
 
       it "should report an empty unique scope" do
-        @login.unique_scope.should == []
+        expect(@login.unique_scope).to eq([])
       end
     end
 
@@ -62,15 +62,15 @@ describe "Column" do
       end
 
       it "should report unique for each" do
-        @first.should be_unique
-        @middle.should be_unique
-        @last.should be_unique
+        expect(@first).to be_unique
+        expect(@middle).to be_unique
+        expect(@last).to be_unique
       end
 
       it "should report unique scope for each" do
-        @first.unique_scope.should =~ %W[middle last]
-        @middle.unique_scope.should =~ %W[first last]
-        @last.unique_scope.should =~ %W[first middle]
+        expect(@first.unique_scope).to match_array(%W[middle last])
+        expect(@middle.unique_scope).to match_array(%W[first last])
+        expect(@last.unique_scope).to match_array(%W[first middle])
       end
     end
 
@@ -80,17 +80,17 @@ describe "Column" do
 
     it "not required if the column can be null" do
       create_table(User, :login => { :null => true})
-      User.columns.find{|column| column.name == "login"}.required_on.should be_nil
+      expect(User.columns.find{|column| column.name == "login"}.required_on).to be_nil
     end
 
     it "must have a value on :save if there's no default" do
       create_table(User, :login => { :null => false })
-      User.columns.find{|column| column.name == "login"}.required_on.should == :save
+      expect(User.columns.find{|column| column.name == "login"}.required_on).to eq(:save)
     end
 
     it "must have a value on :update if there's default" do
       create_table(User, :login => { :null => false, :default => "foo" })
-      User.columns.find{|column| column.name == "login"}.required_on.should == :update
+      expect(User.columns.find{|column| column.name == "login"}.required_on).to eq(:update)
     end
 
   end
@@ -113,19 +113,19 @@ describe "Column" do
 
       it "creating a record should respect default expression" do
         User.create!(:alpha => ActiveRecord::DB_DEFAULT, :beta => "hello")
-        User.last.alpha.should == "gabba"
-        User.last.beta.should == "hello"
+        expect(User.last.alpha).to eq("gabba")
+        expect(User.last.beta).to eq("hello")
       end
 
       it "updating a record should respect default expression" do
         u = User.create!(:alpha => "hey", :beta => "hello")
         u.reload
-        u.alpha.should == "hey"
-        u.beta.should == "hello"
+        expect(u.alpha).to eq("hey")
+        expect(u.beta).to eq("hello")
         u.update_attributes(:alpha => ActiveRecord::DB_DEFAULT, :beta => "goodbye")
         u.reload
-        u.alpha.should == "gabba"
-        u.beta.should == "goodbye"
+        expect(u.alpha).to eq("gabba")
+        expect(u.beta).to eq("goodbye")
       end
     end
   end

data/spec/connection_spec.rb

@@ -4,7 +4,7 @@ describe "Connection" do
 
   it "should re-open without failure" do
     expect {
-      ActiveRecord::Base.establish_connection "schema_plus"
+      ActiveRecord::Base.establish_connection :schema_plus
     }.to_not raise_error
   end
 end

data/spec/foreign_key_definition_spec.rb

@@ -5,17 +5,17 @@ describe "Foreign Key definition" do
   let(:definition) { SchemaPlus::ActiveRecord::ConnectionAdapters::ForeignKeyDefinition.new("posts_user_fkey", :posts, :user, :users, :id) }
 
   it "dumps to sql with quoted values" do
-    definition.to_sql.should == %Q{CONSTRAINT posts_user_fkey FOREIGN KEY (#{quote_column_name('user')}) REFERENCES #{quote_table_name('users')} (#{quote_column_name('id')})}
+    expect(definition.to_sql).to eq(%Q{CONSTRAINT posts_user_fkey FOREIGN KEY (#{quote_column_name('user')}) REFERENCES #{quote_table_name('users')} (#{quote_column_name('id')})})
   end
 
   it "dumps to sql with deferrable values" do
     deferred_definition = SchemaPlus::ActiveRecord::ConnectionAdapters::ForeignKeyDefinition.new("posts_user_fkey", :posts, :user, :users, :id, nil, nil, true)
-    deferred_definition.to_sql.should == %Q{CONSTRAINT posts_user_fkey FOREIGN KEY (#{quote_column_name('user')}) REFERENCES #{quote_table_name('users')} (#{quote_column_name('id')}) DEFERRABLE}
+    expect(deferred_definition.to_sql).to eq(%Q{CONSTRAINT posts_user_fkey FOREIGN KEY (#{quote_column_name('user')}) REFERENCES #{quote_table_name('users')} (#{quote_column_name('id')}) DEFERRABLE})
   end
 
   it "dumps to sql with initially deferrable values" do
     initially_deferred_definition = SchemaPlus::ActiveRecord::ConnectionAdapters::ForeignKeyDefinition.new("posts_user_fkey", :posts, :user, :users, :id, nil, nil, :initially_deferred)
-    initially_deferred_definition.to_sql.should == %Q{CONSTRAINT posts_user_fkey FOREIGN KEY (#{quote_column_name('user')}) REFERENCES #{quote_table_name('users')} (#{quote_column_name('id')}) DEFERRABLE INITIALLY DEFERRED}
+    expect(initially_deferred_definition.to_sql).to eq(%Q{CONSTRAINT posts_user_fkey FOREIGN KEY (#{quote_column_name('user')}) REFERENCES #{quote_table_name('users')} (#{quote_column_name('id')}) DEFERRABLE INITIALLY DEFERRED})
   end
 
   def quote_table_name(table)

data/spec/foreign_key_spec.rb

@@ -20,11 +20,11 @@ describe "Foreign Key" do
     end
 
     it "should report foreign key constraints" do
-      Comment.foreign_keys.collect(&:column_names).flatten.should == [ "user_id" ]
+      expect(Comment.foreign_keys.collect(&:column_names).flatten).to eq([ "user_id" ])
     end
 
     it "should report reverse foreign key constraints" do
-      User.reverse_foreign_keys.collect(&:column_names).flatten.should == [ "user_id" ]
+      expect(User.reverse_foreign_keys.collect(&:column_names).flatten).to eq([ "user_id" ])
     end
 
   end
@@ -32,7 +32,9 @@ describe "Foreign Key" do
   if ::ActiveRecord::VERSION::MAJOR.to_i >= 4
     context "with modifications to SQL generated by upstream visit_TableDefinition" do
       before(:each) do
-        ActiveRecord::Base.connection.class.const_get(:SchemaCreation).any_instance.stub :visit_TableDefinition_without_schema_plus => "this is unexpected"
+        allow_any_instance_of(ActiveRecord::Base.connection.class.const_get(:SchemaCreation))
+          .to receive(:visit_TableDefinition_without_schema_plus)
+          .and_return('this is unexpected')
       end
 
       it "raises an exception when attempting to create a table" do
@@ -105,23 +107,23 @@ describe "Foreign Key" do
         end
 
         it "references users(id)" do
-          Post.should reference(:users, :id).on(:author_id)
+          expect(Post).to reference(:users, :id).on(:author_id)
         end
 
         it "cascades on update" do
-          Post.should reference(:users).on_update(:cascade)
+          expect(Post).to reference(:users).on_update(:cascade)
         end
 
         it "restricts on delete" do
-          Post.should reference(:users).on_delete(:restrict)
+          expect(Post).to reference(:users).on_delete(:restrict)
         end
 
         it "is available in Post.foreign_keys" do
-          Post.foreign_keys.collect(&:column_names).should include(%w[author_id])
+          expect(Post.foreign_keys.collect(&:column_names)).to include(%w[author_id])
         end
 
         it "is available in User.reverse_foreign_keys" do
-          User.reverse_foreign_keys.collect(&:column_names).should include(%w[author_id])
+          expect(User.reverse_foreign_keys.collect(&:column_names)).to include(%w[author_id])
         end
 
       end
@@ -139,15 +141,15 @@ describe "Foreign Key" do
         end
 
         it "doesn't reference posts(id)" do
-          Comment.should_not reference(:posts).on(:post_id)
+          expect(Comment).not_to reference(:posts).on(:post_id)
         end
 
         it "is no longer available in Post.foreign_keys" do
-          Comment.foreign_keys.collect(&:column_names).should_not include(%w[post_id])
+          expect(Comment.foreign_keys.collect(&:column_names)).not_to include(%w[post_id])
         end
 
         it "is no longer available in User.reverse_foreign_keys" do
-          Post.reverse_foreign_keys.collect(&:column_names).should_not include(%w[post_id])
+          expect(Post.reverse_foreign_keys.collect(&:column_names)).not_to include(%w[post_id])
         end
 
       end
@@ -158,7 +160,7 @@ describe "Foreign Key" do
 
         it "should remove foreign keys" do
           remove_foreign_key(:comments, foreign_key_name)
-          Post.reverse_foreign_keys.collect { |fk| fk.column_names == %w[post_id] && fk.table_name == "comments" }.should be_empty
+          expect(Post.reverse_foreign_keys.collect { |fk| fk.column_names == %w[post_id] && fk.table_name == "comments" }).to be_empty
         end
 
       end