schema_monkey 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2ba91ff751129e56965c986ca35a5ca8c7a4996
-  data.tar.gz: 48fac590947b7de42eeb8137eac0ec79639eb544
+  metadata.gz: 2cd38c5890ddc04325c12c6e231bda0d1622ba4e
+  data.tar.gz: dea34315b4b49a545dd43c440f6ffdec23a571c1
 SHA512:
-  metadata.gz: 2f989b848d4dd7b49d970c7e65faa96ddf503a05c24463d0e8737f3f136fd0e1175181d65b649964d66ac9aae0f5977f039cb5b5d7b803e73bf448975899e92e
-  data.tar.gz: 8674917f2c77a10d16d1d52c9b54ed2bafc4386f869588d401fdbece2ae731b1e1a2787c6587e0c98c04caa11363b35d058f9fac772b1bd7de1ab240279513ff
+  metadata.gz: 528676ab7eca48f208b8ceca8b470831d48b767f7a52f559640d708f4e0c543adf92074347b805f60bcadd02e36946f90c34a3bb0ddda0286bb01a577fc04068
+  data.tar.gz: 38d41cfef17a81fcd208a1085978cf0abede1878f3d73f5a1cea3411ada32677d2e6851031e2d9d658782318c5807faa09ba9974e14f802adc1cf63f864b7974

data/README.md

@@ -21,14 +21,6 @@ gem "schema_monkey"                 # in a Gemfile
 gem.add_dependency "schema_monkey"  # in a .gemspec
 ```
 
-To use with a rails app, also include
-
-```ruby
-gem "schema_monkey_rails"
-```
-
-which creates a Railtie to insert SchemaMonkey appropriately into the rails stack. To use with Padrino, see [schema_monkey_padrino](https://github.com/SchemaPlus/schema_monkey_padrino).
-
 ## Usage
 
 SchemaMonkey works with the notion of a "client" -- which is a module containining definitions.  A typical SchemaMonkey client looks like
@@ -62,16 +54,16 @@ of course a typical client will be split into files corresponding to submodules;
 ```ruby
 require 'schema_plus/core'
 
-require_relative 'schema_plus_indexes/active_record/base'
-require_relative 'schema_plus_indexes/active_record/connection_adapters/abstract_adapter'
-require_relative 'schema_plus_indexes/active_record/connection_adapters/index_definition'
+require 'schema_plus/indexes/active_record/base'
+require 'schema_plus/indexes/active_record/connection_adapters/abstract_adapter'
+require 'schema_plus/indexes/active_record/connection_adapters/index_definition'
 
-require_relative 'schema_plus_indexes/middleware/dumper'
-require_relative 'schema_plus_indexes/middleware/migration'
-require_relative 'schema_plus_indexes/middleware/model'
-require_relative 'schema_plus_indexes/middleware/query'
+require 'schema_plus/indexes/middleware/dumper'
+require 'schema_plus/indexes/middleware/migration'
+require 'schema_plus/indexes/middleware/model'
+require 'schema_plus/indexes/middleware/schema'
 
-SchemaMonkey.register SchemaPlusIndexes
+SchemaMonkey.register SchemaPlus::Indexes
 ```
 
 The details of ActiveRecord exentions and Middleware modules are described below.

data/lib/schema_monkey/active_record.rb

@@ -3,13 +3,14 @@ module SchemaMonkey
     module ConnectionAdapters
       module AbstractAdapter
         def initialize(*args)
-          super
           dbm = case adapter_name
                 when /^MySQL/i                 then :Mysql
                 when 'PostgreSQL', 'PostGIS'   then :PostgreSQL
                 when 'SQLite'                  then :SQLite3
                 end
           SchemaMonkey.insert(dbm: dbm)
+
+          super
         end
       end
     end

data/lib/schema_monkey/monkey.rb

@@ -22,6 +22,7 @@ module SchemaMonkey
     end
 
     def insert(dbm: nil)
+      insert if dbm and not @inserted # first do all non-dbm-specific insertions
       clients.each &it.insert(dbm: dbm)
       @inserted = true
       @inserted_dbm = dbm if dbm

data/lib/schema_monkey/version.rb

@@ -1,3 +1,3 @@
 module SchemaMonkey
-  VERSION = "2.0.1"
+  VERSION = "2.1.0"
 end

data/lib/schema_monkey.rb

@@ -9,7 +9,6 @@ require_relative "schema_monkey/errors"
 require_relative "schema_monkey/module"
 require_relative "schema_monkey/monkey"
 require_relative "schema_monkey/stack"
-require_relative 'schema_monkey/rake'
 
 #
 # Middleware contents will be created dynamically

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema_monkey
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 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
@@ -175,16 +175,13 @@ files:
 - lib/schema_monkey/errors.rb
 - lib/schema_monkey/module.rb
 - lib/schema_monkey/monkey.rb
-- lib/schema_monkey/rake.rb
 - lib/schema_monkey/stack.rb
-- lib/schema_monkey/tasks/insert.rake
 - lib/schema_monkey/version.rb
 - schema_dev.yml
 - schema_monkey.gemspec
 - spec/active_record_spec.rb
 - spec/connection_spec.rb
 - spec/middleware_spec.rb
-- spec/rake_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/SchemaPlus/schema_monkey
 licenses:
@@ -214,5 +211,4 @@ test_files:
 - spec/active_record_spec.rb
 - spec/connection_spec.rb
 - spec/middleware_spec.rb
-- spec/rake_spec.rb
 - spec/spec_helper.rb

data/lib/schema_monkey/rake.rb

@@ -1,12 +0,0 @@
-module SchemaMonkey
-  module Rake
-    TASKS_PATH = Pathname.new(__FILE__).dirname + "tasks"
-
-    def self.insert(*task_names)
-      ::Rake.load_rakefile TASKS_PATH + "insert.rake"
-      task_names.each do |name|
-        ::Rake.application.lookup(name).enhance(["schema_monkey:insert"])
-      end
-    end
-  end
-end

data/lib/schema_monkey/tasks/insert.rake

@@ -1,5 +0,0 @@
-namespace :schema_monkey do
-  task :insert do
-    SchemaMonkey.insert
-  end
-end

data/spec/rake_spec.rb

@@ -1,39 +0,0 @@
-require 'spec_helper'
-require 'rake'
-
-describe SchemaMonkey::Rake do
-
-  context "insertion" do
-    Given(:results) { [] }
-
-    Given {
-      allow(SchemaMonkey).to receive(:insert) { results << :schema_monkey }
-    }
-
-    Given {
-      Rake.application = Rake::Application.new
-      Rake::Task.define_task(:test1) { results << :test1 }
-      Rake::Task.define_task(:test2) { results << :test2 }
-      Rake::Task.define_task(:test3) { results << :test3 }
-    }
-
-    Given { SchemaMonkey::Rake.insert(:test1, :test2) }
-
-
-    context "enhanced task 1" do
-      When { Rake.application.invoke_task :test1 }
-      Then { expect(results).to eq [:schema_monkey, :test1] }
-    end
-
-    context "enhanced task 2" do
-      When { Rake.application.invoke_task :test2 }
-      Then { expect(results).to eq [:schema_monkey, :test2] }
-    end
-
-    context "unenhanced task 3" do
-      When { Rake.application.invoke_task :test3 }
-      Then { expect(results).to eq [:test3] }
-    end
-  end
-
-  end