schema_monkey 1.0.1 → 2.0.0

data/lib/schema_monkey/errors.rb

@@ -0,0 +1,6 @@
+module SchemaMonkey
+  class MiddlewareError < Exception
+  end
+  class InsertionError < Exception
+  end
+end

data/lib/schema_monkey/{tool/module.rb → module.rb}

@@ -1,9 +1,13 @@
-module SchemaMonkey::Tool
+module SchemaMonkey
   module Module
     extend self
 
-    def include_once(base, mod)
-      base.send(:include, mod) unless base.include? mod
+    def insert(base, mod)
+      if mod.respond_to? :included
+        base.send(:include, mod) unless base.include? mod
+      else
+        base.send(:prepend, mod)
+      end
     end
 
     # ruby 2.* supports mod.const_get("Component::Path") but ruby 1.9.3
@@ -20,13 +24,12 @@ module SchemaMonkey::Tool
       mod
     end
 
-    def descendants(mod, opts={})
-      opts = opts.keyword_args(can_load: nil)
+    def descendants(mod, can_load: nil)
       consts, auto = mod.constants.group_by{|c| !!mod.autoload?(c)}.values_at(false, true)
       consts ||= []
-      consts += auto.select &it.to_s =~ opts.can_load if opts.can_load and auto
+      consts += auto.select &it.to_s =~ can_load if can_load and auto
       children = consts.map{|c| mod.const_get(c) }.select &it.is_a?(::Module)
-      children + children.flat_map {|c| descendants(c, can_load: opts.can_load) }
+      children + children.flat_map {|c| descendants(c, can_load: can_load) }
     end
 
     def mkpath(mod, path)

data/lib/schema_monkey/monkey.rb

@@ -0,0 +1,31 @@
+module SchemaMonkey
+
+  # The main manager for the monkey patches.  Singleton instance 
+  # created by SchemaMonkey.monkey
+
+  class Monkey
+
+    attr_reader :clients, :stacks
+
+    def initialize
+      @clients = []
+      @inserted = nil
+      @inserted_dbm = nil
+      Module.insert ::ActiveRecord::ConnectionAdapters::AbstractAdapter, SchemaMonkey::ActiveRecord::ConnectionAdapters::AbstractAdapter 
+    end
+
+    def register(mod)
+      client = Client.new(mod)
+      clients << client
+      client.insert if @inserted
+      client.insert(dbm: @inserted_dbm) if @inserted_dbm
+    end
+
+    def insert(dbm: nil)
+      clients.each &it.insert(dbm: dbm)
+      @inserted = true
+      @inserted_dbm = dbm if dbm
+    end
+
+  end
+end

data/lib/schema_monkey/{tool/rake.rb → rake.rb}

@@ -1,4 +1,4 @@
-module SchemaMonkey::Tool
+module SchemaMonkey
   module Rake
     TASKS_PATH = Pathname.new(__FILE__).dirname + "tasks"
 

data/lib/schema_monkey/stack.rb

@@ -0,0 +1,44 @@
+module SchemaMonkey
+  module Stack
+    def self.insert(path, mod)
+      env = Module.const_lookup(mod, "Env") || Module.const_lookup(mod, "ENV")
+      return unless env or Modware.is_middleware?(mod)
+      stack = env ? create(path, env) : get(path)
+      stack.stack.add(mod)
+    rescue MiddlewareError => err
+      raise MiddlewareError, "#{mod}: #{err.message}"
+    end
+
+    private
+
+    def self.create(path, env)
+      if stack = get(path, err: false)
+        raise MiddlewareError, "stack #{stack} is already defined"
+      end
+      Module.mkpath(SchemaMonkey::Middleware, path).tap { |stack|
+        stack.send :extend, Stack::StartMethod
+        stack.send :stack=, Modware::Stack.new(env: env)
+      }
+    end
+
+    def self.get(path, err: true)
+      stack = Module.const_lookup SchemaMonkey::Middleware, path
+      return stack if stack
+      raise MiddlewareError, "No stack #{SchemaMonkey::Middleware}::#{path}" if err
+    end
+
+    module StartMethod
+      attr_reader :stack
+
+      def start(env, &block)
+        stack.start(env, &block)
+      end
+
+      private
+
+      def stack=(stack)
+        @stack = stack
+      end
+    end
+  end
+end

data/lib/schema_monkey/version.rb

@@ -1,3 +1,3 @@
 module SchemaMonkey
-  VERSION = "1.0.1"
+  VERSION = "2.0.0"
 end

data/schema_dev.yml

@@ -1,5 +1,4 @@
 ruby:
-    - 1.9.3
     - 2.1.5
 activerecord:
     - 4.2

data/schema_monkey.gemspec

@@ -18,10 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = ">= 2.1.0"
   spec.add_dependency "activerecord", "~> 4.2"
