saper 0.5.1 → 0.5.2

data/spec/spec_helper.rb

@@ -1,22 +1,3 @@
+require 'minitest/spec'
+require 'minitest/autorun'
 require 'saper'
-
-class EmptyAction < Saper::Action
-  # default configuration
-end
-
-class TestAction < Saper::Action
-  accepts :text
-end
-
-class ActionWithMandatoryArgument < Saper::Action
-  accepts :text
-  argument :text
-  run { |input, string| "%s %s" % [string, input] }
-end
-
-class ActionWithOptionalArgument < Saper::Action
-  accepts :text
-  argument :text, :optional => true
-  run { |input, string| "%s %s" % [string, input] }
-end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saper
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Alex Serebryakov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-05 00:00:00.000000000 Z
+date: 2014-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -52,20 +52,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.1
-- !ruby/object:Gem::Dependency
-  name: vremya
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: reverse_markdown
   requirement: !ruby/object:Gem::Requirement
@@ -95,75 +81,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 10.3.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 10.3.1
-- !ruby/object:Gem::Dependency
-  name: rspec
+  name: jpath
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.14.1
-  type: :development
+        version: 0.1.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: vremya
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.7
-  type: :development
+        version: 1.0.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: guard
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 10.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 10.3.2
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.2.8
+        version: 0.8.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.2.8
+        version: 0.8.7
 description: Web automation library that allows to crawl websites and extract data
   in an efficient and fault-tolerant manner.
 email: alex@merimond.com
@@ -173,9 +145,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/saper
-- lib/lib/json_search.rb
-- lib/lib/mechanize.rb
-- lib/lib/nokogiri.rb
 - lib/saper/actions/append_with.rb
 - lib/saper/actions/convert_to_html.rb
 - lib/saper/actions/convert_to_json.rb
@@ -184,11 +153,13 @@ files:
 - lib/saper/actions/convert_to_xml.rb
 - lib/saper/actions/create_atom.rb
 - lib/saper/actions/fetch.rb
+- lib/saper/actions/fetch_with_token.rb
 - lib/saper/actions/find.rb
 - lib/saper/actions/find_first.rb
 - lib/saper/actions/get_attribute.rb
 - lib/saper/actions/get_contents.rb
 - lib/saper/actions/get_text.rb
+- lib/saper/actions/nothing.rb
 - lib/saper/actions/prepend_with.rb
 - lib/saper/actions/remove_after.rb
 - lib/saper/actions/remove_before.rb
@@ -204,8 +175,10 @@ files:
 - lib/saper/actions/split.rb
 - lib/saper/arguments/attribute.rb
 - lib/saper/arguments/recipe.rb
+- lib/saper/arguments/service.rb
 - lib/saper/arguments/text.rb
 - lib/saper/arguments/timezone.rb
+- lib/saper/arguments/url.rb
 - lib/saper/arguments/variable.rb
 - lib/saper/arguments/xpath.rb
 - lib/saper/core/action.rb
@@ -218,7 +191,9 @@ files:
 - lib/saper/core/logger.rb
 - lib/saper/core/namespace.rb
 - lib/saper/core/recipe.rb
+- lib/saper/core/result.rb
 - lib/saper/core/runtime.rb
+- lib/saper/core/stack.rb
 - lib/saper/core/type.rb
 - lib/saper/items/atom.rb
 - lib/saper/items/document.rb
@@ -230,6 +205,8 @@ files:
 - lib/saper/items/time.rb
 - lib/saper/items/url.rb
 - lib/saper/items/xml.rb
+- lib/saper/patches/mechanize.rb
+- lib/saper/patches/nokogiri.rb
 - lib/saper/version.rb
 - lib/saper.rb
 - Rakefile
@@ -246,19 +223,28 @@ files:
 - spec/actions/find_first_spec.rb
 - spec/actions/find_spec.rb
 - spec/actions/get_attribute_spec.rb
-- spec/actions/get_contents.rb
-- spec/actions/get_text.rb
+- spec/actions/get_contents_spec.rb
+- spec/actions/get_text_spec.rb
+- spec/actions/nothing_spec.rb
 - spec/actions/prepend_with_spec.rb
