schema_monkey 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed3dab4edfea62a3b257c74ee6a1dbf073eccaae
-  data.tar.gz: 401761ac3271ad840abd0df3da2e3260487688ee
+  metadata.gz: bd2b4e25c9e2bcc5fda7640439069570006e8551
+  data.tar.gz: 2270a11166bdffb014753139c575abfd2679d877
 SHA512:
-  metadata.gz: 8548b6671077e6415af86d914f953e177a872d266c5080bb99a1f2f23d6cb92e7a6a8d279f672da2957fb643da56202f7ee6276e0adb080cf47fe0bb741eb139
-  data.tar.gz: 51e70f4c17c995572d86749dacfe9601ab38aa6642eef9457a4f7b7aa50a1aa5f258d03992b156bc692b91686cda5e96e8a88d2c682b18c2a73695c78ad5ec36
+  metadata.gz: 3e7ba30f9468eca1f5f65590df3fbf99f67cfee9eaa75beb1c687215f85da7ace697de4fd543753bb4a129249d57777f84bbd147e10c89fca65c94d8c2975e2f
+  data.tar.gz: df9a386fd3ee4d6e97596bca33137826a362d2adebcd9239311588026a0627cf1c80321aa33aeeb4f991bbcb077262b18c7aa372ebf15ad9e0266fc7729f861c

data/README.md

@@ -232,6 +232,7 @@ SchemaMonkey is tested on:
 <!-- SCHEMA_DEV: MATRIX - end -->
 
 ## Release Notes
+* 2.1.3 -- Guard against multiple insertion of modules.
 * 2.1.2 -- Insert self earlier; don't wait for connection adapter to be instantiated.  Fixes #6 re `db:schema:load`
 * 2.1.1 -- Bug fix: don't choke if a module contains a BasicObject const
 * 2.1.0 -- First version to support all of schema_plus's needs for the 1.8.7 -> 2.0 upgrade

data/lib/schema_monkey/client.rb

@@ -3,7 +3,7 @@ module SchemaMonkey
 
     def initialize(mod)
       @root = mod
-      @inserted_middleware = {}
+      @inserted = {}
     end
 
     def insert(dbm: nil)
@@ -16,6 +16,7 @@ module SchemaMonkey
     def insert_active_record(dbm: nil)
       # Kernel.warn "--- inserting active_record for #{@root}, dbm=#{dbm.inspect}"
       find_modules(:ActiveRecord, dbm: dbm).each do |mod|
+        next if @inserted[mod]
         relative_path = canonicalize_path(mod, :ActiveRecord, dbm)
         ActiveRecord.insert(relative_path, mod)
       end
@@ -23,10 +24,10 @@ module SchemaMonkey
 
     def insert_middleware(dbm: nil)
       find_modules(:Middleware, dbm: dbm).each do |mod|
-        next if @inserted_middleware[mod]
+        next if @inserted[mod]
         relative_path = canonicalize_path(mod, :Middleware, dbm)
         Stack.insert(relative_path, mod) unless relative_path.empty?
-        @inserted_middleware[mod] = true
+        @inserted[mod] = true
       end
     end
 

data/lib/schema_monkey/monkey.rb

@@ -5,25 +5,23 @@ module SchemaMonkey
 
   class Monkey
 
-    attr_reader :clients, :stacks
-
     def initialize
-      @clients = []
+      @client_map = {}
       @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
+      @client_map[mod] ||= Client.new(mod).tap { |client|
+        client.insert if @inserted
+        client.insert(dbm: @inserted_dbm) if @inserted_dbm
+      }
     end
 
     def insert(dbm: nil)
       insert if dbm and not @inserted # first do all non-dbm-specific insertions
-      clients.each &it.insert(dbm: dbm)
+      @client_map.values.each &it.insert(dbm: dbm)
       @inserted = true
       @inserted_dbm = dbm if dbm
     end

data/lib/schema_monkey/version.rb

@@ -1,3 +1,3 @@
 module SchemaMonkey
-  VERSION = "2.1.2"
+  VERSION = "2.1.3"
 end

data/spec/schema_monkey_spec.rb

@@ -0,0 +1,55 @@
+require 'spec_helper'
+
+describe SchemaMonkey do
+
+  it "doesn't register same client's middleware twice" do
+    base = Module.new.tap(&it.module_eval(<<-END))
+      module Middleware
+        module Group
+          module Stack
+            ENV = [:result]
+          end
+        end
+      end
+    END
+    mod = Module.new.tap(&it.module_eval(<<-END))
+      module Middleware
+        module Group
+          module Stack
+            def after(env)
+              env.result += 1
+            end
+          end
+        end
+      end
+    END
+
+    SchemaMonkey.register(base)
+    expect( SchemaMonkey::Middleware::Group::Stack.start(result: 0) {}.result ).to eq 0
+    SchemaMonkey.register(mod)
+    expect( SchemaMonkey::Middleware::Group::Stack.start(result: 0) {}.result ).to eq 1
+    SchemaMonkey.register(mod)
+    expect( SchemaMonkey::Middleware::Group::Stack.start(result: 0) {}.result ).to eq 1
+  end
+
+  it "doesn't register same client's ActiveRecord extensions twice" do
+    mod = Module.new.tap(&it.module_eval(<<-END))
+      module ActiveRecord
+        module Base
+          def monkey_test
+            (super rescue 0) + 1
+          end
+        end
+      end
+    END
+    ActiveRecord::Migration.suppress_messages do
+      ActiveRecord::Migration.create_table "dummy", force: :cascade
+    end
+    record = Class.new(ActiveRecord::Base).tap{ |kls| kls.table_name = "dummy" }.new
+    SchemaMonkey.register mod
+    expect( record.monkey_test ).to eq 1
+    SchemaMonkey.register mod
+    expect( record.monkey_test ).to eq 1
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema_monkey
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - ronen barzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-09 00:00:00.000000000 Z
+date: 2015-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -183,6 +183,7 @@ files:
 - spec/connection_spec.rb
 - spec/middleware_spec.rb
 - spec/module_spec.rb
+- spec/schema_monkey_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/SchemaPlus/schema_monkey
 licenses:
@@ -213,4 +214,5 @@ test_files:
 - spec/connection_spec.rb
 - spec/middleware_spec.rb
 - spec/module_spec.rb
+- spec/schema_monkey_spec.rb
 - spec/spec_helper.rb