summary_judgement 1.2.4 → 1.3.0

data/VERSION

@@ -1 +1 @@
-1.2.4
+1.3.0

data/lib/summary_judgement/instance_methods.rb

@@ -42,8 +42,12 @@ module SummaryJudgement
     
     def summarize_as_branch(options = {})
       result = ''
+      leaves = canopy
+      options[:verbs] ||= :canopy   if leaves.map(&:class).uniq.all? { |k| k.summary.predicate }
+      options[:verbs] ||= :branches
+
       if conjugation = options.delete(:conjugate)
-        options.reverse_merge! :tense => :present, :plurality => :singular
+        options.reverse_merge! :plurality => :singular
         case conjugation
         when String
           options[:person] ||= :third
@@ -53,25 +57,28 @@ module SummaryJudgement
         when TrueClass
           options[:person] ||= :third
         end
-        result << Verbs::Conjugator.conjugate(self.class.summary.predicate, options.slice(:person, :subject, :tense, :plurality)).to_s
-        result = result.humanize unless options[:subject]
-        result << ' '
+        if options[:verbs] == :canopy and options[:subject]
+          result << case options[:subject]
+          when String
+            options[:subject]
+          when Symbol, TrueClass
+            Verbs::Conjugator.subject(options.slice(:person, :plurality)).humanize
+          end
+        elsif options[:verbs] == :branches
+          result << Verbs::Conjugator.conjugate(self.class.summary.predicate, options.slice(:person, :subject, :tense, :plurality, :aspect)).to_s
+          result = result.humanize unless options[:subject]
+        end
+        result << ' ' if options[:subject]
       end
       
+      
       verbosity = options.delete(:verbose)
       verbosity = self.class.summary.class.render verbosity, self
       verbosity = canopy.length <= verbosity if verbosity.is_a? Fixnum
       
-      if verbosity
-        leaves = canopy
-        first_leaf = leaves.shift
-        result << leaves.map { |leaf| leaf.summary :capitalize_indefinite_article => false }.unshift(first_leaf.summary(:capitalize_indefinite_article => !conjugation)).to_sentence
-      else
-        result << canopy.map {|c| c.class}.uniq.map do |k|
-          siblings = canopy.select {|c| c.is_a? k}
-          siblings.length.to_s + ' ' + k.to_s.underscore.humanize.downcase.pluralize_on(siblings.length)
-        end.to_sentence
-      end
+      tufts = organize_leaves(*leaves)
+      first_tuft = tufts.shift
+      result << tufts.map { |tuft| summarize_tuft(tuft, conjugation, verbosity, options) }.unshift(summarize_tuft(first_tuft, conjugation, verbosity, options.merge(:capitalize_anonymous => true))).to_sentence(:words_connector => ';', :last_word_connector => '; and ')
     end
 
     def summarize_as_bare_branch(options = {})
@@ -92,6 +99,35 @@ module SummaryJudgement
       end
       result << self.class.summary.class.render(self.class.summary.default, self).with_indefinite_article
     end
+    
+    def organize_leaves(*leaves)
+      leaves.inject(::ActiveSupport::OrderedHash.new) do |memo, leaf|
+        memo[leaf.class] ||= []
+        memo[leaf.class] << leaf
+        memo
+      end
+    end
+    
+    def summarize_tuft(tuft, conjugation, verbosity, options)
+      klass, siblings = tuft
+      tuft_summary = ''
+      if options[:verbs] == :canopy and conjugation
+        tuft_summary << Verbs::Conjugator.conjugate(klass.summary.predicate, options.slice(:person, :tense, :aspect, :plurality).reverse_merge(klass.summary.options_for_conjugation)).to_s
+        tuft_summary = tuft_summary.humanize unless options[:subject]
+        tuft_summary << ' '
+      end
+      if verbosity
+        if conjugation
+          tuft_summary << siblings.map { |leaf| leaf.summary :capitalize_indefinite_article => false }.to_sentence
+        else
+          first_sibling = siblings.shift
+          tuft_summary << siblings.map { |leaf| leaf.summary :capitalize_indefinite_article => false }.unshift(first_sibling.summary(:capitalize_indefinite_article => !options[:subject])).to_sentence
+        end
+      else
+        tuft_summary << siblings.length.to_s + ' ' + klass.to_s.underscore.humanize.downcase.pluralize_on(siblings.length)
+      end
+      tuft_summary
+    end
 
   end
 end

data/lib/summary_judgement/summary.rb

@@ -9,6 +9,8 @@ module SummaryJudgement
       @modifiers = options[:modifiers] || []
       @subordinates = options[:subordinates] || []
       @verb = options[:verb]
+      @aspect = options[:aspect]
+      @tense = options[:tense]
       @placeholder = options[:placeholder]
     end
     
@@ -47,6 +49,18 @@ module SummaryJudgement
       @verb
     end
     
+    def tense(t)
+      @tense = t
+    end
+    
+    def aspect(a)
+      @aspect = a
+    end
+    
+    def options_for_conjugation
+      { :tense => @tense, :aspect => @aspect }
+    end
+    
     def placeholder(p)
       @placeholder = p
     end
@@ -56,7 +70,7 @@ module SummaryJudgement
     end
     
     def to_hash
