esprima 1.2.0 → 1.4.0

data/Gemfile

@@ -2,6 +2,9 @@ source :rubygems
 
 gemspec
 
+gem 'therubyrhino', :platform => :jruby
+gem 'therubyracer', '~> 0.9.10', :platform => :mri
+
 group :test do
   gem 'rspec', '~> 2.11.0'
   gem 'rr',    '~> 1.0.4'

data/History.txt

@@ -1,3 +1,11 @@
+=== 1.4.0
+
+*  Supported different platforms with execjs, which should fix JRuby issues.
+
+=== 1.3.0
+
+*  Added JRuby compatibility.
+
 === 1.2.0
 
 *  Added intermediate AST class that offers a few convenience methods like `each`.

data/esprima.gemspec

@@ -13,9 +13,9 @@ Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
   s.has_rdoc = true
 
-  s.add_dependency 'therubyracer', '~> 0.9.10'
+  s.add_dependency 'execjs', '~> 1.4.0'
   s.add_dependency 'commonjs', '~> 0.2.6'
-  s.add_dependency 'escodegen', '~> 1.0.0'
+  s.add_dependency 'escodegen', '~> 1.2.0'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec', '~> 2.11.0'

data/lib/esprima.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require 'v8'
+require 'execjs'
 require 'commonjs'
 require 'escodegen'
 
@@ -11,13 +11,23 @@ require 'esprima/ast'
 Enumerator = Enumerable::Enumerator unless defined?(Enumerator)
 
 module Esprima
-  def self.load_path
-    @load_path ||= File.expand_path(File.join(File.dirname(__FILE__), "../vendor"))
-  end
+  class << self
+    def load_path
+      @load_path ||= File.expand_path(File.join(File.dirname(__FILE__), "../vendor"))
+    end
+
+    def new_environment
+      context = new_context
+      env = CommonJS::Environment.new(context, :path => Esprima.load_path)
+      env.require("esprima")
+    end
+
+    protected
 
-  def self.new_environment
-    context = V8::Context.new
-    env = CommonJS::Environment.new(context, :path => Esprima.load_path)
-    env.require("esprima")
+    def new_context
+      cxt_obj = ExecJS.runtime.class::Context.new(nil)
+      cxt_var = cxt_obj.instance_variables.select { |var_name| var_name.to_s.include?("context") }.first
+      cxt_obj.instance_variable_get(cxt_var)
+    end
   end
 end

data/lib/esprima/parser.rb

@@ -22,13 +22,19 @@ module Esprima
     end
 
     def to_ruby_hash(obj)
-      if obj.is_a?(V8::Array)
+      if js_type_of?(obj, :array)
         obj.map { |val| to_ruby_hash(val) }
-      elsif obj.is_a?(V8::Object)
+      elsif js_type_of?(obj, :object)
         obj.inject({}) { |ret, (key, val)| ret[key.to_sym] = to_ruby_hash(val); ret }
       else
         obj
       end
     end
+
+    protected
+
+    def js_type_of?(obj, type_sym)
+      obj.class.to_s.split("::").last.downcase.include?(type_sym.to_s)
+    end
   end
-end
+end

data/lib/esprima/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 module Esprima
-  VERSION = "1.2.0"
+  VERSION = "1.4.0"
 end

data/spec/parser_spec.rb

@@ -19,6 +19,18 @@ AST_RESULT = [{
   }
 }]
 
+class MockV8
+  class Array
+  end
+end
+
+class MockRhino
+  class JS
+    class NativeObject
+    end
+  end
+end
+
 describe Esprima::Parser do
   describe "#parse" do
     it "should parse a basic js expression" do
@@ -37,4 +49,18 @@ describe Esprima::Parser do
       result[:body].should == AST_RESULT
     end
   end
+
+  describe "#js_type_of?" do
+    it "returns true if the object's class name includes the given text, false otherwise" do
+      parser = Esprima::Parser.new
+
+      mock_arr = MockV8::Array.new
+      parser.send(:js_type_of?, mock_arr, :array).should be_true
+      parser.send(:js_type_of?, mock_arr, :object).should be_false
+
+      mock_obj = MockRhino::JS::NativeObject.new
+      parser.send(:js_type_of?, mock_obj, :array).should be_false
+      parser.send(:js_type_of?, mock_obj, :object).should be_true
+    end
+  end
 end

metadata

@@ -1,99 +1,127 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: esprima
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.2.0
+version: !ruby/object:Gem::Version
+  prerelease:
+  version: 1.4.0
 platform: ruby
-authors: 
+authors:
 - Cameron Dutro
 - Ariya Hidayat
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2012-11-15 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: therubyracer
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2012-12-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: execjs
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.0
     none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.9.10
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+    none: false
+  prerelease: false
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: commonjs
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.6
     none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.2.6
+    none: false
+  prerelease: false
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: escodegen
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
     none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.0.0
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+    none: false
+  prerelease: false
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.11.0
     none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.11.0
+    none: false
+  prerelease: false
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: rr
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.4
     none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.4
+    none: false
+  prerelease: false
   type: :development
-  version_requirements: *id006
 description: Ruby wrapper around the Esprima static code analyzer for JavaScript.
-email: 
+email:
 - cdutro@twitter.com
 - ariya.hidayat@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- lib/esprima.rb
 - lib/esprima/ast.rb
 - lib/esprima/parser.rb
 - lib/esprima/version.rb
-- lib/esprima.rb
 - spec/ast_spec.rb
 - spec/esprima_spec.rb
 - spec/parser_spec.rb
@@ -108,30 +136,28 @@ files:
 - esprima.gemspec
 homepage: http://esprima.org
 licenses: []
-
-post_install_message: 
+post_install_message:
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: !binary |-
+        MA==
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: !binary |-
+        MA==
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.8.17
-signing_key: 
+rubyforge_project:
+rubygems_version: 1.8.24
+signing_key:
 specification_version: 3
 summary: Ruby wrapper around the Esprima static code analyzer for JavaScript.
 test_files: []
-