capy 1.4.4 → 1.5.0

data/README.md

@@ -39,6 +39,10 @@ and capy with '-w' option
 
     $ capy -w example.capy
 
+### Import other files
+
+    import 'examples/google_search.capy'
+
 ### To access the elements within IFrame
 
     within_frame('IFRAME_ID') do

data/lib/capy.rb

@@ -3,6 +3,7 @@ require "capy/version"
 require "slop"
 require "colored"
 require 'capybara/dsl'
+require 'capy/evaluator'
 
 module Capy
   class << self
@@ -25,12 +26,12 @@ module Capy
 
       @mode = opts.js? ? :javascript : :capybara
 
-      evaluater = Evaluater.new
+      evaluator = Evaluator.new
 
-      evaluater.visit Capybara.app_host if Capybara.app_host
+      evaluator.visit Capybara.app_host if Capybara.app_host
 
       if args.empty?
-        start_shell evaluater
+        start_shell evaluator
       else
         args.each do |script_file|
           unless File.exists?(script_file)
@@ -38,9 +39,9 @@ module Capy
             return 1
           end
           puts "Running: #{script_file} ..."
-          result = evaluater.eval_script File.read(script_file), mode
+          result = evaluator.eval_script File.read(script_file), mode, script_file
           puts "=> #{result.inspect}".cyan
-          start_shell evaluater if opts.stop?
+          start_shell evaluator if opts.stop?
         end
       end
 
@@ -71,12 +72,12 @@ module Capy
 
     EXIT_COMMANDS = %w(exit quit)
 
-    def start_shell(evaluater)
+    def start_shell(evaluator)
       return if @_start_shell
       @_start_shell = true
 
       Readline.completion_proc = lambda do |text|
