leap 0.5.6 → 0.5.7

data/lib/leap/decision.rb

@@ -32,10 +32,9 @@ module Leap
     #
     # General you won't call this directly, but rather use the dynamically-created method with this decision's goal as its name on the subject instance.
     # @see Leap::GoalMethodsDocumentation
-    def make(characteristics, *considerations)
+    def make(characteristics, options, *considerations)
       Leap.log.decision "Leaping to conclusion", goal
       Leap.log.decision "Initial characteristics: #{characteristics.inspect}", goal
-      options = considerations.extract_options!
       committees.reject { |c| characteristics.keys.include? c.name }.reverse.inject(Deliberation.new(characteristics)) do |deliberation, committee|
         Leap.instrument.committee committee.name do
           if report = committee.report(deliberation.characteristics, considerations, options)

data/lib/leap/deliberation.rb

@@ -19,14 +19,39 @@ module Leap
     def [](characteristic)
       characteristics[characteristic]
     end
+
+    # Convenience method to access a certain committee's report within this deliberation.
+    # @param [Symbol] committee
+    def report(committee)
+      reports.find { |r| r.committee.name == committee }
+    end
     
     # Report which named protocols the deliberation incidentally complied with.
+    # @param [Symbol, optional] committee If provided, Leap will compute this decision's compliance with respect only to this particular conclusion within it. If not provided, compliance will be computed for the entire decision.
     # @return [Array]
-    def compliance
+    def compliance(committee = nil)
+      (committee ? compliance_from(committee) : general_compliance) || []
+    end
+
+    private
+
+    def general_compliance
       reports.map(&:quorum).map(&:compliance).inject do |memo, c|
-        next c unless memo
         memo & c
       end
     end
+
+    def compliance_from(committee)
+      if report = report(committee)
+        compliance = report.quorum.requirements.inject(nil) do |memo, requirement|
+          if subcompliance = compliance_from(requirement)
+            memo ? memo & subcompliance : subcompliance
+          else
+            memo
+          end
+        end
+        report.quorum.compliance & (compliance || report.quorum.compliance)
+      end
+    end
   end
 end

data/lib/leap/goal_methods_documentation.rb

@@ -10,7 +10,7 @@ module Leap
     #   
     #   @param [optional, Array] considerations An ordered array of additional details, immutable during the course of deliberation, that should be made available to each committee for provision, upon request, to quorums.
     #   @param [optional, Hash] options Additional options
-    #   @option comply Force the ensuing deliberation to comply with one or more "protocols" by only respecting quorums that comply with this (these) protocol(s). Protocols can be anything--a Fixnum, a String, whatever, but by tradition a Symbol. If compliance is required with multiple protocols, they should be passed in an Array.
+    #   @option comply Force the ensuing deliberation to comply with one or more "protocols" by only respecting quorums that comply with this (these) protocol(s). Protocols can be anything--a Fixnum, a String, whatever, but by tradition a Symbol. If compliance is required with multiple protocols, they should be passed in an Array. If complex compliance is desired, where certain conclusions must comply with specific protocols, use a Hash in the form of <tt>{ :first_protocol => [:a_committee, :another_committee], :second_protocol => :another_committee }</tt>.
     #   @return The value of the newly-decided goal--or, if there is no committee with the same name as the goal, a hash of committee reports
     #   @raise [Leap::NoSolutionError] Leap could not compute the decision's goal on this subject instance given its characteristics and compliance constraint. 
     def method_missing(*args, &blk)

data/lib/leap/no_solution_error.rb

@@ -29,7 +29,7 @@ module Leap
     def deliberation_report
       @deliberation.characteristics.keys.sort_by(&:to_s).map do |characteristic|
         statement = "#{characteristic}: "
-        if report = @deliberation.reports.find { |r| r.committee.name == characteristic }
+        if report = @deliberation.report(characteristic)
           statement << report.quorum.name.humanize.downcase
         else
           statement << 'provided as input'

data/lib/leap/subject.rb

@@ -51,15 +51,23 @@ module Leap
       Blockenspiel.invoke(blk, decisions[goal])
       define_method goal do |*considerations|
         Leap.instrument.decision goal do
+          options = considerations.extract_options!
           @deliberations ||= {}
           decision = self.class.decisions[goal]
           characteristics = send(decision.signature_method)
-          @deliberations[goal] = decision.make(characteristics, *considerations)
+          @deliberations[goal] = decision.make(characteristics, options, *considerations)
           if decision.mastered? and @deliberations[goal][goal].nil? 
             raise ::Leap::NoSolutionError, :goal => goal, :deliberation => @deliberations[goal]
           elsif decision.mastered?
             Leap.log.decision "Success", goal
             @deliberations[goal][goal]
+          elsif options[:comply].is_a? Hash
+            options[:comply].each do |protocol, committees|
+              [committees].flatten.each do |committee|
+                @deliberations[goal].compliance(committee).include?(protocol) or raise ::Leap::NoSolutionError, :goal => committee, :deliberation => @deliberations[goal]
+              end
+            end
+            Leap.log.decision "Success", goal
           else
             Leap.log.decision "Success", goal
             @deliberations[goal]

