iba 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ef434931c94289fcb2c724e2e50e31a169456682
-  data.tar.gz: 9db3968b45d90cfb24c689852e70a71ee6aae61e
+SHA256:
+  metadata.gz: aa34cf98d021bff67ebed44e9b62e2445c34793422660c0e221b06ca641c722d
+  data.tar.gz: c23f48c6e815351c9181efb572c98e0849e87d3c35a8b922fad6581e87090157
 SHA512:
-  metadata.gz: d2639e24f72a837b9479a1444e0aa217f67d7d3e37392452c8faf13599df585101c10f80895528abfd8c6c02c1fefec3f2f81711b9f07a269705890366bd07fd
-  data.tar.gz: 7be55792993087cd78d88e848158b60322705c9aeae157d8a76e091ed8256546ce6f1ba34ce7c79306bfccefda8588a7d83f69a78339332b905ca3e124b70664
+  metadata.gz: 992248f06af84ad50da540697617ce9980acc400adbf8fe1df08965d54345bd335a98c8071ec8e32920fb1454ae0820dbe74b7b32322125b8769a3d611c93b82
+  data.tar.gz: 4ae83722fa833dd949a6b0ec254f395afbe2bed6fcd26d92cb919932f2c5f8bb101dcce3bcf9082df188a5019e97ceb7348dd4f956bc9e36076983e6970b43e6

data/lib/iba.rb

@@ -35,37 +35,59 @@ module Iba
         nil
       else
         str = expr._to_s
-        "#{str} is #{eval(str, @block.binding).inspect}"
+        value = expr._evaluate(@block.binding).inspect
+        "#{str} is #{value}"
       end
     end
   end
 
-  class EmptyExpression
+  class BaseExpression
     def method_missing method, *args
       super if method.to_s =~ /^_/
       MethodCallExpression.new self, method, args
     end
 
-    def respond_to_missing? _method
+    def respond_to_missing? method
+      return false if method.to_s =~ /^_/
       true
     end
 
+    def to_s
+      method_missing :to_s
+    end
+
+    def == other
+      method_missing :==, other
+    end
+
+    def _wrap arg
+      if arg.is_a? BaseExpression
+        arg
+      else
+        LiteralExpression.new arg
+      end
+    end
+
+    def coerce other
+      [_wrap(other), self]
+    end
+  end
+
+  class EmptyExpression < BaseExpression
     def _parse &blk
-      b = blk.binding
+      bnd = blk.binding
 
-      vars = eval 'local_variables', b
-      ivars = eval 'instance_variables', b
+      vars = bnd.local_variables
+      ivars = bnd.receiver.instance_variables
 
       _override_instance_variables ivars
 
-      _override_local_variables vars, b
+      _override_local_variables vars, bnd
 
       result = instance_eval(&blk)
-      unless result.class == MethodCallExpression
-        result = LiteralExpression.new(result)
-      end
+      result = _wrap(result)
 
-      _restore_local_variables vars, b
+      _restore_local_variables vars, bnd
 
       result
     end
@@ -73,22 +95,22 @@ module Iba
     def _override_instance_variables vars
       vars.each do |v|
         next if v =~ /^@_/
-        eval "#{v} = Iba::MethodCallExpression.new(Iba::EmptyExpression.new, :#{v}, [])"
+        instance_variable_set v, Iba::InstanceVariableExpression.new(v.to_sym)
       end
     end
 
-    def _override_local_variables vars, b
+    def _override_local_variables vars, bnd
       vars.each do |v|
         next if v =~ /^_/
-        eval "_#{v} = #{v}", b
-        eval "#{v} = Iba::MethodCallExpression.new(Iba::EmptyExpression.new, :#{v}, [])", b
+        bnd.local_variable_set "_#{v}", bnd.local_variable_get(v)
+        bnd.local_variable_set v, LocalVariableExpression.new(v.to_sym)
       end
     end
 
-    def _restore_local_variables vars, b
+    def _restore_local_variables vars, bnd
       vars.each do |v|
         next if v =~ /^_/
-        eval "#{v} = _#{v}", b
+        bnd.local_variable_set v, bnd.local_variable_get("_#{v}")
       end
     end
 
@@ -97,7 +119,7 @@ module Iba
     end
   end
 
-  class LiteralExpression
+  class LiteralExpression < BaseExpression
     def initialize val
       @value = val
     end
@@ -105,9 +127,41 @@ module Iba
     def _to_s
       @value.inspect
     end
+
+    def _evaluate _bnd
+      @value
+    end
+  end
+
+  class InstanceVariableExpression < BaseExpression
+    def initialize ivar_name
+      @_ivar_name = ivar_name
+    end
+
+    def _to_s
+      @_ivar_name.to_s
+    end
+
+    def _evaluate bnd
+      bnd.receiver.instance_variable_get @_ivar_name
+    end
+  end
+
+  class LocalVariableExpression < BaseExpression
+    def initialize lvar_name
+      @_lvar_name = lvar_name
+    end
+
+    def _to_s
+      @_lvar_name.to_s
+    end
+
+    def _evaluate bnd
+      bnd.local_variable_get @_lvar_name
+    end
   end
 
-  class MethodCallExpression
+  class MethodCallExpression < BaseExpression
     attr_reader :_method, :_reciever, :_args
 
     def initialize reciever, methodname, args
@@ -122,7 +176,7 @@ module Iba
 
       if @_method == :[]
         "#{rcv}[#{args[0]}]"
-      elsif method_is_operator?
+      elsif _method_is_operator?
         case @_args.length
         when 0
           "#{@_method.to_s.sub(/@$/, '')}#{rcv}"
@@ -139,35 +193,16 @@ module Iba
       end
     end
 
-    def method_missing method, *args
-      super if method.to_s =~ /^_/
-      MethodCallExpression.new self, method, args
-    end
-
-    def respond_to_missing? _method
-      true
-    end
-
-    def method_is_operator?
-      @_method.to_s !~ /^[a-z]/
-    end
-
-    def to_s
-      method_missing :to_s
-    end
-
-    def == other
-      method_missing :==, other
+    def _evaluate bnd
+      rcv = @_reciever._evaluate(bnd)
+      args = @_args.map { |arg| arg._evaluate(bnd) }
+      rcv.send @_method, *args
     end
 
     private
 
-    def _wrap arg
-      if arg.class == MethodCallExpression
-        arg
-      else
-        LiteralExpression.new arg
-      end
+    def _method_is_operator?
+      @_method.to_s !~ /^[a-z]/
     end
   end
 

data/test/analyse_test.rb

@@ -54,4 +54,25 @@ class AnalyseTest < Test::Unit::TestCase
     @foo = 23
     assert_equal '@foo is 23', combinator { @foo }.analyse
   end
+
+  def test_instance_variable_method_call
+    @foo = 23
+    assert_equal "(@foo == 23) is true\n@foo is 23", combinator { @foo == 23 }.analyse
+  end
+
+  def test_instance_variable_as_argument_of_operator
+    @foo = 23
+    assert_equal '(23 + @foo) is 46', combinator { 23 + @foo }.analyse
+  end
+
+  def test_complex_subexpressions
+    @foo = 23
+    bar = 42
+    baz = [42]
+    result = combinator { (@foo + baz.first) == (bar + 23) }.analyse
+    assert_equal \
+      "((@foo + baz.first) == (bar + 23)) is true\n" \
+      '(@foo + baz.first) is 65, (bar + 23) is 65',
+      result
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iba
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Matijs van Zuijlen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-15 00:00:00.000000000 Z
+date: 2018-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -73,7 +73,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -81,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Introspective Block Assertions