summary_judgement 1.3.6 → 1.3.7

data/VERSION

@@ -1 +1 @@
-1.3.6
+1.3.7

data/lib/summary_judgement/instance_methods.rb

@@ -95,11 +95,27 @@ module SummaryJudgement
         when TrueClass
           options[:person] ||= :third
         end
-        result << Verbs::Conjugator.conjugate(self.class.summary.predicate, options.slice(:person, :subject, :tense, :plurality)).to_s
-        results = result.humanize unless options[:subject].is_a?(String)
-        result << ' '
       end
-      result << self.class.summary.class.render(self.class.summary.default, self).with_indefinite_article(!conjugation)
+      if placeholder = self.class.summary.default
+        if conjugation
+          result << Verbs::Conjugator.conjugate(self.class.summary.predicate, options.slice(:person, :subject, :tense, :plurality)).to_s
+          results = result.humanize unless options[:subject].is_a?(String)
+          result << ' '
+        end
+        result << self.class.summary.class.render(placeholder, self).with_indefinite_article(!conjugation)
+      elsif twigs = children.flatten.select(&:children)
+        if conjugation and options[:subject]
+          result << case options[:subject]
+          when String
+            options[:subject]
+          when Symbol, TrueClass
+            Verbs::Conjugator.subject(options.slice(:person, :plurality)).humanize
+          end
+          result << ' '
+        end
+        result << twigs.map { |t| t.summary options.merge(:subject => false, :conjugate => conjugation) }.to_sentence
+      end
+      result
     end
     
     def organize_leaves(*leaves)

data/summary_judgement.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{summary_judgement}
-  s.version = "1.3.6"
+  s.version = "1.3.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andy Rossmeissl"]

data/test/helper.rb

@@ -85,6 +85,12 @@ class Shelf < Library
   end
 end
 
+class Rack < Library
+  summarize do |has|
+    has.placeholder 'empty rack'
+  end
+end
+
 class Catalog
   attr_reader :libraries
   def initialize(*libraries)

data/test/test_summary_judgement.rb

@@ -13,6 +13,8 @@ class TestSummaryJudgement < Test::Unit::TestCase
     @anne = Librarian.new
     @seamus = Enthusiast.new
     @new_releases = Shelf.new # empty!
+    @new_magazines = Rack.new # empty!
+    @browsing_section = Catalog.new @new_releases, @new_magazines
   end
   
   def test_setup
@@ -96,4 +98,8 @@ class TestSummaryJudgement < Test::Unit::TestCase
     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
+  
+  def test_delegated_placeholders
+    assert_equal 'You have an empty shelf and have an empty rack', @browsing_section.summary(:conjugate => :second, :subject => true)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: summary_judgement
 version: !ruby/object:Gem::Version 
-  version: 1.3.6
+  version: 1.3.7
 platform: ruby
 authors: 
 - Andy Rossmeissl