schema_monkey 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d6e7678f91c469b42eeac242d5095283edcaf4a
-  data.tar.gz: 11e38e5ba367ced242293615096012c752150cd3
+  metadata.gz: 79b4b171241c85efd322e1110d21c832a3496ed8
+  data.tar.gz: ffd34501fbe45a95ed29750639c4e1dca540e6f0
 SHA512:
-  metadata.gz: 1022cc53e764a97faca78bec36a612a5a1b69a13369ba74af3b19a93ece5cbe1dd80002bb50430360e2027b717b3082aefa6c66e2f6422d8936978884ae0ae15
-  data.tar.gz: ff13029ef2dd6a8ecf5084e8c16526ae1439ce14df10710914c21afb69abb4927bc6d5275c141e94434c0f631471d3432a820d872e1086bb6ad4fd7b0faf3f8f
+  metadata.gz: 46d478aa24930337a10ce7fa4d672246fa6b6eb2c2ff214ed78eaa09ba6a8c84b751cdb6ba270bbc5efd0a14a4bcf7d262c0bb5ed8d045a361295d133488d9b0
+  data.tar.gz: 4cc5f36af665873d97bc8d8a1e502d8b1564cb79e60597708fd11a97745f6dfd3d3866eeb5aefa09e5a4459ecfa8c6afce2119189d4643c8a84c36393ebeeea0

data/.travis.yml

@@ -8,9 +8,9 @@ rvm:
 - 1.9.3
 - 2.1.5
 gemfile:
-- gemfiles/rails-4.2/Gemfile.mysql2
-- gemfiles/rails-4.2/Gemfile.postgresql
-- gemfiles/rails-4.2/Gemfile.sqlite3
+- gemfiles/activerecord-4.2/Gemfile.mysql2
+- gemfiles/activerecord-4.2/Gemfile.postgresql
+- gemfiles/activerecord-4.2/Gemfile.sqlite3
 env: POSTGRESQL_DB_USER=postgres MYSQL_DB_USER=travis
 addons:
   postgresql: '9.3'

data/README.md

@@ -5,23 +5,27 @@
 
 # SchemaMonkey
 
-SchemaMonkey is a behind-the-scenes gem to facilitate writing other gems that extend ActiveRecord.  It provides:
+SchemaMonkey is a behind-the-scenes gem to facilitate writing extensions to ActiveRecord (typically other gems, but could also be in an application).  It provides:
 
 * A "middleware"-style interface to key ActiveRecord internal functions.  For example, there's a middleware hook to let you insert a handler for migration column definition options, and there are several hooks to insert handlers for the various parts of a schema dump.
 
 * A convention-based protocol for `include`'ing custom modules into ActiveRecord.  You just define your modules and SchemaMonkey will automatically include them in the right places.
 
