verbvector 0.0.1 → 0.0.2

data/Rakefile

@@ -1,12 +1,17 @@
 require 'bundler'
+require 'rdoc/task'
+
 Bundler::GemHelper.install_tasks
 
-#Added to get testing working
-require 'rake/testtask'
-Rake::TestTask.new(:test)
+task :default => :test
 
-require "rake/rdoctask"
-Rake::RDocTask.new do |rd| 
- rd.rdoc_files.include("lib/**/*.rb")
- rd.rdoc_dir = "rdoc"
+RDoc::Task.new do | rd |
+  rd.rdoc_dir = "rdoc"
+  rd.rdoc_files.include("lib/**/*.rb")
+end
+
+require 'rake/testtask'
+Rake::TestTask.new do  |t|
+  t.ruby_opts = [ '-rminitest/pride' ]
+  t.verbose = true
 end

data/lib/verbvector.rb

@@ -1,6 +1,5 @@
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
-require "verbvector"
-require 'pp'
+require 'verbvector'
 
 # Generalized module for handling lingustics processing
 module Linguistics
@@ -14,13 +13,9 @@ module Linguistics
       # given type of verb (French, Latin, Spanish).  I'm not trying to be
       # obscure, but I'm trying to be very generalizable.
       class VerbvectorGenerator
-        attr_reader :language, :aspect_list, :vector_list, :cluster_methods, 
+        attr_reader :language, :aspect_list, :vector_list, :cluster_methods,
                     :respondable_methods
-        
-        # Class methods go here
-        class << self
-        end
-        
+
         # Initialization
         #
         # Takes the descriptive block of the tense structure in a DSL format
@@ -30,7 +25,7 @@ module Linguistics
           @respondable_methods = []
           @cluster_methods     = {}
           @language            = ""
-          
+
           # Let's remember the difference between instance_ and class_eval.
           #
           # "class_eval sets things up as if you were in the body of a class
@@ -39,26 +34,26 @@ module Linguistics
           # "instance_eval on a class acts as if you were working inside the
           # singleton class of self. Therefore, any methods you define will
           # become class methods." - prog ruby 1.9 v3, prag programmers p.388
-          #          
+          #
           # As such, instance_eval here is about to apply this eval to the
           # eigenclass.  That means any instance of this class will have this
           # method.
-          instance_eval &b
-          
+          instance_eval(&b)
+
           @aspect_list.sort!
         end
-        
+
         # Vectors are specified at their most atomic
         # Sometimes it is handy to return all the values that match
         # "up to" a given aspect and then uniq'ify them
 