-  spec.add_dependency "hash_keyword_args"
   spec.add_dependency "its-it"
-  spec.add_dependency "key_struct"
+  spec.add_dependency "modware", "~> 0.1"
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"

data/spec/active_record_spec.rb

@@ -0,0 +1,75 @@
+require 'spec_helper'
+
+$client_count = 0
+
+describe SchemaMonkey::ActiveRecord do
+
+  before(:each) {
+    SchemaMonkey.register(client)
+    SchemaMonkey.insert
+    ActiveRecord::Base.establish_connection :schema_dev
+    ActiveRecord::Base.connection
+  }
+
+  [false, true].each do |class_methods|
+    suffix = class_methods ? " class methods" : ""
+
+    [:prepend, :include].each do |mode|
+
+      context "#{mode} general module"+suffix do
+        let(:client) { make_client('ConnectionAdapters::SchemaStatements', mode: mode, class_methods: class_methods) }
+        it { expect_inserted(ActiveRecord::ConnectionAdapters::SchemaStatements, client.module, mode, class_methods) }
+      end
+
+      SchemaMonkey::DBMS.each do |dbm|
+
+        context "#{mode} #{dbm} module"+suffix do
+          let(:client) { make_client("ConnectionAdapters::#{dbm}::SchemaStatements", mode: mode, class_methods: class_methods) }
+
+          SchemaMonkey::DBMS.each do |loaded_dbm|
+
+            context "when #{loaded_dbm}", loaded_dbm.to_s.downcase.to_sym => :only do
+              if dbm == loaded_dbm
+                it { expect_inserted(ActiveRecord::ConnectionAdapters::SchemaStatements, client.module, mode, class_methods) }
+              else
+                it { expect_not_inserted(ActiveRecord::ConnectionAdapters::SchemaStatements, client.module, class_methods) }
+              end
+            end
+          end
+        end
+      end
+
+    end
+  end
+
+  private
+
+  def expect_inserted(base, mod, mode, class_methods)
+    base = base.singleton_class if class_methods
+    actual = base.ancestors.select{|a| [base, mod].include? a}
+    expected = case mode
+               when :prepend then [mod, base]
+               when :include then [base, mod]
+               end
+    expect(actual).to eq expected
+  end
+
+  def expect_not_inserted(base, mod, class_methods)
+    base = base.singleton_class if class_methods
+    expect(base.ancestors).not_to include mod
+  end
+
+  def make_client(path, mode:, class_methods: nil)
+    name = "TestActiveRecord#{$client_count}"
+    $client_count += 1
+    Object.send :remove_const, name if Object.const_defined? name
+    Object.const_set name, Module.new.tap { |client|
+      path += "::ClassMethods" if class_methods
+      sub = SchemaMonkey::Module.mkpath(client, 'ActiveRecord::' + path)
+      client.singleton_class.send(:define_method, :module) { sub }
+      sub.singleton_class.send(:define_method, :included) {|base|} if mode == :include
+    }
+  end
+
+
+end

data/spec/middleware_spec.rb

@@ -10,13 +10,6 @@ describe SchemaMonkey::Middleware do
 
     Then { expect(defined?(SchemaMonkey::Middleware::Group::Stack)).to be_truthy }
 
-    context "when start with no implementation" do
-
-      When(:env) { SchemaMonkey::Middleware::Group::Stack.start result: [] }
-
-      Then { expect(env).to have_failed(SchemaMonkey::MiddlewareError, /implementation/) }
-    end
-
     context "when start with inline implementation" do
 
       When(:env) { SchemaMonkey::Middleware::Group::Stack.start result: [] { |env| env.result << :inline } }

data/spec/spec_helper.rb

@@ -19,8 +19,8 @@ Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
   config.warnings = true
-  config.after(:each) do
-    SchemaMonkey::Tool.reset_for_rspec
+  config.before(:each) do
+    SchemaMonkey.reset_for_rspec
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema_monkey
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors:
 - ronen barzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
-- !ruby/object:Gem::Dependency
-  name: hash_keyword_args
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: its-it
   requirement: !ruby/object:Gem::Requirement
@@ -53,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: key_struct
+  name: modware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -184,28 +170,18 @@ files:
 - gemfiles/activerecord-4.2/Gemfile.postgresql
 - gemfiles/activerecord-4.2/Gemfile.sqlite3
 - lib/schema_monkey.rb
-- lib/schema_monkey/core_extensions.rb
-- lib/schema_monkey/core_extensions/active_record/base.rb
-- lib/schema_monkey/core_extensions/active_record/connection_adapters/abstract_adapter.rb
-- lib/schema_monkey/core_extensions/active_record/connection_adapters/mysql2_adapter.rb
-- lib/schema_monkey/core_extensions/active_record/connection_adapters/postgresql_adapter.rb
-- lib/schema_monkey/core_extensions/active_record/connection_adapters/schema_statements.rb
-- lib/schema_monkey/core_extensions/active_record/connection_adapters/sqlite3_adapter.rb
-- lib/schema_monkey/core_extensions/active_record/connection_adapters/table_definition.rb
-- lib/schema_monkey/core_extensions/active_record/migration/command_recorder.rb
-- lib/schema_monkey/core_extensions/active_record/schema_dumper.rb
-- lib/schema_monkey/core_extensions/middleware.rb
-- lib/schema_monkey/tool.rb
-- lib/schema_monkey/tool/client.rb
-- lib/schema_monkey/tool/errors.rb
-- lib/schema_monkey/tool/module.rb
-- lib/schema_monkey/tool/monkey.rb
-- lib/schema_monkey/tool/rake.rb
-- lib/schema_monkey/tool/stack.rb
-- lib/schema_monkey/tool/tasks/insert.rake
+- lib/schema_monkey/active_record.rb
+- lib/schema_monkey/client.rb
+- 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
@@ -222,7 +198,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -236,6 +212,7 @@ specification_version: 4
 summary: Provides an internal API and module inclusion protocol to facilitate adding
   features to ActiveRecord
 test_files:
+- spec/active_record_spec.rb
 - spec/connection_spec.rb
 - spec/middleware_spec.rb
 - spec/rake_spec.rb

data/lib/schema_monkey/core_extensions.rb

@@ -1,23 +0,0 @@
-require 'active_record'
-require 'key_struct'
-
-module SchemaMonkey
-  module CoreExtensions
-    module ActiveRecord
-      module ConnectionAdapters
-        DIR = Pathname.new(__FILE__).dirname + 'core_extensions/active_record/connection_adapters'
-        autoload :PostgresqlAdapter,    DIR + 'postgresql_adapter'
-        autoload :Mysql2Adapter,        DIR + 'mysql2_adapter'
-        autoload :Sqlite3Adapter,       DIR + 'sqlite3_adapter'
-      end
-    end
-  end
-end
-
-require_relative "core_extensions/active_record/base"
-require_relative "core_extensions/active_record/connection_adapters/abstract_adapter"
-require_relative "core_extensions/active_record/connection_adapters/table_definition"
-require_relative 'core_extensions/active_record/connection_adapters/schema_statements'
-require_relative 'core_extensions/active_record/migration/command_recorder'
-require_relative 'core_extensions/active_record/schema_dumper'
-require_relative "core_extensions/middleware"

data/lib/schema_monkey/core_extensions/active_record/base.rb

@@ -1,31 +0,0 @@
-module SchemaMonkey::CoreExtensions
-  module ActiveRecord
-
-    module Base
-      def self.included(base)
-        base.extend(ClassMethods)
-      end
-
-      module ClassMethods
-        def self.extended(base)
-          class << base
-            alias_method_chain :columns, :schema_monkey
-            alias_method_chain :reset_column_information, :schema_monkey
-          end
-        end
-
-        def columns_with_schema_monkey
-          SchemaMonkey::Middleware::Model::Columns.start(model: self, columns: []) { |env|
-            env.columns += columns_without_schema_monkey
-          }.columns
-        end
-
-        def reset_column_information_with_schema_monkey
-          SchemaMonkey::Middleware::Model::ResetColumnInformation.start(model: self) do |env|
-            reset_column_information_without_schema_monkey
-          end
-        end
-      end
-    end
-  end
-end

data/lib/schema_monkey/core_extensions/active_record/connection_adapters/abstract_adapter.rb

@@ -1,38 +0,0 @@
-module SchemaMonkey::CoreExtensions
-  module ActiveRecord
-    module ConnectionAdapters
-      module AbstractAdapter
-        def self.included(base) #:nodoc:
-          base.alias_method_chain :initialize, :schema_monkey
-        end
-
-        def initialize_with_schema_monkey(*args) #:nodoc:
-          initialize_without_schema_monkey(*args)
-
-          dbm = case adapter_name
-                when /^MySQL/i                 then :Mysql
-                when 'PostgreSQL', 'PostGIS'   then :PostgreSQL
-                when 'SQLite'                  then :SQLite3
-                end
-
-          SchemaMonkey.insert(dbm: dbm)
-        end
-
-        module SchemaCreation
-          def self.included(base)
-            base.class_eval do
-              alias_method_chain :add_column_options!, :schema_monkey
-              public :options_include_default?
-            end
-          end
-
-          def add_column_options_with_schema_monkey!(sql, options)
-            SchemaMonkey::Middleware::Migration::ColumnOptionsSql.start(caller: self, connection: self.instance_variable_get('@conn'), sql: sql, options: options) { |env|
-              add_column_options_without_schema_monkey! env.sql, env.options
-            }.sql
-          end
-        end
-      end
-    end
-  end
-end