-- spec/actions/remove_after.rb
-- spec/actions/remove_before.rb
+- spec/actions/remove_after_spec.rb
+- spec/actions/remove_before_spec.rb
+- spec/actions/remove_matching_spec.rb
+- spec/actions/remove_tags_spec.rb
 - spec/actions/replace_spec.rb
-- spec/actions/run_recipe_and_save_spec.tmp.rb
-- spec/actions/run_recipe_spec.tmp.rb
+- spec/actions/run_recipe_and_save_spec.rb
+- spec/actions/run_recipe_spec.rb
 - spec/actions/save_spec.rb
 - spec/actions/select_matching_spec.rb
 - spec/actions/set_input_spec.rb
 - spec/actions/skip_tags_spec.rb
 - spec/actions/split_spec.rb
+- spec/arguments/attribute_spec.rb
+- spec/arguments/recipe_spec.rb
+- spec/arguments/text_spec.rb
+- spec/arguments/timezone_spec.rb
+- spec/arguments/variable_spec.rb
+- spec/arguments/xpath_spec.rb
 - spec/core/action_spec.rb
 - spec/core/argument_spec.rb
 - spec/core/browser_spec.rb
@@ -268,8 +254,12 @@ files:
 - spec/core/logger_spec.rb
 - spec/core/namespace_spec.rb
 - spec/core/recipe_spec.rb
+- spec/core/result_spec.rb
 - spec/core/runtime_spec.rb
+- spec/core/stack_spec.rb
 - spec/core/type_spec.rb
+- spec/integration/simple_invalid_spec.rb
+- spec/integration/simple_valid_spec.rb
 - spec/items/atom_spec.rb
 - spec/items/document_spec.rb
 - spec/items/html_spec.rb
@@ -301,7 +291,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Ruby data scraping library
@@ -317,19 +307,28 @@ test_files:
 - spec/actions/find_first_spec.rb
 - spec/actions/find_spec.rb
 - spec/actions/get_attribute_spec.rb
-- spec/actions/get_contents.rb
-- spec/actions/get_text.rb
+- spec/actions/get_contents_spec.rb
+- spec/actions/get_text_spec.rb
+- spec/actions/nothing_spec.rb
 - spec/actions/prepend_with_spec.rb
-- spec/actions/remove_after.rb
-- spec/actions/remove_before.rb
+- spec/actions/remove_after_spec.rb
+- spec/actions/remove_before_spec.rb
+- spec/actions/remove_matching_spec.rb
+- spec/actions/remove_tags_spec.rb
 - spec/actions/replace_spec.rb
-- spec/actions/run_recipe_and_save_spec.tmp.rb
-- spec/actions/run_recipe_spec.tmp.rb
+- spec/actions/run_recipe_and_save_spec.rb
+- spec/actions/run_recipe_spec.rb
 - spec/actions/save_spec.rb
 - spec/actions/select_matching_spec.rb
 - spec/actions/set_input_spec.rb
 - spec/actions/skip_tags_spec.rb
 - spec/actions/split_spec.rb
+- spec/arguments/attribute_spec.rb
+- spec/arguments/recipe_spec.rb
+- spec/arguments/text_spec.rb
+- spec/arguments/timezone_spec.rb
+- spec/arguments/variable_spec.rb
+- spec/arguments/xpath_spec.rb
 - spec/core/action_spec.rb
 - spec/core/argument_spec.rb
 - spec/core/browser_spec.rb
@@ -339,8 +338,12 @@ test_files:
 - spec/core/logger_spec.rb
 - spec/core/namespace_spec.rb
 - spec/core/recipe_spec.rb
+- spec/core/result_spec.rb
 - spec/core/runtime_spec.rb
+- spec/core/stack_spec.rb
 - spec/core/type_spec.rb
+- spec/integration/simple_invalid_spec.rb
+- spec/integration/simple_valid_spec.rb
 - spec/items/atom_spec.rb
 - spec/items/document_spec.rb
 - spec/items/html_spec.rb

data/lib/lib/json_search.rb

