schema_plus 2.0.0.pre7 → 2.0.0.pre8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aaba43d34df0accaa981d624082fa7e8f8179029
-  data.tar.gz: da8fb2f9b6aa8c36e55449889304c07450f639d1
+  metadata.gz: 0f841ad3a38cc1fc65ca2ddf36fdd44568165445
+  data.tar.gz: bc199b47eb9924938016e662d9c060417fa817ba
 SHA512:
-  metadata.gz: 2c211b1b568712234f41659aae7c42d7aceae6e749c9445453eb115cdb4c9fb20055ee9e25dc1639626d3ba0530f53336bbd7e41ceae20c75d16335fce0335b8
-  data.tar.gz: 368cacb87bd95602fb2b7ab3d641c8f9988553c878d7c1835693411c191adf25ebac4462de0db229e7bc24954f08acbb70615916818a97c1f53de221de11b16e
+  metadata.gz: 0b081af031147830bde1beba8c2481ec9c987b8d8d529b1383cf234e900bfec973ef9adfa5123df5d919975da4a91ef3680fc8553874698b0cb7830bbfc64933
+  data.tar.gz: 91e463eea4332315156e6a1444f5b599f496f72211c2b907191f749b3c4b0e19283759d643c649e023de7d19b6699a54ea8e276273ac2433e9a34f78bc4f0d3c

data/README.md

