with_refinements 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46acf7bee0e43d24b1cd6c98a3875573b0125b00b5f171c12b52947c8099d908
-  data.tar.gz: 0ae6e9f1af73a7a30343e2030a4e28266501ed129d0a035a4cc6c74a18115c89
+  metadata.gz: 540b9343999aeee6303dc94c36486399f6852b5ec904114851c3b254de0805de
+  data.tar.gz: ba4682ae1ac92d3c2f1d3094fb75bbe39b9c02a74d88fe8d55b3383f049909a3
 SHA512:
-  metadata.gz: 0b184d7693abd0d8efb1bf5aecc7ca4f8369eceaa7a7d92a4c6139156aaf7ccc5c7d128783c27cec1dbf5b8efacdf35489685968b6c4c04e17401edae586f335
-  data.tar.gz: 64b53f1b80c3d79467d38ad1ad312efec6aa0f7196f1c9d73de9aeb7833f2531644c1385262013a32981a013c4b36b687e17a2ec6310555866062f6811982c15
+  metadata.gz: 9a2689931a6e93e4355f6f6493c3002a7de1dacbb5a6cc4c940c10a72f445b73ba8fbde9ace4eeaacbf0526319864bbd0396b61dccce978b5884af20eb5021bc
+  data.tar.gz: de929a1c059c4488f9381cf7dd518beb3a0384f1e0e7cdb6303e85d9d1a615cf9bb86c682e61bf8a5451ee0bd2980cfa760d79187f070ff54539c67f13130b6a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    with_refinements (0.4.0)
+    with_refinements (0.5.0)
 
 GEM
   remote: https://rubygems.org/

data/examples/b.rb

@@ -2,6 +2,7 @@ require "benchmark_driver"
 
 Benchmark.driver do |x|
   x.prelude <<~RUBY
+    require "sin_refinements"
     require "bundler/setup"
     require "with_refinements"
 
@@ -14,18 +15,45 @@ Benchmark.driver do |x|
         end
       end
     end
+
+    module Plain
+      refine(String) do
+        def world
+          -"world"
+        end
+      end
+    end
+
+    using Plain
+
+    class String
+      def george
+        -"george"
+      end
+    end
   RUBY
 
