rspec-fixture 0.0.1 → 0.0.2

data/ChangeLog

@@ -1,63 +1,189 @@
-----------------------------------------------------------------------
-r3507 (orig r6556):  walf443 | 2008-02-11 17:34:20 +0900
-
-lang/ruby/rspec-fixture: added DESCRIPTION for Rakefile
-----------------------------------------------------------------------
-r3505 (orig r6554):  walf443 | 2008-02-11 17:23:32 +0900
-
-lang/ruby/rspec-fixture: wrote README
-----------------------------------------------------------------------
-r3502 (orig r6551):  walf443 | 2008-02-11 16:34:52 +0900
-
-lang/ruby/rspec-fixture: fix example's output message
-----------------------------------------------------------------------
-r3490 (orig r6539):  walf443 | 2008-02-11 13:04:48 +0900
-
-lang/ruby/rspec-fixture: 
-  - fix a bug that is 'not converting collectly :msg in description template'. 
-  - add spec-fixture-base spec.
-----------------------------------------------------------------------
-r3475 (orig r6524):  walf443 | 2008-02-11 01:08:54 +0900
-
-lang/ruby/rspec-fixture: generated class with filter should behave like 'generated_class'
-----------------------------------------------------------------------
-r3474 (orig r6523):  walf443 | 2008-02-11 01:07:59 +0900
-
-lang/ruby/rspec-fixture: load library  not in each spec file, but spec_helper.rb.
-----------------------------------------------------------------------
-r3473 (orig r6522):  walf443 | 2008-02-11 00:59:39 +0900
-
-lang/ruby/rspec-fixture: delete extra file and change to load library in shared helper.
-----------------------------------------------------------------------
-r3472 (orig r6521):  walf443 | 2008-02-11 00:57:32 +0900
-
-lang/ruby/rspec-fixture: add _define_fixture spec and fix some bug.
-----------------------------------------------------------------------
-r3471 (orig r6520):  walf443 | 2008-02-11 00:30:29 +0900
-
-lang/ruby/rspc-fixture: fix spec task for executing coverage test collectly.
-----------------------------------------------------------------------
-r3453 (orig r6502):  walf443 | 2008-02-10 18:52:37 +0900
-
-lang/ruby/rspec-fixture: add spec for with_fixture method
-----------------------------------------------------------------------
-r3415 (orig r6464):  walf443 | 2008-02-10 05:02:25 +0900
-
-lang/ruby/rspec-fixture:
- - support desc_filters for customizing description flexibly.
- - change desc_template value to use raw input value's inspect
-----------------------------------------------------------------------
-r3408 (orig r6457):  walf443 | 2008-02-10 01:39:04 +0900
-
-lang/ruby/rspec-fixture: 
- - raise NameError when with_fixtures arg duplicate to reserved name.
- - just use msg when description template was not exist.
-----------------------------------------------------------------------
-r3404 (orig r6453):  walf443 | 2008-02-10 00:06:50 +0900
-
-lang/ruby/rspec-fixture: support filters, spec template for description
-----------------------------------------------------------------------
-r3314 (orig r6363):  walf443 | 2008-02-08 09:42:35 +0900
-
-lang/ruby/rspec-fixture: import new project.
-----------------------------------------------------------------------
+commit 8740a1ef1b245f9aee00255ec1eb105d4685e79f
+Author: Keiji, Yoshimi <walf443@gmail.com>
+Date:   Fri Nov 14 00:41:51 2008 +0900
+
+    support mutiple examples in with_fixtures context.
+
+commit 978d41174796bf6ee7dcd0e97a2d2d448636ec76
+Author: Keiji, Yoshimi <walf443@gmail.com>
+Date:   Sat Nov 8 16:14:36 2008 +0900
+
+    fixed uninintialized instance variable warnings.
+
+commit 8348e1bcbfc2d026d1a470237d9d220644825caa
+Author: Keiji, Yoshimi <walf443@gmail.com>
+Date:   Tue Sep 16 07:35:51 2008 +0900
+
+    change for not raising Error in Rakefile without library.
+
+commit 1fd4343bbb61650cea3b298ad5c4878e019bcffe
+Author: Keiji, Yoshimi <walf443 at gmail dot com>
+Date:   Sat May 3 16:24:22 2008 +0900
+
+    it may be better to return nil
+
+commit 8767a87d37c113ec6e56b117b927da40218b1da8
+Author: Keiji, Yoshimi <walf443 at gmail dot com>
+Date:   Sat May 3 16:08:33 2008 +0900
+
+    change variable name.
+
+commit e8848263e3a766d3cc1cd931ba8fff39a7c17666
+Author: walf443 <walf443@d0d07461-0603-4401-acd4-de1884942a52>
+Date:   Sat Feb 16 13:18:39 2008 +0000
+
+    lang/ruby/rspec-fixture: added named filter feature.
+    
+    git-svn-id: http://svn.coderepos.org/share/lang/ruby/rspec-fixture/trunk@6782 d0d07461-0603-4401-acd4-de1884942a52
+
+commit 5e2532abc128d35c36ad2f73fa817ef70bffa544
+Author: walf443 <walf443@d0d07461-0603-4401-acd4-de1884942a52>
+Date:   Wed Feb 13 23:50:34 2008 +0000
+
+    lang/ruby/rspec-fixture: changed to shuffle fixtures for not writing a test with order dependency.
+    
+    git-svn-id: http://svn.coderepos.org/share/lang/ruby/rspec-fixture/trunk@6657 d0d07461-0603-4401-acd4-de1884942a52
+
+commit 5953fa205a8da67fd389b5ab9dbb606e39132e1a
+Author: walf443 <walf443@d0d07461-0603-4401-acd4-de1884942a52>
+Date:   Tue Feb 12 15:30:01 2008 +0000
+
+    lang/ruby/rspec-fixture: changed _example method to behave same as _input method.
+    
+    git-svn-id: http://svn.coderepos.org/share/lang/ruby/rspec-fixture/trunk@6614 d0d07461-0603-4401-acd4-de1884942a52
+
+commit 00836de4fafc20e520937b9c66b717cfe27d4744
+Author: walf443 <walf443@d0d07461-0603-4401-acd4-de1884942a52>
+Date:   Mon Feb 11 09:24:27 2008 +0000
+
+    lang/ruby/rspec-fixture: added rubyforge project id of this project.
+    
+    git-svn-id: http://svn.coderepos.org/share/lang/ruby/rspec-fixture/trunk@6560 d0d07461-0603-4401-acd4-de1884942a52
+
+commit 543a585aedb5009348a882e99777c0b15d89b225
+Author: walf443 <walf443@d0d07461-0603-4401-acd4-de1884942a52>
+Date:   Mon Feb 11 09:09:12 2008 +0000
+
+    lang/ruby/rspec-fixture:
+     - updated ChangeLog from svk log
+     - added document for Spec::Fixture::Base's each methods.
+    
+    git-svn-id: http://svn.coderepos.org/share/lang/ruby/rspec-fixture/trunk@6558 d0d07461-0603-4401-acd4-de1884942a52
+
+commit 8f379c8361e34118e5e3704175afd4072ef4999d
+Author: walf443 <walf443@d0d07461-0603-4401-acd4-de1884942a52>
+Date:   Mon Feb 11 08:34:20 2008 +0000
+
+    lang/ruby/rspec-fixture: added DESCRIPTION for Rakefile
+    
+    git-svn-id: http://svn.coderepos.org/share/lang/ruby/rspec-fixture/trunk@6556 d0d07461-0603-4401-acd4-de1884942a52
+
+commit e694dd45f0eacf763591cb073a2cdc0ccc47a583
+Author: walf443 <walf443@d0d07461-0603-4401-acd4-de1884942a52>
+Date:   Mon Feb 11 08:23:32 2008 +0000
+
+    lang/ruby/rspec-fixture: wrote README
+    
+    git-svn-id: http://svn.coderepos.org/share/lang/ruby/rspec-fixture/trunk@6554 d0d07461-0603-4401-acd4-de1884942a52
+
+commit 9f5bdbf58798241af016e515703958ca2ef3846b
+Author: walf443 <walf443@d0d07461-0603-4401-acd4-de1884942a52>
+Date:   Mon Feb 11 07:34:52 2008 +0000
+
+    lang/ruby/rspec-fixture: fix example's output message
+    
+    git-svn-id: http://svn.coderepos.org/share/lang/ruby/rspec-fixture/trunk@6551 d0d07461-0603-4401-acd4-de1884942a52
+
+commit f403cb774c0dc96ac76e4e2edf8f7da552f5a076
+Author: walf443 <walf443@d0d07461-0603-4401-acd4-de1884942a52>
+Date:   Mon Feb 11 04:04:48 2008 +0000
+
+    lang/ruby/rspec-fixture:
+      - fix a bug that is 'not converting collectly :msg in description template'.
+      - add spec-fixture-base spec.
+    
+    git-svn-id: http://svn.coderepos.org/share/lang/ruby/rspec-fixture/trunk@6539 d0d07461-0603-4401-acd4-de1884942a52
+
+commit 7035e40723789275086d305d1f484ff1eb27b013
+Author: walf443 <walf443@d0d07461-0603-4401-acd4-de1884942a52>
+Date:   Sun Feb 10 16:08:54 2008 +0000
+
+    lang/ruby/rspec-fixture: generated class with filter should behave like 'generated_class'
+    
+    git-svn-id: http://svn.coderepos.org/share/lang/ruby/rspec-fixture/trunk@6524 d0d07461-0603-4401-acd4-de1884942a52
+
+commit 5ee9583f75ff3aeb51146081ee50afc177248d15
+Author: walf443 <walf443@d0d07461-0603-4401-acd4-de1884942a52>
+Date:   Sun Feb 10 16:07:59 2008 +0000
+
+    lang/ruby/rspec-fixture: load library  not in each spec file, but spec_helper.rb.
+    
+    git-svn-id: http://svn.coderepos.org/share/lang/ruby/rspec-fixture/trunk@6523 d0d07461-0603-4401-acd4-de1884942a52
+
+commit 33712131a5425d9eca0416b72ba0300588db76ad
+Author: walf443 <walf443@d0d07461-0603-4401-acd4-de1884942a52>
+Date:   Sun Feb 10 15:59:39 2008 +0000
+
+    lang/ruby/rspec-fixture: delete extra file and change to load library in shared helper.
+    
+    git-svn-id: http://svn.coderepos.org/share/lang/ruby/rspec-fixture/trunk@6522 d0d07461-0603-4401-acd4-de1884942a52
+
+commit ffbc76bf35c2960ff27e951b648b61685f7260b2
+Author: walf443 <walf443@d0d07461-0603-4401-acd4-de1884942a52>
+Date:   Sun Feb 10 15:57:32 2008 +0000
+
+    lang/ruby/rspec-fixture: add _define_fixture spec and fix some bug.
+    
+    git-svn-id: http://svn.coderepos.org/share/lang/ruby/rspec-fixture/trunk@6521 d0d07461-0603-4401-acd4-de1884942a52
+
+commit b043faecc73bfafae9eab4eccf6dfe5f9bda2922
+Author: walf443 <walf443@d0d07461-0603-4401-acd4-de1884942a52>
+Date:   Sun Feb 10 15:30:29 2008 +0000
+
+    lang/ruby/rspc-fixture: fix spec task for executing coverage test collectly.
+    
+    git-svn-id: http://svn.coderepos.org/share/lang/ruby/rspec-fixture/trunk@6520 d0d07461-0603-4401-acd4-de1884942a52
+
+commit 1c84a9cba1255dc566e6a231cc8ef76f78b4592f
+Author: walf443 <walf443@d0d07461-0603-4401-acd4-de1884942a52>
+Date:   Sun Feb 10 09:52:37 2008 +0000
+
+    lang/ruby/rspec-fixture: add spec for with_fixture method
+    
+    git-svn-id: http://svn.coderepos.org/share/lang/ruby/rspec-fixture/trunk@6502 d0d07461-0603-4401-acd4-de1884942a52
+
+commit e37779df95db12d2fef080e3cc890db84a408ab4
+Author: walf443 <walf443@d0d07461-0603-4401-acd4-de1884942a52>
+Date:   Sat Feb 9 20:02:25 2008 +0000
+
+    lang/ruby/rspec-fixture:
+     - support desc_filters for customizing description flexibly.
+     - change desc_template value to use raw input value's inspect
+    
+    git-svn-id: http://svn.coderepos.org/share/lang/ruby/rspec-fixture/trunk@6464 d0d07461-0603-4401-acd4-de1884942a52
+
+commit f31cc321b6329b2f6e9121110d91932410ed87e3
+Author: walf443 <walf443@d0d07461-0603-4401-acd4-de1884942a52>
+Date:   Sat Feb 9 16:39:04 2008 +0000
+
+    lang/ruby/rspec-fixture:
+     - raise NameError when with_fixtures arg duplicate to reserved name.
+     - just use msg when description template was not exist.
+    
+    git-svn-id: http://svn.coderepos.org/share/lang/ruby/rspec-fixture/trunk@6457 d0d07461-0603-4401-acd4-de1884942a52
+
+commit 6439b8c043f58102aa1ce878d89416625aa9cefe
+Author: walf443 <walf443@d0d07461-0603-4401-acd4-de1884942a52>
+Date:   Sat Feb 9 15:06:50 2008 +0000
+
+    lang/ruby/rspec-fixture: support filters, spec template for description
+    
+    git-svn-id: http://svn.coderepos.org/share/lang/ruby/rspec-fixture/trunk@6453 d0d07461-0603-4401-acd4-de1884942a52
+
+commit d9a069ff5d8ab781d587fce2ec1a4e88fe8ebe8e
+Author: walf443 <walf443@d0d07461-0603-4401-acd4-de1884942a52>
+Date:   Fri Feb 8 00:42:35 2008 +0000
+
+    lang/ruby/rspec-fixture: import new project.
+    
+    git-svn-id: http://svn.coderepos.org/share/lang/ruby/rspec-fixture/trunk@6363 d0d07461-0603-4401-acd4-de1884942a52

