schema_plus_core 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4b3d7025a34fb4913c6ec1bac138771edf66ef7
-  data.tar.gz: dc72bc7e1db359648b55957127946402f625c3ca
+  metadata.gz: 2a59aa0134494234f7d1601e3f5c764035c00969
+  data.tar.gz: d8af7c134c42e18f69f749d31bc3b9908179736e
 SHA512:
-  metadata.gz: e585ae20a489a633f49635467122452c215e5aba2c5e35a3a49fc616ef62cb7b539b52df9b25bb6cebbafa7c0e89d00ced22e11728810acaa30498d0750fc5d6
-  data.tar.gz: 003aaf743a991da00c00f4ba57c78ff544c9acdc3967c2356dc1f38324530a11dc75f6c9ea5023753f3df42bdcb614e2aead18fcbab2b736e88c76da8d0c6d06
+  metadata.gz: 07bb287598da65c41da7c50e7a0ae7711e45653012cebcb9e8bf69f66c4c9e96ff363ef6ebdbe0cfd8965d927b518aa2cefc84a2168f8f11ca847ae2cb653a31
+  data.tar.gz: d0834cc8c8da80f8aa19395c5a25f06c6eee457bb0aabdde90d957fad0fad5879bf7d88d9925a716e1e826df3d4457f296fbba9af1530d9504e91a4440dacaba

data/.travis.yml

@@ -12,7 +12,7 @@ gemfile:
 - gemfiles/activerecord-4.2/Gemfile.sqlite3
 env: POSTGRESQL_DB_USER=postgres MYSQL_DB_USER=travis
 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

@@ -435,6 +435,7 @@ SchemaPlus::Core provides a state object and of callbacks to various phases of t
 
 ## History
 
+* 0.3.1 Pass along (undocumented) return values from association declarations
 * 0.3.0 Added `Model::Association::Declaration`
 * 0.2.1 Added `Migration::CreateTable` and `Schema::Define`; removed dependency on (defunct) `schema_monkey_rails` gem.  [Oops, this should have been a minor version bump]
 * 0.2.0 Added `Migration::DropTable`

data/lib/schema_plus/core/active_record/base.rb

@@ -16,32 +16,32 @@ module SchemaPlus
             end
           end
 
+          # has_many, has_one, has_and_belongs_to_many, and belongs_to
+          # don't have a documented return value.  But at least one gem
+          # (https://github.com/hzamani/active_record-acts_as/blob/master/lib/active_record/acts_as/relation.rb#L14)
+          # relies on the undocumented return value.
           def has_many(name, scope = nil, options = {}, &extension)
-            SchemaMonkey::Middleware::Model::Association::Declaration.start(model: self, name: name, scope: scope, options: options, extension: extension) do
-            |env|
-              super(env.name, env.scope, env.options, &env.extension)
-            end
+            SchemaMonkey::Middleware::Model::Association::Declaration.start(model: self, name: name, scope: scope, options: options, extension: extension) do |env|
+              env.result = super(env.name, env.scope, env.options, &env.extension)
+            end.result
           end
 
           def has_one(name, scope = nil, options = {}, &extension)
-            SchemaMonkey::Middleware::Model::Association::Declaration.start(model: self, name: name, scope: scope, options: options, extension: extension) do
-            |env|
-              super(env.name, env.scope, env.options, &env.extension)
-            end
+            SchemaMonkey::Middleware::Model::Association::Declaration.start(model: self, name: name, scope: scope, options: options, extension: extension) do |env|
+              env.result = super(env.name, env.scope, env.options, &env.extension)
+            end.result
           end
 
           def has_and_belongs_to_many(name, scope = nil, options = {}, &extension)
-            SchemaMonkey::Middleware::Model::Association::Declaration.start(model: self, name: name, scope: scope, options: options, extension: extension) do
-            |env|
-              super(env.name, env.scope, env.options, &env.extension)
-            end
+            SchemaMonkey::Middleware::Model::Association::Declaration.start(model: self, name: name, scope: scope, options: options, extension: extension) do |env|
+              env.result = super(env.name, env.scope, env.options, &env.extension)
+            end.result
           end
 
           def belongs_to(name, scope = nil, options = {}, &extension)
-            SchemaMonkey::Middleware::Model::Association::Declaration.start(model: self, name: name, scope: scope, options: options, extension: extension) do
-            |env|
-              super(env.name, env.scope, env.options, &env.extension)
-            end
+            SchemaMonkey::Middleware::Model::Association::Declaration.start(model: self, name: name, scope: scope, options: options, extension: extension) do |env|
+              env.result = super(env.name, env.scope, env.options, &env.extension)
+            end.result
           end
         end
       end

data/lib/schema_plus/core/middleware.rb

@@ -82,7 +82,7 @@ module SchemaPlus
         end
         module Association
           module Declaration
-            ENV = [:model, :name, :scope, :options, :extension]
+            ENV = [:model, :name, :scope, :options, :extension, :result]
           end
         end
       end

data/lib/schema_plus/core/version.rb

@@ -1,5 +1,5 @@
 module SchemaPlus
   module Core
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

data/spec/dumper_spec.rb

@@ -16,20 +16,20 @@ describe SchemaMonkey::Middleware::Dumper do
   end
 
   context TestDumper::Middleware::Dumper::Initial do
-    Then { expect(dump).to match /Schema[.]define.*do\s+#{middleware}/ }
+    Then { expect(dump).to match(/Schema[.]define.*do\s+#{middleware}/) }
   end
 
   context TestDumper::Middleware::Dumper::Tables do
-    Then { expect(dump).to match /create_table "other".*create_table "#{middleware}".*create_table "things"/m }
+    Then { expect(dump).to match(/create_table "other".*create_table "#{middleware}".*create_table "things"/m) }
   end
 
   context TestDumper::Middleware::Dumper::Table do
-    Then { expect(dump).to match /t[.]integer.*option: #{middleware} \# comment: #{middleware}/ }
-    Then { expect(dump).to match /statement: #{middleware}\s+end\s+(add_index.*)?\s+trailer: #{middleware}/ }
+    Then { expect(dump).to match(/t[.]integer.*option: #{middleware} \# comment: #{middleware}/) }
+    Then { expect(dump).to match(/statement: #{middleware}\s+end\s+(add_index.*)?\s+trailer: #{middleware}/) }
   end
 
   context TestDumper::Middleware::Dumper::Indexes do
-    Then { expect(dump).to match /add_index.*#{middleware}/ }
+    Then { expect(dump).to match(/add_index.*#{middleware}/) }
   end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus_core
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - ronen barzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2015-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord