diff --git a/Gemfile b/Gemfile index 916d2a9..215b302 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,4 @@ source 'https://rubygems.org' # Specify your gem's dependencies in kleisli.gemspec -gem 'blankslate', '~> 3.1.3' gemspec diff --git a/kleisli.gemspec b/kleisli.gemspec index 2703e27..5b28d01 100644 --- a/kleisli.gemspec +++ b/kleisli.gemspec @@ -18,8 +18,6 @@ Gem::Specification.new do |spec| spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ["lib"] - - spec.add_dependency 'blankslate', '~> 3.1.3' spec.add_development_dependency "bundler", "~> 1.6" spec.add_development_dependency "rake", "~> 10.0" end diff --git a/lib/kleisli/blankslate.rb b/lib/kleisli/blankslate.rb new file mode 100644 index 0000000..47d2647 --- /dev/null +++ b/lib/kleisli/blankslate.rb @@ -0,0 +1,110 @@ +#!/usr/bin/env ruby +#-- +# Copyright 2004, 2006 by Jim Weirich (jim@weirichhouse.org). +# All rights reserved. + +# Permission is granted for use, copying, modification, distribution, +# and distribution of modified versions of this work as long as the +# above copyright notice is included. +#++ + +###################################################################### +# BlankSlate provides an abstract base class with no predefined +# methods (except for \_\_send__ and \_\_id__). +# BlankSlate is useful as a base class when writing classes that +# depend upon method_missing (e.g. dynamic proxies). +# +class BlankSlate + class << self + + # Hide the method named +name+ in the BlankSlate class. Don't + # hide +instance_eval+ or any method beginning with "__". + def hide(name) + methods = instance_methods.map(&:to_sym) + if methods.include?(name.to_sym) and + name !~ /^(__|instance_eval)/ + @hidden_methods ||= {} + @hidden_methods[name.to_sym] = instance_method(name) + undef_method name + end + end + + def find_hidden_method(name) + @hidden_methods ||= {} + @hidden_methods[name] || superclass.find_hidden_method(name) + end + + # Redefine a previously hidden method so that it may be called on a blank + # slate object. + def reveal(name) + hidden_method = find_hidden_method(name) + fail "Don't know how to reveal method '#{name}'" unless hidden_method + define_method(name, hidden_method) + end + end + + instance_methods.each { |m| hide(m) } +end + +###################################################################### +# Since Ruby is very dynamic, methods added to the ancestors of +# BlankSlate after BlankSlate is defined will show up in the +# list of available BlankSlate methods. We handle this by defining a +# hook in the Object and Kernel classes that will hide any method +# defined after BlankSlate has been loaded. +# +module Kernel + class << self + alias_method :blank_slate_method_added, :method_added + + # Detect method additions to Kernel and remove them in the + # BlankSlate class. + def method_added(name) + result = blank_slate_method_added(name) + return result if self != Kernel + BlankSlate.hide(name) + result + end + end +end + +###################################################################### +# Same as above, except in Object. +# +class Object + class << self + alias_method :blank_slate_method_added, :method_added + + # Detect method additions to Object and remove them in the + # BlankSlate class. + def method_added(name) + result = blank_slate_method_added(name) + return result if self != Object + BlankSlate.hide(name) + result + end + + def find_hidden_method(name) + nil + end + end +end + +###################################################################### +# Also, modules included into Object need to be scanned and have their +# instance methods removed from blank slate. In theory, modules +# included into Kernel would have to be removed as well, but a +# "feature" of Ruby prevents late includes into modules from being +# exposed in the first place. +# +class Module + alias blankslate_original_append_features append_features + def append_features(mod) + result = blankslate_original_append_features(mod) + return result if mod != Object + instance_methods.each do |name| + BlankSlate.hide(name) + end + result + end +end diff --git a/lib/kleisli/composition.rb b/lib/kleisli/composition.rb index 08b5c83..bd56c8a 100644 --- a/lib/kleisli/composition.rb +++ b/lib/kleisli/composition.rb @@ -1,4 +1,4 @@ -require 'blankslate' +require_relative 'blankslate' class Proc def self.comp(f, g) diff --git a/lib/kleisli/version.rb b/lib/kleisli/version.rb index c6cf271..d33152a 100644 --- a/lib/kleisli/version.rb +++ b/lib/kleisli/version.rb @@ -1,3 +1,3 @@ module Kleisli - VERSION = "0.0.4" + VERSION = "0.0.5" end