data/Rakefile

@@ -17,8 +17,8 @@ DESCRIPTION       = <<-"END_DESCRIPTION"
 Test::Base like DSL for RSpec
 END_DESCRIPTION
 BIN_FILES         = %w(  )
-VERS              = "0.0.1"
-RUBYFORGE_PACKAGE_ID = 7007
+VERS              = "0.0.2"
+RUBYFORGE_PROJECT_ID = 7007
 
 EXTRA_RDOC_FILES = []
 HECKLE_ROOT_MODULES = ["Spec::Fixture"]

data/lib/spec/fixture.rb

@@ -7,5 +7,6 @@ module Spec
   end
 end
 
+require 'spec/fixture/filter'
 require 'spec/fixture/base'
 require 'spec/fixture/extentions/example/example_group_methods'

data/lib/spec/fixture/base.rb

@@ -3,11 +3,14 @@ class Spec::Fixture::Base
 
   def initialize binding, hash, &block
     @binding = binding
-    input_names, expected_name = *hash.to_a.first
+    input_names, expected_names = *hash.to_a.first
     unless input_names.kind_of? Array
       input_names = [ input_names ]
     end
-    _define_fixture(input_names, expected_name)
+    unless expected_names.kind_of? Array
+      expected_names = [ expected_names ]
+    end
+    _define_fixture(input_names, expected_names)
     instance_eval(&block)
   end
 
