unmixer 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a952ec2f6409147008426c46f4a15c75786d0a1
-  data.tar.gz: de27755a1162205f2f87be49d2ec6ca6bd4ba970
+  metadata.gz: 744abd9d02195ad0c1cbfb95da0ec26474417dba
+  data.tar.gz: 8c9bafa0140645769984aaae48014b6df80cae53
 SHA512:
-  metadata.gz: 7fbcb863a733baa48689292bb286add91d43065dd4a4dd453c0b660b6ebf95d66c432e3ede24d80fc63de2df640df53fa960452603f288c764bc2d364beff010
-  data.tar.gz: 815580c887f8a318abcc5168b1314e7404f06ef5326db0ac274b1b92a1b3264a3df8feb62cf433c255279d1f6d4d67461d8fa9e263c8dfc40f2c40633c4d15db
+  metadata.gz: ea97559d1ef82901e5641475da7ca286f401b38936576071145d195142e2b58d7df0f82f0020a83635d6a10c2316e2420ed36f73b59bde1b5af77aebfd1c7f92
+  data.tar.gz: e15667eb6ffe2e410232aa6d5b921ac4aa1d3234bebd25ad376a2f1f7f31cf16f2f085c5a1e76be73ee33b61e86fabe2c2bc86da1fce52e9587c67fce3eb795a

data/README.md

@@ -87,3 +87,13 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/osyo-manga/gem-unmixer.
 
+
+## Release Note
+
+#### 0.2.0
+
+* Fix `#extend`/`#unextend` result
+
+#### 0.1.0
+* Release
+

data/example/simple.rb

@@ -0,0 +1,53 @@
+require "unmixer"
+
+# unmixer is using refinements.
+using Unmixer
+
+module M1; end
+module M2; end
+module M3; end
+
+class X
+	include M1
+	prepend M2
+end
+
+p X.ancestors
+# => [M2, X, M1, Object, Kernel, BasicObject]
+
+# Remove include module.
+X.instance_eval { uninclude M1 }
+p X.ancestors
+# => [M2, X, Object, Kernel, BasicObject]
+
+# Not remove prepend module. #uninclude is only include modules.
+X.instance_eval { uninclude M2 }
+p X.ancestors
+# => [M2, X, Object, Kernel, BasicObject]
+
+
+# Remove prepend module.
+X.instance_eval { unprepend M2 }
+p X.ancestors
+# => [X, Object, Kernel, BasicObject]
+
+
+X.extend M3
+p X.singleton_class.ancestors
+# => [#<Class:X>, M3, #<Class:Object>, #<Class:BasicObject>, Class, Module, Object, Kernel, BasicObject]
+
+# Remove extend module.
+X.unextend M3
+p X.singleton_class.ancestors
+# => [#<Class:X>, #<Class:Object>, #<Class:BasicObject>, Class, Module, Object, Kernel, BasicObject]
+
+
+# #extend with block
+X.extend M1 do
+	# mixin only in block.
+	p X.singleton_class.ancestors
+	# => [#<Class:X>, M1, #<Class:Object>, #<Class:BasicObject>, Class, Module, Object, Kernel, BasicObject]
+end
+p X.singleton_class.ancestors
+# => [#<Class:X>, #<Class:Object>, #<Class:BasicObject>, Class, Module, Object, Kernel, BasicObject]
+

data/lib/unmixer/core_refine.rb

@@ -21,24 +21,32 @@ module Unmixer
 	refine Object do
 		alias_method :unmixer_original_extend, :extend
 		def unmixer_extend mod
-			unmixer_original_extend mod
+			result = unmixer_original_extend mod
 			
 			if block_given?
-				yield(self)
-				unmixer_unextend mod
+				begin
+					yield(self)
+				ensure
+					unmixer_unextend mod
+				end
 			end
+			result
 		end
 		alias_method :extend, :unmixer_extend
 
 		def unmixer_unextend mod
-			return unless singleton_class.ancestors.include? mod
+			return self unless singleton_class.ancestors.include? mod
 			
 			singleton_class.__send__ :unmixer_unmixin, mod
 
 			if block_given?
-				yield(self)
-				unmixer_original_extend mod
+				begin
+					yield(self)
+				ensure
+					unmixer_original_extend mod
+				end
 			end
+			self
 		end
 		alias_method :unextend, :unmixer_unextend
 	end

data/lib/unmixer/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unmixer
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - manga_osyo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-06 00:00:00.000000000 Z
+date: 2017-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -82,6 +82,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- example/simple.rb
 - ext/unmixer/2.1.0/internal.h
 - ext/unmixer/2.2.0/internal.h
 - ext/unmixer/2.3.0/internal.h