summary_judgement 1.1.0 → 1.2.0

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/lib/summary_judgement/core_extensions.rb

@@ -1,6 +1,12 @@
 class String
   def indefinite_article
-    %w(a e i o u).include?(first.downcase) ? 'an' : 'a'
+    if WORDS_WITH_INITIAL_VOWELS_THAT_ACT_LIKE_WORDS_WITH_INITIAL_CONSONANTS.include? first_word.first_term
+      INDEFINITE_ARTICLES[:consonant]
+    elsif VOWELS.include? first.downcase
+      INDEFINITE_ARTICLES[:vowel]
+    else
+      INDEFINITE_ARTICLES[:consonant]
+    end
   end
 
   def with_indefinite_article(upcase = false)
@@ -10,4 +16,24 @@ class String
   def pluralize_on(qty)
     qty.is_a?(Numeric) and qty > 1 ? pluralize : self
   end
+  
+  def first_word
+    split(' ').first
+  end
+  
+  def first_term
+    split('-').first
+  end
+  
+  WORDS_WITH_INITIAL_VOWELS_THAT_ACT_LIKE_WORDS_WITH_INITIAL_CONSONANTS = %w(one)
+  INDEFINITE_ARTICLES = { :vowel => 'an', :consonant => 'a'}
+  VOWELS = %w(a e i o u)
+end
+
+class Object
+  def recursive_send(*methods)
+    return self if methods.empty?
+    m = methods.shift
+    send(m).recursive_send(*methods)
+  end
 end

data/lib/summary_judgement/instance_methods.rb

@@ -9,7 +9,7 @@ module SummaryJudgement
     end
     
     def term
-      self.class.summary.class.render self.class.summary.term, self
+      self.class.summary.class.render self.class.summary.terms.find { |t| t.condition.nil? or self.class.summary.class.render(t.condition, self) }.phrase, self
     end
     
     def adjectives
@@ -21,7 +21,9 @@ module SummaryJudgement
     end
     
     def children
-      self.class.summary.class.render self.class.summary.subordinates, self
+      subordinates = self.class.summary.class.render(self.class.summary.subordinates, self)
+      subordinates.flatten! if subordinates.respond_to? :flatten!
+      subordinates
     end
     
     def canopy
@@ -33,7 +35,7 @@ module SummaryJudgement
     
     def summarize_as_leaf(options = {})
       options.reverse_merge! :capitalize_indefinite_article => true
-      "#{adjectives.join(' ').strip.with_indefinite_article(options[:capitalize_indefinite_article])} #{term} #{modifiers.join(' ')}".strip
+      "#{adjectives.join(' ').strip.concat(' ').concat(term).strip.with_indefinite_article(options[:capitalize_indefinite_article])} #{modifiers.join(' ')}".strip
     end
     
     def summarize_as_branch(options = {})

data/lib/summary_judgement/summary.rb

@@ -1,10 +1,10 @@
 module SummaryJudgement
   class Summary
-    attr_reader :term, :adjectives, :modifiers, :subordinates, :base
+    attr_reader :terms, :adjectives, :modifiers, :subordinates, :base
     
     def initialize(base, options = {}, &blk)
       @base = base
-      @term = options[:term] || base.to_s
+      @terms = options[:terms] || []
       @adjectives = options[:adjectives] || []
       @modifiers = options[:modifiers] || []
       @subordinates = options[:subordinates] || []
@@ -14,8 +14,8 @@ module SummaryJudgement
       yield self
     end
     
-    def identity(t)
-      @term = t
+    def identity(t = nil, options = {})
+      @terms << SummaryJudgement::Descriptor.new(t || @base.to_s.underscore.humanize.downcase, options)
     end
     
     def adjective(a, options = {})
@@ -26,12 +26,14 @@ module SummaryJudgement
       @modifiers << SummaryJudgement::Descriptor.new(m, options)
     end
     
-    def children(collection_or_symbol)
-      case collection_or_symbol
-      when Symbol
-        @subordinates << lambda { |parent| parent.send collection_or_symbol }
-      else
-        @subordinates << collection_or_symbol
+    def children(*collections_or_symbols)
+      collections_or_symbols.each do |collection_or_symbol|
+        case collection_or_symbol
+        when Symbol
+          @subordinates << lambda { |parent| parent.send collection_or_symbol }
+        else
+          @subordinates << collection_or_symbol
+        end
       end
     end
     
@@ -44,7 +46,16 @@ module SummaryJudgement
     end
     
     def to_hash
-      { :adjectives => @adjectives.dup, :modifiers => @modifiers.dup, :subordinates => @subordinates.dup, :term => @term.dup }
+      [:adjectives, :modifiers, :subordinates, :terms].inject({}) do |properties, property|
+        val = instance_variable_get :"@#{property}"
+        case val
+        when Symbol
+          properties[property] = val
+        else
+          properties[property] = val.clone
+        end
+        properties
+      end
     end
     
     def dup(base)
@@ -55,7 +66,13 @@ module SummaryJudgement
       def render(obj, context)
         case obj
         when Array
-          obj.empty? ? nil : obj.map {|o| render o, context}
+          if obj.empty?
+            nil
+          elsif obj.all? { |e| e.is_a? Symbol }
+            context.recursive_send(*obj)
+          else
+            obj.empty? ? nil : obj.map {|o| render o, context}
+          end
         when String
           obj
         when Symbol

data/lib/summary_judgement.rb

@@ -3,15 +3,16 @@ require 'verbs'
 
 module SummaryJudgement
   def self.extended(base)
+    base.initialize_summary Summary.new(base)
+    base.send :include, InstanceMethods
     def base.inherited(subclass)
       subclass.initialize_summary @summary.dup(subclass)
+      super
     end
   end
   
   def summarize(&blk)
-    @summary ||= Summary.new(self)
     @summary.define(&blk)
-    send :include, InstanceMethods
   end
   
   def summary

data/summary_judgement.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{summary_judgement}
-  s.version = "1.1.0"
+  s.version = "1.2.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-03}
+  s.date = %q{2009-12-07}
   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

@@ -68,8 +68,7 @@ class Library
   
   extend SummaryJudgement
   summarize do |has|
-    has.children :books
-    has.children :magazines
+    has.children :books, :magazines
     has.verb :have
   end
 end
@@ -86,3 +85,28 @@ class Catalog
     has.verb :contain
   end
 end
+
+class Employee
+  extend SummaryJudgement
+end
+
+class Librarian < Employee
+  summarize do |has|
+    has.identity 'bookworm', :if => lambda { false }
+    has.identity
+  end
+end
+
+class Customer
+  extend SummaryJudgement
+  
+  summarize do |has|
+    has.identity [:label, :downcase]
+  end
+end
+
+class Enthusiast < Customer
+  def label
+    'AVID READER'
+  end
+end

data/test/test_summary_judgement.rb

@@ -10,18 +10,21 @@ class TestSummaryJudgement < Test::Unit::TestCase
     @toilet = Library.new @neuromancer, @current_economist
     @bedstand = Library.new @neuromancer
     @catalog = Catalog.new @bookshelf, @toilet
+    @anne = Librarian.new
+    @seamus = Enthusiast.new
   end
   
   def test_setup
     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
   
   def test_summary_definition
     assert_equal SummaryJudgement::Summary, Book.summary.class
-    assert_equal Proc, Book.summary.term.class
+    assert_equal Proc, Book.summary.terms.first.phrase.class
     assert_equal [SummaryJudgement::Descriptor], Book.summary.adjectives.collect { |a| a.class }.uniq
     assert_equal :have, Library.summary.predicate
   end
@@ -73,5 +76,14 @@ class TestSummaryJudgement < Test::Unit::TestCase
   
   def test_inheritance
     assert_equal 'A hardcover novel by William Gibson', @first_edition_neuromancer.summary
-  end  
+    assert_equal 'A librarian', @anne.summary
+  end
+  
+  def test_lazily_inherited_summary_definitions
+    assert_equal 'An avid reader', @seamus.summary
+  end
+  
+  def test_recursive_send_core_extension
+    assert_equal 'foo bar', 'foo_bar'.recursive_send(:humanize, :downcase)
+  end
 end

metadata

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