leap 0.4.4 → 0.4.5

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.4.5

data/leap.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{leap}
-  s.version = "0.4.4"
+  s.version = "0.4.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andy Rossmeissl", "Seamus Abshere"]
-  s.date = %q{2010-10-28}
+  s.date = %q{2010-11-04}
   s.description = %q{Leap to conclusions}
   s.email = %q{andy@rossmeissl.net}
   s.extra_rdoc_files = [

data/lib/leap/committee.rb

@@ -9,11 +9,11 @@ module Leap
       @quorums = []
     end
     
-    def report(characteristics, considerations, options = {})
+    def report(subject, characteristics, considerations, options = {})
       quorums.grab do |quorum|
         next unless quorum.satisfied_by? characteristics and quorum.complies_with? Array.wrap(options[:comply])
         if conclusion = quorum.acknowledge(characteristics.slice(*quorum.characteristics), considerations.dup)
-          ::Leap::Report.new self, quorum => conclusion
+          ::Leap::Report.new subject, self, quorum => conclusion
         end
       end
     end

data/lib/leap/decision.rb

@@ -8,10 +8,11 @@ module Leap
       @committees = []
     end
     
-    def make(characteristics, *considerations)
+    def make(subject, *considerations)
+      characteristics = subject.send(subject.class.decisions[goal].signature_method)
       options = considerations.extract_options!
       committees.reject { |c| characteristics.keys.include? c.name }.reverse.inject(Deliberation.new(characteristics)) do |deliberation, committee|
-        if report = committee.report(deliberation.characteristics, considerations, options)
+        if report = committee.report(subject, deliberation.characteristics, considerations, options)
           deliberation.reports.unshift report
           deliberation.characteristics[committee.name] = report.conclusion
         end

data/lib/leap/report.rb

@@ -2,19 +2,28 @@ module Leap
   class Report
     include XmlSerializer
 
-    attr_reader :committee, :conclusion, :quorum
+    attr_reader :subject, :committee, :conclusion, :quorum
     
-    def initialize(committee, report)
+    def initialize(subject, committee, report)
       raise ArgumentError, 'Reports must identify themselves' unless committee.is_a?(::Leap::Committee)
+      @subject = subject
       @committee = committee
       raise ArgumentError, 'Please report with quorum => conclusion' unless report.is_a?(Hash) and report.length == 1
       @quorum, @conclusion = report.first
     end
 
+    def formatted_conclusion
+      return @formatted_conclusion unless @formatted_conclusion.nil?
+      if characteristic = subject.class.characteristics[committee.name]
+        @formatted_conclusion = characteristic.display committee.name => conclusion
+      end
+      @formatted_conclusion ||= conclusion
+    end
+
     def as_json(*)
       {
         'committee' => committee.as_json,
-        'conclusion' => conclusion,
+        'conclusion' => formatted_conclusion,
         'quorum' => quorum.as_json
       }
     end
@@ -23,7 +32,7 @@ module Leap
       super options do |xml|
         xml.report do |report_block|
           committee.to_xml(options.merge :skip_instruct => true, :builder => report_block)
-          report_block.conclusion conclusion, :type => conclusion.class.to_s.downcase
+          report_block.conclusion formatted_conclusion, :type => formatted_conclusion.class.to_s.downcase
           quorum.to_xml(options.merge :skip_instruct => true, :builder => report_block)
         end
       end

data/lib/leap/subject.rb

@@ -12,7 +12,7 @@ module Leap
       define_method goal do |*considerations|
         options = considerations.extract_options!
         @deliberations ||= {}
-        @deliberations[goal] = self.class.decisions[goal].make(send(self.class.decisions[goal].signature_method), *considerations.push(options))
+        @deliberations[goal] = self.class.decisions[goal].make(self, *considerations.push(options))
         @deliberations[goal][goal] or raise ::Leap::NoSolutionError
       end
     end

data/test/leap/test_report.rb

@@ -1,22 +1,33 @@
 require 'helper'
 
+class Vagabond
+  include Characterizable
+
+  characterize do
+    has :scruples
+    has :tenacity do
+      displays { |t| "ferocious" }
+    end
+  end
+end
+
 class Leap::ReportTest < Test::Unit::TestCase
   context 'to_xml' do
     should 'serialize to xml' do
       choc = Leap::Quorum.new('with chocolate chips', {}, Proc.new {})
       mac = Leap::Quorum.new('with macadamia nuts', {}, Proc.new {})
-      committee = Leap::Committee.new 'Senate Committee on Chocolate Cookies'
+      committee = Leap::Committee.new :scruples
       committee.instance_variable_set :@quorums, [choc, mac]
 
-      report = Leap::Report.new committee, choc => 'good'
+      report = Leap::Report.new Vagabond.new, committee, choc => 'good'
 
       output = ''
       report.to_xml(:target => output)
-      assert_equal(<<XML, output)
+      assert_equal(<<-XML, output)
 <?xml version=\"1.0\" encoding=\"UTF-8\"?>
 <report>
   <committee>
-    <name type="string">Senate Committee on Chocolate Cookies</name>
+    <name type="string">scruples</name>
     <quorums type="array">
       <quorum>
         <name type="string">with chocolate chips</name>
@@ -49,7 +60,75 @@ class Leap::ReportTest < Test::Unit::TestCase
     </complies>
   </quorum>
 </report>
-XML
+      XML
+    end
+    should 'use a custom conclusion' do
+      choc = Leap::Quorum.new('with chocolate chips', {}, Proc.new {})
+      mac = Leap::Quorum.new('with macadamia nuts', {}, Proc.new {})
+      committee = Leap::Committee.new :tenacity
+      committee.instance_variable_set :@quorums, [choc, mac]
+
+      report = Leap::Report.new Vagabond.new, committee, choc => 'tough'
+
+      output = ''
+      report.to_xml :target => output
+      assert_equal(<<-XML, output)
+<?xml version=\"1.0\" encoding=\"UTF-8\"?>
+<report>
+  <committee>
+    <name type="string">tenacity</name>
+    <quorums type="array">
+      <quorum>
+        <name type="string">with chocolate chips</name>
+        <requirements type="array">
+        </requirements>
+        <appreciates type="array">
+        </appreciates>
+        <complies type="array">
+        </complies>
+      </quorum>
+      <quorum>
+        <name type="string">with macadamia nuts</name>
+        <requirements type="array">
+        </requirements>
+        <appreciates type="array">
+        </appreciates>
+        <complies type="array">
+        </complies>
+      </quorum>
+    </quorums>
+  </committee>
+  <conclusion type="string">ferocious</conclusion>
+  <quorum>
+    <name type="string">with chocolate chips</name>
+    <requirements type="array">
+    </requirements>
+    <appreciates type="array">
+    </appreciates>
+    <complies type="array">
+    </complies>
+  </quorum>
+</report>
+      XML
+    end
+  end
+
+  context 'formatted_conclusion' do
+    should 'return the regular conclusion if there is no custom format for the conclusion corresponding characteristic' do
+      choc = Leap::Quorum.new('with chocolate chips', {}, Proc.new {})
+      committee = Leap::Committee.new :scruples
+      committee.instance_variable_set :@quorums, [choc]
+
+      report = Leap::Report.new Vagabond.new, committee, choc => 'good'
+      assert_equal 'good', report.formatted_conclusion
+    end
+    should 'return the formatted conclusion if there is a custom format for the conclusion corresponding characteristic' do
+      choc = Leap::Quorum.new('with chocolate chips', {}, Proc.new {})
+      committee = Leap::Committee.new :tenacity
+      committee.instance_variable_set :@quorums, [choc]
+
+      report = Leap::Report.new Vagabond.new, committee, choc => 'good'
+      assert_equal 'ferocious', report.formatted_conclusion
     end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 4
-  version: 0.4.4
+  - 5
+  version: 0.4.5
 platform: ruby
 authors: 
 - Andy Rossmeissl
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-28 00:00:00 -04:00
+date: 2010-11-04 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency