harmony 0.5.1 → 0.5.2

data/Manifest

@@ -11,107 +11,3 @@ specs.watchr
 test/harmony_test.rb
 test/page_test.rb
 test/test_helper.rb
-vendor/README
-vendor/envjs/README
-vendor/envjs/bin/envjsrb
-vendor/envjs/bin/jquery-1.2.6-test.js
-vendor/envjs/bin/jquery-1.3.1-test.js
-vendor/envjs/bin/jquery-1.3.2-test.js
-vendor/envjs/bin/prototype-1.6.0.3-test.js
-vendor/envjs/bin/prototype_1.6.0.3_tmpl.txt
-vendor/envjs/bin/test-jquery.sh
-vendor/envjs/bin/test-prototype.sh
-vendor/envjs/bin/tidy
-vendor/envjs/lib/envjs.rb
-vendor/envjs/lib/envjs/env.js
-vendor/envjs/lib/envjs/net.rb
-vendor/envjs/lib/envjs/net/cgi.rb
-vendor/envjs/lib/envjs/net/file.rb
-vendor/envjs/lib/envjs/options.rb
-vendor/envjs/lib/envjs/runtime.rb
-vendor/envjs/lib/envjs/tempfile.rb
-vendor/envjs/test/base64.js
-vendor/envjs/test/call-load-test.js
-vendor/envjs/test/data.js
-vendor/envjs/test/debug.js
-vendor/envjs/test/firebug/errorIcon.png
-vendor/envjs/test/firebug/firebug.css
-vendor/envjs/test/firebug/firebug.html
-vendor/envjs/test/firebug/firebug.js
-vendor/envjs/test/firebug/firebugx.js
-vendor/envjs/test/firebug/infoIcon.png
-vendor/envjs/test/firebug/warningIcon.png
-vendor/envjs/test/fixtures/html/events.html
-vendor/envjs/test/fixtures/html/iframe1.html
-vendor/envjs/test/fixtures/html/iframe1a.html
-vendor/envjs/test/fixtures/html/iframe2.html
-vendor/envjs/test/fixtures/html/iframe3.html
-vendor/envjs/test/fixtures/html/iframeN.html
-vendor/envjs/test/fixtures/html/malformed.html
-vendor/envjs/test/fixtures/html/scope.html
-vendor/envjs/test/fixtures/html/trivial.html
-vendor/envjs/test/fixtures/html/with_js.html
-vendor/envjs/test/fixtures/images/icon-blue.png
-vendor/envjs/test/fixtures/js/external_script.js
-vendor/envjs/test/fixtures/js/script.js
-vendor/envjs/test/fixtures/js/script_error.js
-vendor/envjs/test/html/events.html
-vendor/envjs/test/html/iframe1.html
-vendor/envjs/test/html/iframe1a.html
-vendor/envjs/test/html/iframe2.html
-vendor/envjs/test/html/iframe3.html
-vendor/envjs/test/html/iframeN.html
-vendor/envjs/test/html/malformed.html
-vendor/envjs/test/html/scope.html
-vendor/envjs/test/html/script.js
-vendor/envjs/test/html/trivial.html
-vendor/envjs/test/html/with_js.html
-vendor/envjs/test/index.html
-vendor/envjs/test/java-prototype.js
-vendor/envjs/test/primary-tests.js
-vendor/envjs/test/prototype-test.js
-vendor/envjs/test/qunit.js
-vendor/envjs/test/qunit/qunit/qunit.css
-vendor/envjs/test/qunit/qunit/qunit.js
-vendor/envjs/test/scope.rb
-vendor/envjs/test/specs/dist/env.spec.js
-vendor/envjs/test/specs/envjs.spec.css
-vendor/envjs/test/specs/parser/html.js
-vendor/envjs/test/specs/parser/spec.html
-vendor/envjs/test/specs/parser/xml.js
-vendor/envjs/test/specs/qunit.bdd.js
-vendor/envjs/test/specs/qunit.css
-vendor/envjs/test/specs/qunit.js
-vendor/envjs/test/specs/template/spec-0.js
-vendor/envjs/test/specs/template/spec-1.js
-vendor/envjs/test/specs/template/spec.html
-vendor/envjs/test/specs/window/css.js
-vendor/envjs/test/specs/window/dialog.js
-vendor/envjs/test/specs/window/document.js
-vendor/envjs/test/specs/window/event.js
-vendor/envjs/test/specs/window/history.js
-vendor/envjs/test/specs/window/location.js
-vendor/envjs/test/specs/window/navigator.js
-vendor/envjs/test/specs/window/screen.js
-vendor/envjs/test/specs/window/spec.html
-vendor/envjs/test/specs/window/timer.js
-vendor/envjs/test/specs/window/window.js
-vendor/envjs/test/specs/xhr/spec.html
-vendor/envjs/test/specs/xhr/xhr.js
-vendor/envjs/test/test.js
-vendor/envjs/test/unit/dom.js
-vendor/envjs/test/unit/elementmembers.js
-vendor/envjs/test/unit/events.js
-vendor/envjs/test/unit/fixtures/external_script.js
-vendor/envjs/test/unit/iframe.js
-vendor/envjs/test/unit/multi-window.js
-vendor/envjs/test/unit/nu.validator.js
-vendor/envjs/test/unit/onload.js
-vendor/envjs/test/unit/parser.js
-vendor/envjs/test/unit/prototypecompat.js
-vendor/envjs/test/unit/proxy.js
-vendor/envjs/test/unit/scope.js
-vendor/envjs/test/unit/timer.js
-vendor/envjs/test/unit/window.js
-vendor/envjs/test/vendor/jQuery/README
-vendor/envjs/test/vendor/prototype-1.6.0.3.js

