including 0.1.1 → 0.2.0

data/README.rdoc

@@ -35,13 +35,13 @@ That's basically it. You can pass an array of `only` the methods you'd
 like to mix in, or an array of exceptions, via `except`.
 
   class Quux
-    including Foo, except: [:foo, :baz]
+    including Foo, only: [:foo, :baz]
   end
   
   quux = Quux.new
-  quux.bar # "bar"
-  quux.foo # NoMethodError
-  quux.baz # NoMethodError
+  quux.foo # "foo"
+  quux.bar # NoMethodError
+  quux.baz # "baz"
 
 = Installation
   gem install including

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/including.gemspec

@@ -4,19 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{including}
-  s.version = "0.1.1"
+  s.name = "including"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Bryan Woods}]
-  s.date = %q{2012-03-07}
-  s.description = %q{
-    An observation: Other languages allow for more granular loading of only 
-    desired methods and functions from module code.
-
-    An experiment: How might this be done in Ruby?
-  }
-  s.email = %q{bryanwoods4e@gmail.com}
+  s.authors = ["Bryan Woods"]
+  s.date = "2012-04-05"
+  s.description = "\n    An observation: Other languages allow for more granular loading of only \n    desired methods and functions from module code.\n\n    An experiment: How might this be done in Ruby?\n  "
+  s.email = "bryanwoods4e@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -35,11 +30,11 @@ Gem::Specification.new do |s|
     "spec/including_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/bryanwoods/including}
-  s.licenses = [%q{MIT}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.5}
-  s.summary = %q{Including mixes in only what you want}
+  s.homepage = "http://github.com/bryanwoods/including"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.16"
+  s.summary = "Including mixes in only what you want"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/including.rb

@@ -1,15 +1,25 @@
-class Object
+class Module
   def including(mixin, options = {})
     include mixin and return unless options[:only] || options[:except]
     included_module = mixin.dup
 
-    excluded_methods = (
-      options[:except] ||
-      included_module.instance_methods(false) - options[:only]
-    ).map(&:to_sym)
+    if options[:except]
+      excluded_methods = options[:except]
 
+      undefine(included_module, excluded_methods) and return
+    else
+      included_methods = included_module.instance_methods(false)
+      excluded_methods = Array(options[:only]).map(&:to_sym)
+
+      undefine(included_module, included_methods - excluded_methods)
+    end
+  end
+
+  private
+
+  def undefine(included_module, excluded_methods)
     (include included_module).tap do
-      excluded_methods.each do |meth|
+      Array(excluded_methods).flatten.each do |meth|
         included_module.send(:undef_method, meth)
       end
     end

data/spec/including_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe "Object" do
+describe Module do
   before do
     module Foo
       def foo; "foo"; end
@@ -12,15 +12,15 @@ describe "Object" do
   end
 
   describe "#including" do
-    context "provided no options arguments" do
-      context "provided a valid module" do
+    context "given no options arguments" do
+      context "given a valid module" do
         before do
           Bar.class_eval do
             including Foo
           end
         end
 
-        it "mixes in the provided module" do
+        it "mixes in the given module" do
           bar = Bar.new
 
           bar.foo.should == "foo"
@@ -29,7 +29,7 @@ describe "Object" do
         end
       end
 
-      context "provided an invalid module" do
+      context "given an invalid module" do
         it "raises an exception" do
           expect do
             Bar.class_eval { including NotAModule }
@@ -37,51 +37,111 @@ describe "Object" do
         end
       end
     end
-  end
 
-  context "provided an 'only' options argument" do
-    before do
-      Bar.class_eval { including Foo, only: [:foo, :bar] }
-    end
+    context "given an 'only' options argument" do
+      context "given an array" do
+        before do
+          Bar.class_eval { including Foo, only: [:foo, :bar] }
+        end
 
-    it "undefines all methods listed in the 'only' array" do
-      bar = Bar.new
+        it "undefines all methods not listed in the 'only' array" do
+          bar = Bar.new
 
-      bar.foo.should == "foo"
-      bar.bar.should == "bar"
+          bar.foo.should == "foo"
+          bar.bar.should == "bar"
 
-      expect { bar.baz }.to raise_error(NoMethodError)
-    end
-  end
+          expect { bar.baz }.to raise_error(NoMethodError)
+        end
+      end
+
+      context "given a symbol" do
+        before do
+          Bar.class_eval { including Foo, only: :bar }
+        end
+
+        it "undefines all other methods" do
+          bar = Bar.new
 
-  context "provided an 'except' options argumenmt" do
-    context "given an array of symbols" do
-      before do
-        Bar.class_eval { including Foo, except: [:foo] }
+          bar.bar.should == "bar"
+
+          expect { bar.foo }.to raise_error(NoMethodError)
+        end
       end
 
-      it "undefines all methods not listed in the 'except' array" do
-        bar = Bar.new
+      context "given a string" do
+        before do
+          Bar.class_eval { including Foo, only: "bar" }
+        end
+
+        it "undefines all other methods" do
+          bar = Bar.new
 
-        expect { bar.foo }.to raise_error(NoMethodError)
+          bar.bar.should == "bar"
 
-        bar.bar.should == "bar"
-        bar.baz.should == "baz"
+          expect { bar.foo }.to raise_error(NoMethodError)
+        end
       end
     end
 
-    context "given an array with at least one string" do
-      before do
-        Bar.class_eval { including Foo, except: ["foo"] }
+    context "given an 'except' options argumenmt" do
+      context "given an array of symbols" do
+        before do
+          Bar.class_eval { including Foo, except: [:foo] }
+        end
+
+        it "undefines all methods listed in the 'except' array" do
+          bar = Bar.new
+
+          expect { bar.foo }.to raise_error(NoMethodError)
+
+          bar.bar.should == "bar"
+          bar.baz.should == "baz"
+        end
+      end
+
+      context "given an array with at least one string" do
+        before do
+          Bar.class_eval { including Foo, except: ["foo"] }
+        end
+
+        it "undefines all methods listed in the 'except' array" do
+          bar = Bar.new
+
+          expect { bar.foo }.to raise_error(NoMethodError)
+
+          bar.bar.should == "bar"
+          bar.baz.should == "baz"
+        end
       end
 
-      it "undefines all methods not listed in the 'except' array" do
-        bar = Bar.new
+      context "given a symbol" do
+        before do
+          Bar.class_eval { including Foo, except: :foo }
+        end
 
-        expect { bar.foo }.to raise_error(NoMethodError)
+        it "undefines the given method" do
+          bar = Bar.new
 
-        bar.bar.should == "bar"
-        bar.baz.should == "baz"
+          expect { bar.foo }.to raise_error(NoMethodError)
+
+          bar.bar.should == "bar"
+          bar.baz.should == "baz"
+        end
+      end
+
+      context "given a string" do
+        before do
+          Bar.class_eval { including Foo, except: "foo" }
+        end
+
+        it "undefines the given method" do
+          bar = Bar.new
+
+          expect { bar.foo }.to raise_error(NoMethodError)
+
+          bar.bar.should == "bar"
+          bar.baz.should == "baz"
+        end
       end
     end
   end

metadata

@@ -1,60 +1,59 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: including
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.0
   prerelease: 
-  version: 0.1.1
 platform: ruby
-authors: 
+authors:
 - Bryan Woods
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-07 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-05 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70158534189880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70158534189880
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70158534189280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70158534189280
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &70158534188360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *id003
-description: "\n    An observation: Other languages allow for more granular loading of only \n    desired methods and functions from module code.\n\n    An experiment: How might this be done in Ruby?\n  "
+  version_requirements: *70158534188360
+description: ! "\n    An observation: Other languages allow for more granular loading
+  of only \n    desired methods and functions from module code.\n\n    An experiment:
+  How might this be done in Ruby?\n  "
 email: bryanwoods4e@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - .document
 - .rspec
 - Gemfile
@@ -68,34 +67,31 @@ files:
 - spec/including_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/bryanwoods/including
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 4074772481834400452
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 260768192517672204
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: Including mixes in only what you want
 test_files: []
-