-        (Evaluater.instance_methods - Object.methods + EXIT_COMMANDS).grep(/^#{Regexp.quote(text.strip)}/)
+        (Evaluator.instance_methods - Object.methods + EXIT_COMMANDS).grep(/^#{Regexp.quote(text.strip)}/)
       end
 
       history_file = File.expand_path('~/.capy_history')
@@ -101,7 +102,7 @@ module Capy
           return
         else
           begin
-            result = evaluater.eval_script(buf, mode)
+            result = evaluator.eval_script(buf, mode)
             puts "=> #{result.inspect}".cyan
           rescue Exception => e
             error e
@@ -119,78 +120,4 @@ module Capy
       puts "\t#{e.backtrace[1..-1].join("\n\t")}".red
     end
   end
-
-  class Evaluater
-    include Capybara::DSL
-
-    def initialize
-      if page.driver.respond_to?(:header)
-        page.driver.header(
-          'user-agent',
-          'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_3) AppleWebKit/534.55.3 (KHTML, like Gecko) Version/5.1.5 Safari/534.55.3'
-        )
-      end
-    end
-
-    def eval_script(script, mode)
-      case mode
-      when :javascript
-        javascript script
-      else
-        capybara script
-      end
-    end
-
-    def javascript(script)
-      page.evaluate_script script.sub(/\A#!.*\n/, '')
-    end
-    alias_method :js, :javascript
-
-    def capybara(script)
-      instance_eval script
-    end
-
-    def take_screenshot(png_path = nil)
-      png_path = gen_uniq_file_name('Screen Shot', 'png') unless png_path
-      case Capybara.current_driver
-      when :webkit
-        driver.render(png_path)
-      else
-        browser.save_screenshot(png_path)
-      end
-      png_path
-    end
-
-    def driver
-      page.driver
-    end
-
-    def browser
-      driver.browser
-    end
-
-    def host(app_host)
-      Capybara.app_host = app_host
-    end
-
-    def stop
-      Capy.start_shell(self)
-    end
-
-    private
-
-    def gen_uniq_file_name(prefix, extension)
-      file_name = "#{prefix} #{Time.now}"
-      i = 2
-      while File.exists?("#{file_name}.#{extension}")
-        file_name = if file_name =~ /\(\d+\)$/
-            file_name.sub(/\(\d+\)$/, i.to_s)
-          else
-            file_name + " (#{i})"
-          end
-        i += 1
-      end
-      "#{file_name}.#{extension}"
-    end
-  end
 end

data/lib/capy/evaluator.rb

@@ -0,0 +1,97 @@
+module Capy
+
+class Evaluator
+  include Capybara::DSL
+
+  def initialize
+    if page.driver.respond_to?(:header)
+      page.driver.header(
+        'user-agent',
+        'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_3) AppleWebKit/534.55.3 (KHTML, like Gecko) Version/5.1.5 Safari/534.55.3'
+      )
+    end
+  end
+
+  def eval_script(script, mode, file_path = nil)
+    prev_file, @current_file = @current_file, file_path if file_path
+    prev_mode, @current_mode = @current_mode, mode
+
+    case mode
+    when :javascript
+      javascript script
+    else
+      capybara script
+    end
+  ensure
+    @current_file = prev_file if file_path
+    @current_mode = prev_mode
+  end
+
+  def import(file_name)
+    script_file = if @current_file
+        File.join(File.dirname(@current_file), file_name)
+      else
+        file_name
+      end
+
+    if File.exists?(script_file)
+      eval_script(File.read(script_file), @current_mode, script_file)
+    else
+      raise "No such file: #{script_file}"
+    end
+  end
+
+  def javascript(script)
+    page.evaluate_script script.sub(/\A#!.*\n/, '')
+  end
+  alias_method :js, :javascript
+
+  def capybara(script)
+    instance_eval script
+  end
+
+  def take_screenshot(png_path = nil)
+    png_path = gen_uniq_file_name('Screen Shot', 'png') unless png_path
+    case Capybara.current_driver
+    when :webkit
+      driver.render(png_path)
+    else
+      browser.save_screenshot(png_path)
+    end
+    png_path
+  end
+
+  def driver
+    page.driver
+  end
+
+  def browser
+    driver.browser
+  end
+
+  def host(app_host)
+    Capybara.app_host = app_host
+  end
+
+  def stop
+    Capy.start_shell(self)
+  end
+
+  private
+
+  def gen_uniq_file_name(prefix, extension)
+    file_name = "#{prefix} #{Time.now}"
+    i = 2
+    while File.exists?("#{file_name}.#{extension}")
+      file_name = if file_name =~ /\(\d+\)$/
+          file_name.sub(/\(\d+\)$/, i.to_s)
+        else
+          file_name + " (#{i})"
+        end
+      i += 1
+    end
+    "#{file_name}.#{extension}"
+  end
+end
+
+end

data/lib/capy/version.rb

@@ -1,3 +1,3 @@
 module Capy
-  VERSION = "1.4.4"
+  VERSION = "1.5.0"
 end

data/spec/capy_spec.rb

@@ -24,8 +24,8 @@ describe Capy do
 
   context '$ capy -a http://google.com/' do
     it 'visit http://google.com/' do
-      any_instance_of(Capy::Evaluater) do |evaluater|
-        mock(evaluater).visit('http://google.com/')
+      any_instance_of(Capy::Evaluator) do |evaluator|
+        mock(evaluator).visit('http://google.com/')
       end
       mock(Capy).start_shell.with_any_args
       Capy.run(%w(-a http://google.com/)).should == 0
@@ -37,8 +37,8 @@ describe Capy do
       it 'eval script' do
         file = File.expand_path('../fixtures/foo.capy', __FILE__)
         script = File.read(file)
-        any_instance_of(Capy::Evaluater) do |evaluater|
-          mock(evaluater).eval_script(script, :capybara)
+        any_instance_of(Capy::Evaluator) do |evaluator|
+          mock(evaluator).eval_script(script, :capybara, file)
         end
         Capy.run([file]).should == 0
       end
@@ -46,8 +46,8 @@ describe Capy do
 
     context 'file is not exists' do
       it 'does not eval script' do
-        any_instance_of(Capy::Evaluater) do |evaluater|
-          mock(evaluater).eval_script.with_any_args.never
+        any_instance_of(Capy::Evaluator) do |evaluator|
+          mock(evaluator).eval_script.with_any_args.never
         end
         Capy.run(%w(bar.capy)).should == 1
       end
@@ -57,8 +57,8 @@ describe Capy do
   context '$ capy foo.capy' do
     it 'eval script and stop' do
       file = File.expand_path('../fixtures/foo.capy', __FILE__)
-      any_instance_of(Capy::Evaluater) do |evaluater|
-        mock(evaluater).eval_script.with_any_args
+      any_instance_of(Capy::Evaluator) do |evaluator|
+        mock(evaluator).eval_script.with_any_args
       end
       mock(Capy).start_shell.with_any_args
       Capy.run(['-s', file]).should == 0
@@ -77,8 +77,8 @@ describe Capy do
       it 'eval script' do
         file = File.expand_path('../fixtures/foo.js', __FILE__)
         script = File.read(file)
-        any_instance_of(Capy::Evaluater) do |evaluater|
-          mock(evaluater).eval_script(script, :javascript)
+        any_instance_of(Capy::Evaluator) do |evaluator|
+          mock(evaluator).eval_script(script, :javascript, file)
         end
         Capy.run(['-j', file]).should == 0
       end
@@ -93,7 +93,7 @@ describe Capy do
   end
 
   describe 'gen_uniq_file_name' do
-    let!(:evaluater) { Capy::Evaluater.new }
+    let!(:evaluator) { Capy::Evaluator.new }
     let!(:now) { Time.now }
 
     before do
@@ -102,7 +102,7 @@ describe Capy do
 
     context 'when file does not exists' do
       it do
-        evaluater.send(:gen_uniq_file_name, 'Foo', :png).should == "Foo #{now}.png"
+        evaluator.send(:gen_uniq_file_name, 'Foo', :png).should == "Foo #{now}.png"
       end
     end
 
@@ -110,7 +110,7 @@ describe Capy do
       it do
         mock(File).exists?("Foo #{now}.png") { true }
         mock(File).exists?("Foo #{now} (2).png") { false }
-        evaluater.send(:gen_uniq_file_name, 'Foo', :png).should == "Foo #{now} (2).png"
+        evaluator.send(:gen_uniq_file_name, 'Foo', :png).should == "Foo #{now} (2).png"
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capy
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-25 00:00:00.000000000Z
+date: 2012-04-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
-  requirement: &70245184336920 !ruby/object:Gem::Requirement
+  requirement: &70155630974880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70245184336920
+  version_requirements: *70155630974880
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70245184336300 !ruby/object:Gem::Requirement
+  requirement: &70155630974460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70245184336300
+  version_requirements: *70155630974460
 - !ruby/object:Gem::Dependency
   name: colored
-  requirement: &70245184335660 !ruby/object:Gem::Requirement
+  requirement: &70155630974000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70245184335660
+  version_requirements: *70155630974000
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70245184334940 !ruby/object:Gem::Requirement
+  requirement: &70155630973580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70245184334940
+  version_requirements: *70155630973580
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70245184333980 !ruby/object:Gem::Requirement
+  requirement: &70155630973160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70245184333980
+  version_requirements: *70155630973160
 description: Capybara Script Runner
 email:
 - jugyo.org@gmail.com
@@ -85,6 +85,7 @@ files:
 - examples/twitter.capy
 - examples/wikipedia_search.capy
 - lib/capy.rb
+- lib/capy/evaluator.rb
 - lib/capy/version.rb
 - spec/capy_spec.rb
 - spec/fixtures/foo.capy