data/lib/leap/version.rb

@@ -1,3 +1,3 @@
 module Leap
-  VERSION = "0.5.6"
+  VERSION = "0.5.7"
 end

data/test/helper.rb

@@ -120,14 +120,29 @@ class Seamus
   end
 end
 
-class Idea
+class Idea < Struct.new(:gotchas, :caveats)
+  def to_hash() Hash[members.zip(values)].reject {|_,v| v.nil?} end
+  
   include Leap
-  decide :value do
+  decide :value, :with => :to_hash do
     committee :cost do
-      quorum('default') {0}
+      quorum 'based on estimate of hangups', :needs => :hangups, :complies => :common_sense do |characteristics|
+        characteristics[:hangups]
+      end
     end
     committee :benefit do
+      quorum 'based on caveats', :needs => :caveats, :complies => :wisdom do |characteristics|
+        10 - characteristics[:caveats]
+      end
+    end
+    committee :caveats do
       quorum('default') {1}
     end
+    committee :hangups do
+      quorum 'based on estimate of gotchas', :needs => :gotchas, :complies => :common_sense do |characteristics|
+        characteristics[:gotchas]
+      end
+      quorum('default') {0}
+    end
   end
 end

data/test/test_leap.rb

@@ -161,15 +161,50 @@ class TestLeap < Test::Unit::TestCase
   context 'A decision without a master committee' do
     setup do
       @idea = Idea.new
+      @bad_idea = Idea.new(100, 10) # gotchas, caveats
     end
     
     should 'still compute' do
       @idea.value
-      assert_equal({:cost => 0, :benefit => 1}, @idea.deliberations[:value].characteristics)
+      assert_equal({:cost => 0, :benefit => 9, :caveats => 1, :hangups => 0}, @idea.deliberations[:value].characteristics)
     end
     
     should 'provide easy access to committee reports' do
       assert_equal 0, @idea.value[:cost]
     end
+    
+    should 'provide compliance specific to a certain conclusion' do
+      # If hangups does not comply with common sense, neither should cost
+      assert_equal [], @idea.deliberations[:value].compliance(:hangups)
+      assert_equal [], @idea.deliberations[:value].compliance(:benefit)
+      assert_equal [], @idea.deliberations[:value].compliance(:cost)
+      
+      # If hangups complies with common sense, cost should also
+      assert_equal [:common_sense], @bad_idea.deliberations[:value].compliance(:hangups)
+      assert_equal [:common_sense], @bad_idea.deliberations[:value].compliance(:cost)
+      
+      # User input complies with all standards
+      assert_equal [:wisdom], @bad_idea.deliberations[:value].compliance(:benefit)
+    end
+    
+    should 'only return compliant values when compliance is requested and endpoint is unknown' do
+      # Nothing complies
+      assert_equal({}, @idea.value(:comply => :common_sense).characteristics)
+      
+      # Everything but benefit complies
+      assert_equal({:gotchas => 100, :caveats => 10, :hangups => 100, :cost => 100}, @bad_idea.value(:comply => :common_sense).characteristics)
+    end
+    
+    should 'return an error message when known endpoint cannot be achieved' do
+      exception = assert_raise ::Leap::NoSolutionError do
+        @idea.value(:comply => { :common_sense => :benefit })
+      end
+      assert_match(/No solution was found for "benefit"/, exception.message)
+      
+      exception = assert_raise ::Leap::NoSolutionError do
+        @bad_idea.value(:comply => { :common_sense => :benefit })
+      end
+      assert_match(/No solution was found for "benefit"/, exception.message)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: leap
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
   prerelease: 
 platform: ruby
 authors:
@@ -15,7 +15,7 @@ date: 2011-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: charisma
-  requirement: &10759248 !ruby/object:Gem::Requirement
+  requirement: &6662508 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: 0.2.0
   type: :development
   prerelease: false
-  version_requirements: *10759248
+  version_requirements: *6662508
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &10758996 !ruby/object:Gem::Requirement
+  requirement: &6662088 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10758996
+  version_requirements: *6662088
 - !ruby/object:Gem::Dependency
   name: bueller
-  requirement: &10758720 !ruby/object:Gem::Requirement
+  requirement: &6661620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10758720
+  version_requirements: *6661620
 - !ruby/object:Gem::Dependency
   name: blockenspiel
-  requirement: &10758420 !ruby/object:Gem::Requirement
+  requirement: &6661068 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: 0.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *10758420
+  version_requirements: *6661068
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &10758120 !ruby/object:Gem::Requirement
+  requirement: &6660456 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: 2.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *10758120
+  version_requirements: *6660456
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &10757892 !ruby/object:Gem::Requirement
+  requirement: &6660096 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10757892
+  version_requirements: *6660096
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &10757616 !ruby/object:Gem::Requirement
+  requirement: &6659700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,7 +89,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10757616
+  version_requirements: *6659700
 description: Leap to conclusions
 email: andy@rossmeissl.net
 executables: []
@@ -132,7 +132,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 744383405
+      hash: 545920577
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 744383405
+      hash: 545920577
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11