@@ -1,54 +0,0 @@
-# XPath-style library for JSON
-
-module JSONSearch
-  
-  def self.find(object, selector)
-    if object.is_a?(Array)
-      return object.map { |item|
-        find(item, selector)
-      }.flatten.compact
-    end
-    case selector
-    when /\A\/([^\/]+)/
-      name = $1
-      sub  = selector.sub($&, "")
-      children(object, name).map { |child|
-        find(child, sub)
-      }.flatten.compact
-    when /\A\/\/([^\/]+)/
-      name = $1
-      sub  = selector.sub($&, "")
-      descendants(object, name).map { |descendant|
-        find(descendant, sub)
-      }.flatten.compact
-    when /\A\z/
-      object
-    else
-      raise "Unsupported selector"
-    end
-  end
-  
-  def self.children(object, name)
-    case object
-    when Array
-      object.map { |item|
-        children(item, name)
-      }.flatten
-    when Hash
-      if name == "*"
-        object.values
-      else
-        [object[name]]
-      end
-    else
-      []
-    end
-  end
-  
-  def self.descendants(object, name)
-    children(object, "*").map { |child|
-      descendants(child, name)
-    }.push(*children(object, name))
-  end
-  
-end

data/spec/actions/run_recipe_and_save_spec.tmp.rb

@@ -1,52 +0,0 @@
-require './spec/spec_helper'
-
-describe Saper::Actions::RunRecipeAndSave do
-  
-  let(:namespace) do
-    Saper::Namespace.parse do |ns|
-      recipe :child do
-        prepend_with 'test-'
-      end
-      recipe :parent do
-        run_recipe_and_save :variable, :child
-      end
-    end
-  end
-  
-  context "when argument is missing" do
-    it "raises InvalidArgument" do
-      expect { Saper::Action.new(:run_recipe_and_save).run }.to raise_error(Saper::InvalidArgument)
-    end
-  end
-  
-  context "when input is invalid" do
-    let(:runtime) do
-      namespace.run(:parent, nil)
-    end
-    it "raises no errors" do
-      expect { runtime }.to_not raise_error
-    end
-    it "returns valid output" do
-      runtime.results.should == nil
-    end
-    it "sets error flag in runtime" do
-      runtime.error?.should be_true
-    end
-    it "records error in runtime" do
-      runtime.error.should be_a(Saper::InvalidInput)
-    end
-  end
-  
-  context "when input and arguments are valid" do
-    let(:runtime) do
-      Saper::Action.new(:run_recipe_and_save, :variable, :child).run('string', :namespace => namespace)
-    end
-    it "raises no errors" do
-      expect { runtime }.to_not raise_error
-    end
-    it "returns valid output" do
-      runtime.results.should == ['test-string']
-    end
-  end
-  
-end

data/spec/actions/run_recipe_spec.tmp.rb

@@ -1,53 +0,0 @@
-require './spec/spec_helper'
-
-describe Saper::Actions::RunRecipe do
-  
-  let(:child) do
-    Saper::Recipe.new do |recipe|
-      recipe << Saper::Action.new(:prepend_with, 'test-')
-    end
-  end
-  
-  let(:namespace) do
-    Saper::Namespace.new do |ns|
-      ns[:child] = child
-    end
-  end
-  
-  context "when argument is missing" do
-    it "raises InvalidArgument" do
-      expect { Saper::Action.new(:run_recipe).run }.to raise_error(Saper::InvalidArgument)
-    end
-  end
-  
-  context "when input is invalid" do
-    let(:runtime) do
-      Saper::Action.new(:run_recipe, :child).run(nil, :namespace => namespace)
-    end
-    it "raises no errors" do
-      expect { runtime }.to_not raise_error
-    end
-    it "returns valid output" do
-      runtime.results.should == nil
-    end
-    it "sets error flag in runtime" do
-      runtime.error?.should be_true
-    end
-    it "records error in runtime" do
-      runtime.error.should be_a(Saper::InvalidInput)
-    end
-  end
-  
-  context "when input and arguments are valid" do
-    let(:runtime) do
-      Saper::Action.new(:run_recipe, :child).run('string', :namespace => namespace)
-    end
-    it "raises no errors" do
-      expect { runtime }.to_not raise_error
-    end
-    it "returns valid output" do
-      runtime.results.should == 'test-string'
-    end
-  end
-  
-end