summary_judgement 1.3.4 → 1.3.6

data/VERSION

@@ -1 +1 @@
-1.3.4
+1.3.6

data/lib/summary_judgement/core_extensions.rb

@@ -1,6 +1,6 @@
 class String
   def indefinite_article
-    if WORDS_WITH_INITIAL_VOWELS_THAT_ACT_LIKE_WORDS_WITH_INITIAL_CONSONANTS.include? first_word.first_term
+    if WORDS_WITH_INITIAL_VOWELS_THAT_ACT_LIKE_WORDS_WITH_INITIAL_CONSONANTS.include? first_word.first_term.downcase
       INDEFINITE_ARTICLES[:consonant]
     elsif VOWELS.include? first.downcase
       INDEFINITE_ARTICLES[:vowel]
@@ -25,7 +25,7 @@ class String
     split('-').first
   end
   
-  WORDS_WITH_INITIAL_VOWELS_THAT_ACT_LIKE_WORDS_WITH_INITIAL_CONSONANTS = %w(one)
+  WORDS_WITH_INITIAL_VOWELS_THAT_ACT_LIKE_WORDS_WITH_INITIAL_CONSONANTS = %w(one united)
   INDEFINITE_ARTICLES = { :vowel => 'an', :consonant => 'a'}
   VOWELS = %w(a e i o u)
 end

data/lib/summary_judgement/instance_methods.rb

@@ -1,7 +1,7 @@
 module SummaryJudgement
   module InstanceMethods
     def summary(options = {})
-      if children and !children.empty?
+      if children and !canopy.empty?
         summarize_as_branch(options)
       elsif !self.class.summary.subordinates.empty?
         summarize_as_bare_branch(options)
@@ -77,9 +77,9 @@ module SummaryJudgement
       verbosity = canopy.length <= verbosity if verbosity.is_a? Fixnum
       
       tufts = organize_leaves(*leaves)
+      connector = (verbosity and tufts.values.any? {|t| t.length > 2}) ? ';' : ','
       first_tuft = tufts.shift
-      connector = verbosity ? ';' : ','
-      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 => "#{connector} ", :last_word_connector => "#{connector} and")
+      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 => "#{connector} ", :last_word_connector => "#{connector} and ")
     end
 
     def summarize_as_bare_branch(options = {})
@@ -95,10 +95,11 @@ module SummaryJudgement
         when TrueClass
           options[:person] ||= :third
         end
-        result << Verbs::Conjugator.conjugate(self.class.summary.predicate, options.slice(:person, :subject, :tense, :plurality)).to_s.humanize
+        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
+      result << self.class.summary.class.render(self.class.summary.default, self).with_indefinite_article(!conjugation)
     end
     
     def organize_leaves(*leaves)
@@ -118,7 +119,7 @@ module SummaryJudgement
         tuft_summary << ' '
       end
       if verbosity
-        if conjugation
+        if conjugation or !options[:capitalize_anonymous]
           tuft_summary << siblings.map { |leaf| leaf.summary :capitalize_indefinite_article => false }.to_sentence
         else
           first_sibling = siblings.shift

data/summary_judgement.gemspec

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

metadata

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