opto 1.8.2 → 1.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f08a0ec227631377b328f07f87e3b0ff2f1e2def
-  data.tar.gz: 3af3a7c0077be8a24f304789a14dfbc970162e0e
+  metadata.gz: 2d154fe92a61aa8299e7275cb82e22e659becbae
+  data.tar.gz: 572aff6816d0aaf364482f0543c6a68a30a5a981
 SHA512:
-  metadata.gz: eb8f310f22ded339e110e98ca00d01f4f2922307ca3697b7c1dd4e989183fd160a3ecd123238d6abe0a9ca1d72981e001e1eb2ae2050f69cdb51ef76a35a81c7
-  data.tar.gz: c6472dfea318ad51b7c85148d66b63580216266d08fe0250ff1f1638a11033272635c47480bd872eb40af19c9b573507ad83a4c6c4d9a8ea758a8a2557a2d911
+  metadata.gz: ef4277e6893c6cc03226c982821c98079eb8154562f59405d7f0493b5a719dc1c105e8765791afa6f0e3c3bb881f399c5101003e09e200162341ad8b6f0d4ef0
+  data.tar.gz: 5b6bb2f4d14ade307209de3a83e2e97f45ab4cfd3c9f904388f100ffcdde2d8b5d7f85fa8a25fe216321d0971495db0451225d599b72fdc6828e91ef1c307a47

data/lib/opto/option.rb

@@ -199,13 +199,11 @@ module Opto
     def resolve
       resolvers.each do |resolver|
         begin
-          resolver.respond_to?(:before) && resolver.before(self)
-          result = resolver.resolve
-          resolver.respond_to?(:after) && resolver.after(self)
+          result = resolver.try_resolve
         rescue StandardError => ex
           raise ex, "Resolver '#{resolver.origin}' for '#{name}' : #{ex.message}"
         end
-        if result
+        unless result.nil?
           @origin = resolver.origin
           return result
         end

data/lib/opto/resolver.rb

@@ -43,6 +43,28 @@ module Opto
     def initialize(hint = nil, option = nil)
       @hint = hint
       @option = option
+      @tried = false
+    end
+
+    def tried?
+      !!@tried
+    end
+
+    def set_tried
+      @tried = true
+    end
+
+    def reset_tried
+      @tried = false
+    end
+
+    def try_resolve
+      return nil if tried?
+      set_tried
+      self.respond_to?(:before) && self.before
+      result = resolve
+      self.respond_to?(:after) && self.after
+      result
     end
 
     # This is a "base" class, you're supposed to inherit from this in your resolver and define a #resolve method.

data/lib/opto/resolvers/condition.rb

@@ -79,6 +79,10 @@ module Opto
         matching_condition = conditions.find {|c| c.true? }
         matching_condition.result
       end
+
+      def after
+        reset_tried # conditional value can change if some of the depending variables change values
+      end
     end
   end
 end

data/lib/opto/resolvers/evaluate.rb

@@ -27,6 +27,10 @@ module Opto
           raise TypeError, "Syntax error: '#{interpolated_hint}' does not look like a number or a calculation"
         end
       end
+
+      def after
+        reset_tried
+      end
     end
   end
 end

data/lib/opto/resolvers/interpolate.rb

@@ -25,6 +25,10 @@ module Opto
           option.value_of(var)
         end
       end
+
+      def after
+        reset_tried
+      end
     end
   end
 end

data/lib/opto/version.rb

@@ -1,3 +1,3 @@
 module Opto
-  VERSION = "1.8.2"
+  VERSION = "1.8.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opto
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.8.3
 platform: ruby
 authors:
 - Kimmo Lehto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-06 00:00:00.000000000 Z
+date: 2017-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler