uninclude 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07fcd722a37b1721f21727b6b13e2b4416113e54
-  data.tar.gz: 5b218b563279f83f79d7df3c691afd0a01f07517
+  metadata.gz: 63ca22de6460367252869605ea1792dc2d054fbc
+  data.tar.gz: c303566dc299e748ac350501586ebce8392e82a9
 SHA512:
-  metadata.gz: b0e06176c4b95b002d995bfcf09be5e253fd4847c86e1f193fc0b6244eaba5a2c8bb951872bfe776edef83c7bae360cb38f7c9e5dba68935aa18e4f41fa97fa0
-  data.tar.gz: 0c92c941433a5a01be82504e1bf05867f69e642e7fc7d1a0bf85532423b2e8d2de86ff06840106ad5b6f89bbd58011db2050b1d2bf54b1d9bd830f1c959f041d
+  metadata.gz: 654b37c0c348f9f66f8ac96856f88cc074088529f09474a3675809b02f3361211f073da1c20f7b57633584a1109a465b606e7b4535c6bb2fcfd859761809e60c
+  data.tar.gz: e821ed19e65f549429f5f1998d961e1ba81619356784911068cabdcff6cfe3021d2de0bde23393e62d35fd5af67ffd061169453a432291527851c03ba5f04ab6

data/.travis.yml

@@ -1,6 +1,8 @@
 language: ruby
 rvm:
   - ruby-head
+  - 2.1.3
+  - 2.1.0
   - 2.0.0
   - 1.9.3
   - 1.9.2

data/README.md

@@ -8,6 +8,8 @@ Implement Module#uninclude and Object#unextend
 
 ## Tested ruby versions
 
+- 2.1.3 __BORKEN__
+- 2.1.0 __BROKEN__
 - 2.0.0
 - 1.9.3
 - 1.9.2

data/Rakefile

@@ -21,4 +21,4 @@ end
 RSpec::Core::RakeTask.new(:spec)
 task :spec => "lib/#{GEM_NAME}/#{GEM_NAME}.#{DLEXT}"
 
-task :default => :spec
+task :default => [:clean, :spec]

data/ext/uninclude/extconf.rb

@@ -8,4 +8,8 @@ if RUBY_VERSION >= '1.9.3'
   $CFLAGS << ' -DHAVE_RUBY_BACKWARD_CLASSEXT_H'
 end
 
+if RUBY_VERSION >= '2.1.0'
+  $CFLAGS << ' -DRUBY_V2_1_0'
+end
+
 create_makefile('uninclude/uninclude')

data/ext/uninclude/uninclude.c

@@ -8,6 +8,17 @@
 #define RCLASS_M_TBL(c) (RCLASS(c)->m_tbl)
 #endif
 
+#ifndef RB_CLEAR_CACHE_BY_CLASS
+#define RB_CLEAR_CACHE_BY_CLASS(c) rb_clear_cache_by_class(c)
+#endif
+
+#ifdef RUBY_V2_1_0
+#undef RCLASS_M_TBL
+#define RCLASS_M_TBL(c) (RCLASS(c)->m_tbl_wrapper)
+#undef RB_CLEAR_CACHE_BY_CLASS
+#define RB_CLEAR_CACHE_BY_CLASS(c) rb_clear_method_cache_by_class(c)
+#endif
+
 static void uninclude(VALUE klass, VALUE mod) {
   Check_Type(mod, T_MODULE);
 
@@ -17,7 +28,7 @@ static void uninclude(VALUE klass, VALUE mod) {
     if(lastklass == klass) break;
     if(klass == mod || RCLASS_M_TBL(superklass) == RCLASS_M_TBL(mod)) {
       RCLASS_SUPER(klass) = RCLASS_SUPER(superklass);
-      rb_clear_cache_by_class(klass);
+      RB_CLEAR_CACHE_BY_CLASS(klass);
       break;
     }
     lastklass = klass;

data/lib/uninclude/version.rb

@@ -1,3 +1,3 @@
 module Uninclude
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/spec/uninclude_spec.rb

@@ -15,9 +15,9 @@ describe Uninclude do
   describe '.uninclude' do
     it 'should uninclude module' do
       klass.class_eval { include ExampleMod }
-      instance.should respond_to(:mod)
+      expect(instance).to respond_to(:mod)
       klass.class_eval { uninclude ExampleMod }
-      instance.should_not respond_to(:mod)
+      expect(instance).to_not respond_to(:mod)
     end
 
     it 'should not infinite loop' do
@@ -28,9 +28,9 @@ describe Uninclude do
   describe '#unextend' do
     it 'should unextend module' do
       instance.extend(ExampleMod)
-      instance.should respond_to(:mod)
+      expect(instance).to respond_to(:mod)
       instance.unextend(ExampleMod)
-      instance.should_not respond_to(:mod)
+      expect(instance).to_not respond_to(:mod)
     end
   end
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: uninclude
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Sho Kusano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-21 00:00:00.000000000 Z
+date: 2014-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Implement Module#uninclude and Object#unextend
@@ -60,9 +60,9 @@ extensions:
 - ext/uninclude/extconf.rb
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -84,17 +84,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Implement Module#uninclude and Object#unextend