escodegen 1.1.0 → 1.2.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,7 @@
+=== 1.2.0
+
+*  Supported different platforms with execjs, which should fix JRuby issues.
+
 === 1.1.0
 
 *  Added JRuby support.

data/escodegen.gemspec

@@ -13,11 +13,7 @@ Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
   s.has_rdoc = true
 
-  if (RUBY_PLATFORM == 'java')
-    s.add_dependency 'therubyrhino'
-  else
-    s.add_dependency 'therubyracer', '~> 0.9.10'
-  end
+  s.add_dependency 'execjs', '~> 1.4.0'
   s.add_dependency 'commonjs', '~> 0.2.6'
 
   s.add_development_dependency 'rake'

data/lib/escodegen.rb

@@ -1,26 +1,28 @@
 # encoding: UTF-8
 
-if (RUBY_PLATFORM == 'java')
-  require 'rhino'
-else
-  require 'v8'
-end
+require 'execjs'
 require 'commonjs'
 
 require 'escodegen/generator'
 
 module Escodegen
-  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 => Escodegen.load_path)
+      env.require("escodegen")
+    end
+
+    protected
 
-  def self.new_environment
-    if (RUBY_PLATFORM == 'java')
-      context = Rhino::Context.new
-    else
-      context = V8::Context.new
+    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
-    env = CommonJS::Environment.new(context, :path => Escodegen.load_path)
-    env.require("escodegen")
   end
 end

data/lib/escodegen/version.rb

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

metadata

@@ -1,99 +1,100 @@
 --- !ruby/object:Gem::Specification
 name: escodegen
 version: !ruby/object:Gem::Version
-  version: 1.1.0
-  prerelease: 
+  prerelease:
+  version: 1.2.0
 platform: ruby
 authors:
 - Cameron Dutro
 - Yusuke Suzuki
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-12-26 00:00:00.000000000 Z
+date: 2012-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: therubyracer
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  name: execjs
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.10
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: 1.4.0
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.10
+        version: 1.4.0
+    none: false
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: commonjs
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.6
+    none: false
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.11.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.11.0
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.4
-description: Ruby wrapper around the escodegen JavaScript generator that generates
-  ECMA script from an abstract syntax tree.
+    none: false
+  prerelease: false
+  type: :development
+description: Ruby wrapper around the escodegen JavaScript generator that generates ECMA script from an abstract syntax tree.
 email:
 - cdutro@twitter.com
 - ! '@Constellation'
@@ -101,9 +102,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/escodegen.rb
 - lib/escodegen/generator.rb
 - lib/escodegen/version.rb
-- lib/escodegen.rb
 - spec/escodegen_spec.rb
 - spec/generator_spec.rb
 - spec/spec_helper.rb
@@ -117,27 +118,28 @@ files:
 - escodegen.gemspec
 homepage: https://github.com/Constellation/escodegen
 licenses: []
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: !binary |-
+        MA==
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: !binary |-
+        MA==
+  none: false
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.23
-signing_key: 
+rubyforge_project:
+rubygems_version: 1.8.24
+signing_key:
 specification_version: 3
-summary: Ruby wrapper around the escodegen JavaScript generator that generates ECMA
-  script from an abstract syntax tree.
+summary: Ruby wrapper around the escodegen JavaScript generator that generates ECMA script from an abstract syntax tree.
 test_files: []