schema_plus_default_expr 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 233c5f272e73d93ee11a5689c290511864c4e613
-  data.tar.gz: b5989731ef1ccb2cd48b8d3e75c591d2bb3a57ec
+  metadata.gz: 44fabc8c3f10cafca1397f164d5977d937900513
+  data.tar.gz: ce0a1818447e022b5308898cacb419865f97b396
 SHA512:
-  metadata.gz: 37137a6e9c15d2873bcd7b2fc0b37c1e13e9d3efe7838c520d1f3f748e417015fd026c2cf650ea117c9aa7c9a17c48319de9eb66dd38da8328dea40b171b968a
-  data.tar.gz: 5dc9dc12ca8166865a7867220ac324e48eabc81d0c9ef873934a900ad0a15646f5610dfab46ac6d134c83891c235ebb574fa968e6cae83ea5f853f967ad6d642
+  metadata.gz: 516f226ba7aa5ffa0aedb83349a805cb49dc246effcc9803292b19ae78672cd4c1a155e574c59bcdcd64a54a7df089180086791e07cd1fe75fc23766fa92e832
+  data.tar.gz: dac0f06442864762b8c132db809d8083e4d556e518087ec8d0892f74627d5134aa40f9bc761be710914c6ea94de0fcc49499cecd94e41f355b173909710f0839

data/.gitignore

@@ -3,6 +3,7 @@
 /pkg
 /Gemfile.local
 
+.byebug_history
 *.lock
 *.log
 *.sqlite3

data/.travis.yml

@@ -11,7 +11,7 @@ gemfile:
 - gemfiles/activerecord-4.2/Gemfile.sqlite3
 env: POSTGRESQL_DB_USER=postgres
 addons:
-  postgresql: '9.3'
+  postgresql: '9.4'
 before_script: bundle exec rake create_databases
 after_script: bundle exec rake drop_databases
 script: bundle exec rake travis

data/README.md

@@ -67,6 +67,7 @@ If you are using Postgresql with a `json` column, ActiveRecord allows you to use
 
 ## History
 
+* 0.1.1 - Fix dumping bug (#1); upgrade to schema_plus_core 1.0
 * 0.1.0 - Initial release, extracted from schema_plus 1.x
 
 ## Development & Testing

data/gemfiles/activerecord-4.2/Gemfile.base

@@ -1,3 +1,3 @@
 eval File.read File.expand_path('../../Gemfile.base', __FILE__)
 
-gem "activerecord", "~> 4.2.0"
+gem "activerecord", "~> 4.2.6"

data/lib/schema_plus/default_expr/middleware.rb

@@ -42,9 +42,7 @@ module SchemaPlus::DefaultExpr
           env.connection.columns(env.table.name).each do |column|
             if !column.default_function.nil?
               if col = env.table.columns.find(&its.name == column.name)
-                options = "default: { expr: #{column.default_function.inspect} }"
-                options += ", #{col.options}" unless col.options.blank?
-                col.options = options
+                col.options[:default] = { expr: column.default_function }
               end
             end
           end

data/lib/schema_plus/default_expr/version.rb

@@ -1,5 +1,5 @@
 module SchemaPlus
   module DefaultExpr
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/schema_plus_default_expr.gemspec

@@ -18,12 +18,12 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency "activerecord", "~> 4.2"
-  gem.add_dependency "schema_plus_core", "~> 0.2", ">= 0.2.1"
+  gem.add_dependency "schema_plus_core", "~> 1.0"
 
   gem.add_development_dependency "bundler", "~> 1.7"
   gem.add_development_dependency "rake", "~> 10.0"
   gem.add_development_dependency "rspec", "~> 3.0"
-  gem.add_development_dependency "schema_dev", "~> 3.4"
+  gem.add_development_dependency "schema_dev", "~> 3.6"
   gem.add_development_dependency "simplecov"
   gem.add_development_dependency "simplecov-gem-profile"
 end

data/spec/schema_dumper_spec.rb

@@ -34,13 +34,13 @@ describe "Schema dump" do
   context "with date default", :postgresql => :only do
     it "should dump the default hash expr as now()" do
       with_additional_column Post, :posted_at, :datetime, :default => :now do
-        expect(dump_posts).to match(%r{t\.datetime\s+"posted_at",\s*(?:default:|:default =>)\s*\{\s*(?:expr:|:expr\s*=>)\s*"now\(\)"\s*\}})
+        expect(dump_posts).to match(%r{t\.datetime\s+"posted_at",\s*(?:default:|:default\s*=>)\s*\{\s*(?:expr:|:expr\s*=>)\s*"now\(\)"\s*\}\s*$})
       end
     end
 
     it "should dump the default hash expr as CURRENT_TIMESTAMP" do
       with_additional_column Post, :posted_at, :datetime, :default => {:expr => 'date \'2001-09-28\''} do
-        expect(dump_posts).to match(%r{t\.datetime\s+"posted_at",\s*(?:default:|:default =>).*2001-09-28.*})
+        expect(dump_posts).to match(%r{t\.datetime\s+"posted_at",\s*(?:default:|:default\s*=>).*2001-09-28.*})
       end
     end
 
@@ -54,19 +54,19 @@ describe "Schema dump" do
   context "with date default", :sqlite3 => :only do
     it "should dump the default hash expr as now" do
       with_additional_column Post, :posted_at, :datetime, :default => :now do
-        expect(dump_posts).to match(%r{t\.datetime\s+"posted_at",\s*(?:default:|:default =>)\s*\{\s*(?:expr:|:expr =>)\s*"\(DATETIME\('now'\)\)"\s*\}})
+        expect(dump_posts).to match(%r{t\.datetime\s+"posted_at",\s*(default:|:default\s*=>)\s*\{\s*(?:expr:|:expr\s*=>)\s*"\(DATETIME\('now'\)\)"\s*\}})
       end
     end
 
     it "should dump the default hash expr string as now" do
       with_additional_column Post, :posted_at, :datetime, :default => { :expr => "(DATETIME('now'))" } do
-        expect(dump_posts).to match(%r{t\.datetime\s+"posted_at",\s*(?:default:|:default =>)\s*\{\s*(?:expr:|:expr =>)\s*"\(DATETIME\('now'\)\)"\s*\}})
+        expect(dump_posts).to match(%r{t\.datetime\s+"posted_at",\s*(default:|:default\s*=>)\s*\{\s*(?:expr:|:expr\s*=>)\s*"\(DATETIME\('now'\)\)"\s*\}})
       end
     end
 
     it "should dump the default value normally" do
       with_additional_column Post, :posted_at, :string, :default => "now" do
-        expect(dump_posts).to match(%r{t\.string\s*"posted_at",\s*(?:default:|:default =>)\s*"now"})
+        expect(dump_posts).to match(%r{t\.string\s*"posted_at",\s*(?:default:|:default\s*=>)\s*"now"})
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus_default_expr
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - ronen barzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -30,20 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement