unmixer 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 744abd9d02195ad0c1cbfb95da0ec26474417dba
-  data.tar.gz: 8c9bafa0140645769984aaae48014b6df80cae53
+  metadata.gz: 31f9b48b391a4775a211798f0b6fc8bf80780c5c
+  data.tar.gz: daf1b1a3ec1de1b8f3c43277ceaea0414a9a82a2
 SHA512:
-  metadata.gz: ea97559d1ef82901e5641475da7ca286f401b38936576071145d195142e2b58d7df0f82f0020a83635d6a10c2316e2420ed36f73b59bde1b5af77aebfd1c7f92
-  data.tar.gz: e15667eb6ffe2e410232aa6d5b921ac4aa1d3234bebd25ad376a2f1f7f31cf16f2f085c5a1e76be73ee33b61e86fabe2c2bc86da1fce52e9587c67fce3eb795a
+  metadata.gz: d9f6d675fbd5441c81d0ea8d6bb69f624090f83e9b89ae96a96723346e0fdf45171a116ec0c4e2c295c4c4b63d8f9a03d75efe6cf50ecec3cd25dd5c2f708518
+  data.tar.gz: ebe7174f917f60af175d00d0982c86f472a7b47b8aac83c0f522eef4db4b864dfd8179bdc5a85d9c499c3df8148f01b8437b1eade2350d68a5d64007c5f0b7e3

data/README.md

@@ -90,6 +90,11 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/osyo-m
 
 ## Release Note
 
+#### 0.3.0
+
+* Fix accessibility `#unmixin`/`#uninclude`/`#unprepend` to public.
+* Remove `#unextend` with block.
+
 #### 0.2.0
 
 * Fix `#extend`/`#unextend` result

data/ext/unmixer/unmixer.c

@@ -50,5 +50,5 @@ static VALUE rb_m_unmixin(VALUE self, VALUE mod) {
 
 
 void Init_unmixer(void) {
-  rb_define_private_method(rb_cModule, "unmixer_unmixin", RUBY_METHOD_FUNC(rb_m_unmixin), 1);
+  rb_define_method(rb_cModule, "unmixer_unmixin", RUBY_METHOD_FUNC(rb_m_unmixin), 1);
 }

data/lib/unmixer/core_refine.rb

@@ -2,18 +2,26 @@ require "unmixer/unmixer"
 
 module Unmixer
 	refine Module do
-		private
-		alias_method :unmixin,   :unmixer_unmixin
+		alias_method :unmixin, :unmixer_unmixin
 
 		def unmixer_uninclude mod, &block
-			return unless ancestors.tap { |it| break it[it.find_index(self)+1..it.find_index(superclass)-1] }.include? mod
+			return self unless ancestors.tap { |it| break it[it.find_index(self)+1..it.find_index(superclass)-1] }.include? mod
 			unmixer_unmixin mod
 		end
 		alias_method :uninclude, :unmixer_uninclude
 
 		def unmixer_unprepend mod
-			return unless ancestors.tap { |it| break it[0, it.find_index(self)] }.include? mod
+			return self unless ancestors.tap { |it| break it[0, it.find_index(self)] }.include? mod
 			unmixer_unmixin mod
+
+			if block_given?
+				begin
+					yield(self)
+				ensure
+					unmixer_original_extend mod
+				end
+			end
+			self
 		end
 		alias_method :unprepend, :unmixer_unprepend
 	end
@@ -21,7 +29,7 @@ module Unmixer
 	refine Object do
 		alias_method :unmixer_original_extend, :extend
 		def unmixer_extend mod
-			result = unmixer_original_extend mod
+			unmixer_original_extend mod
 			
 			if block_given?
 				begin
@@ -30,7 +38,7 @@ module Unmixer
 					unmixer_unextend mod
 				end
 			end
-			result
+			self
 		end
 		alias_method :extend, :unmixer_extend
 
@@ -39,13 +47,14 @@ module Unmixer
 			
 			singleton_class.__send__ :unmixer_unmixin, mod
 
-			if block_given?
-				begin
-					yield(self)
-				ensure
-					unmixer_original_extend mod
-				end
-			end
+			# NOTE: 複数のモジュールが mixin されている場合、同じ位置に mixin 出来ない
+# 			if block_given?
+# 				begin
+# 					yield(self)
+# 				ensure
+# 					unmixer_original_extend mod
+# 				end
+# 			end
 			self
 		end
 		alias_method :unextend, :unmixer_unextend

data/lib/unmixer/version.rb

@@ -1,3 +1,3 @@
 module Unmixer
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unmixer
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - manga_osyo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-09 00:00:00.000000000 Z
+date: 2017-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler