facets 2.9.0.pre.1 → 2.9.0.pre.2

data/lib/tour/facets/module/prepend.rb

@@ -1,25 +1,51 @@
+module Prependable
+
+  def self.included(base)
+    base.extend Self
+    base.instance_methods(false).each do |meth|
+      base.method_added(meth)
+    end
+  end
+
+  module Self
+    def prepend_module
+      @_prepend_module ||= Module.new
+    end
+
+    def method_added(meth)
+      return if meth.to_s[-2,2] == ':-'
+      alias_method "#{meth}:-", meth
+      remove_method(meth)
+      prepend_module.module_eval %{
+        def #{meth}(*a,&b); __send__("#{meth}:-",*a,&b); end
+      }
+      include prepend_module
+    end
+  end
+
+end
+
 class Module
 
-  # Prepend an +aspect+ module to a module.
-  # This only works at the module level.
+  # Prepend module.
   #
-  #   module ::PreX
-  #     def x; "x"; end
+  #   class X
+  #     def a; "Xa"; end
   #   end
   #
-  #   module ::PreU
-  #     def x; '{' + super + '}'; end
+  #   module M
+  #     def a; "M" + super ; end
   #   end
   #
-  #   PreX.prepend(PreU)
+  #   class X
+  #     prepend M
+  #   end
   #
-  #   PreX.x  # => "{x}"
+  #   X.new.a  #=> MXa
   #
-  # CREDIT Trans
-
-  def prepend(aspect)
-    aspect.__send__(:include, self)
-    extend aspect
+  def prepend(mod)
+    include Prependable
+    include mod
   end
 
 end

data/meta/gemfile

@@ -1,5 +1,5 @@
 name: facets
-version: 2.9.0.pre.1
+version: 2.9.0.pre.2
 date: 2010-09-01
 path: [lib/core, lib/more, lib/tour]
 

data/qed/core/binding/caller.rdoc

@@ -13,9 +13,7 @@ We will use the following code to demonstrate their use.
 
 == Binding#caller
 
-  Exception.refute.raised? do
-    @bind.caller
-  end
+  @bind.caller
 
 == Binding#callstack
 

data/test/core/array/test_after.rb

@@ -2,7 +2,7 @@ covers 'facets/array/after'
 
 testcase Array do
 
-  instance do
+  setup do
     ['a', 'b', 'c']
   end
 

data/test/core/array/test_before.rb

@@ -2,7 +2,7 @@ covers 'facets/array/before'
 
 testcase Array do
 
-  instance do
+  setup do
     ['a', 'b', 'c']
   end
 

data/test/core/array/test_conjoin.rb

@@ -2,7 +2,7 @@ covers 'facets/array/conjoin'
 
 testcase Array do
 
-  instance "any array" do
+  setup "any array" do
     [1,2,3,4]
   end
 

data/test/core/array/test_store.rb

@@ -2,7 +2,7 @@ covers 'facets/array/store'
 
 testcase Array do
 
-  instance do
+  setup do
      [1,2,3,4,5]
   end
 

data/test/core/hash/test_argumentize.rb

@@ -2,7 +2,7 @@ covers 'facets/hash/argumentize'
 
 testcase Hash do
 
-  instance do
+  setup do
     { :list => [1,2], :base => "HI" }
   end
 

data/test/core/hash/test_join.rb

@@ -2,7 +2,7 @@ covers 'facets/hash/join'
 
 tests Hash do
 
-  instance do
+  setup do
     {:a=>1, :b=>2}
   end
 

data/test/core/kernel/test_dup.rb

@@ -1,7 +1,7 @@
 covers 'facets/kernel/dup'
 
 tests Object do
-  instance "ordinary object" do
+  setup "ordinary object" do
     Object.new
   end
 

data/test/core/kernel/test_get.rb

@@ -3,7 +3,7 @@ covers 'facets/kernel/__set__'
 
 tests Kernel do
 
-  instance "an object with an instance variable" do
+  setup "an object with an instance variable" do
     c = Class.new do
       attr :a
       def initialize

data/test/core/kernel/test_qua_class.rb

@@ -2,7 +2,7 @@ covers 'facets/kernel/qua_class'
 
 tests Kernel do
 
-  instance "any object" do
+  setup "any object" do
     Object.new
   end
 

data/test/core/time/test_ago.rb

@@ -1,127 +1,15 @@
 covers 'facets/time/ago'
 
-testcase Time do
+tests Time do
 
-  instance "January 20th 2010 at Noon" do
-    Time.utc(2010,01,20,12,00,00)
-  end
+  # We do not need to test #ago b/c it is an alias for #less.
+  # One test is provided to add to coverage report.
 
-  unit :ago => 'years' do |t|
+  unit :ago => "is an alias of #less" do
+    t = Time.utc(2010,01,20,12,00,00)
     t.ago(1, :year).year.assert = 2009
     t.ago(2, :years).year.assert = 2008
   end
 
-  unit :ago => 'weeks' do |t|
-    t.ago(1, :week).day.assert == 13
-    t.ago(2, :weeks).day.assert == 6
-  end
-
-  unit :ago => 'days' do |t|
-    t.ago(1, :day).day.assert == 19
-    t.ago(2, :days).day.assert == 18
-  end
-
-  unit :ago => 'hours' do |t|
-    t.ago(1, :hour).hour.assert == 11
-    t.ago(2, :hours).hour.assert == 10
-    t.ago(12, :hours).hour.assert == 0
-  end
-
-  unit :ago => 'minutes' do |t|
-    t.ago(1, :minute).min.assert == 59
-    t.ago(2, :minutes).min.assert == 58
-    t.ago(60, :minutes).min.assert == 0
-  end
-
-  unit :ago => 'seconds' do |t|
-    t.ago(1, :second).sec.assert == 59
-    t.ago(2, :seconds).sec.assert == 58
-    t.ago(60, :seconds).sec.assert == 0
-  end
-
-  #
-
-  unit :ago => "change years" do
-    e = Time.utc(2007,11, 1, 18,30,57)
-    r = Time.utc(2008,11, 1, 18,30,57).ago(1, :years)
-    r.assert == e
-  end
-
-  unit :ago => "change weeks" do
-    e = Time.utc(2008,11,24, 18,30,57)
-    r = Time.utc(2008,12, 1, 18,30,57).ago(1, :weeks)
-    r.assert == e
-  end
-
-  unit :ago => "change days" do
-    e = Time.utc(2008,11,30, 18,30,57)
-    r = Time.utc(2008,12, 1, 18,30,57).ago(1, :days)
-    r.assert == e
-  end
-
-  unit :ago => "change hours" do
-    e = Time.utc(2008,11,30, 23,30,57)
-    r = Time.utc(2008,12, 1,  0,30,57).ago(1, :hours)
-    r.assert == e
-  end
-
-  unit :ago => "change minutes" do
-    e = Time.utc(2008,11,30, 23,58,57)
-    r = Time.utc(2008,12, 1,  0, 0,57).ago(2, :minutes)
-    r.assert == e
-  end
-
-  unit :ago => "change seconds" do
-    e = Time.utc(2008,11,30, 23,59,57)
-    r = Time.utc(2008,12, 1,  0, 0, 1).ago(4, :seconds)
-    r.assert == e
-  end
-
-  context "Months are the tricky one, so they get their own section"
-
-  unit :ago => "change month no year wrap" do
-    e = Time.utc(2008,11, 1)
-    r = Time.utc(2008,12, 1).ago(1, :months)
-    r.assert == e
-  end
-
-  unit :ago => "change month with year wrap due to month" do
-    e = Time.utc(2007,12, 1)
-    r = Time.utc(2008, 1, 1).ago(1, :months)
-    r.assert == e
-  end
-
-  unit :ago => "change month with 12 or more converts extra months into a year adjustment" do
-    e = Time.utc(2007, 1, 1)
-    r = Time.utc(2008, 1, 1).ago(12, :months)
-    r.assert == e
-
-    e = Time.utc(2006,11, 1)
-    r = Time.utc(2008,12, 1).ago(25, :months)
-    r.assert == e
-  end
-
-  # 13 months = 1 year + 1 month AND month changing from 12 to 1 when going backward means go back 1 extra  year
-  unit :ago => "change month with 12 or more AND year wrap due to month" do
-    e = Time.utc(2006,12, 1)
-    r = Time.utc(2008, 1, 1).ago(13, :months)
-    r.assert == e
-  end
-
-  unit :ago => "smaller units should remain unchanged" do
-    e = Time.utc(2005, 8,20, 15,37,59)
-    r = Time.utc(2006, 1,20, 15,37,59).ago(5, :months)
-    r.assert == e
-  end
-
-  unit :ago => "passing a negative number to ago should be same as a positive number to hence" do
-    e = Time.utc(2008, 1, 1)
-    r = Time.utc(2006,12, 1).ago(-13, :months)
-    r.assert == e
-
-    r = Time.utc(2006,12, 1).hence(13, :months)
-    r.assert == e
-  end
-
 end
 

data/test/core/time/test_hence.rb

@@ -2,8 +2,8 @@ covers 'facets/time/hence'
 
 tests Time do
 