-  x.report 'plain', %{
-    using M
-    "hello".goodbye
+  x.report 'plain monkey patch', %{
+    "hello".george
+  }
+
+  x.report 'plain refinements', %{
+    "hello".world
   }
 
   x.report 'with_refinements', %{
     with_refinements(M) { "hello".goodbye }
   }
 
-  x.report 'with_refinements(local_variables: false)', %{
-    with_refinements(M, local_variables: false) { "hello".goodbye }
+  x.report 'with_refinements_light', %{
+    with_refinements_light(M) { "hello".goodbye }
+  }
+
+  x.report 'SinRefinements.refining', %{
+    SinRefinements.refining(M) { "hello".goodbye }
+  }
+
+  x.report 'SinRefinements.light_refining', %{
+    SinRefinements.light_refining(M) { "hello".goodbye }
   }
 end

data/lib/with_refinements.rb

@@ -1,15 +1,56 @@
 require "with_refinements/version"
 
 module WithRefinements
+  @context_cache = {}
+  @refined_proc_cache = Hash.new {|h,k| h[k] = {} }
+  @refined_proc_light_cache = Hash.new {|h,k| h[k] = {} }
+
   class << self
-    def clean_binding
-      eval('module Class.new::CleanRoom; binding; end')
+    def context(refinements)
+      @context_cache[refinements] ||= clean_binding.tap do |b|
+        b.local_variable_set(:__refinements__, refinements)
+        b.eval('__refinements__.each {|r| using r }')
+      end
     end
 
-    def code_from_block(block)
+    def refined_proc(c, block)
+      @refined_proc_cache[c][block.source_location] ||= (
+        lvars = block.binding.local_variables
+        c.eval(<<~RUBY)
+          proc do |__binding__|
+            proc { |#{lvars.join(",")}|
+              ret = __binding__.receiver.instance_exec #{code_from_block(block)}
+              #{lvars.map {|v| "__binding__.local_variable_set(:#{v}, #{v})" }.join("\n")}
+              ret
+            }.call(*__binding__.local_variables.map {|v| __binding__.local_variable_get(v) })
+          end
+        RUBY
+      )
+    end
+
+    def refined_proc_light(c, block)
+      @refined_proc_light_cache[c][block.source_location] ||= (
+        c.eval(<<~RUBY)
+          proc { |__receiver__, __args__| __receiver__.instance_exec(*__args__) #{code_from_block(block)} }
+        RUBY
+      )
+    end
+
+    private
+
+    def block_source_location(block)
       iseq = RubyVM::InstructionSequence.of(block).to_a
       loc = iseq[4].yield_self {|h| h[:code_range] || h[:code_location] }
       path = iseq[7]
+      return path, loc
+    end
+
+    def clean_binding
+      TOPLEVEL_BINDING.eval('Module.new { break binding }')
+    end
+
+    def code_from_block(block)
+      path, loc = block_source_location(block)
       File.readlines(path)[loc[0]-1..loc[2]-1].tap {|ls|
         if loc[0] == loc[2]
           ls[0] = ls[0][loc[1]...loc[3]]
@@ -25,31 +66,19 @@ module WithRefinements
     end
   end
 
-  refine(Object) do
-    def with_refinements(*ms, local_variables: true, &block)
-      # enable refinements
-      b = WithRefinements.clean_binding
-      b.local_variable_set(:__modules__, ms)
-      b.eval('__modules__.each {|m| using m }')
-
-      # setup block eval context
-      bb = block.binding
-      b.local_variable_set(:__self__, bb.receiver)
-
-      # copy local_variables
-      if local_variables
-        bb.local_variables.each {|n| b.local_variable_set(n, bb.local_variable_get(n)) }
-      end
+  def with_refinements(*refinements, &block)
+    c = WithRefinements.context(refinements)
+    p = WithRefinements.refined_proc(c, block)
+    p.call(block.binding)
+  end
 
-      # eval block code
-      ret = b.eval("__self__.instance_eval #{WithRefinements.code_from_block(block)}")
+  def with_refinements_light(*refinements, args: [], &block)
+    c = WithRefinements.context(refinements)
+    p = WithRefinements.refined_proc_light(c, block)
+    p.call(block.binding.receiver, args)
+  end
 
-      # write back local_variables
-      if local_variables
-        bb.local_variables.each {|n| bb.local_variable_set(n, b.local_variable_get(n)) }
-      end
+  module_function :with_refinements, :with_refinements_light
 
-      ret
-    end
-  end
+  refine(Object) { include WithRefinements }
 end

data/lib/with_refinements/core_ext.rb

@@ -0,0 +1,3 @@
+require "with_refinements"
+
+Object.include(WithRefinements)

data/lib/with_refinements/version.rb

@@ -1,3 +1,3 @@
 module WithRefinements
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: with_refinements
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Seiei Miyagi
@@ -34,7 +34,7 @@ cert_chain:
   OKwDKKYe2ogJ/XrOjTltlugSNvq/NgD53wc4TA0F5KofdIZSJELTCUyyZMPztwI4
   OawPtyIyOegL6pM8fc7IfzLzjkdO3Bis1qFZcg==
   -----END CERTIFICATE-----
-date: 2018-08-02 00:00:00.000000000 Z
+date: 2018-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -111,6 +111,7 @@ files:
 - examples/b.rb
 - examples/greeting.rb
 - lib/with_refinements.rb
+- lib/with_refinements/core_ext.rb
 - lib/with_refinements/version.rb
 - with_refinements.gemspec
 homepage: https://github.com/hanachin/with_refinements