invisible 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72e65a804434aaa0d8ab2ffd43ac25e1d21cd9ece36ada09cc1182386c07e1d6
-  data.tar.gz: e1379dff0e06e556fa0fa015416a4a6d598b58bf3442dc13d14aaeb676dc5f8b
+  metadata.gz: e928cb33873c0a9e4d6a3dac359ca80c9d14b28584c5697c9eb702ddf723e3d0
+  data.tar.gz: 9d74fa7b57f100fcdff73d52259099dad1495596151a8543b378748283953788
 SHA512:
-  metadata.gz: 25eee1664224d7e3f1ef82943cdf421f77b8859d4d4a3dc6c5dc370398297556cf84ea7c9be3ea04a2b4a165b5ed03d51bec85fa3e8783eb5afade47207617cf
-  data.tar.gz: 52173c2d4870367147ef495117703cbcc23f7dd29c110d8f4eab7b551f4eb5f07bfa19eec798d41b7a583110dc2c4dfff71252fa506cf40d7743dd9f2ea0f17b
+  metadata.gz: f58a4075089d38b5f9b578782c8ac3c0afb4cf9f7d5e80ff9fb048cce63e10a8e90a0bb840c7deb485254ad2ae95b6ae9ddf1155158c56b774766544118f1895
+  data.tar.gz: ec1730fce3f4254437c437e08f29a0d3057dd37b93c09c07df8caea85c0bc40239a287127faa36e54be6a339f2c572182a8fab991e02978428d1c3148baeba15

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## 0.2
 
+### 0.2.4 (October 30, 2019)
+
+* Only dup module if prepending class has different visibility
+  ([#6](https://github.com/shioyama/invisible/pull/6))
+
 ### 0.2.3 (October 30, 2019)
 
 * Only prepend dup'ed module once if possible ([#5](https://github.com/shioyama/invisible/pull/5))

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    invisible (0.2.2)
+    invisible (0.2.3)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -84,7 +84,8 @@ Base.prepend WithFoo
 
 instance = Base.new
 
-Base.private_method_defined?(:private_method)        # raises NoMethodError
+Base.private_method_defined?(:private_method)        # true
+instance.private_method                              # raises NoMethodError
 instance.send(:private_method)                       #=> 'private with foo'
 ```
 

data/lib/invisible.rb

@@ -63,16 +63,23 @@ maintain their original visibility.
 
   instance = Base.new
 
-  Base.private_method_defined?(:private_method)        # raises NoMethodError
+  Base.private_method_defined?(:private_method)        # true
+  instance.private_method                              # raises NoMethodError
   instance.send(:private_method)                       #=> 'private with foo'
 
 =end
   def append_features(base)
-    sync_visibility(base) { super }
+    private_methods, protected_methods = methods_to_hide(base)
+
+    super
+
+    base.send(:private, *private_methods)
+    base.send(:protected, *protected_methods)
   end
 
   def prepend_features(base)
-    return super if invisible
+    private_methods, protected_methods = methods_to_hide(base)
+    return super if private_methods.empty? && protected_methods.empty?
 
     mod = dup
 
@@ -81,23 +88,15 @@ maintain their original visibility.
       base.const_set(mod_name, mod)
     end
 
-    sync_visibility(base, mod)
-    mod.invisible = true
+    mod.send(:private, *private_methods)
+    mod.send(:protected, *protected_methods)
     base.prepend mod
   end
 
-  protected
-  attr_accessor :invisible
-
   private
 
-  def sync_visibility(source, target = source)
-    private_methods   = instance_methods.select { |m| source.private_method_defined? m }
-    protected_methods = instance_methods.select { |m| source.protected_method_defined? m }
-
-    yield if block_given?
-
-    private_methods.each   { |method_name| target.class_eval { private method_name } }
-    protected_methods.each { |method_name| target.class_eval { protected method_name } }
+  def methods_to_hide(mod)
+    [(instance_methods - private_instance_methods)   & mod.private_instance_methods,
+     (instance_methods - protected_instance_methods) & mod.protected_instance_methods]
   end
 end

data/lib/invisible/version.rb

@@ -1,3 +1,3 @@
 module Invisible
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: invisible
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Chris Salzberg