@@ -19,13 +22,13 @@ class Spec::Fixture::Base
   # please use +desc_filters+.
   # 
   # Block should take argumentes in order input, expected.
-  # input was a Hash in input has two or larger members. 
-  # When input has only a member, input has filtered value.
+  # input and expected was a Hash in input has two or larger members. 
+  # When input and expected has only a member, input has filtered value.
   def it desc=nil, &example
-    if desc
-      @desc_template = desc
-    end
-    @example_shared_runner = example
+    @desc_template ||= []
+    @desc_template << desc
+    @example_shared_runner ||= []
+    @example_shared_runner << example
   end
 
   # You specify test data in this methods.
@@ -35,16 +38,19 @@ class Spec::Fixture::Base
     @fixtures = data.map do |item|
       fxt, msg = *item
       input, expected = *fxt.to_a.first
-      @class.new input, expected, msg, @filter_of
-    end
+      filter_of = instance_variable_defined?('@filter_of') ? @filter_of : nil
+      @class.new input, expected, msg, filter_of
+    end.sort_by { rand } # you should write test to pass without order dependency.
   end
 
   # If you specify +filters+, you can use filtered value in +it+'s block
   # filters argument is hash that has a key of members.
   # value should be string or symbol or Array that contain strings or symbols or Proc.
   # In case value is Proc, filtered value is Proc's result.