data/README.md

@@ -111,10 +111,15 @@ Install
     # There's a gem dependency bug in rubygems currently, so we'll have to
     # install dependencies manually. This will be fixed soon.
     gem install stackdeck
-    gem install johnson -v "2.0.0.pre0"
+    gem install johnson -v "2.0.0.pre1"
 
     gem install harmony
 
+See Also
+--------
+
+* [holygrail][20]: Harmony plugin for Rails tests
+
 Acknowledgement
 ---------------
 
@@ -153,4 +158,5 @@ YinYang ASCII art is © Normand Veilleux (nveilleuATemr1.emrDOTca)
 [11]: http://github.com/smparkes/env-js/commit/49abe259813a505b0761e6d31dde671344b5bc87#L0R279
 [12]: http://groups.google.com/group/envjs/msg/4ac719f7db7912f5
 [13]: http://gemcutter.org/gems/envjs
+[20]: http://github.com/mynyml/holygrail
 [30]: http://github.com/thatcher/env-js

data/harmony.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |s|
   s.version             =  Harmony::VERSION
   s.files               =  File.read("Manifest").strip.split("\n")
 
-  s.add_dependency 'johnson', '2.0.0.pre0'
+  s.add_dependency 'johnson', '2.0.0.pre1'
+  s.add_dependency 'envjs', '0.1.2'
   s.add_development_dependency 'minitest'
 end

data/lib/harmony.rb

@@ -1,5 +1,5 @@
 module Harmony
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 
   autoload :Page, 'harmony/page'
 end

data/lib/harmony/page.rb

@@ -2,7 +2,7 @@ require 'pathname'
 require 'tempfile'
 
 require 'johnson/tracemonkey'
-require  Pathname(__FILE__).dirname.parent.parent + 'vendor/envjs/lib/envjs/runtime'
+require 'envjs/runtime'
 
 module Harmony
   class Page
@@ -65,15 +65,16 @@ module Harmony
       @window = Window.from_document(document) if document
     end
 
-    # Load a javascript file in page's context
-    #
-    # @param [String] path
-    #   path to js file
+    # Load one or more javascript files in page's context
     #
+    # @param [#to_s, #to_s, ...] paths
+    #   paths to js file
     # @return [Page] self
     #