-  # we don't need to hence b/c it is an alias for #in
-  # one test is provided to add to coverage report
+  # We do not need to test #hence b/c it is an alias for #shift.
+  # One test is provided to add to coverage report.
 
   unit :hence do
     e = Time.utc(2008,11, 1, 18,30,57)

data/test/core/time/test_in.rb

@@ -1,126 +1,15 @@
-covers 'facets/time/in'
+covers 'facets/time/ago'
 
 tests Time do
 
-  instance "January 1st 2010 at Noon" do
-    Time.utc(2010,01,01, 12,00,00)
-  end
-
-  unit :in => 'years' do |t|
-    t.in(1, :year).year.assert = 2011
-    t.in(2, :years).year.assert = 2012
-  end
-
-  unit :in => 'weeks' do |t|
-    t.in(1, :week).day.assert == 8
-    t.in(2, :weeks).day.assert == 15
-  end
-
-  unit :in => 'days' do |t|
-    t.in(1, :day).day.assert == 2
-    t.in(2, :days).day.assert == 3
-  end
-
-  unit :in => 'hours' do |t|
-    t.in(1, :hour).hour.assert == 13
-    t.in(2, :hours).hour.assert == 14
-    t.in(12, :hours).hour.assert == 0
-  end
-
-  unit :in => 'minutes' do |t|
-    t.in(1, :minute).min.assert == 1
-    t.in(2, :minutes).min.assert == 2
-    t.in(60, :minutes).min.assert == 0
-  end
-
-  unit :in => 'seconds' do |t|
-    t.in(1, :second).sec.assert == 1
-    t.in(2, :seconds).sec.assert == 2
-    t.in(60, :seconds).sec.assert == 0
-  end
+  # We do not need to test #in b/c it is an alias for #shift.
+  # One test is provided to add to coverage report.
 
-
-  unit :in => "change_years" do
+  unit :in do
     e = Time.utc(2008,11, 1, 18,30,57)
     r = Time.utc(2007,11, 1, 18,30,57).in(1, :years)
     r.assert == e                 
   end
 
-  unit :in => "change weeks" do
-    e = Time.utc(2008,12, 1, 18,30,57)
-    r = Time.utc(2008,11,24, 18,30,57).in(1, :weeks)
-    r.assert == e
-  end
-
-  unit :in => "change days" do
-    e = Time.utc(2008,12, 1, 18,30,57)
-    r = Time.utc(2008,11,30, 18,30,57).in(1, :days)
-    r.assert == e
-  end
-
-  unit :in => "change hours" do
-    e = Time.utc(2008,12, 1,  0,30,57)
-    r = Time.utc(2008,11,30, 23,30,57).in(1, :hours)
-    r.assert == e
-  end
-
-  unit :in => "change minutes" do
-    e = Time.utc(2008,12, 1,  0, 0,57)
-    r = Time.utc(2008,11,30, 23,58,57).in(2, :minutes)
-    r.assert == e
-  end
-
-  unit :in => "change seconds" do
-    e = Time.utc(2008,12, 1,  0, 0, 1)
-    r = Time.utc(2008,11,30, 23,59,57).in(4, :seconds)
-    r.assert == e
-  end
-
-
-  concern "months are more difficult, so they get their own section"
-
-  unit :in => "change month no year wrap" do
-    e = Time.utc(2008,12, 1)
-    r = Time.utc(2008,11, 1).in(1, :months)
-    r.assert == e
-  end
-
-  unit :in => "change month with year wrap due to month" do
-    e = Time.utc(2008, 1, 1)
-    r = Time.utc(2007,12, 1).in(1, :months)
-    r.assert == e
-  end
-
-  unit :in => "change month with 12 or more converts extra months into a year adjustment" do
-    e = Time.utc(2008, 1, 1)
-    r = Time.utc(2007, 1, 1).in(12, :months)
-    r.assert == e
-
-    e = Time.utc(2008,12, 1)
-    r = Time.utc(2006,11, 1).in(25, :months)
-    r.assert == e
-  end
-
-  unit :in => "change month with 12 or more AND year wrap due to month" do
-    e = Time.utc(2008, 1, 1)
-    r = Time.utc(2006,12, 1).in(13, :months)
-    r.assert == e
-  end
-
-  unit :in => "smaller units should remain unchanged" do
-    e = Time.utc(2006, 1,20, 15,37,59)
-    r = Time.utc(2005, 8,20, 15,37,59).in(5, :months)
-    r.assert == e
-  end
-
-  unit :in => "passing a negative number to #in should be same as a positive number to #ago" do
-    e = Time.utc(2005, 8,20)
-    r = Time.utc(2006, 1,20).in(-5, :months)
-    r.assert == e
-
-    r = Time.utc(2006, 1,20).ago(5, :months)
-    r.assert == e
-  end
-
 end