-* It takes care of setting up the Railtie appropriately to invoke the gems.
+* (If you're using Rails) It takes care of setting up a Railtie appropriately to invoke the extensions.
 
-The middleware interface has two benefits: it provides a clean API so that the client gems don't need to monkey-patch ActiveRecord (SchemaMonkey does all the monkey-patching for you), and it lets the client gems operate in parallel without concern about conflicting monkey-patches.
+The middleware interface has two benefits: it provides a clean API so that the gem or aplication code doesn't need to monkey-patch ActiveRecord (SchemaMonkey does all the monkey-patching for you), and it lets multiple client gems operate in parallel without concern about conflicting monkey-patches.
 
 
 ## Installation
 
-In your gem's `gemspec`, specify a dependency:
+As usual:
 
 ```ruby
+# In a gem's .gemspec:
 spec.add_dependency "schema_monkey", "~> <MAJOR>.<MINOR>", ">= <MAJOR>.<MINOR>.<PATCH>"
+
+# In an applications Gemfile:
+gem "schema_monkey", "~> <MAJOR>.<MINOR>", ">= <MAJOR>.<MINOR>.<PATCH>"
 ```
 
 SchemaMonkey follows semantic versioning; it's a good idea to explicitly use the `~>` and `>=` dependencies to make sure your gem's clients don't accidentally pull in a version of SchemaMonkey that your gem isn't compatible with.
@@ -32,15 +36,15 @@ SchemaMonkey is tested on:
 
 <!-- SCHEMA_DEV: MATRIX - begin -->
 <!-- These lines are auto-generated by schema_dev based on schema_dev.yml -->
-* ruby **1.9.3** with rails **4.2**, using **mysql2**, **sqlite3** or **postgresql**
-* ruby **2.1.5** with rails **4.2**, using **mysql2**, **sqlite3** or **postgresql**
+* ruby **1.9.3** with activerecord **4.2**, using **mysql2**, **sqlite3** or **postgresql**
+* ruby **2.1.5** with activerecord **4.2**, using **mysql2**, **sqlite3** or **postgresql**
 
 <!-- SCHEMA_DEV: MATRIX - end -->
 
 ## Usage
 
 
-**Sorry -- no real documentation yet.  Will get to that as soon as I can.**
+**Sorry -- no real documentation yet.  Too much is still in flux.**
 
 
 
@@ -51,7 +55,7 @@ the standard protocol: fork, feature branch, develop, push, and issue pull reque
 
 Some things to know about to help you develop and test:
 
-* **Ugh -- no specs yet.  SchemaMonkey is currently tested indirectly by testing the client gems that use it.  That's another thing to get to as soon as I can.**
+* **Ugh -- not many specs yet.  SchemaMonkey is currently tested indirectly by testing the client gems that use it.  Working on it...**
 
 * **schema_dev**:  SchemaMonkey uses [schema_dev](https://github.com/SchemaPlus/schema_dev) to
   facilitate running rspec tests on the matrix of ruby, rails, and database

data/gemfiles/{rails-4.2 → activerecord-4.2}/Gemfile.base

@@ -1,3 +1,3 @@
 eval File.read File.expand_path('../../Gemfile.base', __FILE__)
 
-gem "rails", "~> 4.2.0"
+gem "activerecord", "~> 4.2.0"

data/lib/schema_monkey.rb

@@ -2,6 +2,7 @@ require 'hash_keyword_args'
 require 'its-it'
 require 'key_struct'
 require 'middleware'
+require 'active_record'
 require 'active_support/core_ext/string'
 
 require_relative "schema_monkey/client"
@@ -13,7 +14,7 @@ require_relative "schema_monkey/active_record/connection_adapters/table_definiti
 require_relative 'schema_monkey/active_record/connection_adapters/schema_statements'
 require_relative 'schema_monkey/active_record/migration/command_recorder'
 require_relative 'schema_monkey/active_record/schema_dumper'
-require_relative 'schema_monkey/railtie' if defined?(Rails::Railtie)
+require_relative 'schema_monkey/rake'
 
 module SchemaMonkey
   extend Module

data/lib/schema_monkey/rake.rb

@@ -0,0 +1,12 @@
+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

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

data/lib/schema_monkey/version.rb

@@ -1,3 +1,3 @@
 module SchemaMonkey
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/schema_dev.yml

@@ -1,7 +1,7 @@
 ruby:
     - 1.9.3
     - 2.1.5
-rails:
+activerecord:
     - 4.2
 db:
     - mysql2

data/schema_monkey.gemspec

@@ -26,8 +26,9 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0.0"
-  spec.add_development_dependency "schema_dev", "~> 2.0"
+  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rspec-given", "~> 3.6"
+  spec.add_development_dependency "schema_dev", "~> 3.0"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "simplecov-gem-profile"
 end

data/spec/connection_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe "Connection" do
+
+  it "is connected" do
+    expect(ActiveRecord::Base).to be_connected
+  end
+
+  it "re-opens without failure" do
+    expect { ActiveRecord::Base.establish_connection :schema_dev }.to_not raise_error
+    expect(ActiveRecord::Base.connection).to_not be_nil
+    expect(ActiveRecord::Base).to be_connected
+  end
+
+end

data/spec/rake_spec.rb

@@ -0,0 +1,39 @@
+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

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'rspec'
+require 'rspec/given'
 require 'active_record'
 require 'schema_monkey'
 require 'schema_dev/rspec'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema_monkey
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - ronen barzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-29 00:00:00.000000000 Z
+date: 2015-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -114,28 +114,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-given
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: schema_dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -179,10 +193,10 @@ files:
 - README.md
 - Rakefile
 - 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
+- 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_monkey.rb
 - lib/schema_monkey/active_record/base.rb
 - lib/schema_monkey/active_record/connection_adapters/abstract_adapter.rb
@@ -196,11 +210,13 @@ files:
 - lib/schema_monkey/client.rb
 - lib/schema_monkey/middleware.rb
 - lib/schema_monkey/module.rb
-- lib/schema_monkey/railtie.rb
+- lib/schema_monkey/rake.rb
+- lib/schema_monkey/tasks/insert.rake
 - lib/schema_monkey/version.rb
 - schema_dev.yml
 - schema_monkey.gemspec
-- spec/sanity_spec.rb
+- spec/connection_spec.rb
+- spec/rake_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/SchemaPlus/schema_monkey
 licenses:
@@ -228,5 +244,6 @@ specification_version: 4
 summary: Provides an internal API and module inclusion protocol to facilitate adding
   features to ActiveRecord
 test_files:
-- spec/sanity_spec.rb
+- spec/connection_spec.rb
+- spec/rake_spec.rb
 - spec/spec_helper.rb

data/lib/schema_monkey/railtie.rb

@@ -1,24 +0,0 @@
-module SchemaMonkey
-  class Railtie < Rails::Railtie #:nodoc:
-
-    initializer 'schema_monkey.insert', :before => "active_record.initialize_database" do
-      ActiveSupport.on_load(:active_record) do
-        SchemaMonkey.insert
-      end
-    end
-
-    rake_tasks do
-      namespace :schema_monkey do
-        task :insert do
-          SchemaMonkey.insert
-        end
-      end
-      ['db:schema:dump', 'db:schema:load'].each do |name|
-        if task = Rake.application.tasks.find { |task| task.name == name }
-          task.enhance(["schema_monkey:insert"])
-        end
-      end
-    end
-
-  end
-end

data/spec/sanity_spec.rb

@@ -1,13 +0,0 @@
-require 'spec_helper'
-
-
-# A basic sanity check to have as a spec when first starting.  Feel free to delete this
-# once you've got real content.
-
-describe "Sanity Check" do
-
-  it "database is connected" do
-    expect(ActiveRecord::Base).to be_connected
-  end
-
-end