wrapper_based 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 860bb92daa686c64bcb7807cc743a0e1f41d892d
-  data.tar.gz: 15482c725f191bc7fa9a336fddebbc10e71a3051
+  metadata.gz: ff350bc479ae984adc21032e70fab33aea8f1ce5
+  data.tar.gz: 281d02a14989a788d9b53ba6eb0b3f41c1ed86a6
 SHA512:
-  metadata.gz: ab743403db24d5918f180321e2c6f45c93f5284c7d9bfab97038cf19b399abcb2d0f28870e98db9d0dc854d99e79a1afafa38e35288ccdb3c63285ab6718fbcb
-  data.tar.gz: 817c1a3a8494e3d259df6602f59eaf15a6931208ea530333201895dc8c8c1bb124160e4e75712ca62bb675ca515654330a6d1795bc700949af2096a4b950012a
+  metadata.gz: 4b0f9bab7b974ff6a94b8be0e91e63f779f8df8c0fd6e6d959a4d28632c91ef85ad5382a0ec6521ed572d82e060e0e9add15117370649ebd298d5d669eac8330
+  data.tar.gz: 696723ab1d675cf1acb1cb9a6765823853bb84b31e95fe689dd4fcfe7afdf427c8bf9f00f7594c1316129675443366b22c3c424f2a760a457ab39722d4524b83

data/README.md

@@ -34,22 +34,22 @@ module Map
   end
 
   def distance_of(path)
-    Distance[within: self].of(path)
+    GetDistance[within: self].of(path)
   end
 end
 
 module CurrentIntersection
-  def neighbors(nearest:)
-    east_neighbor = nearest.east_neighbor_of(self)
-    south_neighbor = nearest.south_neighbor_of(self)
-    [south_neighbor, east_neighbor].compact
+  def neighbors(manhattan:)
+    east_neighbor = manhattan.east_neighbor_of(self)
+    south_neighbor = manhattan.south_neighbor_of(self)
+    [south_neighbor, east_neighbor].compact # excludes nil neighbors
   end
 end
 
 module DestinationNode
   def shortest_path(from:, within:)
     return [self] if equal? from
-    Shortest[to: self, from: from, city: within].path
+    FindShortest[to: self, from: from, city: within].path
   end
 end
 
@@ -57,7 +57,7 @@ end
 
 DCI = WrapperBased::DCI.new unless defined? DCI
 
-class Distance < DCI::Context(:within)
+class GetDistance < DCI::Context(:within)
   within.as Map
 
   def between(from, to)
@@ -69,7 +69,7 @@ class Distance < DCI::Context(:within)
   end
 end
 
-class Shortest < DCI::Context(:from, :to, :city)
+class FindShortest < DCI::Context(:from, :to, :city)
   from.as CurrentIntersection
   to.as DestinationNode
   city.as Map
@@ -79,14 +79,14 @@ class Shortest < DCI::Context(:from, :to, :city)
   end
 
   def path
-    _shortest_path + [@from]
+    shortest_path_from_city_neighbors << @from
   end
 
   private
 
-  def _shortest_path
+  def shortest_path_from_city_neighbors
     from.
-      neighbors(nearest: @city).
+      neighbors(manhattan: @city).
       map { |neighbor| to.shortest_path from: neighbor, within: @city }.
       min_by { |path| city.distance_of path }
   end

data/examples/benchmark.rb

@@ -0,0 +1,27 @@
+# Derived from https://tonyarcieri.com/dci-in-ruby-is-completely-broken
+require 'rubygems'
+require 'benchmark/ips'
+require 'wrapper_based'
+
+class ExampleClass
+  def foo; 42; end
+end
+
+module ExampleMixin
+  def foo; 43; end
+end
+
+wrapper = WrapperBased::FORWARDING[ExampleClass, ExampleMixin]
+
+Benchmark.ips do |bm|
+  bm.report("without dci") { ExampleClass.new.foo }
+  bm.report("with wrapper") do
+    wrapper.new(ExampleClass.new).foo
+  end
+  bm.report("with extend") do
+    obj = ExampleClass.new
+    obj.extend(ExampleMixin)
+    obj.foo
+  end
+  bm.compare!
+end

data/examples/dijkstra.rb

@@ -9,22 +9,22 @@ module Map
   end
 
   def distance_of(path)
-    Distance[within: self].of(path)
+    GetDistance[within: self].of(path)
   end
 end
 
 module CurrentIntersection
-  def neighbors(nearest:)
-    east_neighbor = nearest.east_neighbor_of(self)
-    south_neighbor = nearest.south_neighbor_of(self)
-    [south_neighbor, east_neighbor].compact
+  def neighbors(manhattan:)
+    east_neighbor = manhattan.east_neighbor_of(self)
+    south_neighbor = manhattan.south_neighbor_of(self)
+    [south_neighbor, east_neighbor].compact # excludes nil neighbors
   end
 end
 
 module DestinationNode
   def shortest_path(from:, within:)
     return [self] if equal? from
-    Shortest[to: self, from: from, city: within].path
+    FindShortest[to: self, from: from, city: within].path
   end
 end
 
@@ -32,7 +32,7 @@ end
 
 DCI = WrapperBased::DCI.new unless defined? DCI
 
-class Distance < DCI::Context(:within)
+class GetDistance < DCI::Context(:within)
   within.as Map
 
   def between(from, to)
@@ -44,7 +44,7 @@ class Distance < DCI::Context(:within)
   end
 end
 
-class Shortest < DCI::Context(:from, :to, :city)
+class FindShortest < DCI::Context(:from, :to, :city)
   from.as CurrentIntersection
   to.as DestinationNode
   city.as Map
@@ -54,14 +54,14 @@ class Shortest < DCI::Context(:from, :to, :city)
   end
 
   def path
-    _shortest_path + [@from]
+    shortest_path_from_city_neighbors << @from
   end
 
   private
 
-  def _shortest_path
+  def shortest_path_from_city_neighbors
     from.
-      neighbors(nearest: @city).
+      neighbors(manhattan: @city).
       map { |neighbor| to.shortest_path from: neighbor, within: @city }.
       min_by { |path| city.distance_of path }
   end

data/examples/money_transfer.rb

@@ -1,4 +1,4 @@
-Log = method(:puts)
+LogTransaction = method(:puts)
 Account = Struct.new(:number, :balance)
 NotEnoughFunds = Class.new(StandardError)
 
@@ -23,12 +23,12 @@ class TransferMoney < DCI::Context(:from, :to)
 
   def withdraw(amount)
     from.decrease_balance_by(amount)
-    Log["Withdraw", amount, from]
+    LogTransaction["Withdraw", amount, from.number]
   end
 
   def deposit(amount)
     to.increase_balance_by(amount)
-    Log["Deposit", amount, to]
+    LogTransaction["Deposit", amount, to.number]
   end
 
   def call(amount:)

data/lib/wrapper_based/context.rb

@@ -1,7 +1,8 @@
 module WrapperBased
   class Context
     def initialize(**where)
-      where.each { |role, player| instance_variable_set :"@#{role}", player }
+      @_casting = {}
+      where.each { |role, player| send :"#{role}=", player }
     end
 
     def to_proc
@@ -12,25 +13,32 @@ module WrapperBased
       call(*args, &block)
     end
 
+    UnassignedRole = StandardError
+
     class << self
       def [](**role_cast, &block)
         context_class = Class.new(self, &block)
 
         context_class.class_eval do
           role_cast.each do |role, cast|
-            class_variable_set :"@@#{role}", cast
+            role_player = :"@#{role}"
+
+            define_method(:"#{role}=") do |actor|
+              instance_variable_set(role_player, actor)
+              @_casting[role] = context_class.send(role).typecast(actor)
+            end
+
             define_method(role) do
-              self.class.class_variable_get(:"@@#{role}").
-                typecast instance_variable_get(:"@#{role}")
+              @_casting.fetch(role) { fail UnassignedRole, "Role '#{role}' is missing." }
             end
           end
         end
 
         context_class.singleton_class.class_eval do
-          role_cast.each do |role, _|
-            define_method(role) do
-              class_variable_get :"@@#{role}"
-            end
+          role_cast.each do |role, cast|
+            variable = :"@@#{role}"
+            define_method(role) { class_variable_get variable }
+            context_class.class_variable_set variable, cast
           end
 
           alias_method :[], :new

data/lib/wrapper_based/version.rb

@@ -1,3 +1,3 @@
 module WrapperBased
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wrapper_based
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Ritchie Paul Buitre
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-16 00:00:00.000000000 Z
+date: 2017-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,6 +67,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- examples/benchmark.rb
 - examples/dijkstra.rb
 - examples/dijkstra/data.rb
 - examples/money_transfer.rb