facade 1.0.1 → 1.0.2

data/CHANGES

@@ -1,3 +1,9 @@
+== 1.0.2 - 11-Jun-2007
+* Added a Rakefile with tasks for installation and testing.
+* Removed the install.rb file. Installation is now handled as a Rake task.
+* Some test suite refactoring.
+* Fixed the FACADE_VERSION number (now 1.0.2, was 1.1.0).
+
 == 1.0.1 - 8-Jun-2005
 * Moved project to RubyForge.
 * Added a .gemspec file.

data/MANIFEST

@@ -1,9 +1,7 @@
-CHANGES
-MANIFEST
-README
-install.rb
-facade.gemspec
-
-lib/facade.rb
-
-test/tc_facade.rb
+* CHANGES
+* MANIFEST
+* README
+* Rakefile
+* facade.gemspec
+* lib/facade.rb
+* test/tc_facade.rb

data/README

@@ -25,7 +25,7 @@
    shamelessly plagiarized.
 
 == Copyright
-   Copyright (c) 2005 Daniel J. Berger
+   Copyright (c) 2005-2007 Daniel J. Berger
    Licensed under the same terms as Ruby itself. 
 
 == Warranty
@@ -35,5 +35,5 @@
 
 == Author
    Daniel J. Berger
-   djberg96 at yahoo dot com
+   djberg96 at nospam at gmail dot com
    imperator on IRC (freenode)

data/Rakefile

@@ -0,0 +1,24 @@
+require 'rake'
+require 'rake/testtask'
+require 'rbconfig'
+include Config
+
+desc 'Install the facade package (non-gem)'
+task :install do
+   sitelibdir = CONFIG["sitelibdir"]
+   file = "lib/facade.rb"
+   FileUtils.cp(file, sitelibdir, :verbose => true)
+end
+
+task :install_gem do
+   ruby 'facade.gemspec'
+   file = Dir["*.gem"].first
+   sh "gem install #{file}"
+end
+
+Rake::TestTask.new do |t|
+   t.libs << 'test'
+   t.verbose = true
+   t.warning = true
+   t.test_files = FileList['test/tc_facade.rb']
+end

data/lib/facade.rb

@@ -22,24 +22,38 @@
 # Licensed under the same terms as Ruby itself.
  
 module Facade
-   FACADE_VERSION = "1.0.1"
+   FACADE_VERSION = '1.0.2'
 
-   # Forward a class method as an instance method of the including class
+   # Forward a class or module method as an instance method of the
+   # including class.
    #
    # call-seq:
-   #   forward +Klass+, :method
-   #   forward +Klass+, :method1, :method2, ...
+   #   forward +klass+, :method
+   #   forward +klass+, :method1, :method2, ...
    # 
    # This will not override the class' existing methods.
+   #
    def facade(klass, *methods)
       methods.flatten!
-      methods = klass.methods(false) if methods.empty? # Default to all methods
-      methods.collect!{|m| m.to_s}                     # Symbols or strings
+      if methods.empty?                                # Default to all methods
+         if klass.kind_of?(Class)
+            methods = klass.methods(false)
+         else
+            methods = klass.public_instance_methods(false)
+         end
+      end
+      methods.collect!{ |m| m.to_s }                   # Symbols or strings
       methods -= self.instance_methods                 # No clobber
 
       methods.each do |methname|
+         methname = methname.to_sym
          define_method(methname){ ||
-            meth = klass.method(methname)
+            if klass.kind_of?(Class)
+               meth = klass.method(methname)
+            else
+               meth = Object.new.extend(klass).method(methname)
+            end
+
             if meth.arity.zero?                        # Zero or one argument
                meth.call
             else

data/test/tc_facade.rb

@@ -1,22 +1,23 @@
-#####################################
+#########################################################################
 # tc_facade.rb
 #
-# Test suite for the Facade module.
-#####################################
-base = File.basename(Dir.pwd)
-if base == "test" || base =~ /facade.*/
-   Dir.chdir("..") if base == "test"
-   $LOAD_PATH.unshift(Dir.pwd)
-   $LOAD_PATH.unshift(Dir.pwd + "/lib")
-end
-
+# Test suite for the Facade module. This test suite should be run via
+# the 'rake test' task.
+#########################################################################
 require "test/unit"
 require "facade"
 
+module Baz
+   def testme(str)
+      str
+   end
+end
+
 class Foo < String
    extend Facade
    facade File, :basename, "dirname"
    facade Dir
+   facade Baz
    def blockdev?
       "test"
    end
@@ -26,6 +27,10 @@ class TC_Facade < Test::Unit::TestCase
    def setup
       @f = Foo.new("/home/djberge")
    end
+   
+   def test_facade_version
+      assert_equal('1.0.2', Facade::FACADE_VERSION)
+   end
 
    def test_file_methods
       assert_respond_to(@f, :basename)
@@ -49,6 +54,11 @@ class TC_Facade < Test::Unit::TestCase
       assert_equal("test", @f.blockdev?)
    end
 
+   def test_module_methods
+      assert_respond_to(@f, :testme)
+      assert_equal("/home/djberge", @f.testme)
+   end
+
    def teardown
       @f = nil
    end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.10
+rubygems_version: 0.9.4
 specification_version: 1
 name: facade
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
-date: 2005-06-09
+  version: 1.0.2
+date: 2007-06-11 00:00:00 -06:00
 summary: An easy way to implement the facade pattern in your class
 require_paths: 
 - lib
@@ -23,12 +23,16 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
       version: 0.0.0
   version: 
 platform: ruby
+signing_key: 
+cert_chain: 
+post_install_message: 
 authors: 
 - Daniel J. Berger
 files: 
 - lib/facade.rb
 - CHANGES
 - MANIFEST
+- Rakefile
 - README
 - test/tc_facade.rb
 test_files: 
@@ -38,6 +42,7 @@ rdoc_options: []
 extra_rdoc_files: 
 - README
 - CHANGES
+- MANIFEST
 executables: []
 
 extensions: []