schema_plus 1.5.2 → 1.5.3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Ronen Barzel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-27 00:00:00.000000000 Z
+date: 2014-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -18,9 +18,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - <=
-      - !ruby/object:Gem::Version
-        version: 4.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -28,9 +25,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - <=
-      - !ruby/object:Gem::Version
-        version: 4.1.1
 - !ruby/object:Gem::Dependency
   name: valuable
   requirement: !ruby/object:Gem::Requirement
@@ -63,16 +57,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2.99'
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2.99'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -102,7 +96,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov-gem-adapter
+  name: simplecov-gem-profile
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -174,7 +168,7 @@ files:
 - lib/schema_plus/version.rb
 - runspecs
 - schema_plus.gemspec
-- spec/column_definition_spec.rb
+- spec/column_default_spec.rb
 - spec/column_spec.rb
 - spec/connection_spec.rb
 - spec/connections/mysql/connection.rb
@@ -223,7 +217,7 @@ specification_version: 4
 summary: Enhances ActiveRecord schema mechanism, including more DRY index creation
   and support for foreign key constraints and views.
 test_files:
-- spec/column_definition_spec.rb
+- spec/column_default_spec.rb
 - spec/column_spec.rb
 - spec/connection_spec.rb
 - spec/connections/mysql/connection.rb

data/spec/column_definition_spec.rb

@@ -1,212 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-
-describe "Column definition" do
-  before(:all) do
-    define_schema(:auto_create => false) do
-      create_table :users, :force => true do |t|
-        t.string :login
-        t.datetime :deleted_at
-      end
-
-      create_table :posts, :force => true do |t|
-        t.text :body
-        t.integer :user_id
-        t.integer :author_id
-      end
-
-      create_table :comments, :force => true do |t|
-        t.text :body
-        t.integer :post_id
-        t.foreign_key :post_id, :posts, :id
-      end
-    end
-  end
-
-  def call_add_column_options!(*params, &block)
-    if ::ActiveRecord::VERSION::MAJOR >= 4
-      ActiveRecord::Base.connection.schema_creation.send(:add_column_options!, *params, &block)
-    else
-      ActiveRecord::Base.connection.add_column_options!(*params, &block)
-    end
-  end
-
-  context "text columns" do
-    before(:each) do
-      @sql = 'time_taken text'
-    end
-
-    context "just default passed" do
-      before(:each) do
-        call_add_column_options!(@sql, { :default => "2011-12-11 00:00:00" })
-      end
-
-      subject { @sql}
-
-      it "should use the normal default" do
-        should == "time_taken text DEFAULT '2011-12-11 00:00:00'"
-      end
-    end
-
-    context "just default passed in hash" do
-      before(:each) do
-        call_add_column_options!(@sql, { :default => { :value => "2011-12-11 00:00:00" } })
-      end
-
-      subject { @sql}
-
-      it "should use the normal default" do
-        should == "time_taken text DEFAULT '2011-12-11 00:00:00'"
-      end
-    end
-
-    context "default passed with no nulls" do
-      before(:each) do
-        call_add_column_options!(@sql, { :default => "2011-12-11 00:00:00", null: false })
-      end
-
-      subject { @sql}
-
-      it "should use the normal default" do
-        should == "time_taken text DEFAULT '2011-12-11 00:00:00' NOT NULL"
-      end
-    end
-
-    context "default passed in hash with no nulls" do
-      before(:each) do
-        call_add_column_options!(@sql, { :default => { :value => "2011-12-11 00:00:00" }, null: false })
-      end
-
-      subject { @sql}
-
-      it "should use the normal default" do
-        should == "time_taken text DEFAULT '2011-12-11 00:00:00' NOT NULL"
-      end
-    end
-
-    context "default function passed as now" do
-      before(:each) do
-        begin
-          call_add_column_options!(@sql, { :default => :now })
-        rescue ArgumentError => e
-          @raised_argument_error = e
-        end
-      end
-
-      subject { @sql }
-
-      if SchemaPlusHelpers.postgresql?
-        it "should use NOW() as the default" do
-          should == "time_taken text DEFAULT NOW()"
-        end
-      end
-
-      if SchemaPlusHelpers.sqlite3?
-        it "should use NOW() as the default" do
-          should == "time_taken text DEFAULT (DATETIME('now'))"
-        end
-      end
-
-      if SchemaPlusHelpers.mysql?
-        it "should raise an error" do
-          @raised_argument_error.should be_a ArgumentError
-        end
-      end
-    end
-
-    context "default function passed as now with no nulls" do
-      before(:each) do
-        begin
-          call_add_column_options!(@sql, { :default => :now, null: false })
-        rescue ArgumentError => e
-          @raised_argument_error = e
-        end
-      end
-
-      subject { @sql }
-
-      if SchemaPlusHelpers.postgresql?
-        it "should use NOW() as the default" do
-          should == "time_taken text DEFAULT NOW() NOT NULL"
-        end
-      end
-
-      if SchemaPlusHelpers.sqlite3?
-        it "should use NOW() as the default" do
-          should == "time_taken text DEFAULT (DATETIME('now')) NOT NULL"
-        end
-      end
-
-      if SchemaPlusHelpers.mysql?
-        it "should raise an error" do
-          @raised_argument_error.should be_a ArgumentError
-        end
-      end
-    end
-
-    context "valid expr passed as default" do
-      subject { call_add_column_options!(@sql, { :default => { :expr => 'NOW()' } }); @sql }
-
-      if SchemaPlusHelpers.postgresql?
-        it "should use NOW() as the default" do
-          should == "time_taken text DEFAULT NOW()"
-        end
-      end
-
-      if SchemaPlusHelpers.sqlite3?
-        it "should use NOW() as the default" do
-          should == "time_taken text DEFAULT NOW()"
-        end
-      end
-
-      if SchemaPlusHelpers.mysql?
-        it "should raise an error" do
-          lambda { subject }.should raise_error
-        end
-      end
-    end
-
-    context "invalid expr passed as default" do
-      if SchemaPlusHelpers.mysql?
-        it "should raise an error" do
-          lambda {call_add_column_options!(@sql, { :default => { :expr => "ARBITRARY_EXPR" } })}.should raise_error ArgumentError
-        end
-      else
-        it "should just accept the SQL" do
-          call_add_column_options!(@sql, { :default => { :expr => "ARBITRARY_EXPR" } })
-          @sql.should == "time_taken text DEFAULT ARBITRARY_EXPR"
-        end
-      end
-    end
-  end
-
-  context "boolean column" do
-    before(:each) do
-      @sql = 'time_taken boolean'
-    end
-
-    context "passed as boolean false" do
-      before(:each) do
-        call_add_column_options!(@sql, { :default => false })
-      end
-
-      subject { @sql}
-
-      it "should give the default as false" do
-        should =~ /boolean DEFAULT (\'f\'|0)/
-      end
-    end
-
-    context "passed as boolean true" do
-      before(:each) do
-        call_add_column_options!(@sql, { :default => true })
-      end
-
-      subject { @sql}
-
-      it "should give the default as true" do
-        should =~ /boolean DEFAULT (\'t\'|1)/
-      end
-    end
-  end
-end