@@ -24,7 +24,7 @@ Gem | Description | Included In `schema_plus` gem?
 <p style="color:grey">schema_plus_foreign_keys | Extended support for foreign keys, including creation as column options, `:deferrable`, and SQLite3 support | Y
 [schema_plus_indexes](https://github.com/SchemaPlus/schema_plus_indexes) | Convenience and consistency in using indexes | Y
 [schema_plus_pg_indexes](https://github.com/SchemaPlus/schema_plus_pg_indexes) |PostgreSQL index features: `case_insenstive`, `expression` and `operator_class` | Y
-[schema_plus_tables](https://github.com/SchemaPlus/schema_plus_views) | Convenience and consistency in using tables | Y
+[schema_plus_tables](https://github.com/SchemaPlus/schema_plus_tables) | Convenience and consistency in using tables | Y
 [schema_plus_views](https://github.com/SchemaPlus/schema_plus_views) | Create and drop views in migrations | Y
 [schema_validations](https://github.com/SchemaPlus/schema_validations) | Automatically defines ActiveRecord validations based on database constraints |
 
@@ -95,8 +95,6 @@ or in a Gemfile
 
     gem "schema_plus"
 
-`schema_plus` includes [schema_monkey_rails](https://github.com/SchemaPlus/schema_monkey_rails) so it will automatically be inserted in Rails apps.  To use with Padrino, see [schema_monkey_padrino](https://github.com/SchemaPlus/schema_monkey_padrino)
-
 ## History
 
 *   See [CHANGELOG](CHANGELOG.md) for per-version release notes.

data/lib/schema_plus.rb

@@ -1,4 +1,3 @@
-require 'schema_monkey_rails'
 require 'schema_plus/columns'
 require 'schema_plus/db_default'
 require 'schema_plus/default_expr'

data/lib/schema_plus/foreign_keys.rb

@@ -5,13 +5,13 @@ require_relative 'foreign_keys/version'
 require_relative 'foreign_keys/active_record/base'
 require_relative 'foreign_keys/active_record/connection_adapters/abstract_adapter'
 require_relative 'foreign_keys/active_record/connection_adapters/table_definition'
-require_relative 'foreign_keys/active_record/schema'
 require_relative 'foreign_keys/active_record/connection_adapters/foreign_key_definition'
 require_relative 'foreign_keys/active_record/migration/command_recorder'
 require_relative 'foreign_keys/middleware/dumper'
 require_relative 'foreign_keys/middleware/migration'
 require_relative 'foreign_keys/middleware/model'
 require_relative 'foreign_keys/middleware/mysql'
+require_relative 'foreign_keys/middleware/schema'
 require_relative 'foreign_keys/middleware/sql'
 
 module SchemaPlus::ForeignKeys

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

@@ -18,13 +18,13 @@ module SchemaPlus::ForeignKeys
         end
 
         def reset_foreign_key_information
-          @foreign_keys = nil
+          @foreign_keys = @reverse_foreign_keys = nil
         end
 
         # Returns a list of ForeignKeyDefinition objects, for each foreign
         # key constraint of other tables that refer to this model's table
         def reverse_foreign_keys
-          connection.reverse_foreign_keys(table_name, "#{name} Reverse Foreign Keys")
+          @reverse_foreign_keys ||= connection.reverse_foreign_keys(table_name, "#{name} Reverse Foreign Keys")
         end
 
       end

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

@@ -12,19 +12,6 @@ module SchemaPlus::ForeignKeys
       #
       module AbstractAdapter
 
-        def create_table(table, options = {})
-          options = options.dup
-          config_options = options.delete(:foreign_keys) || {}
-
-          # override rails' :force to cascade
-          # drop_table(table, if_exists: true, force: true) if options.delete(:force)
-
-          super(table, options) do |table_definition|
-            table_definition.schema_plus_config = SchemaPlus::ForeignKeys.config.merge(config_options)
-            yield table_definition if block_given?
-          end
-        end
-
         # Define a foreign key constraint.  Valid options are :on_update,
         # :on_delete, and :deferrable, with values as described at
         # ConnectionAdapters::ForeignKeyDefinition

data/lib/schema_plus/foreign_keys/active_record/connection_adapters/foreign_key_definition.rb

@@ -18,22 +18,22 @@ module SchemaPlus::ForeignKeys
       module ForeignKeyDefinition
 
         def column_names
-          ActiveSupport::Deprecation.warn "ForeignKeyDefinition#column_names is depcreated, use Array.wrap(column)"
+          ActiveSupport::Deprecation.warn "ForeignKeyDefinition#column_names is deprecated, use Array.wrap(column)"
           Array.wrap(column)
         end
 
         def references_column_names
-          ActiveSupport::Deprecation.warn "ForeignKeyDefinition#references_column_names is depcreated, use Array.wrap(primary_key)"
+          ActiveSupport::Deprecation.warn "ForeignKeyDefinition#references_column_names is deprecated, use Array.wrap(primary_key)"
           Array.wrap(primary_key)
         end
 
         def references_table_name
-          ActiveSupport::Deprecation.warn "ForeignKeyDefinition#references_table_name is depcreated, use #to_table"
+          ActiveSupport::Deprecation.warn "ForeignKeyDefinition#references_table_name is deprecated, use #to_table"
           to_table
         end
 
         def table_name
-          ActiveSupport::Deprecation.warn "ForeignKeyDefinition#table_name is depcreated, use #from_table"
+          ActiveSupport::Deprecation.warn "ForeignKeyDefinition#table_name is deprecated, use #from_table"
           from_table
         end
 

data/lib/schema_plus/foreign_keys/middleware/migration.rb

@@ -2,6 +2,19 @@ module SchemaPlus::ForeignKeys
   module Middleware
     module Migration
 
+      module CreateTable
+        def around(env)
+          if (original_block = env.block)
+            config_options = env.options.delete(:foreign_keys) || {}
+            env.block = -> (table_definition) {
+              table_definition.schema_plus_config = SchemaPlus::ForeignKeys.config.merge(config_options)
+              original_block.call table_definition
+            }
+          end
+          yield env
+        end
+      end
+
       module Column
 
         #

data/lib/schema_plus/foreign_keys/{active_record → middleware}/schema.rb

@@ -1,14 +1,13 @@
 module SchemaPlus::ForeignKeys
-  module ActiveRecord
+  module Middleware
     module Schema
-      module ClassMethods
-
-        def define(*args)
+      module Define
+        def around(env)
           fk_override = { :auto_create => false, :auto_index => false }
           save = Hash[fk_override.keys.collect{|key| [key, SchemaPlus::ForeignKeys.config.send(key)]}]
           begin
             SchemaPlus::ForeignKeys.config.update_attributes(fk_override)
-            super
+            yield env
           ensure
             SchemaPlus::ForeignKeys.config.update_attributes(save)
           end

data/lib/schema_plus/version.rb

@@ -1,3 +1,3 @@
 module SchemaPlus
-  VERSION = "2.0.0.pre7"
+  VERSION = "2.0.0.pre8"
 end

data/schema_plus.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "activerecord", "~> 4.2"
   gem.add_dependency "valuable"
   gem.add_dependency "schema_plus_core", "~> 0.2"
-  gem.add_dependency "schema_monkey_rails", "~> 0.1", ">= 0.1.2"
+  gem.add_dependency "schema_monkey", "~> 2.1"
   gem.add_dependency "schema_plus_columns", "~> 0.1"
   gem.add_dependency "schema_plus_indexes", "~> 0.1", ">= 0.1.3"
   gem.add_dependency "schema_plus_pg_indexes", "~> 0.1", ">= 0.1.3"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre7
+  version: 2.0.0.pre8
 platform: ruby
 authors:
 - Ronen Barzel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-14 00:00:00.000000000 Z
+date: 2015-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -54,25 +54,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: schema_monkey_rails
+  name: schema_monkey
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: schema_plus_columns
   requirement: !ruby/object:Gem::Requirement
@@ -286,11 +280,11 @@ files:
 - lib/schema_plus/foreign_keys/active_record/connection_adapters/sqlite3_adapter.rb
 - lib/schema_plus/foreign_keys/active_record/connection_adapters/table_definition.rb
 - lib/schema_plus/foreign_keys/active_record/migration/command_recorder.rb
-- lib/schema_plus/foreign_keys/active_record/schema.rb
 - lib/schema_plus/foreign_keys/middleware/dumper.rb
 - lib/schema_plus/foreign_keys/middleware/migration.rb
 - lib/schema_plus/foreign_keys/middleware/model.rb
 - lib/schema_plus/foreign_keys/middleware/mysql.rb
+- lib/schema_plus/foreign_keys/middleware/schema.rb
 - lib/schema_plus/foreign_keys/middleware/sql.rb
 - lib/schema_plus/foreign_keys/version.rb
 - lib/schema_plus/version.rb