uninclude 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f79263459ef7fa7277c158219544f3aea224485
-  data.tar.gz: 28000a08eb75952fa64bbee0a8b5cef0fbca6e42
+  metadata.gz: 3aa09b356c198f58864dd17372554755b4c8ba15
+  data.tar.gz: b9a4d6ef26be9affba3fa4e81320ff63b5ad8616
 SHA512:
-  metadata.gz: fe90ab8dae54b66dce47c424f0f7a670490acf81ff18402abc3eed7be827da559851f788e513afbd8639de470c15aa0544050df5c0b3ef51b8a76dfabe3e2018
-  data.tar.gz: 80890fe920c38978abbc006eac479a1aa28c50643a474e2458d21f87ecc75d76fc64509cc9a1e3d988c59b79373b6161ed227605eefbea600278d2638f297679
+  metadata.gz: 403ec16ed0601df7d2954a38e509e4af79feabef77a58ac6556fb1870b1fd9a6b771f2ad6bb52f406864bcfe1601eab1c9431a8091d045bcd25caf11c547535b
+  data.tar.gz: b81169d1ccfa269681ca357f2e4d2766c2fd2f53570cda344f794a4efd81bb20b239824ce8919808b6dcb5c207e11bf8798889b71e92bfe8276ee860b1281d82

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
 rvm:
   - ruby-head
+  - 2.2.3
   - 2.2.0
   - 2.1.4
   - 2.1.0
@@ -9,3 +10,6 @@ rvm:
   - 1.9.2
   - 1.8.7
   - ree
+matrix:
+  allow_failures:
+    - rvm: ruby-head

data/README.md

@@ -8,6 +8,7 @@ Implement Module#uninclude and Object#unextend
 
 ## Tested ruby versions
 
+- 2.2.3
 - 2.2.0
 - 2.1.4
 - 2.1.0
@@ -59,6 +60,20 @@ foo.unextend(Bar)
 p foo.singleton_class.ancestors # => [Foo, Object, Kernel, BasicObject]
 ```
 
+### `uninclude/block`
+
+Make `#include` / `#uninclude` accepts blocks.
+
+```ruby
+require 'uninclude/block' # This feature is optional. Please require 'uninclude/block' first.
+
+Foo.include(Bar) do
+  p Foo.ancestors # => [Foo, Bar, Object, Kernel, BasicObject]
+end
+
+p Foo.ancestors # => [Foo, Object, Kernel, BasicObject]
+```
+
 ## Contributing
 
 1. Fork it

data/lib/uninclude/block.rb

@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+require 'uninclude'
+
+class Module
+  alias_method :__include, :include
+  alias_method :__uninclude, :uninclude
+
+  def include(mod)
+    __include(mod)
+
+    if block_given?
+      yield(self)
+      __uninclude(mod)
+    end
+  end
+
+  def uninclude(mod)
+    return unless ancestors.include?(mod)
+
+    __uninclude(mod)
+
+    if block_given?
+      yield(self)
+      __include(mod)
+    end
+  end
+end
+
+class Object
+  alias_method :__extend, :extend
+  alias_method :__unextend, :unextend
+
+  def extend(mod)
+    __extend(mod)
+
+    if block_given?
+      yield(self)
+      __unextend(mod)
+    end
+  end
+
+  def unextend(mod)
+    return unless singleton_class.ancestors.include?(mod)
+
+    __unextend(mod)
+
+    if block_given?
+      yield(self)
+      __extend(mod)
+    end
+  end
+end

data/lib/uninclude/version.rb

@@ -1,3 +1,3 @@
 module Uninclude
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/spec/uninclude_spec.rb

@@ -8,11 +8,9 @@ end
 describe Uninclude do
   let(:klass) {
     Class.new do
-      if respond_to_missing?(:singleton_class, true)
-        def singleton_class
-          class << self
-            self
-          end
+      def singleton_class
+        class << self
+          self
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uninclude
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Sho Kusano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2015-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,6 +70,7 @@ files:
 - ext/uninclude/extconf.rb
 - ext/uninclude/uninclude.c
 - lib/uninclude.rb
+- lib/uninclude/block.rb
 - lib/uninclude/version.rb
 - spec/spec_helper.rb
 - spec/uninclude_spec.rb
@@ -94,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Implement Module#uninclude and Object#unextend