-      [:adjectives, :modifiers, :subordinates, :terms, :verb, :placeholder].inject({}) do |properties, property|
+      [:adjectives, :modifiers, :subordinates, :terms, :verb, :placeholder, :aspect, :tense].inject({}) do |properties, property|
         val = instance_variable_get :"@#{property}"
         case val
         when Symbol, NilClass, TrueClass, FalseClass, Fixnum

data/summary_judgement.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{summary_judgement}
-  s.version = "1.2.4"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andy Rossmeissl"]
-  s.date = %q{2009-12-07}
+  s.date = %q{2009-12-10}
   s.description = %q{Constructs adaptive summaries of object hierarchies based on ActiveRecord associations and other simple relationship structures}
   s.email = %q{andy@rossmeissl.net}
   s.extra_rdoc_files = [

data/test/helper.rb

@@ -26,6 +26,9 @@ class Book
     has.adjective lambda { |book| "#{book.length_in_pages}pp" }, :if => :length_in_pages
     has.identity lambda { |book| book.book_type }
     has.modifier lambda { |book| "by #{book.author}" }, :if => :author
+    has.verb :read
+    has.aspect :perfect
+    has.tense :present
   end
 end
 
@@ -52,6 +55,9 @@ class Magazine
     has.adjective lambda { |magazine| "#{magazine.length_in_pages}pp" }, :if => :length_in_pages
     has.identity 'magazine issue'
     has.modifier lambda { |magazine| "from #{magazine.date}" }, :if => :date
+    has.verb :skim
+    has.aspect :perfect
+    has.tense :present
   end
 end
 

data/test/test_summary_judgement.rb

@@ -19,7 +19,7 @@ class TestSummaryJudgement < Test::Unit::TestCase
     assert_equal Book, @neuromancer.class
     assert_equal Library, @bookshelf.class
     assert_equal 2, @bookshelf.books.length
-    assert_equal :accept, Verbs::Conjugator.conjugate(:accept, :tense => :present, :person => :first, :plurality => :singular)
+    assert_equal 'accept', Verbs::Conjugator.conjugate(:accept, :tense => :present, :person => :first, :plurality => :singular)
     assert_equal 'a', 'one'.indefinite_article
   end
   
@@ -52,9 +52,9 @@ class TestSummaryJudgement < Test::Unit::TestCase
   end
   
   def test_conjugated_summary
-    assert_equal 'Has 2 books', @bookshelf.summary(:conjugate => true, :subject => false)
-    assert_equal 'You have 2 books', @bookshelf.summary(:conjugate => :second, :subject => true)
-    assert_equal 'The catalog contains 2 books and 1 magazine', @catalog.summary(:conjugate => :third, :subject => 'The catalog')
+    assert_equal 'Has read 2 books', @bookshelf.summary(:conjugate => true, :subject => false)
+    assert_equal 'You have 2 books', @bookshelf.summary(:conjugate => :second, :subject => true, :verbs => :branches)
+    assert_equal 'The catalog contains 2 books and 1 magazine', @catalog.summary(:conjugate => :third, :subject => 'The catalog', :verbs => :branches)
   end
   
   def test_verbose_summaries
@@ -62,7 +62,7 @@ class TestSummaryJudgement < Test::Unit::TestCase
   end
   
   def test_conjugated_verbose_summaries
-    assert_equal 'I have a novel by William Gibson and an illustrated childrens book by Maurice Sendak', @bookshelf.summary(:verbose => true, :conjugate => :first, :subject => true)
+    assert_equal 'I have read a novel by William Gibson and an illustrated childrens book by Maurice Sendak', @bookshelf.summary(:verbose => true, :conjugate => :first, :subject => true)
   end
   
   def test_summaries_with_adaptive_verbosity
@@ -71,8 +71,8 @@ class TestSummaryJudgement < Test::Unit::TestCase
   end
   
   def test_conjugated_summaries_with_adaptive_verbosity
-    assert_equal 'They have 2 books', @bookshelf.summary(:verbose => :small?, :conjugate => :third, :plurality => :plural, :subject => true)
-    assert_equal 'They have a novel by William Gibson', @bedstand.summary(:verbose => :small?, :conjugate => :third, :plurality => :plural, :subject => true)
+    assert_equal 'They have read 2 books', @bookshelf.summary(:verbose => :small?, :conjugate => :third, :plurality => :plural, :subject => true)
+    assert_equal 'They have read a novel by William Gibson', @bedstand.summary(:verbose => :small?, :conjugate => :third, :plurality => :plural, :subject => true)
   end
   
   def test_inheritance
@@ -91,4 +91,9 @@ class TestSummaryJudgement < Test::Unit::TestCase
   def test_empty_state
     assert_equal 'You have an empty shelf', @new_releases.summary(:conjugate => :second, :subject => true)
   end
+  
+  def test_conjugated_summary_with_multiple_verbs
+    assert_equal 'I have read 2 books and have skimmed 1 magazine', @catalog.summary(:conjugate => :first, :subject => true, :aspect => :perfect)
+    assert_equal 'I have read a novel by William Gibson and an illustrated childrens book by Maurice Sendak and have skimmed a magazine issue from December 2009', @catalog.summary(:conjugate => :first, :subject => true, :aspect => :perfect, :verbose => true)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: summary_judgement
 version: !ruby/object:Gem::Version 
-  version: 1.2.4
+  version: 1.3.0
 platform: ruby
 authors: 
 - Andy Rossmeissl
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-07 00:00:00 -05:00
+date: 2009-12-10 00:00:00 -05:00
 default_executable: 
 dependencies: []