ns-options 1.1.3 → 1.1.4

data/lib/ns-options/option.rb

@@ -38,13 +38,8 @@ module NsOptions
     # if reading a lazy_proc, call the proc and return its coerced return val
     # otherwise, just return the stored value
     def value
-      if self.lazy_proc?(@value)
-        self.coerce(@value.call)
-      elsif @value.respond_to?(:returned_value)
-        @value.returned_value
-      else
-        @value
-      end
+      val = self.lazy_proc?(@value) ? self.coerce(@value.call) : @value
+      val.respond_to?(:returned_value) ? val.returned_value : val
     end
 
     def value=(new_value)

data/lib/ns-options/version.rb

@@ -1,3 +1,3 @@
 module NsOptions
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 end

data/test/unit/option_tests.rb

@@ -520,6 +520,9 @@ class NsOptions::Option
     should "should honor `returned_value` when returning option values" do
       @hosted_at.value = "path/to/resource/"
       assert_equal '/path/to/resource', @hosted_at.value
+
+      @hosted_at.value = proc{ "path/to/resource/" }
+      assert_equal '/path/to/resource', @hosted_at.value
     end
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ns-options
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: 
   segments: 
   - 1
   - 1
-  - 3
-  version: 1.1.3
+  - 4
+  version: 1.1.4
 platform: ruby
 authors: 
 - Collin Redding
@@ -16,12 +16,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-26 00:00:00 Z
+date: 2013-05-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: assert
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -31,8 +30,9 @@ dependencies:
         - 2
         - 0
         version: "2.0"
+  requirement: *id001
+  name: assert
   type: :development
-  version_requirements: *id001
 description: A DSL for defining, organizing and accessing options.
 email: 
 - collin.redding@me.com
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A DSL for defining, organizing and accessing options.