-  # In case value is Array, each item was applyed using Object#__send__.
-  # In case value is string or symbol, same the above.
+  # In case value is Array, each item applyed by following rule.
+  # In case item is String that start from ".", for example ".uri", filter use Spec::Fixture::Filter module_functions
+  # Otherwise, Object#__send__ was applyed.
+  # If it has only a filter, you can omit bracket and applyed following above.
   def filters hash
     @filter_of = hash
   end
@@ -55,20 +61,26 @@ class Spec::Fixture::Base
     @desc_filter_of = hash
   end
 
-  def generate_msg fxt #:nodoc:
-    if @desc_template
-      msg = @desc_template
+  def generate_msg fxt, desc_template #:nodoc:
+    if desc_template
+      msg = desc_template
       [ fxt._members, :msg ].flatten.each do |item|
         if item == :msg
           result = fxt.msg.to_s
         else
           result = fxt.value_of[item]
-          if @desc_filter_of && @desc_filter_of[item]
+          if instance_variable_defined?('@desc_filter_of') && @desc_filter_of && @desc_filter_of[item]
             if @desc_filter_of[item].kind_of? Proc
               result = @desc_filter_of[item].call(result)
             else
-              [ @desc_filter_of[item] ].flatten.each do |meth|
-                result = result.__send__ meth
+              [ @desc_filter_of[item] ].flatten.each do |filter|
+                # XXX: Proc filter can not use in Array. 
+                # It's simple, it think, do all in a proc.
+                if filter.to_s =~ /^\./
+                  result = Spec::Fixture::Filter.__send__(filter.to_s.sub(/^\./, ''), result)
+                else
+                  result = result.__send__ filter
+                end
               end
             end
           else
@@ -83,18 +95,22 @@ class Spec::Fixture::Base
       if fxt.msg
         fxt.msg
       else
-        ""
+        nil
       end
     end
   end
 
   def run #:nodoc:
     fixture = self
+    desc_template = @desc_template
     @binding.module_eval do
       if fixture.fixtures
         fixture.fixtures.each do |fxt|
-          it fixture.generate_msg(fxt) do
-            fixture.example_shared_runner.call(fxt._input, fxt._expected)
+          fixture.example_shared_runner.sort_by { rand }.each_with_index do |runner,index|
+            msg = fixture.generate_msg(fxt, desc_template.nil? ? nil : desc_template[index] )
+            it msg do
+              runner.call(fxt._input, fxt._expected)
+            end
           end
         end
       end
@@ -102,7 +118,7 @@ class Spec::Fixture::Base
   end
 
   # generate temp class for fixture.
-  def _define_fixture input, expected #:nodoc:
+  def _define_fixture __input, __expected #:nodoc:
     klass = Class.new
     klass.class_eval do
       attr_reader :filter_of, :value_of, :msg
@@ -110,40 +126,39 @@ class Spec::Fixture::Base
       define_method :initialize do |_input, _expected, msg, filter_of|
         @value_of = {}
         @filter_of = filter_of ? filter_of : {}
-        if input.size == 1
-          key = input.first
-          @value_of[key] = _input
-        else
-          input.zip(_input) do |key, value|
-            @value_of[key] = value
+        [ [__input, _input], [__expected, _expected] ].each do |input_or_expected|
+          if input_or_expected.first.size == 1
+            key = input_or_expected.first.first
+            @value_of[key] = input_or_expected.last
+          else
+            input_or_expected.first.zip(input_or_expected.last) do |key, value|
+              @value_of[key] = value
+            end
           end
         end
-        @value_of[expected] = _expected
         @msg = msg
       end
 
       define_method :_members do
