ridgepole 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d08fea3e3aeaee714ef067586032c6e6eb25049e
-  data.tar.gz: 2a9acc2fd3f48e8e79b08aec8138fd58bc3559d6
+  metadata.gz: a32f500b9c3b34e20718ff38f2d8c105da56a6d9
+  data.tar.gz: 60f9a30069f99a53045dcb2ff8666b45a05b5d16
 SHA512:
-  metadata.gz: 883436edcae382bf87885bf406f03ff12c17ff91e7cc01cf65c1e0d6a2b55f82edf7088a599da99f66eabf810c1e0cebfe9ab201d97e834b26e87913afaebdfc
-  data.tar.gz: cffcd28f3981b8fe96d76648e79bca2a2804919c32ee0e9a4f3f8a64278c81955552dfdc9d5484a831d9065d5002ad8c0d4bbda8a6b9a8e6d85e87aaa17e37b4
+  metadata.gz: 23552503c21a1ece686ed0fdb79d9c1c2e7cb00696139f719e01d70ab775632110f84add2be4cb28ba87c2cb1ed8546bbafb3fa4d8908bb508b591bc50ec1dd3
+  data.tar.gz: 6928abc2468aa26d70bb38e32f27a05c1229c84571a934a699f86e11ed63a75ef388338659ae36ba4af11645a7f4037506a92b07773e6426b8abbc60b9516296

data/lib/ridgepole/execute_expander.rb

@@ -44,21 +44,20 @@ end
 require 'active_record/connection_adapters/abstract/schema_statements'
 
 module ActiveRecord::ConnectionAdapters::SchemaStatements
-  def add_index_with_noop(table_name, column_name, options = {})
-    begin
-      add_index_without_noop(table_name, column_name, options)
-    rescue => e
-      raise e unless Ridgepole::ExecuteExpander.noop
-    end
-  end
-  alias_method_chain :add_index, :noop
-
-  def remove_index_with_noop(table_name, options = {})
-    begin
-      remove_index_without_noop(table_name, options)
-    rescue => e
-      raise e unless Ridgepole::ExecuteExpander.noop
+  def index_name_exists_with_noop?(table_name, column_name, options = {})
+    if Ridgepole::ExecuteExpander.noop
+      caller_methods = caller.map {|i| i =~ /:\d+:in `(.+)'/ ? $1 : '' }
+
+      if caller_methods.any? {|i| i =~ /\Aremove_index/ }
+        true
+      elsif caller_methods.any? {|i| i =~ /\Aadd_index/ }
+        false
+      else
+        index_name_exists_without_noop?(table_name, column_name, options)
+      end
+    else
+      index_name_exists_without_noop?(table_name, column_name, options)
     end
   end
-  alias_method_chain :remove_index, :noop
+  alias_method_chain :index_name_exists?, :noop
 end

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.3.4'
+  VERSION = '0.3.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-01 00:00:00.000000000 Z
+date: 2014-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord