uber 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f71a66b9f3f5b51c0ceb68c2aa396d9f1571d28b
-  data.tar.gz: 243f81afa103da2cc3b1c2d8f9d1445b9acf8013
+  metadata.gz: d35993c8fa8e0378bda6e3207c7a34c79fcaf901
+  data.tar.gz: 57e3c7e6251134b7c38f4e946768f795d842da1e
 SHA512:
-  metadata.gz: c67f0fe6bf6fe588af3848e9a243f4fe5ca2857468c7ccdf9e0100e3a94b717a923e395ec77c2cc31edb301593663f8de6483f06f7cfb6cf53fb603cea1b43a9
-  data.tar.gz: 4c3ef47a30140dc3191d582e678a28362477ec0786ab30194f9434e26ced92bc12ce937385a7848918e715b22218ea7c12329e17bb5f64e65d171f85dd48d730
+  metadata.gz: 02482631941669e1ce796a484b4876e3b9e82dc1a163935579b6ce46acba7a6533ad0b3655df7cb455bec8ac723108ca256c0effb6895a759a584b2e9dd559b4
+  data.tar.gz: 47e7927839f0d30ba4ef9ea11e400b114744d65ade257036d8f018476c17a4ada0bfdaed5c2667d4cd7336987c424d2d298b55717ca5fe8b751ff751b8127023

data/CHANGES.md

@@ -1,3 +1,9 @@
+# 0.0.15
+
+* `Value#evaluate` is now `#call`. This will make it easier to introduce Null objects.
+* Options passed to `::builds` are now wrapped in `Uber::Options::Value` which allows specifying builder _class methods_ using `builds :builder_method`.
+* `Builder::class_builder` now accepts an optional context object which is used to `instance_exec` the builder blocks. This allows to share predefined builder blocks between different classes while resolving the constants in the respective class.
+
 # 0.0.14
 
 * Add `inheritable_attr :title, clone: false`. Thanks to @katafrakt.

data/README.md

@@ -222,7 +222,7 @@ Note how `#title` calls the original title and then downcases the string.
 When included, `Builder` allows to add builder instructions on the class level. These can then be evaluated when instantiating
 the class to conditionally build (sub-)classes based on the incoming parameters.
 
-Builders can be defined in two different ways.
+Builders can be defined in three different ways.
 
 ## Block Syntax
 
@@ -271,6 +271,33 @@ end
 
 This makes the block extremely readable.
 
+## Method Syntax
+
+You can also specify a build method.
+
+```ruby
+build :build_method
+
+def self.build_method(params)
+  return SignedIn if params[:current_user]
+end
+```
+
+The method has to be a class method on the building class.
+
+## Build Context
+
+Normally, build blocks and methods are run in the context where they were defined in. You can change that by passing any context object to `class_builder`.
+
+```ruby
+def self.build(params)
+  class_builder(context_object) # ...
+end
+```
+
+This allows copying builders to other classes and evaluate blocks in the new context.
+
+## More On Builders
 
 Note that builders are _not_ inherited to subclasses. This allows instantiating subclasses directly without running builders.
 

data/lib/uber/builder.rb

@@ -1,3 +1,5 @@
+require "uber/options"
+
 module Uber
   # When included, allows to add builder on the class level.
   #
@@ -28,9 +30,11 @@ module Uber
       end
     end
 
+    # Computes the concrete target class.
     class Constant
-      def initialize(constant) # TODO: evaluate usage of builders and implement using Uber::Options::Value.
+      def initialize(constant, context)
         @constant     = constant
+        @context      = context
         @builders     = @constant.builders # only dependency, must be a Cell::Base subclass.
       end
 
@@ -47,7 +51,7 @@ module Uber
       end
 
       def run_builder_block(block, *args)
-        block.call(*args)
+        block.(@context, *args) # Uber::Value.call()
       end
     end
 
@@ -78,13 +82,15 @@ module Uber
       #     AdminUserBox if model.admin?
       #   end
       #
-      # In your view #cell will instantiate the right cell for you now.
+      # In your view #cell will instantiate the right class for you now.
       def builds(proc=nil, &block)
-        builders << (proc.kind_of?(Proc) ? proc : block)
+        builders << Uber::Options::Value.new(proc.nil? ? block : proc) # TODO: provide that in Uber::O:Value.
       end
 
-      def class_builder
-        @class_builder ||= Constant.new(self)
+      # Call this from your classes' own ::build method to compute the concrete target class.
+      # The class_builder is cached, you can't change the context once it's set.
+      def class_builder(context=nil)
+        @class_builder ||= Constant.new(self, context)
       end
     end # ClassMethods
   end

data/lib/uber/options.rb

@@ -54,11 +54,12 @@ module Uber
         @dynamic = @proc || @callable || @method
       end
 
-      def evaluate(context, *args)
+      def call(context, *args)
         return @value unless dynamic?
 
         evaluate_for(context, *args)
       end
+      alias_method :evaluate, :call
 
       def dynamic?
         @dynamic

data/lib/uber/uber_version.rb

@@ -1,3 +1,3 @@
 module Uber
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

data/test/builder_test.rb

@@ -72,4 +72,67 @@ class BuilderTest < MiniTest::Spec
 
   it { Boomerang.build({}).must_be_instance_of Boomerang }
   it { Boomerang.build({hit: true}).must_be_instance_of Song }
+end
+
+
+class BuilderScopeTest < MiniTest::Spec
+  def self.builder_method(options)
+    options[:from_builder_method] and return self
+  end
+
+  class Hit; end
+
+  class Song
+    class Hit
+    end
+
+    include Uber::Builder
+
+    builds :builder_method # i get called first.
+    builds ->(options) do  # and i second.
+      self::Hit
+    end
+
+    def self.build(context, options={})
+      class_builder(context).call(options)
+    end
+  end
+
+  class Evergreen
+    class Hit
+    end
+
+    include Uber::Builder
+
+    class << self
+      attr_writer :builders
+    end
+    self.builders = Song.builders
+
+    def self.build(context, options={})
+      class_builder(context).call(options)
+    end
+
+    def self.builder_method(options)
+      options[:from_builder_method] and return self
+    end
+  end
+
+  it do
+    Song.build(self.class).must_equal BuilderScopeTest::Hit
+
+    # this runs BuilderScopeTest::builder_method and returns self.
+    Song.build(self.class, from_builder_method: true).must_equal BuilderScopeTest
+
+    # since the class_builder gets cached, this won't change.
+    Song.build(Song).must_equal BuilderScopeTest::Hit
+  end
+
+
+  it do
+    # running the "copied" block in Evergreen will reference the correct @context.
+    Evergreen.build(Evergreen).must_equal BuilderScopeTest::Evergreen::Hit
+
+    Evergreen.build(Evergreen, from_builder_method: true).must_equal BuilderScopeTest::Evergreen
+  end
 end

data/test/options_test.rb

@@ -25,24 +25,28 @@ class UberOptionTest < MiniTest::Spec
     it { Value.new(Callable.new).dynamic?.must_equal true }
   end
 
-  describe "#evaluate" do
+  describe "#call" do
     let (:version) { Module.new { def version; 999 end } }
 
-    it { Value.new(nil).evaluate(Object.new).must_equal nil }
-    # it { Value.new(nil, :dynamic => true).evaluate(Object.new).must_equal nil } # DISCUSS: should we handle that?
+    it { Value.new(nil).(Object.new).must_equal nil }
+    # it { Value.new(nil, :dynamic => true).(Object.new).must_equal nil } # DISCUSS: should we handle that?
 
-    it { Value.new(true).evaluate(Object.new).must_equal true }
+    it { Value.new(true).(Object.new).must_equal true }
 
-    it { Value.new(:version).evaluate(object.extend(version)).must_equal 999 }
-    it { Value.new("version", :dynamic => true).evaluate(object.extend(version)).must_equal 999 }
-    it { Value.new(:version, :dynamic => false).evaluate(object.extend(version)).must_equal :version }
-    it { Value.new(lambda { self }).evaluate(object).must_equal object }
-    it { Value.new(lambda { self }).evaluate(nil).must_equal self }
+    it { Value.new(:version).(object.extend(version)).must_equal 999 }
+    it { Value.new("version", :dynamic => true).(object.extend(version)).must_equal 999 }
+    it { Value.new(:version, :dynamic => false).(object.extend(version)).must_equal :version }
+    it { Value.new(lambda { self }).(object).must_equal object }
+    it { Value.new(lambda { self }).(nil).must_equal self }
 
-    it { Value.new(lambda { :loud }, :dynamic => true).evaluate(object).must_equal :loud }
+    it { Value.new(lambda { :loud }, :dynamic => true).(object).must_equal :loud }
 
     # Uber::Callable
-    it { Value.new(Callable.new).evaluate(nil).must_equal 999 }
+    it { Value.new(Callable.new).(nil).must_equal 999 }
+  end
+
+  it "#call is aliased to evaluate" do
+    Value.new(Callable.new).(nil).must_equal 999
   end
 
   describe "passing options" do
@@ -50,9 +54,9 @@ class UberOptionTest < MiniTest::Spec
     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]" }
+    it { Value.new(:version).(object.extend(version), 1, 2, 3).must_equal "[1, 2, 3]" }
+    it { Value.new(block).(object, 1, 2, 3).must_equal "[1, 2, 3]" }
+    it { Value.new(callable).(Object, 1, 2, 3).must_equal "[Object, 1, 2, 3]" }
   end
 
   # it "speed" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uber
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-14 00:00:00.000000000 Z
+date: 2015-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake