dienashorner 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd7cd7502f49f9a24841e42881064fce73a09df1
-  data.tar.gz: 3b5f2dc911bf0384853232e290f25405a900786c
+  metadata.gz: 55418407ed597875c9e30b3c4e984cee94217f91
+  data.tar.gz: b0032e9cc1fc2cc6e4f44a33639335a87b22525e
 SHA512:
-  metadata.gz: 514de8502051b964befd3bb7edd902969f9a15251cbb4042a9be361f07b46a451807da9681e9cb574a24451dcaf967d0e6a3473ae9b83d3997899431185865b4
-  data.tar.gz: ff10758e53b1b206bac06d2104a6041b68ce150b4f353e640a96b92fe7fa24a36aaec12dc927208a6433038e84c44f2bdd79b69496b86b755d1d42cf6442e6c9
+  metadata.gz: 31cd85e1027c9cf4a43336f853a9ee5e21cb806cc2475e7ae48d6592477ce1c45b651f8230760b538356d64ad95f162ad1417f025dc3ad582d20bca2bf6ba13b
+  data.tar.gz: f8dc1ce3afc7b7c40650b2f3f53b0b22e0f51c3f133b9ee97107bd6c0b1f2ead26e9e7aedb3a45bc671dcda6fb649a69a2bea1101891b1c9b0f52a1b86dbd81a

data/.travis.yml

@@ -0,0 +1,15 @@
+rvm:
+  - jruby-1.7.24
+  - jruby-9.0.5.0
+jdk:
+  - oraclejdk8
+
+script: "if [[ -v COMMAND ]]; then $COMMAND; else rake spec; fi"
+
+env:
+  global:
+    - JAVA_OPTS="-Xmx512M"
+  matrix:
+    - COMMAND="ruby -Ilib spec/nashorn/test_execjs.rb"
+    - EMPTY='' # COMMAND="rake spec"
+    

data/Gemfile

@@ -7,7 +7,7 @@ group :test do
   #gem 'redjs', :git => 'git://github.com/cowboyd/redjs.git', :group => :test,
   #             :ref => "0d844f066666f967a78b20beb164c52d9ac3f5ca"
   gem 'less', '~> 2.6.0', :require => false
-  gem 'execjs', '2.6.0', :require => false
+  gem 'execjs', '~> 2.7.0', :require => false
 end
 
 gem 'rake', :require => false, :group => :development

data/README.md

@@ -143,8 +143,8 @@ Far from being a drop-in replacement although there's `require 'nashorn/rhino'`.
 
 ### Less.rb
 
