schema_plus 1.8.3 → 1.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a5f207e0ebe6cbe96157c4762ac33335023a439
-  data.tar.gz: 024b7be47e963277cc5a673cc5639bede4348d58
+  metadata.gz: b535cbef242d2c3616d089e7ef267ffcda421a06
+  data.tar.gz: e788022566d93869fd22c992c1e15b6acee28bf9
 SHA512:
-  metadata.gz: 4e40fb778ee431cac5b5393f417036f62be5b256ad63dd98ea67cab6c7414e9a6abf7ac4a3b591a72f484c4b547cc1e8d727b27b7b8e993873e7b28c941d7e25
-  data.tar.gz: 18eee79285313cef82db8533032862e9662c9c8ac74c454afc2b80fd137a6081aa97594636becb63d56f260c4a213d98b49501da243c31c6ef1df196ce40330c
+  metadata.gz: 2c4bb4ccada1450523f33121bf5c7f4071c53f1714c6fbe6cd1c32efdce9aa85ddf7130194332b048127af5ef18ecbff4b738be8e6e172126d68abf686e9e0c2
+  data.tar.gz: c5f26b566f7cc429eb62d53a0d1f84faed2583b4bbc1f76b0ceabcc6e44ad3f80571456aef55a614720a9a106ea38e89bb18c508b3839eb91943c85591d57f28

data/.travis.yml

@@ -23,6 +23,8 @@ gemfile:
 - gemfiles/rails-4.2/Gemfile.postgresql
 - gemfiles/rails-4.2/Gemfile.sqlite3
 env: POSTGRESQL_DB_USER=postgres MYSQL_DB_USER=travis
+addons:
+  postgresql: '9.3'
 before_script: bundle exec rake create_databases
 after_script: bundle exec rake drop_databases
 script: bundle exec rake travis

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Change Log
 
+## 1.8.4
+
+* Bug fix: Allow default value as hash for json columns (#195)
+
 ## 1.8.3
 
 * Don't modifiy migration column options hashes (#191).  Thanks to [@lowjoel](https://github.com/lowjoel)

data/README.md

@@ -258,6 +258,12 @@ resolves to:
     NOW()                 # PostgreSQL
     (DATETIME('now'))     # SQLite3
     invalid               # MySQL
+    
+If you are using Postgresql with a `json` column, the default value may be an unadorned hash.  A hash having just one key `:expr` or `:value` will be taken as schema_plus syntax; i.e, these two are equivalent:
+
+	t.json :fields, default: { field1: 'a', field2: 'b' }
+	t.json :fields, default: { value: { field1: 'a', field2: 'b' } }
+	
 
 ### Column Defaults: Using
 

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

@@ -199,7 +199,7 @@ module SchemaPlus
             if options_include_default?(options)
               default = options[:default]
 
-              if default.is_a? Hash
+              if default.is_a? Hash and [[:expr], [:value]].include?(default.keys)
                 value = default[:value]
                 expr = sql_for_function(default[:expr]) || default[:expr] if default[:expr]
               else

data/lib/schema_plus/version.rb

@@ -1,3 +1,3 @@
 module SchemaPlus
-  VERSION = "1.8.3"
+  VERSION = "1.8.4"
 end

data/schema_plus.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency("activerecord", ">= 3.2", "< 4.3")
   s.add_dependency("valuable")
 
-  s.add_development_dependency("schema_dev", "~> 1.2", ">= 1.2.5")
+  s.add_development_dependency("schema_dev", "~> 1.4")
   s.add_development_dependency("rake")
   s.add_development_dependency("rspec", "~> 3.0.0")
   s.add_development_dependency("rdoc")

data/spec/migration_spec.rb

@@ -49,6 +49,13 @@ describe ActiveRecord::Migration do
       expect(@model.create.reload.bool).to be true
     end
 
+    it "should properly handle default values for json (#195)", :postgresql => :only do
+      recreate_table(@model) do |t|
+        t.json :json, :default => {}
+      end
+      expect(@model.create.reload.json).to eq({})
+    end if ActiveRecord::VERSION::MAJOR >= 4
+
     it "should create auto foreign keys" do
       recreate_table(@model) do |t|
         t.integer :user_id

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.8.4
 platform: ruby
 authors:
 - Ronen Barzel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-13 00:00:00.000000000 Z
+date: 2015-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -51,20 +51,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement