h8 0.4.5 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da7dc92fe9f18d03e202dbd8566c5469f3b122b2
-  data.tar.gz: 4c570745ab23ac22f705405742ff10b7fb9310df
+  metadata.gz: ae98780cc495a9c2f15db1b3de81f81cc014978b
+  data.tar.gz: ee00bd70c38b2f4b62ecf8beddb2e15fb6aacb61
 SHA512:
-  metadata.gz: 3eade24933e29d3d5b124b4665a3eef82e4e6dee3cde4a7e62c1a5f68acf08ee5d060bdaa1f7a61eeedd53aea417b751618d847ffd67dd8f75dddbdd32f5cc56
-  data.tar.gz: 90c14a2a879418134c41ce3958ce8b943cc5d86285811657e280af079e3802d275e1156860f6af4f3f664515ec37f19e9a51d07d8914a8e5eaa5c03218d20026
+  metadata.gz: 4a2be9806423de66eacb312891d1abcff2af0f24679e740af339689cae1ae50fd8dbb07d15d138fc13976bbb410b3acf92951d020bcb96df93c16ab9a5fd3b20
+  data.tar.gz: 85f4398e82fc5a818654936cdb2b0fe5b51ee64c8e08284d131657d4f89c90b55585fbb8fc052dfe673a8371ce9ad7f69ab4a440c3d8301ec5a23d5777981250

data/ext/h8/h8.h

@@ -19,8 +19,7 @@ extern VALUE value_class;
 extern VALUE ruby_gate_class;
 extern VALUE Rundefined;
 
-extern ID id_is_a;
-extern ID id_safe_call;
+extern ID id_is_a, id_safe_call, id_safe_proc_call;
 
 VALUE protect_ruby(const std::function<VALUE()> &block);
 

data/ext/h8/main.cpp

@@ -14,8 +14,7 @@ VALUE ruby_gate_class;
 VALUE value_class;
 VALUE Rundefined;
 
-ID id_is_a;
-ID id_safe_call;
+ID id_is_a, id_safe_call, id_safe_proc_call;
 
 VALUE protect_ruby(const std::function<VALUE()> &block) {
 	try {
@@ -189,6 +188,7 @@ void Init_h8(void) {
 
 	id_is_a = rb_intern("is_a?");
 	id_safe_call = rb_intern("secure_call");
+	id_safe_proc_call = rb_intern("safe_proc_call");
 
 	VALUE h8 = rb_define_module("H8");
 

data/ext/h8/ruby_gate.cpp

@@ -124,7 +124,7 @@ VALUE h8::RubyGate::rescue_callback(VALUE me, VALUE exception_object) {
 VALUE RubyGate::call(VALUE args) {
 	VALUE callable = rb_ary_pop(args);
 	VALUE context = rb_ary_pop(args);
-	VALUE res = rb_funcall(context, rb_intern("safe_proc_call"), 2, callable, args);
+	VALUE res = rb_funcall(context, id_safe_proc_call, 2, callable, args);
 	return res;
 }
 

data/hybrid8.gemspec

@@ -33,6 +33,7 @@ spec = Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rake-compiler"
   spec.add_development_dependency "rspec", '~> 3.1'
+  spec.add_development_dependency 'hashie', '>= 0.1.2'
 
   spec.add_dependency 'pargser', '>= 0.1.2'
 end

data/lib/h8.rb

@@ -7,3 +7,6 @@ require 'h8/coffee'
 
 # The native library should be required AFTER ruby defintions
 require 'h8/h8'
+
+# Initialize dependencies
+H8::Coffee.compile ''

data/lib/h8/coffee.rb

@@ -18,7 +18,7 @@ module H8
     # compiler instance across all threads with a mutex.
     def self.eval src, ** kwargs
       @@mutex.synchronize {
-        (@@compiler ||= Coffee.new).eval src, ** kwargs
+        (@@compiler ||= Coffee.new).eval src, **kwargs
       }
     end
 
@@ -29,13 +29,13 @@ module H8
     # compiler instance across all threads with a mutex.
     def self.compile src, ** kwargs
       @@mutex.synchronize {
-        (@@compiler ||= Coffee.new).compile src, ** kwargs
+        (@@compiler ||= Coffee.new).compile src, **kwargs
       }
     end
 
     # Create compiler instance.
     def initialize
-      @context = H8::Context.new
+      @context = H8::Context.new noglobals: true
       @context.eval read_script 'coffee-script.js'
       eval read_script('globals.coffee')
     end
@@ -70,5 +70,4 @@ module H8
     end
   end
 
-
 end

data/lib/h8/context.rb

@@ -1,14 +1,17 @@
 require 'thread'
+require 'h8'
 
 module H8
+
   class Context
     # Create new context optionally providing variables hash
-    def initialize **kwargs
+    def initialize noglobals: false, **kwargs
       @idcount = 0
       set_all **kwargs
       _set_var '___create_ruby_class', -> (cls, args) {
         _do_create_ruby_class cls, args
       }
+      # noglobals or execute_script 'globals.coffee'
     end
 
     # set variables from keyword arguments to this context
@@ -48,13 +51,13 @@ module H8
     # If you need to execute same script more than once consider first H8::Coffee.compile
     # and cache compiled script.
     def coffee script, ** kwargs
-      eval Coffee.compile script, **kwargs
+      eval Coffee.compile script, ** kwargs
     end
 
 
     # Execute script in a new context with optionally set vars. @see H8#set_all
     # @return [Value] wrapped object returned by the script
-    def self.eval script, file_name: nil, **kwargs
+    def self.eval script, file_name: nil, ** kwargs
       Context.new(** kwargs).eval script, file_name: file_name
     end
 
@@ -67,12 +70,12 @@ module H8
     def self.secure_call instance, method, args=nil
       method = method.to_sym
       begin
-        m = instance.public_method(method)
+        m     = instance.public_method(method)
         owner = m.owner
         if can_access?(owner)
           return m.call(*args) if method[0] == '[' || method[-1] == '='
           if m.arity != 0
-            return -> (*args) { m.call *args }
+            return ProcGate.new( -> (*args) { m.call *args } )
           else
             return m.call
           end
@@ -80,7 +83,7 @@ module H8
       rescue NameError
         # No exact method, calling []/[]= if any
         method, args = if method[-1] == '='
-                         [:[]=, [method[0..-2].to_s, args[0]] ]
+                         [:[]=, [method[0..-2].to_s, args[0]]]
                        else
                          [:[], [method.to_s]]
                        end
@@ -88,7 +91,11 @@ module H8
           m = instance.public_method(method)
           if can_access?(owner)
             if method == :[]
-              return m.call(*args) || m.call(args[0].to_sym)
+              if instance.is_a?(Hash)
+                return m.call(*args) || m.call(args[0].to_sym)
+              else
+                return m.call(*args)
+              end
             else
               return m.call(*args)
             end
@@ -115,10 +122,13 @@ module H8
     # Set var that could be either a callable, class instance, simple value or a Class class
     # in which case constructor function will be created
     def set_var name, value
-      if value.is_a?(Class)
-        _gate_class name.to_s, -> (*args) { value.new *args }
-      else
-        _set_var name, value
+      case value
+        when Class
+          _gate_class name.to_s, -> (*args) { value.new *args }
+        when Proc
+          _set_var name, ProcGate.new(value)
+        else
+          _set_var name, value
       end
     end
 
@@ -127,6 +137,36 @@ module H8
     def _do_create_ruby_class(klass, arguments)
       klass.new *H8::arguments_to_a(arguments.to_ruby.values)
     end
+
+
+    @@base  = File.expand_path File.join(File.dirname(__FILE__), '../scripts')
+    @@cache = {}
+
+    def execute_script name
+      p [:exs, name]
+      script = @@cache[name] ||= begin
+        p 'cache miss'
+        script = open(File.join(@@base, name), 'r').read
+        name.downcase.end_with?('.coffee') ? H8::Coffee.compile(script) : script
+      end
+      eval script
+    end
+
+  end
+
+  # The gate for Ruby's callable to support javascript's 'apply' functionality
+  class ProcGate
+    def initialize callable
+      @callable = callable
+    end
+
+    def apply this, args
+      @callable.call *args
+    end
+
+    def call *args
+      @callable.call *args
+    end
   end
 
 end

data/lib/h8/value.rb

@@ -1,3 +1,5 @@
+require 'ostruct'
+
 module H8
 
   # Wrapper for javascript objects.
@@ -179,6 +181,37 @@ module H8
 
 end
 
+class OpenStruct
+  # OpenStruct converts to plain ruby hash in depth. Primary usage
+  # is when it was used bu javascript and could contain gated objects.
+  def to_ruby depth=0
+    to_h.to_ruby depth+1
+  end
+end
+
+class Hash
+  # Hash copies in depth converting its data. Primary usage
+  # is when it was used bu javascript and could contain gated objects.
+  #
+  # Important! that converted keys are turned to string even of were
+  # pure ruby symbols. This is done to remove ambiguity: work the same
+  # with ruby hashes, javasctipt objects, OpenStruct and Hashie::Mash instances
+  def to_ruby depth=0
+    res = {}
+    depth += 1
+    each { |k,v| res[k.to_ruby(depth).to_s] = v.to_ruby depth }
+    res
+  end
+end
+
+class Array
+  # @return new array with all components converted to_ruby
+  def to_ruby depth
+    depth += 1
+    map { |x| x.to_ruby depth }
+  end
+end
+
 # Ruby object's t_ruby does nothing (tree conversion optimization)
 class Object
   # It is already a ruby object. Gate objects should override

data/lib/h8/version.rb

@@ -1,3 +1,3 @@
 module H8
-  VERSION = "0.4.5"
+  VERSION = "0.4.8"
 end

data/lib/scripts/globals.coffee

@@ -1,4 +1,5 @@
 @.puts ?= ->
   # Do nothing if not set
 
-@.globalsIncluded = true
+@globalsIncluded = true
+

data/spec/coffee_spec.rb

@@ -35,7 +35,7 @@ describe 'coffeescript' do
       # above is bad
     END
     # pending
-    expect(->{
+    expect(-> {
       H8::Coffee.compile script, file_name: 'test.coffee'
     }).to raise_error(H8::JsError) { |e| e.to_s.should =~ /test.coffee\:4/ }
   end
@@ -63,15 +63,49 @@ describe 'coffeescript' do
       // CoffeeScript.sourceMaps['inner'] = res.sourceMap
       eval(res.js);
     END
-    cxt = H8::Coffee.new.context
+    cxt        = H8::Coffee.new.context
     cxt[:puts] = -> (*args) { puts args.join(' ') }
-    cxt[:src] = src
+    cxt[:src]  = src
     # cxt[:src] = 'return "hello"'
     begin
-    res = cxt.eval script, file_name: 'extest.coffee'
-    rescue Exception=>e
+      res = cxt.eval script, file_name: 'extest.coffee'
+    rescue Exception => e
       puts e
     end
   end
 
+  context 'realword' do
+    class Room
+    end
+
+    it 'should process varargs' do
+      c = H8::Context.new
+      c[:puts] = ->(*args) { puts "> "+args.join('') }
+      c.coffee <<-End
+        @.fn1 = (args...) ->
+          args.join(',')
+
+        @.test = (args...) ->
+          fn1 'first', args...
+      End
+      c.coffee('return test(1,2,3);').should == 'first,1,2,3'
+
+      # Real world example
+      c[:r3] = -> (*args) {
+        @last_args = args
+      }
+      c[:r4] = -> (first, second=0) {
+        [first+100, second]
+      }
+      script = <<-End
+        @r1 = (args...) ->
+          r3 'done', args[0..-2]...
+        @r2 = (args...) ->
+          r4 args...
+      End
+      c.coffee script
+      c.eval('r1( "now", 1, 2, 4);').should == ['done', 'now', 1, 2]
+      c.eval('r2( 100, 200);').should == [200, 200]
+    end
+  end
 end

data/spec/ruby_gate_spec.rb

@@ -1,5 +1,7 @@
 require 'spec_helper'
 require 'h8'
+require 'ostruct'
+require 'hashie'
 
 describe 'ruby gate' do
 
@@ -173,7 +175,7 @@ describe 'ruby gate' do
     end
 
     class Test < Base
-      attr :ro
+      attr :ro, :val
       attr_accessor :rw
 
       def initialize
@@ -216,7 +218,7 @@ describe 'ruby gate' do
     end
 
     it 'should access object properties and methods' do
-      cxt       = H8::Context.new
+      cxt = H8::Context.new
       cxt.eval('RubyGate.prototype.test2 = function() { return "ttt"; }; null;');
       cxt[:foo] = Test.new
       cxt.eval('foo.ro').should == 'readonly'
@@ -231,19 +233,11 @@ describe 'ruby gate' do
       cxt.eval('foo.object_id').should == H8::Undefined
       cxt.eval('foo.prot_method').should == H8::Undefined
       cxt.eval('foo.priv_method').should == H8::Undefined
-      cxt.eval('foo.test_args').should be_kind_of(Proc)
+      cxt.eval('foo.test_args').should be_kind_of(H8::ProcGate)
       cxt.eval('foo.test_args("hi", "you")').should == 'hi-you'
       cxt.eval('foo instanceof RubyGate').should == true
     end
 
-    it 'should set ruby properties' do
-      cxt       = H8::Context.new
-      cxt[:foo] = t = Test.new
-      cxt.eval('foo.rw="hello";')
-      t.rw.should == 'hello'
-      cxt.eval('foo.rw').should == 'hello'
-    end
-
     context 'do interceptors' do
       class Test2 < Base
         attr :ro
@@ -280,7 +274,7 @@ describe 'ruby gate' do
         cxt.eval('foo.send').should == H8::Undefined
         cxt.eval('foo.prot_method').should == H8::Undefined
         cxt.eval('foo.priv_method').should == H8::Undefined
-        cxt.eval('foo.test_args').should be_kind_of(Proc)
+        cxt.eval('foo.test_args').should be_kind_of(H8::ProcGate)
         cxt.eval('foo.test_args("hi", "you")').should == 'hi-you'
       end
 
@@ -294,15 +288,37 @@ describe 'ruby gate' do
     end
 
     it 'should add and intercept property access' do
-      # pending
       t          = Test.new
       t.do_throw = true
       cxt        = H8::Context.new t: t
+
+      # see Test class implementation: this is a valid test
       cxt.eval("t['foo'];").should == 'init[]'
+      cxt.eval("t.foo").should == 'init[]'
       expect(-> { cxt.eval("t['foo1'];") }).to raise_error(RuntimeError)
-      cxt.eval("t['foo']='bar'");
-      # p t['foo']
-      # p cxt.eval "t['foo'] = 'bar';"
+      cxt.eval("t.foo='bar'");
+      cxt.eval("t.foo;").should == 'bar'
+      t.val.should == 'bar'
+    end
+
+    it 'should allow adding data to ruby hash' do
+      [OpenStruct.new, Hashie::Mash.new].each { |s|
+        s.test     = 'foo'
+        c          = H8::Context.new
+        c[:data]   = s
+        c[:assert] = -> (cond) { !cond and raise "assertion failed" }
+        c.coffee 'assert data.test == "foo"'
+        c.coffee 'data.test = "bar"; assert data.test == "bar"'
+        s.test.should == 'bar'
+        c.coffee 'data.foo = "baz"'
+        s.foo.should == 'baz'
+        c.coffee 'data.h = { foo: "bar", bar: { baz: 1 } }'
+        s.h.foo.should == 'bar'
+        c.coffee 'data.h.bar.baz == 1'
+        s.h.bar.baz.should == 1
+        c.coffee 'data.h.bar.arr = ["hello", { one: 2 }]'
+        s.to_ruby.should == { 'test' => "bar", 'foo' => "baz", 'h' => { "foo" => "bar", "bar" => { "baz" => 1, "arr" => ["hello", { "one" => 2 }] } } }
+      }
     end
 
     it 'should access plain arrays (provide numeric indexes)' do
@@ -341,9 +357,9 @@ describe 'ruby gate' do
     end
 
     it 'should gate classes through API' do
-      c = H8::Context.new
+      c  = H8::Context.new
       la = -> (*args) {
-        { 'hello' => 'world'}
+        { 'hello' => 'world' }
       }
       c._gate_class 'Tec', la
       c.eval("var res = new Tec()")
@@ -372,6 +388,10 @@ describe 'ruby gate' do
         self
       end
 
+      def testm a1, a2='???'
+        "#{a1} - #{a2}"
+      end
+
       def to_str
         inspect
       end
@@ -391,18 +411,24 @@ describe 'ruby gate' do
       cxt.eval('rc.init_args').should == ['hello', 'world']
     end
 
+    it 'should provide apply to gated class and instance' do
+      c = H8::Context.new RClass: Gated
+      c.eval('new RClass().testm(1,"d");').should == '1 - d'
+      c.eval('new RClass().testm.apply( null, [1,"n"]);').should == '1 - n'
+    end
+
     it 'should not die on calling wrong arity' do
       cxt = H8::Context.new RClass: Gated
-      g1 = cxt.eval 'var g1 = new RClass(1,2.3); g1'
+      g1  = cxt.eval 'var g1 = new RClass(1,2.3); g1'
 
       # We call gated ruby object with wrong number of args
       # which in turn causes attempt to call not callable result:
-      expect(-> {cxt.eval('g1.checkself(12)')}).to raise_error(NoMethodError)
+      expect(-> { cxt.eval('g1.checkself(12)') }).to raise_error(NoMethodError)
     end
 
     it 'should return self from gated class' do
       cxt = H8::Context.new RClass: Gated
-      g1 = cxt.eval 'var g1 = new RClass(1,2.3); g1'
+      g1  = cxt.eval 'var g1 = new RClass(1,2.3); g1'
       g1.should be_a(Gated)
       g2 = cxt.eval 'g1.checkself'
       g2.should be_a(Gated)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: h8
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.8
 platform: ruby
 authors:
 - sergeych
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-21 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: pargser
   requirement: !ruby/object:Gem::Requirement