-        [ input, expected].flatten
+        [ __input, __expected].flatten
       end
 
-      define_method :_expected do
-        __send__ expected
-      end
+      [ [__input, :_input], [__expected, :_expected] ].each do |input_or_expected|
+        define_method input_or_expected.last do
+          if input_or_expected.first.size == 1
+            __send__(input_or_expected.first.first)
+          else
+            result_of = {}
+            input_or_expected.first.each do |item|
+              result_of[item] = __send__ item
+            end
 
-      define_method :_input do
-        if input.size == 1
-          __send__(input.first)
-        else
-          result_of = {}
-          input.each do |item|
-            result_of[item] = __send__ item
+            result_of
           end
-
-          result_of
         end
       end
 
-      [ input, expected ].flatten.each do |item|
+      [ __input, __expected ].flatten.each do |item|
         raise NameError if instance_methods.map{|i| i.to_s }.include? item.to_s
 
         define_method item do
@@ -153,7 +168,13 @@ class Spec::Fixture::Base
           else
             if @filter_of[item]
               [ @filter_of[item] ].flatten.each do |filter|
-                result = result.__send__ filter
+                # XXX: Proc filter can not use in Array. 
+                # It's simple, it think, do all in a proc.
+                if filter.to_s =~ /^\./
+                  result = Spec::Fixture::Filter.__send__(filter.to_s.sub(/^\./, ''), result)
+                else
+                  result = result.__send__ filter
+                end
               end
             end
           end

data/lib/spec/fixture/filter.rb

@@ -0,0 +1,56 @@
+module Spec::Fixture::Filter
+  constants.each do |const|
+    extend const
+  end
+
+  class << self
+    def eval str
+      eval(str.to_s)
+    end
+
+    def timep str
+      require 'time'
+      Time.parse(str.to_s)
+    end
+
+    def html_escape str
+      require 'cgi'
+      CGI.escapeHTML(str.to_s)
+    end
+
+    def html_unescape str
+      require 'cgi'
+      CGI.unescapeHTML(str.to_s)
+    end
+    
+    def pathname str
+      require 'pathname'
+      Pathname.new(str.to_s)
+    end
+
+    def uri str
+      require 'uri'
+      URI.new(str.to_s)
+    end
+
+    def uri_encode str
+      require 'uri'
+      URI.encode(str.to_s)
+    end
+
+    def uri_decode str
+      require 'uri'
+      URI.decode(str.to_s)
+    end
+
+    def base64_encode str
+      require 'base64'
+      Base64.encode64(str.to_s)
+    end
+
+    def base64_decode str
+      require 'base64'
+      Base64.decode64(str.to_s)
+    end
+  end
+end

data/spec/spec-fixture-base-_define_fixture_spec.rb

@@ -23,27 +23,27 @@ describe Spec::Fixture::Base do
     end
 
     it 'should generate some class' do
-      @fixuture_base._define_fixture(:foo, :bar).should be_kind_of(Class)
+      @fixuture_base._define_fixture([:foo], [:bar]).should be_kind_of(Class)
     end
 
     %w(_input _expected _members filter_of value_of msg).each do |reserved_name|
       it "should raise NameError when using  #{reserved_name} for arguments" do
         lambda {
-          @fixuture_base._define_fixture(reserved_name, :foo)
+          @fixuture_base._define_fixture([reserved_name], [:foo])
         }.should raise_error(NameError)
       end
     end
 
     it 'should raise NameError when specify same name for arguments' do
       lambda {
-        @fixuture_base._define_fixture([:foo], :foo)
+        @fixuture_base._define_fixture([:foo], [:foo])
       }.should raise_error(NameError)
     end
 
     describe 'generated class', 'when one input, one expected' do
       before do
-        @class = @fixuture_base._define_fixture([:foo], :bar)
-        @class_instance = @class.new([:foo], :bar, nil, nil)
+        @class = @fixuture_base._define_fixture([:foo], [:bar])
+        @class_instance = @class.new([:foo], [:bar], nil, nil)
       end
 
       it_should_behave_like 'generated_class'
@@ -63,8 +63,8 @@ describe Spec::Fixture::Base do
 
     describe 'generated class', 'when two input, one expected' do
       before do
-        @class = @fixuture_base._define_fixture([:foo, :bar], :baz)
-        @class_instance = @class.new([:foo, :bar], :baz, nil, nil)
+        @class = @fixuture_base._define_fixture([:foo, :bar], [:baz])
+        @class_instance = @class.new([:foo, :bar], [:baz], nil, nil)
       end
 
       it_should_behave_like 'generated_class'
@@ -84,15 +84,42 @@ describe Spec::Fixture::Base do
         }
       end
     end
+
+    describe 'generated class', 'when two input, two expected' do
+      before do
+        @class = @fixuture_base._define_fixture([:foo, :bar], [:baz, :zoo])
+        @class_instance = @class.new([:foo, :bar], [:baz, :zoo], nil, nil)
+      end
+
+      it_should_behave_like 'generated_class'
+
+      it 'should have members list' do
+        @class_instance._members.should == [:foo, :bar, :baz, :zoo]
+      end
+
+      it '_expected method should return expected members method result Hash' do
+        @class_instance._expected.should == { 
+          :baz => @class_instance.baz, 
+          :zoo => @class_instance.zoo 
+        }
+      end
+
+      it '_input method should return input members method result Hash' do
+        @class_instance._input.should == { 
+          :foo => @class_instance.foo, 
+          :bar => @class_instance.bar 
+        }
+      end
+    end
     
     describe 'generated class with filter', 'when filter value is only simbol' do
       before do
-        @class = @fixuture_base._define_fixture([:foo], :bar)
+        @class = @fixuture_base._define_fixture([:foo], [:bar])
         filter = {
           :foo => :to_s,
           :bar => :inspect,
         }
-        @class_instance = @class.new([:foo], :bar, nil, filter)
+        @class_instance = @class.new(:foo, :bar, nil, filter)
       end
 
       it_should_behave_like 'generated_class'
@@ -101,17 +128,38 @@ describe Spec::Fixture::Base do
         @class_instance.foo.should == 'foo'
         @class_instance._input.should == 'foo'
         @class_instance.bar.should == ':bar'
+        @class_instance._expected.should == ':bar'
+      end
+    end
+
+    describe 'generated class with filter', 'when filter value is only a String that start from "."' do
+      before do
+        @class = @fixuture_base._define_fixture([:foo], [:bar])
+        filter = {
+          :foo => '.html_escape',
+          :bar => '.html_unescape',
+        }
+        @class_instance = @class.new(:foo, :bar, nil, filter)
+      end
+
+      it_should_behave_like 'generated_class'
+
+      it 'should be applyed filter with sending symbol to raw value' do
+        @class_instance.foo.should == 'foo'
+        @class_instance._input.should == 'foo'
+        @class_instance.bar.should == 'bar'
+        @class_instance._expected.should == 'bar'
       end
     end
 
     describe 'generated class with filter', 'when filter value with symbol array' do
       before do
-        @class = @fixuture_base._define_fixture([:foo], :bar)
+        @class = @fixuture_base._define_fixture([:foo], [:bar])
         filter = {
           :foo => [ :to_s, :inspect ],
           :bar => [ :to_s, :capitalize, :to_sym ]
         }
-        @class_instance = @class.new([:foo], :bar, nil, filter)
+        @class_instance = @class.new([:foo], [:bar], nil, filter)
       end
 
       it_should_behave_like 'generated_class'
@@ -120,17 +168,18 @@ describe Spec::Fixture::Base do
         @class_instance.foo.should == '"foo"'
         @class_instance._input.should == '"foo"'
         @class_instance.bar.should == :Bar
+        @class_instance._expected.should == :Bar
       end
     end
 
     describe 'generated class with filter', 'when filter value with Proc' do
       before do
-        @class = @fixuture_base._define_fixture([:foo], :bar)
+        @class = @fixuture_base._define_fixture([:foo], [:bar])
         filter = {
           :foo => lambda {|val| val.to_s.capitalize.reverse },
           :bar => lambda {|val| val.to_s.size }
         }
-        @class_instance = @class.new([:foo], :bar, nil, filter)
+        @class_instance = @class.new([:foo], [:bar], nil, filter)
       end
 
       it_should_behave_like 'generated_class'
@@ -138,7 +187,7 @@ describe Spec::Fixture::Base do
       it 'should be applyed filter with executing Proc' do
         @class_instance.foo.should == 'ooF'
         @class_instance._input.should == 'ooF'
-        @class_instance.bar.should == 3
+        @class_instance._expected.should == 3
       end
     end
   end

data/spec/spec-fixture-base_spec.rb

@@ -39,8 +39,8 @@ describe Spec::Fixture::Base do
       @fxt.should_receive(:msg).and_return(nil)
     end
 
-    it 'should return ""' do
-      @fixture_base.generate_msg(@fxt).should == ""
+    it 'should return nil' do
+      @fixture_base.generate_msg(@fxt, nil).should be_nil
     end
   end
 
@@ -51,7 +51,7 @@ describe Spec::Fixture::Base do
     end
 
     it 'should return msg' do
-      @fixture_base.generate_msg(@fxt).should == "fuga"
+      @fixture_base.generate_msg(@fxt, nil).should == "fuga"
     end
   end
 
@@ -70,14 +70,12 @@ describe Spec::Fixture::Base do
 
     it 'should convert :symbol to raw member inspect' do
       [:input, :expected].each do |member|
-        @fixture_base.instance_variable_set('@desc_template', ":#{member}")
-        @fixture_base.generate_msg(@fxt).should == '"raw value"'
+        @fixture_base.generate_msg(@fxt, ":#{member}").should == '"raw value"'
       end
     end
 
     it 'should convert :msg to fixture#msg value' do
-      @fixture_base.instance_variable_set('@desc_template', ':msg')
-      @fixture_base.generate_msg(@fxt).should == "fuga"
+      @fixture_base.generate_msg(@fxt, ':msg').should == "fuga"
     end
   end
 
@@ -101,14 +99,40 @@ describe Spec::Fixture::Base do
 
     it 'should convert :symbol to desc_filtered member value with sending symbol method to raw value' do
       [:input, :expected].each do |member|