-        def match_vector_upto_aspect(s)         
-          @vector_list.compact.sort.grep(/#{s}/).map{ |x| 
+        def match_vector_upto_aspect(s)
+          @vector_list.compact.sort.grep(/#{s}/).map{ |x|
             x.sub(/(^.*#{s}).*/,%q(\1))
-          }.uniq         
+          }.uniq
         end
-        
-        # Creates the anonymous module based on the contents of @vector_list. 
+
+        # Creates the anonymous module based on the contents of @vector_list.
         # The method names in this module are just stubs _except_ those that
         # are loaded into the @cluster_methods hash.  By generating all the
         # method names we allow +responds_to?+ to work as expected.
@@ -72,13 +67,13 @@ module Linguistics
           Module.new do
             # This defines instance methods on the Module
             # m.instance_methods #=> [:say_foo, :say_bar, :say_bat]
- 
+
             # Note, you can't use @someArray in the iteration because
             # self has changed to this anonymous module.  Since a block
-            # is a binding, it has the local context (including 'v') 
-            # bundled up with it -- despte self having changed!  
+            # is a binding, it has the local context (including 'v')
+            # bundled up with it -- despte self having changed!
             # Therefore, the following works.
- 
+
             # Define a method for each name in vector_list.
             raise("Language was not defined." ) if l.nil?
 
@@ -86,8 +81,8 @@ module Linguistics
               r << "#{m}"
               define_method "#{l.downcase}_#{m}".to_sym do
               end
-            end     
-            
+            end
+
             # Write something to spit out the vectors as well.
             define_method :vector_list do
               return v
@@ -98,24 +93,24 @@ module Linguistics
             end
 
             # Spit out the clustered methods
-            c.each_pair do |k,v|
+            c.each_pair do |k,val|
               define_method k do
-                v.call
-              end              
+                val.call
+              end
             end
 
-          end                
+          end
         end
-        
+
         # Language takes a symbol for +l+ the language whose verb we seek to
         # model.  It then takes a block for the sub-specification of the verbs
         # of that language.
-        def language(*l,&b) 
+        def language(*l,&b)
           return @language if (l[0].nil? and not @language.nil?)
           @language = l[0]
-          instance_eval &b
+          instance_eval(&b)
         end
-        
+
         # Method generates tense vectors based on aspects that are assumed to
         # apply to all possible vectors.  These would be seen as the most
         # general aspects possible  For example, while only *some* vectors are
@@ -124,32 +119,32 @@ module Linguistics
         def all_vectors(position,&b)
           # Make sure there is a block given
           return unless (block_given? or yield.first)
-          
+
           # Sentinel condition for stopping recursive call
           return @vector_list unless yield.first
 
           # Provided that there was a block, collect the DSL hash into
           # specifications
           specifications = yield
-          
+
           # Extract the first k/v
           specification = specifications.first
 
           # Based on the key for each row, take that content and postpend
           # it.to_s to the ending of each value held in the hash element value
           expanded_specification = combinatorialize(specification)
-          
+
           # Remove the expanded value from the specifications hash
-          specifications.delete(specification[0])   
-          
+          specifications.delete(specification[0])
+
           # Keep a record of aspects we have seen
           @aspect_list.push specification[0]
           @aspect_list.uniq!
-          
+
           # If it's the first go round put the first set of values in.  In
           # general these should be the leftmost and theremfore most general
-          if @vector_list.empty? 
-            @vector_list = expanded_specification 
+          if @vector_list.empty?
+            @vector_list = expanded_specification
           else
             # If there's already a definition in the tens list, for each of
             # the _existing_ values add the array of strings seen in
@@ -163,49 +158,49 @@ module Linguistics
             end
             @vector_list = temp
           end
-          
+
           # Recursive call, sentnel contition is at the top of the method
           all_vectors(position) do
             specifications
           end
-          
-          instance_eval &b
+
+          instance_eval(&b)
         end
-        
+
         # Method appends vector definitions _if_ the +condition+ (a RegEx) is satisfied
         def vectors_that(condition,&b)
           matching_stems = @vector_list.grep condition
           temp = []
-          
+
           specifications = yield
-          
+
           # Extract the first k/v
           specification = specifications.first
 
           # Based on the key for each row, take that content and postpend
           # it.to_s to the ending of each value held in the hash element value
           expanded_specification = combinatorialize(specification)
-          
+
           # Remove the expanded value from the specifications hash
-          specifications.delete(specification[0])   
+          specifications.delete(specification[0])
 
           # Keep a record of aspects we have seen
           @aspect_list.push specification[0]
           @aspect_list.uniq!
-          
+
           # So we grepped the desired stems and stored them in matching_stems
           # First we delete those stems (becasue we're going to further specify) them
-          matching_stems.each do |x| 
+          matching_stems.each do |x|
             @vector_list.delete x
             expanded_specification.each do |u|
               temp.push x+"_#{u}"
             end
           end
-          
+
           # Combine the original list with the freshly expanded list
           @vector_list = (@vector_list + temp).sort
         end
-        
+
         # Languages are not entirely rational, while something _ought_ exist
         # by the rules of rational combination, some times they simply _don't_
         # exist.  That's what this method is for.
@@ -215,11 +210,11 @@ module Linguistics
         # _block_  :: used to add
         def exception(action, id, &b)
           if action == :remove
-            @vector_list.delete_if {|x| x =~ /#{id.to_s}/ } 
+            @vector_list.delete_if {|x| x =~ /#{id.to_s}/ }
           elsif action == :add
           end
         end
-        
+
         # Method to take a hash key where the key is an _aspect_ and the value
         # is an array of specifications valid for that _aspect_.
         def combinatorialize(h)
@@ -229,7 +224,7 @@ module Linguistics
           end
           results
         end
-        
+
         # Method to allow "clusters" of simiar vectors to be identified (see:
         # +match_upto+) based on the 0th string match.  These clusters can be
         # called by the method namd provided as the 2nd argument (0-index)
@@ -246,21 +241,21 @@ module Linguistics
         # needs
         #
         # *Example:*  <tt>cluster_on /active_voice.*third/, "as method", :active_thirds</tt>
-        # 
-        # 
-        # This means you want to collect several method names that match the Regexp and make them identifiable by a call to the 
-        # method +active_thirds+ 
+        #
+        #
+        # This means you want to collect several method names that match the Regexp and make them identifiable by a call to the
+        # method +active_thirds+
         #
         # Alternatively, you might want to use a String or Symbol (making use of match_upto).
         #
         # *Example:*  <tt>cluster_on :tense, "as method", :tense_list</tt>
-        # 
+        #
         # +match+  :: The String or Regex match_upto will use for matching
         # +junk+          :: Syntactic sugar, a string that makes the DSL look sensible
-        # +method_name+   :: The method in the anonymous module that returns the matched method names.  See +create_module+       
+        # +method_name+   :: The method in the anonymous module that returns the matched method names.  See +create_module+
         def cluster_on(match, junk, method_name)
 
-          clustered_matches = 
+          clustered_matches =
             if match.class == Regexp
               @vector_list.grep match
             elsif match.class.to_s =~ /^(String|Symbol)/
@@ -273,7 +268,7 @@ module Linguistics
 
           unless clustered_matches.nil?
             # No, this should not be done:
-            #                    ...and add them to the @vector_list.  
+            #                    ...and add them to the @vector_list.
             #                    @vector_list += clustered_matches
             # Clustered methods need to be defined, for real, somewhere.  We
             # should not claim to respond to them here, but rather let the
@@ -286,9 +281,7 @@ module Linguistics
               clustered_matches
             end
           end
-          
         end
-        
       end
     end
   end

data/lib/verbvector/version.rb

@@ -2,7 +2,7 @@ module Linguistics
   module Verbs
     module Verbvector
       # Version of the gem
-      VERSION = "0.0.1"
+      VERSION = "0.0.2"
     end
   end
 end

data/test/test_generator.rb

@@ -5,7 +5,7 @@ require "verbvector"
 
 class TestVerbVector  < Test::Unit::TestCase
   def setup
-    @vv = 
+    @vv =
     Linguistics::Verbs::Verbvector::VerbvectorGenerator.new do
        language :Latin do
          all_vectors :start_with do
@@ -14,19 +14,19 @@ class TestVerbVector  < Test::Unit::TestCase
              :mood  =>  %w(indicative subjunctive imperative)
             }
          end
-         vectors_that /.*_indicative_mood/ do
+         vectors_that( /.*_indicative_mood/ ) do
            {
              :tense  => %w(present imperfect future
                            perfect pastperfect futureperfect)
            }
          end
-         vectors_that /.*_subjunctive_mood/ do
+         vectors_that( /.*_subjunctive_mood/ ) do
            {
-             :tense => %w(present imperfect 
+             :tense => %w(present imperfect
                            perfect pastperfect)
            }
          end
-         vectors_that /.*_imperative_mood/ do
+         vectors_that( /.*_imperative_mood/ ) do
            {
              :tense => %w(present)
            }
@@ -46,7 +46,7 @@ class TestVerbVector  < Test::Unit::TestCase
   def test_basics
     v = Linguistics::Verbs::Verbvector::VerbvectorGenerator.new do
     end
-    
+
     assert_not_nil(v)
     assert_equal(:Latin, @vv.language)
   end
@@ -56,9 +56,9 @@ class TestVerbVector  < Test::Unit::TestCase
    assert_equal 5,          @vv.match_vector_upto_aspect("mood").length
    assert_equal 21,         @vv.match_vector_upto_aspect("tense").length
   end
-  
+
   def test_tense_resolution
-    tense_list = Array.new(File.open(File.join(File.dirname(__FILE__), *%w[fixtures tense_list])).read.split /\s/)
+    tense_list = Array.new(File.open(File.join(File.dirname(__FILE__), *%w[fixtures tense_list])).read.split( /\s/ ))
     tense_list.sort!
 
     tc = Class.new
@@ -68,7 +68,7 @@ class TestVerbVector  < Test::Unit::TestCase
   end
 
   def test_clustering_with_regex
-    t = 
+    t =
     Linguistics::Verbs::Verbvector::VerbvectorGenerator.new do
        language :Latin do
          all_vectors :start_with do
@@ -77,19 +77,19 @@ class TestVerbVector  < Test::Unit::TestCase
              :mood  =>  %w(indicative subjunctive imperative)
             }
          end
-         vectors_that /.*_indicative_mood/ do
+         vectors_that( /.*_indicative_mood/ ) do
            {
              :tense  => %w(present imperfect future
                            perfect pastperfect futureperfect)
            }
          end
-         vectors_that /.*_subjunctive_mood/ do
+         vectors_that( /.*_subjunctive_mood/ ) do
            {
-             :tense => %w(present imperfect 
+             :tense => %w(present imperfect
                            perfect pastperfect)
            }
          end
-         vectors_that /.*_imperative_mood/ do
+         vectors_that( /.*_imperative_mood/ ) do
            {
              :tense => %w(present)
            }
@@ -101,7 +101,7 @@ class TestVerbVector  < Test::Unit::TestCase
            }
          end
          exception :remove, :passive_voice_imperative_mood_present_tense
-         cluster_on /active_voice.*third/, "as method", :active_thirds
+         cluster_on( /active_voice.*third/, "as method", :active_thirds )
        end
      end
      tc = Class.new
@@ -109,13 +109,13 @@ class TestVerbVector  < Test::Unit::TestCase
      assert_respond_to(tc, :active_thirds)
      assert_equal(22, tc.active_thirds.length)
   end
-  
+
   def test_extension
     tc = Class.new
     tc.extend @vv.method_extension_module
     assert_respond_to(tc, :latin_active_voice_indicative_mood_imperfect_tense_singular_number_third_person)
   end
-  
+
   def test_clustering
     assert_respond_to(@vv, :vectors_that)
     assert_respond_to(@vv, :cluster_on)
@@ -128,7 +128,7 @@ class TestVerbVector  < Test::Unit::TestCase
 
     cms=@vv.cluster_methods[:tense_list].call
     cms.each do |m|
-      assert_true  not(tc.respond_to? m.to_sym)
+      assert not(tc.respond_to? m.to_sym)
     end
 
   end

data/test/test_passed_block.rb

@@ -0,0 +1,82 @@
+require "test/unit"
+
+$:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
+require "verbvector"
+
+class TestProcBasedDefinition < Test::Unit::TestCase
+  def setup
+    @dsl_proc = Proc.new do
+       language :Latin do
+         all_vectors :start_with do
+            {
+             :voice =>  %w(active passive),
+             :mood  =>  %w(indicative subjunctive imperative)
+            }
+         end
+         vectors_that( /.*_indicative_mood/ ) do
+           {
+             :tense  => %w(present imperfect future
+                           perfect pastperfect futureperfect)
+           }
+         end
+         vectors_that( /.*_subjunctive_mood/ ) do
+           {
+             :tense => %w(present imperfect
+                           perfect pastperfect)
+           }
+         end
+         vectors_that( /.*_imperative_mood/ ) do
+           {
+             :tense => %w(present)
+           }
+         end
+         all_vectors :end_with do
+           {
+             :number => %w(singular plural),
+             :person => %w(first second third)
+           }
+         end
+         exception :remove, :passive_voice_imperative_mood_present_tense
+         cluster_on :tense, "as method", :tense_list
+       end
+     end
+    @vv = Linguistics::Verbs::Verbvector::VerbvectorGenerator.new(&@dsl_proc)
+  end
+
+  def test_basics
+    v = Linguistics::Verbs::Verbvector::VerbvectorGenerator.new do
+    end
+
+    assert_not_nil(v)
+    assert_equal(:Latin, @vv.language)
+  end
+
+  def test_vector_matcher
+   assert_equal 2,          @vv.match_vector_upto_aspect("voice").length
+   assert_equal 5,          @vv.match_vector_upto_aspect("mood").length
+   assert_equal 21,         @vv.match_vector_upto_aspect("tense").length
+  end
+
+  def test_extension
+    tc = Class.new
+    tc.extend @vv.method_extension_module
+    assert_respond_to(tc, :latin_active_voice_indicative_mood_imperfect_tense_singular_number_third_person)
+  end
+
+  def test_clustering
+    assert_respond_to(@vv, :vectors_that)
+    assert_respond_to(@vv, :cluster_on)
+
+    tc = Class.new
+    tc.extend @vv.method_extension_module
+
+    # Make sure that each cluster method is /not/ defined.  We want these to
+    # be defined "for real," not as a proxy.
+
+    cms=@vv.cluster_methods[:tense_list].call
+    cms.each do |m|
+      assert not(tc.respond_to? m.to_sym)
+    end
+  end
+
+end

metadata

@@ -1,28 +1,24 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: verbvector
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.2
   prerelease: 
-  version: 0.0.1
 platform: ruby
-authors: 
+authors:
 - Steven G. Harms
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-02 00:00:00 Z
+date: 2012-10-20 00:00:00.000000000 Z
 dependencies: []
-
-description: Use a DSL to describe the verb tense framework of a language and have it generate methods corresponding to each unique vector.
-email: 
+description: Use a DSL to describe the verb tense framework of a language and have
+  it generate methods corresponding to each unique vector.
+email:
 - github@sgharms.oib.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README.textile
@@ -31,34 +27,30 @@ files:
 - lib/verbvector/version.rb
 - test/fixtures/tense_list
 - test/test_generator.rb
+- test/test_passed_block.rb
 - verbvector.gemspec
 homepage: http://rubygems.org/gems/verbvector
 licenses: []
-
 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 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+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: verbvector
-rubygems_version: 1.8.5
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Generates the verb tense "vectors" based on a DSL description syntax.
-test_files: 
-- test/fixtures/tense_list
-- test/test_generator.rb
+test_files: []