schema_plus_core 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be82dc70c1337ef9fec4f7bcc88ad9011455bf86
-  data.tar.gz: fb4f3f8aa09a494fc535b8c4e337f08ef43994c4
+  metadata.gz: 7c429be6c02483276cfb59a812bb4cc5f25b2177
+  data.tar.gz: 72cc5ab39f8876bf2d334c21f6ea6daa0198ba1f
 SHA512:
-  metadata.gz: 59e8ed21ad18ee6dfbed44d4d70b2700a9617044a96d87746c61b8ca3d54aa4911d7c3c147fd7afa38ff8da0ee6242d9f5f0570b25aed6c1593d5db186768e49
-  data.tar.gz: 53e646d5d164ce111e58b137dd0c4e07b129429699de0c913a638971ca94ad53076725ac9e2f28f266b6fe48a6b258bcbbcde384d1b3d0f23bc66bb9efe5693e
+  metadata.gz: f840686e345770edaa13e50ae1aa6eddf6a921020567bb8b0ef5edce4f3006a33cb4975d58ca9350e9772889e31900a18f8981ca3282558a868548d1214b944a
+  data.tar.gz: 6886022c5232b16f8e6700ff5eee18ac9c09041ef2e28a68a66eed27468811be321d48e0900a23fa2167bad15d3f620cf2d1aa7bbdfeae54a74badef38cea47c

data/README.md

@@ -40,14 +40,6 @@ gem "schema_plus_core"                # in a Gemfile
 gem.add_dependency "schema_plus_core" # in a .gemspec
 ```
 
-To use with a rails app, also include
-
-```ruby
-gem "schema_monkey_rails"
-```
-
-which creates a Railtie to that will insert SchemaPlus::Core appropriately into the rails stack. To use with Padrino, see [schema_monkey_padrino](https://github.com/SchemaPlus/schema_monkey_padrino).
-
 <!-- SCHEMA_DEV: TEMPLATE INSTALLATION - end -->
 
 
@@ -104,7 +96,18 @@ For organizational clarity, the SchemaPlus::Core stacks are grouped into modules
 
 ### Schema
 
-Stacks for general queries pertaining to the entire database schema:
+Stacks for general operations queries pertaining to the entire database schema:
+
+* `Schema::Define`
+
+  Wrapper around the `ActiveRecord::Schema.define` method loads a dumped schema file (`schema.rb`).
+  
+    Env Field    | Description | Initial value
+    --- | --- | ---
+    `:info` | Schema information hash | *args*
+    `:block` | The proc containing the schema definition statements | *args*
+
+  The base implementation calls the block to define the schema.
 
 * `Schema::Indexes`
 
@@ -191,6 +194,19 @@ Stacks for operations that change the schema.  In some cases the operation immed
 
   3. ActiveRecord's base implementation may make nested calls to column creation.  For example: References result in a nested call to create an integer column; Polymorphic references nest calls to create two columns; Sqlite3 implements `:change` by a nested call to a new table definition.  SchemaPlus::Core doesn't attempt to normalize or suppress these; each such nested call will result in its own `Migration::Column` stack execution.
 
+* `Migration::CreateTable`
+
+  Creates a new table
+
+    Env Field    | Description | Initialized
+    --- | --- | ---
+    `:caller`     | The ActiveRecord instance responsible for creating the table | *context*
+    `:table_name` | The name of the table | *arg*
+    `:options`    | Create table options | *arg*
+    `:block`      | Proc containing table definition statements | *arg*
+
+   The base implementation creates the table, yielding a `table_definition` instance to the block (if a block is given).
+
 * `Migration::DropTable`
 
   Drops a table from the database
@@ -199,7 +215,7 @@ Stacks for operations that change the schema.  In some cases the operation immed
     --- | --- | ---
     `:connection`     | The current ActiveRecord connection | *context*
     `:table_name` | The name of the table | *arg*
-    `:options`    | The index options | *arg*
+    `:options`    | Drop table options | *arg*
 
    The base implementation drops the table.  No value is returned.
 
@@ -439,6 +455,5 @@ Some things to know about to help you develop and test:
   [schema_monkey](https://github.com/SchemaPlus/schema_monkey) client,
   using [schema_monkey](https://github.com/SchemaPlus/schema_monkey)'s
   convention-based protocols for extending ActiveRecord and using middleware stacks.
-  For more information see [schema_monkey](https://github.com/SchemaPlus/schema_monkey)'s README.
 
 <!-- SCHEMA_DEV: TEMPLATE USES SCHEMA_MONKEY - end -->

data/lib/schema_plus/core.rb

@@ -18,6 +18,7 @@ require_relative "core/active_record/base"
 require_relative "core/active_record/connection_adapters/abstract_adapter"
 require_relative "core/active_record/connection_adapters/table_definition"
 require_relative "core/active_record/migration/command_recorder"
+require_relative "core/active_record/schema"
 require_relative "core/active_record/schema_dumper"
 require_relative "core/middleware"
 require_relative "core/schema_dump"

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

@@ -10,24 +10,30 @@ module SchemaPlus
             end
           end
 
+          def add_index_options(table_name, column_names, options={})
+            SchemaMonkey::Middleware::Sql::IndexComponents.start(connection: self, table_name: table_name, column_names: Array.wrap(column_names), options: options.deep_dup, sql: SqlStruct::IndexComponents.new) { |env|
+              env.sql.name, env.sql.type, env.sql.columns, env.sql.options, env.sql.algorithm, env.sql.using = super env.table_name, env.column_names, env.options
+            }.sql.to_hash.values
+          end
+
           def add_reference(table_name, name, options = {})
             SchemaMonkey::Middleware::Migration::Column.start(caller: self, operation: :add, table_name: table_name, column_name: "#{name}_id", type: :reference, options: options.deep_dup) do |env|
               super env.table_name, env.column_name.sub(/_id$/, ''), env.options
             end
           end
 
+          def create_table(table_name, options={}, &block)
+            SchemaMonkey::Middleware::Migration::CreateTable.start(connection: self, table_name: table_name, options: options.deep_dup, block: block) do |env|
+              super env.table_name, env.options, &env.block
+            end
+          end
+
           def drop_table(table_name, options={})
             SchemaMonkey::Middleware::Migration::DropTable.start(connection: self, table_name: table_name, options: options.dup) do |env|
               super env.table_name, env.options
             end
           end
 
-          def add_index_options(table_name, column_names, options={})
-            SchemaMonkey::Middleware::Sql::IndexComponents.start(connection: self, table_name: table_name, column_names: Array.wrap(column_names), options: options.deep_dup, sql: SqlStruct::IndexComponents.new) { |env|
-              env.sql.name, env.sql.type, env.sql.columns, env.sql.options, env.sql.algorithm, env.sql.using = super env.table_name, env.column_names, env.options
-            }.sql.to_hash.values
-          end
-
           module SchemaCreation
 
             def add_column_options!(sql, options)

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

@@ -0,0 +1,13 @@
+module SchemaPlus::Core
+  module ActiveRecord
+    module Schema
+      module ClassMethods
+        def define(info={}, &block)
+          SchemaMonkey::Middleware::Schema::Define.start(info: info, block: block) do |env|
+            super env.info, &env.block
+          end
+        end
+      end
+    end
+  end
+end

data/lib/schema_plus/core/middleware.rb

@@ -8,16 +8,20 @@ module SchemaPlus
       end
 
       module Schema
-        module Tables
-          # :database and :like are only for mysql
-          # :table_name is only for sqlite3
-          ENV = [:connection, :query_name, :table_name, :database, :like, :tables]
+        module Define
+          ENV = [:info, :block]
         end
 
         module Indexes
           ENV = [:connection, :query_name, :table_name, :index_definitions]
         end
 
+        module Tables
+          # :database and :like are only for mysql
+          # :table_name is only for sqlite3
+          ENV = [:connection, :query_name, :table_name, :database, :like, :tables]
+        end
+
       end
 
       module Migration
@@ -25,14 +29,19 @@ module SchemaPlus
           ENV = [:caller, :operation, :table_name, :column_name, :type, :options]
         end
 
-        module Index
-          ENV = [:caller, :operation, :table_name, :column_names, :options]
+        module CreateTable
+          ENV = [:connection, :table_name, :options, :block]
         end
 
         module DropTable
           ENV = [:connection, :table_name, :options]
         end
 
+        module Index
+          ENV = [:caller, :operation, :table_name, :column_names, :options]
+        end
+
+
       end
 
       module Sql

data/lib/schema_plus/core/version.rb

@@ -1,5 +1,5 @@
 module SchemaPlus
   module Core
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/schema_plus_core.gemspec

@@ -19,13 +19,13 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency "activerecord", "~> 4.2"
-  gem.add_dependency "schema_monkey", "~> 2.0"
+  gem.add_dependency "schema_monkey", "~> 2.1"
 
   gem.add_development_dependency "bundler", "~> 1.7"
   gem.add_development_dependency "rake", "~> 10.0"
   gem.add_development_dependency "rspec", "~> 3.0.0"
   gem.add_development_dependency "rspec-given"
-  gem.add_development_dependency "schema_dev", "~> 3.1"
+  gem.add_development_dependency "schema_dev", "~> 3.3"
   gem.add_development_dependency "simplecov"
   gem.add_development_dependency "simplecov-gem-profile"
 end

data/spec/middleware_spec.rb

@@ -24,6 +24,10 @@ describe SchemaMonkey::Middleware do
 
   context SchemaMonkey::Middleware::Schema do
 
+    context TestReporter::Middleware::Schema::Define do
+      Then { expect_middleware { ActiveRecord::Schema.define { } } }
+    end
+
     context TestReporter::Middleware::Schema::Tables do
       Then { expect_middleware { connection.tables() } }
     end
@@ -59,6 +63,10 @@ describe SchemaMonkey::Middleware do
       Then { expect_middleware(enable: {type: :reference}, env: {operation: :define, column_name: "ref_id"}) { table_statement(:belongs_to, "ref") } }
     end
 
+    context TestReporter::Middleware::Migration::CreateTable do
+      Then { expect_middleware { connection.create_table "other" } }
+    end
+
     context TestReporter::Middleware::Migration::DropTable do
       Then { expect_middleware { connection.drop_table "things" } }
     end

data/spec/support/test_reporter.rb

@@ -25,14 +25,16 @@ module TestReporter
     end
 
     module Schema
-      module Tables ;                   include Notify ; end
+      module Define ;                   include Notify ; end
       module Indexes ;                  include Notify ; end
+      module Tables ;                   include Notify ; end
     end
 
     module Migration
       module Column ;                   include Notify ; end
-      module Index ;                    include Notify ; end
+      module CreateTable ;              include Notify ; end
       module DropTable ;                include Notify ; end
+      module Index ;                    include Notify ; end
     end
 
     module Sql

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus_core
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - ronen barzel
 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
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +164,7 @@ files:
 - lib/schema_plus/core/active_record/connection_adapters/sqlite3_adapter.rb
 - lib/schema_plus/core/active_record/connection_adapters/table_definition.rb
 - lib/schema_plus/core/active_record/migration/command_recorder.rb
+- lib/schema_plus/core/active_record/schema.rb
 - lib/schema_plus/core/active_record/schema_dumper.rb
 - lib/schema_plus/core/middleware.rb
 - lib/schema_plus/core/schema_dump.rb