-        @fixture_base.instance_variable_set('@desc_template', ":#{member}")
-        @fixture_base.generate_msg(@fxt).should == 'raw value'.upcase
+        @fixture_base.generate_msg(@fxt, ":#{member}").should == 'raw value'.upcase
+      end
+    end
+
+    it 'should convert :msg to fixture#msg value' do
+      @fixture_base.generate_msg(@fxt, ":msg").should == "fuga"
+    end
+  end
+
+  describe '#generate_msg' , "when @desc_template has value and @desc_filter_of has only a String that start from '.'" do
+    before do
+      @fxt = mock(:fixture)
+      @fxt.should_receive(:msg).any_number_of_times.and_return("fuga")
+      @fxt.should_receive(:_members).any_number_of_times.and_return([:input, :expected])
+      @fxt.should_receive(:value_of).any_number_of_times.and_return({
+        :input => "raw value",
+        :expected => "raw value",
+      })
+      @fxt.should_receive(:input).any_number_of_times.and_return("filtered value")
+      @fxt.should_receive(:expected).any_number_of_times.and_return("filtered value")
+      @fixture_base.instance_variable_set('@desc_filter_of', {
+        :input => '.html_escape',
+        :expected => '.html_unescape'
+      })
+    end
+
+    it 'should convert :symbol to desc_filtered member value with sending symbol method to raw value' do
+      [:input, :expected].each do |member|
+        @fixture_base.generate_msg(@fxt, ":#{member}").should == 'raw value'
       end
     end
 
     it 'should convert :msg to fixture#msg value' do
-      @fixture_base.instance_variable_set('@desc_template', ':msg')
-      @fixture_base.generate_msg(@fxt).should == "fuga"
+      @fixture_base.generate_msg(@fxt, ":msg").should == "fuga"
     end
   end
 
@@ -131,14 +155,12 @@ describe Spec::Fixture::Base do
 
     it 'should convert :symbol to desc_filtered member value with sending symbol method to raw value in array order' do
       [:input, :expected].each do |member|
-        @fixture_base.instance_variable_set('@desc_template', ":#{member}")
-        @fixture_base.generate_msg(@fxt).should == 'raw value'.upcase.reverse
+        @fixture_base.generate_msg(@fxt, ":#{member}").should == 'raw value'.upcase.reverse
       end
     end
 
     it 'should convert :msg to fixture#msg value' do
-      @fixture_base.instance_variable_set('@desc_template', ':msg')
-      @fixture_base.generate_msg(@fxt).should == "fuga"
+      @fixture_base.generate_msg(@fxt, ":msg").should == "fuga"
     end
   end
 
@@ -163,13 +185,12 @@ describe Spec::Fixture::Base do
     it 'should convert :symbol to desc_filtered member value with applying Proc result' do
       [:input, :expected].each do |member|
         @fixture_base.instance_variable_set('@desc_template', ":#{member}")
-        @fixture_base.generate_msg(@fxt).should == @proc.call('raw value')
+        @fixture_base.generate_msg(@fxt, ":#{member}").should == @proc.call('raw value')
       end
     end
 
     it 'should convert :msg to fixture#msg value' do
-      @fixture_base.instance_variable_set('@desc_template', ':msg')
-      @fixture_base.generate_msg(@fxt).should == "fuga"
+      @fixture_base.generate_msg(@fxt, ":msg").should == "fuga"
     end
   end
 

data/tasks/basic_tasks.rake

@@ -10,77 +10,81 @@ end
 task :default => [:spec]
 task :test    => [:spec]
 task :package => [:clean]
-
+begin
 require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.spec_opts = ['--options', 'spec/spec.opts']
-  t.warning = true
-  t.libs << 'lib'
-  t.rcov = true
-  t.rcov_dir = 'doc/output/coverage'
-  t.rcov_opts = ['--exclude', '/*,spec,\.autotest', '-i', 'lib/**/*']
-end
+  Spec::Rake::SpecTask.new(:spec) do |t|
+    t.spec_files = FileList['spec/**/*_spec.rb']
+    t.spec_opts = ['--options', 'spec/spec.opts']
+    t.warning = true
+    t.libs << 'lib'
+    # t.rcov = true
+    # t.rcov_dir = 'doc/output/coverage'
+    # t.rcov_opts = ['--exclude', '/*,spec,\.autotest', '-i', 'lib/**/*']
+  end
 
-desc "Heckle each module and class in turn"
-task :heckle => :spec do
-  root_modules = HECKLE_ROOT_MODULES
-  spec_files = FileList['spec/**/*_spec.rb']
-  
-  current_module, current_method = nil, nil
-  heckle_caught_modules = Hash.new { |hash, key| hash[key] = [] }
-  unhandled_mutations = 0
-  
-  root_modules.each do |root_module|
-    IO.popen("heckle #{root_module} -t #{spec_files}") do |pipe|
-      while line = pipe.gets
-        line = line.chomp
-        
-        if line =~ /^\*\*\*  ((?:\w+(?:::)?)+)#(\w+)/
-          current_module, current_method = $1, $2
-        elsif line == "The following mutations didn't cause test failures:"
-          heckle_caught_modules[current_module] << current_method
-        elsif line == "+++ mutation"
-          unhandled_mutations += 1 
+  desc "Heckle each module and class in turn"
+  task :heckle => :spec do
+    root_modules = HECKLE_ROOT_MODULES
+    spec_files = FileList['spec/**/*_spec.rb']
+
+    current_module, current_method = nil, nil
+    heckle_caught_modules = Hash.new { |hash, key| hash[key] = [] }
+    unhandled_mutations = 0
+
+    root_modules.each do |root_module|
+      IO.popen("heckle #{root_module} -t #{spec_files}") do |pipe|
+        while line = pipe.gets
+          line = line.chomp
+
+          if line =~ /^\*\*\*  ((?:\w+(?:::)?)+)#(\w+)/
+            current_module, current_method = $1, $2
+          elsif line == "The following mutations didn't cause test failures:"
+            heckle_caught_modules[current_module] << current_method
+          elsif line == "+++ mutation"
+            unhandled_mutations += 1
+          end
+
+          puts line
         end
-              
-        puts line
       end
     end
-  end
-  
-  if unhandled_mutations > 0
-    error_message_lines = ["*************\n"]
-    
-    error_message_lines << 
-      "Heckle found #{unhandled_mutations} " + 
-      "mutation#{"s" unless unhandled_mutations == 1} " +
-      "that didn't cause spec violations\n"
-
-    heckle_caught_modules.each do |mod, methods|
+    if unhandled_mutations > 0
+      error_message_lines = ["*************\n"]
+
       error_message_lines <<
-        "#{mod} contains the following poorly-specified methods:"
-      methods.each do |m| 
-        error_message_lines << " - #{m}"
+        "Heckle found #{unhandled_mutations} " +
+        "mutation#{"s" unless unhandled_mutations == 1} " +
+        "that didn't cause spec violations\n"
+
+      heckle_caught_modules.each do |mod, methods|
+        error_message_lines <<
+          "#{mod} contains the following poorly-specified methods:"
+        methods.each do |m|
+          error_message_lines << " - #{m}"
+        end
+        error_message_lines << ""
       end
-      error_message_lines << ""
+
+      error_message_lines <<
+        "Get your act together and come back " +
+        "when your specs are doing their job!"
+
+      puts "*************"
+      raise error_message_lines.join("\n")
+    else
+      puts "Well done! Your code withstood a heckling."
     end
-    
-    error_message_lines <<
-      "Get your act together and come back " +
-      "when your specs are doing their job!"
-    
-    puts "*************"
-    raise error_message_lines.join("\n")
-  else
-    puts "Well done! Your code withstood a heckling."
   end
+rescue LoadError
 end
 
-require 'spec/rake/verify_rcov'
-RCov::VerifyTask.new(:rcov_veryfy) do |t|
-  t.index_html = "doc/output/coverage/index.html"
-  t.threshold = 100
+begin
+  require 'spec/rake/verify_rcov'
+  RCov::VerifyTask.new(:rcov_veryfy) do |t|
+    t.index_html = "doc/output/coverage/index.html"
+    t.threshold = 100
+  end
+rescue LoadError
 end
 
 task :install do

metadata

@@ -1,33 +1,36 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: rspec-fixture
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
-date: 2008-02-11 00:00:00 +09:00
-summary: Test::Base like DSL for RSpec
-require_paths: 
-- lib
-email: walf443 at gmail.com
-homepage: http://akasakarb.rubyforge.org
-rubyforge_project: akasakarb
-description: Test::Base like DSL for RSpec
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.0.2
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Keiji, Yoshimi
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-11-14 00:00:00 +09:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
+    version: 
+description: Test::Base like DSL for RSpec
+email: walf443 at gmail.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README
+- ChangeLog
 files: 
 - Rakefile
 - README
@@ -38,6 +41,7 @@ files:
 - lib/spec/fixture/extentions
 - lib/spec/fixture/extentions/example
 - lib/spec/fixture/extentions/example/example_group_methods.rb
+- lib/spec/fixture/filter.rb
 - lib/spec/fixture.rb
 - spec/spec-fixture-base-_define_fixture_spec.rb
 - spec/spec-fixture-base_spec.rb
@@ -47,10 +51,9 @@ files:
 - tasks/basic_config.rake
 - tasks/basic_tasks.rake
 - examples/detect_location_spec.rb
-test_files: 
-- spec/spec-fixture-base-_define_fixture_spec.rb
-- spec/spec-fixture-base_spec.rb
-- spec/with_fixture_spec.rb
+has_rdoc: true
+homepage: http://akasakarb.rubyforge.org
+post_install_message: 
 rdoc_options: 
 - --charset
 - utf-8
@@ -64,22 +67,28 @@ rdoc_options:
 - ^(example|extras)/
 - --title
 - rspec-fixture documentation
-extra_rdoc_files: 
-- README
-- ChangeLog
-executables: []
-
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.0.0
-    version: 
+rubyforge_project: akasakarb
+rubygems_version: 1.3.0
+signing_key: 
+specification_version: 2
+summary: Test::Base like DSL for RSpec
+test_files: 
+- spec/spec-fixture-base-_define_fixture_spec.rb
+- spec/spec-fixture-base_spec.rb
+- spec/with_fixture_spec.rb