-[Less.rb](https://github.com/cowboyd/less.rb) seems to be working, for now you
-will simply need to :`require 'nashorn/rhino/less'` before a `require 'less'`.
+[Less.rb](https://github.com/cowboyd/less.rb) seems to be working (with hacks),
+for now you will need to :`require 'nashorn/rhino/less'` before `require 'less'`.
 
 
 ### ExecJS
@@ -168,4 +168,4 @@ Copyright (c) 2016 Karol Bucek. Apache License v2 (see LICENSE for details).
 
 [0]: http://www.oracle.com/technetwork/articles/java/jf14-nashorn-2126515.html
 [3]: https://github.com/rails/execjs
-[4]: http://openjdk.java.net/projects/nashorn/
+[4]: http://openjdk.java.net/projects/nashorn/

data/lib/nashorn.rb

@@ -18,7 +18,7 @@ module Nashorn
     # Undefined = Java::JdkNashornInternalRuntime::Undefined rescue nil
   end
 
-  def eval_js(source, options = {})
+  def eval_js(source, options = nil)
     factory = JS::NashornScriptEngineFactory.new
     factory.getScriptEngine.eval(source)
   end

data/lib/nashorn/context.rb

@@ -85,6 +85,8 @@ module Nashorn
 
     def factory; @native.getFactory end
 
+    attr_reader :scope
+
     # Read a value from the global scope of this context
     def [](key)
       @scope[key]
@@ -96,19 +98,23 @@ module Nashorn
       @scope[key] = val
     end
 
+    # @private
+    FILENAME = javax.script.ScriptEngine.FILENAME
+
     # Evaluate a String/IO of JavaScript in this context.
-    def eval(source, source_name = "<eval>", line_number = 1)
+    def eval(source, filename = nil, line = nil)
       open do
         if IO === source || StringIO === source
           source = IOReader.new(source)
         else
           source = source.to_s
         end
+        @native.put(FILENAME, filename) if filename
         Nashorn.to_rb @native.eval(source, @scope)
       end
     end
 
-    def evaluate(source); eval(source) end
+    def evaluate(source, filename = nil); eval(source, filename) end
 
     # Read the contents of <tt>filename</tt> and evaluate it as JavaScript.
     #

data/lib/nashorn/execjs/runtime.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 require 'execjs/runtime'
 
 module ExecJS
   class NashornRuntime < Runtime
     class Context < Runtime::Context
 
-      def initialize(runtime, source = nil)
+      def initialize(_, source = nil, _ = nil)
         source = encode(source) if source
         @nashorn_context = ::Nashorn::Context.new
         @nashorn_context.eval(source) if source
@@ -17,7 +18,7 @@ module ExecJS
         eval "(function(){#{source}})()", options if /\S/ =~ source
       end
 
-      def eval(source, options = nil) # options not used
+      def eval(source, _ = nil) # options not used
         source = encode(source)
         unbox @nashorn_context.eval("(#{source})") if /\S/ =~ source
       rescue Exception => e
@@ -25,10 +26,11 @@ module ExecJS
       end
 
       def call(prop, *args)
-        evaled = @nashorn_context.eval(prop)
-        unbox evaled.call(*args)
-      rescue Exception => e
-        raise wrap_error(e)
+      #  evaled = @nashorn_context.eval(prop)
+      #  unbox evaled.call(*args)
+      #rescue Exception => e
+      #  raise wrap_error(e)
+        eval "#{prop}.apply(this, #{::JSON.generate(args)})"
       end
 
       def unbox(value)

data/lib/nashorn/ext.rb

@@ -167,25 +167,7 @@ module Nashorn
 
       # @private NOTE: duplicated from JSObject
       def call(*args)
-        # Nashorn.to_rb __call__ nil, *Nashorn.args_to_js(args) # this = nil
-
-
-        #if isFunction
-        #  this = Nashorn.to_js args.shift
-        #
-        #  puts "calling this = #{this.inspect} args = #{args.inspect}"
-        #
-        #  result = __call__(this, Nashorn.args_to_js(args))
-        #else
-
-        #puts "calling args = #{args.inspect} Nashorn.args_to_js(args) #{Nashorn.args_to_js(args).inspect}"
-
-        result = __call__ nil, *Nashorn.args_to_js(args)
-
-        #puts "called result = #{result.inspect} #{result.class}"
-
-        Nashorn.to_rb result
-        #end
+        Nashorn.to_rb __call__ nil, *Nashorn.args_to_js(args) # this = nil
       rescue JS::NashornException => e
         raise Nashorn::JSError.new(e)
       end

data/lib/nashorn/rhino/less.rb

@@ -61,24 +61,65 @@ module Less
       private
 
       def handle_js_error(e)
-
-        raise e # TODO NOT IMPLEMENTED
-
         #if e.value && ( e.value['message'] || e.value['type'].is_a?(String) )
         #  raise Less::ParseError.new(e, e.value) # LessError
         #end
-        #if e.unwrap.to_s =~ /missing opening `\(`/
-        #  raise Less::ParseError.new(e.unwrap.to_s)
-        #end
+        raise Less::ParseError.new(e) if ::Nashorn::JSError.parse_error?(e.cause)
+
+        msg = e.value.to_s
+        raise Less::ParseError.new(msg) if msg.start_with?("missing opening `(`")
         #if e.message && e.message[0, 12] == "Syntax Error"
         #  raise Less::ParseError.new(e)
-        #else
-        #  raise Less::Error.new(e)
         #end
+        raise Less::Error.new(e)
       end
 
     end
+
+    def self.to_js_hash(hash) # TODO this needs to be figured out
+      # we can not pass wrapped Ruby Hash objects down as they won't
+      # have a prototype (and thus no hasOwnProperty)
+      js_hash = Nashorn.eval_js '({})'
+      hash.each { |key, val| js_hash[key] = val }
+      js_hash
+    end
+
   end
 end
 
 Less::JavaScript.context_wrapper = Less::JavaScript::NashornContext
+
+require 'less'
+
+Less::Parser.class_eval do
+
+  def initialize(options = {})
+    env = {}
+    Less.defaults.merge(options).each do |key, val|
+      env[key.to_s] =
+        case val
+        when Symbol, Pathname then val.to_s
+        when Array
+          val.map!(&:to_s) if key.to_sym == :paths # might contain Pathname-s
+          val # keep the original passed Array
+        else val # true/false/String/Method
+        end
+    end
+    ###
+    env = Less::JavaScript.to_js_hash env
+    ###
+    @parser = Less::JavaScript.exec { Less['Parser'].new(env) }
+  end
+
+end
+
+Less::Parser::Tree.class_eval do
+
+  def to_css(opts = {})
+    ###
+    opts = Less::JavaScript.to_js_hash opts
+    ###
+    Less::JavaScript.exec { @tree.toCSS(opts) }
+  end
+
+end

data/lib/nashorn/ruby.rb

@@ -88,6 +88,11 @@ module Nashorn
 
       private
 
+      # @private
+      NUMBER_CLASS = Java::JavaLang::Number.java_class
+      # @private
+      STRING_CLASS = Java::JavaLang::String.java_class
+
       def convert(name)
         if exclude?(name)
           nil
@@ -130,6 +135,20 @@ module Nashorn
         instance.class.equal? @unwrap
       end
 
+      # @override
+      def isInstanceOf(clazz)
+        @unwrap.is_a?(clazz)
+      end
+
+      # @override
+      def getDefaultValue(hint)
+        if hint && NUMBER_CLASS.eql?(hint)
+          return hint.to_f if hint.respond_to?(:to_f)
+          return hint.to_i if hint.respond_to?(:to_i)
+        end
+        @unwrap.to_s
+      end
+
       # @override
       def isArray; @unwrap.is_a?(Array) end
 
@@ -193,6 +212,16 @@ module Nashorn
         instance.class.equal? @unwrap
       end
 
+      # @override
+      def isInstanceOf(clazz)
+        @unwrap.is_a?(clazz)
+      end
+
+      # @override
+      def getDefaultValue(hint)
+        @unwrap.to_s
+      end
+
       # @override
       def isArray; false end
 

data/lib/nashorn/version.rb

@@ -1,3 +1,3 @@
 module Nashorn
-  VERSION = '0.2.2'
-end
+  VERSION = '0.3.0'
+end

data/spec/nashorn/ext_spec.rb

@@ -0,0 +1,142 @@
+require File.expand_path('../spec_helper', File.dirname(__FILE__))
+
+module NashornHelpers
+
+  module_function
+
+  def add_prototype_key(hash, recurse = false)
+    hash['prototype'] ||= {}
+    hash.keys.each do |key|
+      val = hash[key] unless key == 'prototype'
+      add_prototype_key(val, recurse) if val.is_a?(Hash)
+    end if recurse
+  end
+
+end
+
+shared_examples_for 'JSObject', :shared => true do
+
+  it "acts like a hash" do
+    @object['foo'] = 'bar'
+    @object['foo'].should == 'bar'
+  end
+
+#  it "might be converted to a hash with string keys" do
+#    @object[42] = '42'
+#    @object[:foo] = 'bar'
+#    expect = @object.respond_to?(:to_h_properties) ? @object.to_h_properties : {}
+#    @object.to_h.should == expect.merge('42' => '42', 'foo' => 'bar')
+#  end
+
+  it "yields properties with each" do
+    @object['1'] = 1
+    @object['3'] = 3
+    @object['2'] = 2
+    @object.each do |key, val|
+      case key
+        when '1' then val.should == 1
+        when '2' then val.should == 2
+        when '3' then val.should == 3
+      end
+    end
+  end
+
+end
+
+describe "JS Array" do
+
+  before do
+    @object = Nashorn.eval_js '[ 1, 2, 3 ]'
+  end
+
+  it_should_behave_like 'JSObject'
+
+  it "converts toString" do
+    @object.to_s.should == '{"0"=>1, "1"=>2, "2"=>3}'
+  end
+
+  it "converts toString" do
+    @object.getDefaultValue(nil).should == '1,2,3'
+  end
+
+  it 'routes rhino methods' do
+    @object.proto.should_not be nil
+    @object.class_name.should == 'Array'
+  end
+
+  it 'raises on missing method' do
+    lambda { @object.aMissingMethod }.should raise_error(NoMethodError)
+  end
+
+  it 'puts JS property' do
+    @object.hasMember('foo').should == false
+    @object.foo = 'bar'
+    @object.hasMember('foo').should == true
+  end
+
+  it 'gets JS property' do
+    @object.put('foo', 42)
+    @object.foo.should == 42
+  end
+
+end
+
+describe "JS Object" do
+
+  before do
+    @object = Nashorn.eval_js 'Object.create({})'
+  end
+
+  it_should_behave_like 'JSObject'
+
+  it 'raises on missing method' do
+    lambda { @object.aMissingMethod }.should raise_error(NoMethodError)
+  end
+
+  it 'puts JS property' do
+    @object.hasMember('foo').should == false
+    @object.foo = 'bar'
+    @object.hasMember('foo').should == true
+  end
+
+  it 'gets JS property' do
+    @object.put('foo', 42)
+    @object.foo.should == 42
+  end
+
+#  it 'is == to an empty Hash / Map' do
+#    ( @object == {} ).should be true
+#    ( @object == java.util.HashMap.new ).should be true
+#  end
+#
+#  it 'is === to an empty Hash' do
+#    ( @object === {} ).should be true
+#  end
+
+  it 'is eql? to an empty Hash / Map' do
+    ( @object.eql?( {} ) ).should be true
+    ( @object.eql?( java.util.HashMap.new ) ).should be true
+  end
+
+#  it 'is eql? to another native object' do
+#    object = @context.newObject(scope)
+#    ( @object.eql?( object ) ).should be true
+#    ( object.eql?( @object ) ).should be true
+#    ( @object == object ).should be true
+#    ( object === @object ).should be true
+#  end
+
+#  it 'objects with same values are equal' do
+#    #object1 = @object; object1['foo'] = 'bar'; object1['answer'] = 42
+#    #object2 = Nashorn.eval_js '({ foo: "bar", answer: 42 })'
+#    Nashorn::Context.open do |js|
+#      object1 = js.eval '({})'
+#      object1['foo'] = 'bar'; object1['answer'] = 42
+#      object2 = js.eval '({ foo: "bar", answer: 42 })'
+#
+#      ( object1 == object2 ).should be true
+#      ( object1.eql?( object2 ) ).should be true
+#    end
+#  end
+
+end

data/spec/nashorn/ruby_spec.rb

@@ -127,6 +127,14 @@ describe Nashorn::Ruby::Object do
     rb_object.keys.should_not include('writer')
   end
 
+  it 'getDefaultValue returns to_s' do
+    rb_object = Nashorn::Ruby::Object.wrap object = UII.new
+    str = object.to_s # <UII:0x7b9a4292>
+    expect( rb_object.getDefaultValue(nil) ).to eql str
+    expect( rb_object.getDefaultValue(java.lang.Number.java_class) ).to eql str
+    expect( rb_object.getDefaultValue(java.lang.String.java_class) ).to eql str
+  end
+
   it "is aliased to RubyObject" do
     Nashorn::RubyObject.should be(Nashorn::Ruby::Object)
   end

data/spec/nashorn/test_execjs.rb

@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
-require 'minitest/autorun'
-
-require 'json'
-
-require 'nashorn/execjs/load'
-require 'execjs'
+require "minitest/autorun"
+require "execjs/module"
+require "json"
+
+begin
+  require "execjs"
+rescue ExecJS::RuntimeUnavailable => e
+  warn e
+  exit 2
+end
 
 if defined? Minitest::Test
   Test = Minitest::Test
@@ -13,26 +17,10 @@ elsif defined? MiniTest::Unit::TestCase
 end
 
 class TestExecJS < Test
-#  def test_runtime_available
-#    runtime = ExecJS::ExternalRuntime.new(command: "nonexistent")
-#    assert !runtime.available?
-#
-#    runtime = ExecJS::ExternalRuntime.new(command: "ruby")
-#    assert runtime.available?
-#  end
-#
-#  def test_runtime_assignment
-#    original_runtime = ExecJS.runtime
-#    runtime = ExecJS::ExternalRuntime.new(command: "nonexistent")
-#    assert_raises(ExecJS::RuntimeUnavailable) { ExecJS.runtime = runtime }
-#    assert_equal original_runtime, ExecJS.runtime
-#
-#    runtime = ExecJS::ExternalRuntime.new(command: "ruby")
-#    ExecJS.runtime = runtime
-#    assert_equal runtime, ExecJS.runtime
-#  ensure
-#    ExecJS.runtime = original_runtime
-#  end
+
+  def setup
+    super
+  end
 
   def test_context_call
     context = ExecJS.compile("id = function(v) { return v; }")
@@ -80,6 +68,9 @@ class TestExecJS < Test
     end
 
     define_method("test_compile_return_string_#{index}") do
+
+      puts "var a = #{input};"
+
       context = ExecJS.compile("var a = #{input};")
       assert_equal output, context.eval("a")
     end
@@ -125,7 +116,6 @@ class TestExecJS < Test
     end
 
     define_method("test_strinigfy_value_#{index}") do
-      # context = ExecJS.compile("function json(obj) { return obj || JSON.stringify(obj); }")
       context = ExecJS.compile("function json(obj) { return JSON.stringify(obj); }")
 
       puts context.inspect; puts "value = #{value.inspect}"
@@ -270,6 +260,9 @@ class TestExecJS < Test
       ExecJS.eval(")")
       flunk
     rescue ExecJS::RuntimeError => e
+
+      #puts "\n\nEVAL: " + e.inspect + "\n  #{e.backtrace.join("\n  ")}\n"
+
       assert e
       assert e.backtrace[0].include?("(execjs):1"), e.backtrace.join("\n")
     end
@@ -332,7 +325,7 @@ class TestExecJS < Test
       ExecJS.compile("throw 'hello'")
     end
   end
-=begin
+
   def test_babel
     skip if ExecJS.runtime.is_a?(ExecJS::RubyRhinoRuntime)
 
@@ -370,5 +363,6 @@ class TestExecJS < Test
     assert_equal "function foo(bar){return bar}",
       context.call("uglify", "function foo(bar) {\n  return bar;\n}")
   end
-=end
+
 end
+

data/spec/nashorn_spec.rb

@@ -7,6 +7,14 @@ describe Nashorn do
     expect( Nashorn.eval_js 'true + 100' ).to eql 101
   end
 
+  it 'getDefaultValue is used for toString' do
+    arr = Nashorn.eval('[ 1, 2 ]')
+    expect( arr ).to be_a Nashorn::JS::JSObject
+    expect( arr.getDefaultValue(nil) ).to eql '1,2'
+    expect( arr.getDefaultValue(java.lang.Number.java_class) ).to eql '1,2'
+    expect( arr.getDefaultValue(java.lang.String.java_class) ).to eql '1,2'
+  end
+
   class NashornStub
     include Nashorn
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dienashorner
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Karol Bucek
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2016-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -49,6 +49,7 @@ extra_rdoc_files:
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -70,6 +71,7 @@ files:
 - lib/nashorn/version.rb
 - spec/nashorn/access_spec.rb
 - spec/nashorn/error_spec.rb
+- spec/nashorn/ext_spec.rb
 - spec/nashorn/integration/bar.js
 - spec/nashorn/integration/foo.js
 - spec/nashorn/integration/index.js