uber 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c041fd887390fe14c2105874c29871320872be44
-  data.tar.gz: 255a4728ff3a6e9afd5b37abdc636f69176c6b1e
+  metadata.gz: 8b1c72fd6f3f99e2d92ee6bba306785d88b64963
+  data.tar.gz: 01443d5ec98cee53824c305ffa5203030849b33a
 SHA512:
-  metadata.gz: 920346ed6d820f7ec4d85f9876498a92a98cae168749ef55cb1b7c2a8ad07c1cc897276e4a6bb3f775791e4b52355c398f7ee5798e5b9c04cef5b5f6d61a2b64
-  data.tar.gz: d7fd5fae927d359a8763bf79557161c688833b4a1fe2f7356a18d1bdbdd13e7c9d76bc2e4dc2d2318d39f0ebbd009592a5d43de94eded447103702d17d4624ba
+  metadata.gz: 39ccf2b0c211ae18559d825ae4613c450e2c38b63a692d5ad86b5da51f33f32bc05100869f0ecdcadce2888d01be5af3017bee1db16bbc2eef9b31d1b455e2fa
+  data.tar.gz: 11e6460fafc4153976248595236e08bc543c11ba32252bfe0708b454c32b8ba335a01f5c7c149742869ff0c89b2bf1f313cb188746cb0d17d07056c141ddae37

data/CHANGES.md

@@ -1,3 +1,7 @@
+# 0.0.7
+
+* Add `Uber::Callable` and support for it in `Options::Value`.
+
 # 0.0.6
 
 * Fix `Version#>=` partially.

data/README.md

@@ -108,9 +108,32 @@ The default behaviour is to treat `Proc`s, lambdas and symbolized `:method` name
 
 This is a pattern well-known from Rails and other frameworks.
 
+## Uber::Callable
+
+A third way of providing a dynamic option is using a "callable" object. This saves you the unreadable lambda syntax and gives you more flexibility.
+
+```ruby
+require 'uber/callable'
+class Tags
+  include Uber::Callable
+
+  def call(context, *args)
+    [:comment]
+  end
+end
+```
+
+By including `Uber::Callable`, uber will invoke the `#call` method on the specified object.
+
+Note how you simply pass an instance of the callable object into the hash instead of a lambda.
+
+```ruby
+options = Uber::Options.new(tags: Tags.new)
+```
+
 ## Evaluating Elements
 
-If you wanna evaluate a single option element, use `#eval`.
+If you want to evaluate a single option element, use `#eval`.
 
 ```ruby
 options.eval(:ttl, user) #=> "n/a"

data/lib/uber/callable.rb

@@ -0,0 +1,7 @@
+module Uber
+  # Include this module into a class or extend an object to mark it as callable.
+  # E.g., in a dynamic option in Options::Value it will be treated like a Proc object
+  # and invoked with +#call+.
+  module Callable
+  end
+end

data/lib/uber/options.rb

@@ -1,3 +1,5 @@
+require 'uber/callable'
+
 module Uber
   class Options < Hash
     def initialize(options)
@@ -43,13 +45,13 @@ module Uber
       def initialize(value, options={})
         @value, @dynamic = value, options[:dynamic]
 
-        @callable = true if @value.kind_of?(Proc)
+        @proc     = proc?
+        @callable = callable?
+        @method   = method?
 
         return if options.has_key?(:dynamic)
 
-        # conventional behaviour:
-        @dynamic = true if @callable
-        @dynamic = true if @value.is_a?(Symbol)
+        @dynamic = @proc || @callable || @method
       end
 
       def evaluate(context, *args)
@@ -64,9 +66,10 @@ module Uber
 
     private
       def evaluate_for(*args)
-        return method!(*args) unless callable?
+        return proc!(*args)     if @proc
+        return callable!(*args) if @callable
+        method!(*args)
          # TODO: change to context.instance_exec and deprecate first argument.
-         proc!(*args)
       end
 
       def method!(context, *args)
@@ -77,8 +80,21 @@ module Uber
         context.instance_exec(*args, &@value)
       end
 
+      # Callable object is executed in its original context.
+      def callable!(context, *args)
+        @value.call(context, *args)
+      end
+
+      def proc?
+        @value.kind_of?(Proc)
+      end
+
       def callable?
-        @callable
+        @value.is_a?(Uber::Callable)
+      end
+
+      def method?
+        @value.is_a?(Symbol)
       end
     end
   end

data/lib/uber/uber_version.rb

@@ -1,3 +1,3 @@
 module Uber
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/test/inheritance_test.rb

@@ -21,6 +21,9 @@ class InheritanceTest < MiniTest::Spec
 
     CODE_BLOCK = lambda { |base| base.class_eval { extend ClassMethods } } # i want that to be executed at every include
 
+    instance_exec do
+      @block = CODE_BLOCK # this would happen in inherited_included do .. end
+    end
 
     def self.included(includer) #
       # CODE_BLOCK.call(base)

data/test/options_test.rb

@@ -5,16 +5,24 @@ class UberOptionTest < MiniTest::Spec
   Value = Uber::Options::Value
   let (:object) { Object.new }
 
+  class Callable
+    include Uber::Callable
+    def call(*); 999 end
+  end
+
   describe "#dynamic?" do
-    it { Value.new(1).dynamic?.must_equal nil }
-    it { Value.new(true).dynamic?.must_equal nil }
-    it { Value.new("loud").dynamic?.must_equal nil }
+    it { Value.new(1).dynamic?.must_equal false }
+    it { Value.new(true).dynamic?.must_equal false }
+    it { Value.new("loud").dynamic?.must_equal false }
     it { Value.new(:loud, :dynamic => false).dynamic?.must_equal false }
     it { Value.new("loud", :dynamic => true).dynamic?.must_equal true }
 
     it { Value.new(lambda {}).dynamic?.must_equal true }
     it { Value.new(Proc.new{}).dynamic?.must_equal true }
     it { Value.new(:method).dynamic?.must_equal true }
+
+    # Uber::Callable
+    it { Value.new(Callable.new).dynamic?.must_equal true }
   end
 
   describe "#evaluate" do
@@ -30,14 +38,19 @@ class UberOptionTest < MiniTest::Spec
     it { Value.new(:version, :dynamic => false).evaluate(object.extend(version)).must_equal :version }
 
     it { Value.new(lambda { :loud }, :dynamic => true).evaluate(object).must_equal :loud }
+
+    # Uber::Callable
+    it { Value.new(Callable.new).evaluate(nil).must_equal 999 }
   end
 
   describe "passing options" do
     let (:version) { Module.new { def version(*args); args.inspect end } }
     let (:block) { Proc.new { |*args| args.inspect } }
+    let (:callable) { (Class.new { include Uber::Callable; def call(*args); args.inspect; end }).new }
 
     it { Value.new(:version).evaluate(object.extend(version), 1, 2, 3).must_equal "[1, 2, 3]" }
     it { Value.new(block).evaluate(object, 1, 2, 3).must_equal "[1, 2, 3]" }
+    it { Value.new(callable).evaluate(Object, 1, 2, 3).must_equal "[Object, 1, 2, 3]" }
   end
 
   # it "speed" do

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: uber
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-08 00:00:00.000000000 Z
+date: 2014-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.10.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.10.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 5.0.0
 description: A gem-authoring framework.
@@ -45,13 +45,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - CHANGES.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - lib/uber.rb
+- lib/uber/callable.rb
 - lib/uber/inheritable_attr.rb
 - lib/uber/options.rb
 - lib/uber/uber_version.rb
@@ -73,17 +74,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Gem-authoring tools like class method inheritance in modules, dynamic options
@@ -95,4 +96,3 @@ test_files:
 - test/test_helper.rb
 - test/version_test.rb
 - test/zeugs.rb
-has_rdoc: