schema_plus 2.0.0.pre2 → 2.0.0.pre3

data/spec/{schema_dumper_spec.rb → schema_plus_foreign_keys/schema_dumper_spec.rb}

@@ -4,8 +4,8 @@ require 'stringio'
 describe "Schema dump" do
 
   before(:all) do
-    SchemaPlus.setup do |config|
-      config.foreign_keys.auto_create = false
+    SchemaPlusForeignKeys.setup do |config|
+      config.auto_create = false
     end
     ActiveRecord::Migration.suppress_messages do
       ActiveRecord::Schema.define do

data/spec/{schema_spec.rb → schema_plus_foreign_keys/schema_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 describe ActiveRecord::Schema do
 
@@ -77,22 +77,22 @@ describe ActiveRecord::Schema do
 
 
   def with_auto_index(value = true)
-    old_value = SchemaPlus.config.foreign_keys.auto_index
-    SchemaPlus.config.foreign_keys.auto_index = value
+    old_value = SchemaPlusForeignKeys.config.auto_index
+    SchemaPlusForeignKeys.config.auto_index = value
     begin
       yield
     ensure
-      SchemaPlus.config.foreign_keys.auto_index = old_value
+      SchemaPlusForeignKeys.config.auto_index = old_value
     end
   end
 
   def with_auto_create(value = true)
-    old_value = SchemaPlus.config.foreign_keys.auto_create
-    SchemaPlus.config.foreign_keys.auto_create = value
+    old_value = SchemaPlusForeignKeys.config.auto_create
+    SchemaPlusForeignKeys.config.auto_create = value
     begin
       yield
     ensure
-      SchemaPlus.config.foreign_keys.auto_create = old_value
+      SchemaPlusForeignKeys.config.auto_create = old_value
     end
   end
 

data/spec/{schema_views → schema_plus_views}/named_schemas_spec.rb

@@ -7,9 +7,9 @@ describe "with multiple schemas" do
 
   before(:all) do
     newdb = case connection.adapter_name
-            when /^mysql/i then      "CREATE SCHEMA IF NOT EXISTS schema_views_test2"
-            when /^postgresql/i then "CREATE SCHEMA schema_views_test2"
-            when /^sqlite/i then     "ATTACH ':memory:' AS schema_views_test2"
+            when /^mysql/i then      "CREATE SCHEMA IF NOT EXISTS schema_plus_views_test2"
+            when /^postgresql/i then "CREATE SCHEMA schema_plus_views_test2"
+            when /^sqlite/i then     "ATTACH ':memory:' AS schema_plus_views_test2"
             end
     begin
       ActiveRecord::Base.connection.execute newdb
@@ -27,8 +27,8 @@ describe "with multiple schemas" do
       end
     end
 
-    connection.execute 'DROP TABLE IF EXISTS schema_views_test2.users'
-    connection.execute 'CREATE TABLE schema_views_test2.users (id ' + case connection.adapter_name
+    connection.execute 'DROP TABLE IF EXISTS schema_plus_views_test2.users'
+    connection.execute 'CREATE TABLE schema_plus_views_test2.users (id ' + case connection.adapter_name
           when /^mysql/i then      "integer primary key auto_increment"
           when /^postgresql/i then "serial primary key"
           when /^sqlite/i then     "integer primary key autoincrement"
@@ -40,14 +40,14 @@ describe "with multiple schemas" do
       begin
         example.run
       ensure
-        connection.execute 'DROP VIEW schema_views_test2.myview' rescue nil
+        connection.execute 'DROP VIEW schema_plus_views_test2.myview' rescue nil
         connection.execute 'DROP VIEW myview' rescue nil
       end
     end
 
     before(:each) do
       connection.views.each { |view| connection.drop_view view }
-      connection.execute 'CREATE VIEW schema_views_test2.myview AS SELECT * FROM users'
+      connection.execute 'CREATE VIEW schema_plus_views_test2.myview AS SELECT * FROM users'
     end
 
     it "should not find views in other schema" do

data/spec/spec_helper.rb

@@ -24,12 +24,12 @@ RSpec.configure do |config|
 end
 
 def with_fk_config(opts, &block)
-  save = Hash[opts.keys.collect{|key| [key, SchemaPlus.config.foreign_keys.send(key)]}]
+  save = Hash[opts.keys.collect{|key| [key, SchemaPlusForeignKeys.config.send(key)]}]
   begin
-    SchemaPlus.config.foreign_keys.update_attributes(opts)
+    SchemaPlusForeignKeys.config.update_attributes(opts)
     yield
   ensure
-    SchemaPlus.config.foreign_keys.update_attributes(save)
+    SchemaPlusForeignKeys.config.update_attributes(save)
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre2
+  version: 2.0.0.pre3
 platform: ruby
 authors:
 - Ronen Barzel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-29 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -45,14 +45,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: schema_monkey_rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.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.1
 - !ruby/object:Gem::Dependency
   name: schema_plus_indexes
   requirement: !ruby/object:Gem::Requirement
@@ -87,20 +113,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -191,71 +211,72 @@ files:
 - Rakefile
 - TODO.md
 - gemfiles/Gemfile.base
-- gemfiles/rails-4.2/Gemfile.base
-- gemfiles/rails-4.2/Gemfile.mysql2
-- gemfiles/rails-4.2/Gemfile.postgresql
-- gemfiles/rails-4.2/Gemfile.sqlite3
-- init.rb
-- lib/schema_column_plus.rb
-- lib/schema_column_plus/active_record/connection_adapters/column.rb
-- lib/schema_column_plus/middleware/model.rb
-- lib/schema_db_default.rb
-- lib/schema_db_default/active_record/attribute.rb
-- lib/schema_db_default/db_default.rb
-- lib/schema_db_default/middleware.rb
-- lib/schema_default_expr.rb
-- lib/schema_default_expr/active_record/connection_adapters/mysql2_adapter.rb
-- lib/schema_default_expr/active_record/connection_adapters/postgresql_adapter.rb
-- lib/schema_default_expr/active_record/connection_adapters/sqlite3_adapter.rb
-- lib/schema_default_expr/middleware.rb
-- lib/schema_pg_enums.rb
-- lib/schema_pg_enums/active_record.rb
-- lib/schema_pg_enums/middleware.rb
+- gemfiles/activerecord-4.2/Gemfile.base
+- gemfiles/activerecord-4.2/Gemfile.mysql2
+- gemfiles/activerecord-4.2/Gemfile.postgresql
+- gemfiles/activerecord-4.2/Gemfile.sqlite3
 - lib/schema_plus.rb
-- lib/schema_plus/active_record/base.rb
-- lib/schema_plus/active_record/connection_adapters/abstract_adapter.rb
-- lib/schema_plus/active_record/connection_adapters/foreign_key_definition.rb
-- lib/schema_plus/active_record/connection_adapters/mysql2_adapter.rb
-- lib/schema_plus/active_record/connection_adapters/postgresql_adapter.rb
-- lib/schema_plus/active_record/connection_adapters/schema_statements.rb
-- lib/schema_plus/active_record/connection_adapters/sqlite3_adapter.rb
-- lib/schema_plus/active_record/connection_adapters/table_definition.rb
-- lib/schema_plus/active_record/migration/command_recorder.rb
-- lib/schema_plus/active_record/schema.rb
-- lib/schema_plus/middleware/dumper.rb
-- lib/schema_plus/middleware/migration.rb
-- lib/schema_plus/middleware/model.rb
 - lib/schema_plus/version.rb
+- lib/schema_plus_columns.rb
+- lib/schema_plus_columns/active_record/connection_adapters/column.rb
+- lib/schema_plus_columns/middleware/model.rb
+- lib/schema_plus_db_default.rb
+- lib/schema_plus_db_default/active_record/attribute.rb
+- lib/schema_plus_db_default/db_default.rb
+- lib/schema_plus_db_default/middleware.rb
+- lib/schema_plus_default_expr.rb
+- lib/schema_plus_default_expr/active_record/connection_adapters/mysql2_adapter.rb
+- lib/schema_plus_default_expr/active_record/connection_adapters/postgresql_adapter.rb
+- lib/schema_plus_default_expr/active_record/connection_adapters/sqlite3_adapter.rb
+- lib/schema_plus_default_expr/middleware.rb
+- lib/schema_plus_enums.rb
+- lib/schema_plus_enums/active_record.rb
+- lib/schema_plus_enums/middleware.rb
+- lib/schema_plus_foreign_keys.rb
+- lib/schema_plus_foreign_keys/active_record/base.rb
+- lib/schema_plus_foreign_keys/active_record/connection_adapters/abstract_adapter.rb
+- lib/schema_plus_foreign_keys/active_record/connection_adapters/foreign_key_definition.rb
+- lib/schema_plus_foreign_keys/active_record/connection_adapters/mysql2_adapter.rb
+- lib/schema_plus_foreign_keys/active_record/connection_adapters/postgresql_adapter.rb
+- lib/schema_plus_foreign_keys/active_record/connection_adapters/schema_statements.rb
+- 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/version.rb
 - lib/schema_plus_tables.rb
 - lib/schema_plus_tables/active_record/connection_adapters/abstract_adapter.rb
 - lib/schema_plus_tables/active_record/connection_adapters/mysql2_adapter.rb
 - lib/schema_plus_tables/active_record/connection_adapters/postgresql_adapter.rb
 - lib/schema_plus_tables/active_record/connection_adapters/sqlite3_adapter.rb
-- lib/schema_views.rb
-- lib/schema_views/active_record/connection_adapters/abstract_adapter.rb
-- lib/schema_views/active_record/connection_adapters/mysql2_adapter.rb
-- lib/schema_views/active_record/connection_adapters/postgresql_adapter.rb
-- lib/schema_views/active_record/connection_adapters/sqlite3_adapter.rb
-- lib/schema_views/middleware.rb
+- lib/schema_plus_views.rb
+- lib/schema_plus_views/active_record/connection_adapters/abstract_adapter.rb
+- lib/schema_plus_views/active_record/connection_adapters/mysql2_adapter.rb
+- lib/schema_plus_views/active_record/connection_adapters/postgresql_adapter.rb
+- lib/schema_plus_views/active_record/connection_adapters/sqlite3_adapter.rb
+- lib/schema_plus_views/middleware.rb
 - schema_dev.yml
 - schema_plus.gemspec
-- spec/connection_spec.rb
-- spec/foreign_key_definition_spec.rb
-- spec/foreign_key_spec.rb
-- spec/migration_spec.rb
-- spec/named_schemas_spec.rb
 - spec/schema/auto_schema.rb
 - spec/schema/core_schema.rb
-- spec/schema_column_plus/column_spec.rb
-- spec/schema_db_default/column_spec.rb
-- spec/schema_default_expr/column_default_spec.rb
-- spec/schema_default_expr/schema_dumper_spec.rb
-- spec/schema_dumper_spec.rb
-- spec/schema_pg_enums/enum_spec.rb
-- spec/schema_pg_enums/schema_dumper_spec.rb
-- spec/schema_spec.rb
-- spec/schema_views/named_schemas_spec.rb
-- spec/schema_views/views_spec.rb
+- spec/schema_plus_columns/column_spec.rb
+- spec/schema_plus_db_default/column_spec.rb
+- spec/schema_plus_default_expr/column_default_spec.rb
+- spec/schema_plus_default_expr/migration_spec.rb
+- spec/schema_plus_default_expr/schema_dumper_spec.rb
+- spec/schema_plus_enums/enum_spec.rb
+- spec/schema_plus_enums/schema_dumper_spec.rb
+- spec/schema_plus_foreign_keys/foreign_key_definition_spec.rb
+- spec/schema_plus_foreign_keys/foreign_key_spec.rb
+- spec/schema_plus_foreign_keys/migration_spec.rb
+- spec/schema_plus_foreign_keys/named_schemas_spec.rb
+- spec/schema_plus_foreign_keys/schema_dumper_spec.rb
+- spec/schema_plus_foreign_keys/schema_spec.rb
+- spec/schema_plus_views/named_schemas_spec.rb
+- spec/schema_plus_views/views_spec.rb
 - spec/spec_helper.rb
 - spec/support/helpers.rb
 - spec/support/matchers/automatic_foreign_key_matchers.rb
@@ -287,23 +308,23 @@ specification_version: 4
 summary: Enhances ActiveRecord schema mechanism, including more DRY index creation
   and support for foreign key constraints and views.
 test_files:
-- spec/connection_spec.rb
-- spec/foreign_key_definition_spec.rb
-- spec/foreign_key_spec.rb
-- spec/migration_spec.rb
-- spec/named_schemas_spec.rb
 - spec/schema/auto_schema.rb
 - spec/schema/core_schema.rb
-- spec/schema_column_plus/column_spec.rb
-- spec/schema_db_default/column_spec.rb
-- spec/schema_default_expr/column_default_spec.rb
-- spec/schema_default_expr/schema_dumper_spec.rb
-- spec/schema_dumper_spec.rb
-- spec/schema_pg_enums/enum_spec.rb
-- spec/schema_pg_enums/schema_dumper_spec.rb
-- spec/schema_spec.rb
-- spec/schema_views/named_schemas_spec.rb
-- spec/schema_views/views_spec.rb
+- spec/schema_plus_columns/column_spec.rb
+- spec/schema_plus_db_default/column_spec.rb
+- spec/schema_plus_default_expr/column_default_spec.rb
+- spec/schema_plus_default_expr/migration_spec.rb
+- spec/schema_plus_default_expr/schema_dumper_spec.rb
+- spec/schema_plus_enums/enum_spec.rb
+- spec/schema_plus_enums/schema_dumper_spec.rb
+- spec/schema_plus_foreign_keys/foreign_key_definition_spec.rb
+- spec/schema_plus_foreign_keys/foreign_key_spec.rb
+- spec/schema_plus_foreign_keys/migration_spec.rb
+- spec/schema_plus_foreign_keys/named_schemas_spec.rb
+- spec/schema_plus_foreign_keys/schema_dumper_spec.rb
+- spec/schema_plus_foreign_keys/schema_spec.rb
+- spec/schema_plus_views/named_schemas_spec.rb
+- spec/schema_plus_views/views_spec.rb
 - spec/spec_helper.rb
 - spec/support/helpers.rb
 - spec/support/matchers/automatic_foreign_key_matchers.rb

data/init.rb

@@ -1 +0,0 @@
-require 'schema_plus' unless defined?(SchemaPlus)

data/lib/schema_column_plus.rb

@@ -1,7 +0,0 @@
-require 'schema_monkey'
-require 'schema_plus_indexes'
-
-require_relative 'schema_column_plus/active_record/connection_adapters/column'
-require_relative 'schema_column_plus/middleware/model'
-
-SchemaMonkey.register(SchemaColumnPlus)

data/lib/schema_column_plus/middleware/model.rb

@@ -1,22 +0,0 @@
-module SchemaColumnPlus
-  module Middleware
-    module Model
-
-      def self.insert
-        SchemaMonkey::Middleware::Model::Columns.append AddModels
-      end
-
-      class AddModels < SchemaMonkey::Middleware::Base
-        def call(env)
-          continue env
-
-          env.columns.each do |column|
-            column.model = env.model
-          end
-
-          env.columns
-        end
-      end
-    end
-  end
-end

data/lib/schema_db_default.rb

@@ -1,13 +0,0 @@
-require 'schema_monkey'
-
-require_relative 'schema_db_default/active_record/attribute'
-require_relative 'schema_db_default/db_default'
-require_relative 'schema_db_default/middleware'
-
-module SchemaDbDefault
-  def self.insert
-    ::ActiveRecord.const_set(:DB_DEFAULT, SchemaDbDefault::DB_DEFAULT)
-  end
-end
-
-SchemaMonkey.register(SchemaDbDefault)

data/lib/schema_db_default/middleware.rb

@@ -1,30 +0,0 @@
-module SchemaDbDefault
-  module Middleware
-    module PostgresqlAdapter
-      def self.insert
-        SchemaMonkey::Middleware::Query::ExecCache.prepend BindDbDefault
-      end
-    end
-
-    # Middleware to replace each ActiveRecord::DB_DEFAULT with a literal
-    # DEFAULT in the sql string, for postgresql.  The underlying pg gem provides no
-    # way to bind a value that will replace $n with DEFAULT.
-    class BindDbDefault < SchemaMonkey::Middleware::Base
-      def call(env)
-        if env.binds.any?{ |col, val| val.equal? ::ActiveRecord::DB_DEFAULT}
-          j = 0
-          env.binds.each_with_index do |(col, val), i|
-            if val.equal? ::ActiveRecord::DB_DEFAULT
-              env.sql = env.sql.sub(/\$#{i+1}/, 'DEFAULT')
-            else
-              env.sql = env.sql.sub(/\$#{i+1}/, "$#{j+1}") if i != j
-              j += 1
-            end
-          end
-          env.binds = env.binds.reject{|col, val| val.equal? ::ActiveRecord::DB_DEFAULT}
-        end
-        continue env
-      end
-    end
-  end
-end

data/lib/schema_pg_enums.rb

@@ -1,6 +0,0 @@
-require 'schema_monkey'
-
-require_relative 'schema_pg_enums/active_record'
-require_relative 'schema_pg_enums/middleware'
-
-SchemaMonkey.register(SchemaPgEnums)