-    def load(path)
-      window.load(path.to_s)
+    def load(*paths)
+      paths.flatten.each do |path|
+        window.load(path.to_s)
+      end
       self
     end
 

data/test/page_test.rb

@@ -65,6 +65,34 @@ class PageTest < MiniTest::Unit::TestCase
     assert_equal 'bar', page.x('foo()')
   end
 
+  test "can load multiple files as array" do
+    paths = []
+    paths << tempfile(<<-HTML)
+      function foo() { return 'bar' };
+    HTML
+    paths << tempfile(<<-HTML)
+      function moo() { return 'boo' };
+    HTML
+
+    page = Page.new.load(paths)
+    assert_equal 'bar', page.x('foo()')
+    assert_equal 'boo', page.x('moo()')
+  end
+
+  test "can load multiple files as splat" do
+    paths = []
+    paths << tempfile(<<-HTML)
+      function foo() { return 'bar' };
+    HTML
+    paths << tempfile(<<-HTML)
+      function moo() { return 'boo' };
+    HTML
+
+    page = Page.new.load(*paths)
+    assert_equal 'bar', page.x('foo()')
+    assert_equal 'boo', page.x('moo()')
+  end
+
   private
     def tempfile(content)
       Tempfile.open('abc') {|f| f << content; @__path = f.path }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: harmony
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - mynyml
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-11 00:00:00 -05:00
+date: 2010-02-13 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,17 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.0.0.pre0
+        version: 2.0.0.pre1
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: envjs
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.1.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: minitest
@@ -54,110 +64,6 @@ files:
 - test/harmony_test.rb
 - test/page_test.rb
 - test/test_helper.rb
-- vendor/README
-- vendor/envjs/README
-- vendor/envjs/bin/envjsrb
-- vendor/envjs/bin/jquery-1.2.6-test.js
-- vendor/envjs/bin/jquery-1.3.1-test.js
-- vendor/envjs/bin/jquery-1.3.2-test.js
-- vendor/envjs/bin/prototype-1.6.0.3-test.js
-- vendor/envjs/bin/prototype_1.6.0.3_tmpl.txt
-- vendor/envjs/bin/test-jquery.sh
-- vendor/envjs/bin/test-prototype.sh
-- vendor/envjs/bin/tidy
-- vendor/envjs/lib/envjs.rb
-- vendor/envjs/lib/envjs/env.js
-- vendor/envjs/lib/envjs/net.rb
-- vendor/envjs/lib/envjs/net/cgi.rb
-- vendor/envjs/lib/envjs/net/file.rb
-- vendor/envjs/lib/envjs/options.rb
-- vendor/envjs/lib/envjs/runtime.rb
-- vendor/envjs/lib/envjs/tempfile.rb
-- vendor/envjs/test/base64.js
-- vendor/envjs/test/call-load-test.js
-- vendor/envjs/test/data.js
-- vendor/envjs/test/debug.js
-- vendor/envjs/test/firebug/errorIcon.png
-- vendor/envjs/test/firebug/firebug.css
-- vendor/envjs/test/firebug/firebug.html
-- vendor/envjs/test/firebug/firebug.js
-- vendor/envjs/test/firebug/firebugx.js
-- vendor/envjs/test/firebug/infoIcon.png
-- vendor/envjs/test/firebug/warningIcon.png
-- vendor/envjs/test/fixtures/html/events.html
-- vendor/envjs/test/fixtures/html/iframe1.html
-- vendor/envjs/test/fixtures/html/iframe1a.html
-- vendor/envjs/test/fixtures/html/iframe2.html
-- vendor/envjs/test/fixtures/html/iframe3.html
-- vendor/envjs/test/fixtures/html/iframeN.html
-- vendor/envjs/test/fixtures/html/malformed.html
-- vendor/envjs/test/fixtures/html/scope.html
-- vendor/envjs/test/fixtures/html/trivial.html
-- vendor/envjs/test/fixtures/html/with_js.html
-- vendor/envjs/test/fixtures/images/icon-blue.png
-- vendor/envjs/test/fixtures/js/external_script.js
-- vendor/envjs/test/fixtures/js/script.js
-- vendor/envjs/test/fixtures/js/script_error.js
-- vendor/envjs/test/html/events.html
-- vendor/envjs/test/html/iframe1.html
-- vendor/envjs/test/html/iframe1a.html
-- vendor/envjs/test/html/iframe2.html
-- vendor/envjs/test/html/iframe3.html
-- vendor/envjs/test/html/iframeN.html
-- vendor/envjs/test/html/malformed.html
-- vendor/envjs/test/html/scope.html
-- vendor/envjs/test/html/script.js
-- vendor/envjs/test/html/trivial.html
-- vendor/envjs/test/html/with_js.html
-- vendor/envjs/test/index.html
-- vendor/envjs/test/java-prototype.js
-- vendor/envjs/test/primary-tests.js
-- vendor/envjs/test/prototype-test.js
-- vendor/envjs/test/qunit.js
-- vendor/envjs/test/qunit/qunit/qunit.css
-- vendor/envjs/test/qunit/qunit/qunit.js
-- vendor/envjs/test/scope.rb
-- vendor/envjs/test/specs/dist/env.spec.js
-- vendor/envjs/test/specs/envjs.spec.css
-- vendor/envjs/test/specs/parser/html.js
-- vendor/envjs/test/specs/parser/spec.html
-- vendor/envjs/test/specs/parser/xml.js
-- vendor/envjs/test/specs/qunit.bdd.js
-- vendor/envjs/test/specs/qunit.css
-- vendor/envjs/test/specs/qunit.js
-- vendor/envjs/test/specs/template/spec-0.js
-- vendor/envjs/test/specs/template/spec-1.js
-- vendor/envjs/test/specs/template/spec.html
-- vendor/envjs/test/specs/window/css.js
-- vendor/envjs/test/specs/window/dialog.js
-- vendor/envjs/test/specs/window/document.js
-- vendor/envjs/test/specs/window/event.js
-- vendor/envjs/test/specs/window/history.js
-- vendor/envjs/test/specs/window/location.js
-- vendor/envjs/test/specs/window/navigator.js
-- vendor/envjs/test/specs/window/screen.js
-- vendor/envjs/test/specs/window/spec.html
-- vendor/envjs/test/specs/window/timer.js
-- vendor/envjs/test/specs/window/window.js
-- vendor/envjs/test/specs/xhr/spec.html
-- vendor/envjs/test/specs/xhr/xhr.js
-- vendor/envjs/test/test.js
-- vendor/envjs/test/unit/dom.js
-- vendor/envjs/test/unit/elementmembers.js
-- vendor/envjs/test/unit/events.js
-- vendor/envjs/test/unit/fixtures/external_script.js
-- vendor/envjs/test/unit/iframe.js
-- vendor/envjs/test/unit/multi-window.js
-- vendor/envjs/test/unit/nu.validator.js
-- vendor/envjs/test/unit/onload.js
-- vendor/envjs/test/unit/parser.js
-- vendor/envjs/test/unit/prototypecompat.js
-- vendor/envjs/test/unit/proxy.js
-- vendor/envjs/test/unit/scope.js
-- vendor/envjs/test/unit/timer.js
-- vendor/envjs/test/unit/window.js
-- vendor/envjs/test/vendor/jQuery/README
-- vendor/envjs/test/vendor/prototype-1.6.0.3.js
 has_rdoc: true
 homepage: http://github.com/mynyml/harmony
 licenses: []

data/vendor/README

@@ -1 +0,0 @@
-vendoring specific envjs version (built from source) until changes are released

data/vendor/envjs/README

@@ -1,36 +0,0 @@
-This is a fork of the env.js project (http://github.com/thatcher/env-js/). See that link for env.js details.
-
-This fork is based on the Johnson Ruby gem (http://github.com/jbarnette/johnson) and will become obsolete when the Johnson support has been reintegrated into the master repo.
-
-For now, you can install the envjs gem by installing Johnson:
-
-  gem install johnson --prerelease
-
-(You'll need to manually install any prerequisites it asks for) and then installing the envjs gem with
-
-  gem install envjs
-
-The envjs gem provides the envjsrb command, which functions as an extended version of the Johnson javascript shell. For example:
-
-mbp:env-js smparkes$ envjsrb
-js> this
-=> [object Window 0]
-js> window.location
-=> about:blank
-js> document.innerHTML
-=> "<html><head><title></title></head><body></body></html>"
-js> 
-
-It's also possible to embed the envjs interpreter similar to the way it's done in Johnson, e.g.,
-
-require 'rubygems' # if necessary
-require 'johnson/tramonkey'
-require 'envjs/runtime'
-
-envjs = Johnson::Runtime.new
-envjs.extend Envjs::Runtime
-window = envjs.evaluate("")
-puts window.location.to_s # == "about:blank"
-puts window.document.innerHTML # == "<html><head><title></title></head><body></body></html>"
-
-Comments to http://groups.google.com/group/envjs or #envjs on freenode.

data/vendor/envjs/bin/envjsrb

@@ -1,255 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rubygems'
-require 'pathname'
-
-require 'envjs/options'
-
-require 'johnson/tracemonkey'
-require 'johnson/cli'
-require 'envjs/runtime'
-
-RUNTIME = js = Johnson::Runtime.new
-RUNTIME.extend Envjs::Runtime
-
-# RUNTIME.load Envjs::ENVJS
-
-EXIT_VERBS = [nil] + %w(exit quit)
-  
-prepped = false
-ruby_readline = []
-js_readline = []
-local_binding = binding
-mode = nil
-
-(class<<self; self; end).send :define_method, :prep do
-
-  return if prepped
-  prepped = true
-
-  require "readline"
-  require "johnson/cli"
-
-  RUNTIME.evaluate(Johnson::CLI::JS)
-
-  def copy_history
-    new_history = []
-    until Readline::HISTORY.empty?
-      new_history.push(Readline::HISTORY.pop)
-    end
-    new_history
-  end
-
-  def paste_history(old_history)
-    until old_history.empty?
-      Readline::HISTORY << old_history.pop
-    end
-  end
-
-  def handle_exit(input)
-    return EXIT_VERBS.include?(input)
-  end
-
-  def rescued(&block)
-    yield
-  rescue Exception => e
-    exit if SystemExit === e
-
-    puts e.message
-    puts e.backtrace.reject { |l| l =~ /bin\/johnson/ }
-  end
-
-  def eval_in_js(expression,stream)
-    rescued do
-      v = RUNTIME.evaluate(expression, "(console)")
-      stream.result { "=> " + v.inspect }
-  end
-  end
-
-  def eval_in_ruby(expression, bind_to, stream)
-    rescued do
-      v = eval(expression, bind_to)
-      stream.result { "=> " + v.inspect }
-    end
-  end
-  
-  (class<<self; self; end).send :define_method, :do_loop do |stream|
-  # def foo
-
-    catch "Breakout" do
-      loop do
-        mode = :js
-        input = stream.next("js> ")
-        input and input.chomp!
-        begin stream.exit(input); throw "Breakout" end if handle_exit(input)
-        
-        if input =~ /^rb\s+(.+)$/
-          eval_in_ruby($1, local_binding, stream)
-          next
-        end
-        
-        if input == "rb"
-          js_readline = copy_history
-          paste_history(ruby_readline)
-          
-          loop do
-            mode = :rb
-            # input = Readline.readline("rb> ", true)
-            input = stream.next("rb> ")
-            begin stream.exit(input); throw "Breakout" end if handle_exit(input)
-
-            break if input == "js"
-
-            if input =~ /^js\s+(.+)$/
-              eval_in_js($1)
-              next
-            end
-
-            eval_in_ruby(input, local_binding, stream)
-          end
-          
-          ruby_readline = copy_history
-          paste_history(js_readline)
-          next
-        end
-        
-        eval_in_js(input, stream)
-      end
-    end
-  end
-end
-
-if ARGV.length > 0
-
-  begin
-    about_blank = true
-    ARGV.each do |file|
-
-      uri = URI.parse file
-
-      if uri.scheme == nil
-        uri.scheme = "file"
-        begin
-          uri.path = Pathname.new(uri.path).realpath.to_s
-        rescue Errno::ENOENT; end
-        uri = URI.parse uri.to_s
-      end
-
-      uri_s = uri.to_s.sub %r(^file:/([^/])), 'file:///\1'
-
-      if uri.scheme == "about" and uri.opaque == "blank"
-        RUNTIME.wait
-        RUNTIME.evaluate("window.location = 'about:blank'", "(comand line)", 1)
-        about_blank = true
-      elsif uri.path =~ /\.x?html?$/ || uri.scheme =~ %r(^https?)
-
-        # this might want to go alway; jazrb does it manually now, which I think was the use case
-        # that wanted this
-        if !about_blank
-          RUNTIME.wait
-          RUNTIME.evaluate("window.location = 'about:blank'", "(comand line)", 1)
-        end
-
-        RUNTIME.wait
-        # RUNTIME.evaluate("window.location = 'file://#{Pathname.new(file).realpath}'", file, 1)
-        RUNTIME.evaluate("window.location = '#{uri_s}'", file, 1)
-        about_blank = false
-      else
-        RUNTIME.become_first_script_window
-        RUNTIME.top_level_load uri_s
-        RUNTIME.load uri_s
-      end
-    end
-  rescue Johnson::Error => je
-    if je.message.match /<SystemExit: exit>/
-      exit
-    end
-    raise je
-  end
-
-  RUNTIME.wait
-
-else
-
-  prep
-
-  if !(files = Dir[".envjsrbrc",File.join(ENV["HOME"],".envjsrbrc")]).empty?
-    file = Class.new do
-      def initialize f
-        @file = open f
-      end
-      def next prompt
-        @file.gets
-      end
-      def result &block
-      end
-      def exit v; end
-    end.new files[0]
-
-    do_loop file
-  end
-
-  options = Johnson::CLI::Options.parse!(ARGV)
-
-  options.load_paths.each { |d| $LOAD_PATH << d }
-  options.paths_to_require.each { |p| RUNTIME.evaluate("Johnson.require('#{p}')") }
-  options.files_to_preload.each { |f| RUNTIME.load(f) }
-
-  unless options.expressions.empty?
-    options.expressions.each { |e| RUNTIME.evaluate(e, '-e') }
-    exit if options.files_to_evaluate.empty?
-  end
-
-  unless options.files_to_evaluate.empty?
-    RUNTIME[:arguments] = options.arguments
-    
-    options.files_to_evaluate.each do |file|
-      RUNTIME.load(file)
-    end
-    
-    exit
-  end
-
-  reader = Class.new do
-    def next prompt
-      Readline.readline(prompt, true)
-    end
-    def result
-      puts yield
-    end
-    def exit v; puts if v.nil?; end
-  end.new
-
-  begin
-  open(File.join(ENV["HOME"],".envjsrb.js")) do |f|
-    js_readline = f.read.split("\n")
-  end
-  rescue; end
-
-  begin
-  open(File.join(ENV["HOME"],".envjsrb.ruby")) do |f|
-    ruby_readline = f.read.split("\n")
-  end
-  rescue; end
-
-  case mode
-  when :js; paste_history js_readline
-  when :rb; paste_history ruby_readline
-  end
-
-  do_loop reader
-
-  case mode
-  when :js; js_readline = copy_history
-  when :rb; ruby_readline = copy_history
-  end
-
-  open(File.join(ENV["HOME"],".envjsrb.js"),"w") do |f|
-    f.write js_readline[0..100].join("\n")+"\n"
-  end
-
-  open(File.join(ENV["HOME"],".envjsrb.ruby"),"w") do |f|
-    f.write ruby_readline[0..100].join("\n")+"\n"
-  end
-
-end