saper 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e3837b908a7c2e26f770d28ba24bc8e5ceb5beb
-  data.tar.gz: 1a442deae6a10374bab445b695f1d83597ce37f7
+  metadata.gz: 7aba132c13d3bc80c0034121a49cb2c45841a5c2
+  data.tar.gz: 12e4ca23e2d339a1951e2495f7791444160f3daa
 SHA512:
-  metadata.gz: 55844e966392ebd596d8a62ace3a9fc70831ea7b60ebfb2df81fc7ddbaad2aacac9c431adc5ff4dbd504fbe7b951670780c2778395473111adbbda2ca9c3e3d5
-  data.tar.gz: 3da6224447204cd0784d7abcc4806a68aa086ea89fe23401cde51eb3d5968b8b83a307be80ffcd4506979791b6c22f01cf99e1dc704a71c4b86c9e9c7623d884
+  metadata.gz: 0ff6858a582e44d4e61682a014e351d688d9b303870b516a897dd48c50ab66efddd42d3077d2cc87470da4cd4173faeefbc13f3375df214353ce1d17869d13f7
+  data.tar.gz: f8cc29550eaa47a9040fbebbf659dddd627b470dfbcd4d2a42998741d5d4aab187b2b49bcfe813279b2e3eff3989be4fdc0ccb36d47e5e3f9b0a63777cdd0414

data/README.md

@@ -9,6 +9,9 @@ Common use scenarios:
 - create an RSS feed for a website or a web application
 - create an API for a website that doesn't have one
 
+[![Gem Version](https://badge.fury.io/rb/saper.svg)](http://badge.fury.io/rb/saper)
+[![Build Status](https://travis-ci.org/merimond/saper.svg?branch=master)](https://travis-ci.org/merimond/saper)
+
 ## Installing
 
 Make sure you have Ruby and RubyGems, then run:

data/Rakefile

@@ -1,19 +1,19 @@
 require 'rubygems'
 require 'bundler'
-require 'rspec/core/rake_task'
+require 'rake/testtask'
 require 'yard'
 
 Bundler.require
 Bundler::GemHelper.install_tasks
 
-desc "Run specs"
-RSpec::Core::RakeTask.new do |t|
-  # nothing
+desc "Run tests"
+Rake::TestTask.new do |t|
+  t.test_files = FileList['spec/**/*_spec.rb']
 end
 
 desc "Generate docs"
 YARD::Rake::YardocTask.new do |t|
-  t.files   = ['lib/saper/**/*.rb']
+  t.files = ['lib/saper/**/*.rb']
 end
 
-task :default => :spec
+task :default => :test

data/bin/saper

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "saper"
-require 'trollop'
+require_relative "../lib/saper"
+require "trollop"
 
 opts = Trollop::options do
   banner <<-EOS
@@ -10,51 +10,32 @@ Usage: saper <filename> [options]
   
 Options are ...
   EOS
-  opt :input, "Recipe input", :type => :string
-  opt :recipe, "Recipe name", :type => :string
+  opt :recipe,   "Recipe name",   :type => :string
+  opt :input,    "Recipe input",  :type => :string
+  opt :agent,    "User-Agent",    :type => :string
+  opt :keychain, "Keychain file", :type => :string
 end
 
-unless ARGV.size == 1
-  Trollop::die "Please specify filename"
+if opts[:recipe].nil?
+  Trollop::die "Recipe name missing"
 end
 
-path = File.expand_path(ARGV.first)
-
-unless File.exists?(path) && File.file?(path)
-  Trollop::die("File not found")
+unless ARGV.size == 1
+  Trollop::die "Please specify filename"
 end
 
 begin
-  data = File.read(path)
-rescue
-  Trollop::die("File cannot be read")
-end  
-
-begin
-  space = Saper::Namespace.parse(data)
+  puts Saper.run_from_file(ARGV.first, opts.delete(:recipe), opts.delete(:input), opts).serialize
+rescue Errno::ENOENT => e
+  Trollop::die("File not found: %s" % ARGV.first)
 rescue NoMethodError => e
   Trollop::die("Invalid command: %s" % e.message.match(/`(\w+)'/)[1])
-end
-
-if opts[:recipe].nil?
-  if space.run_by_default.nil?
-    Trollop::die("Recipe name undefined")
-  end
-  opts[:recipe] = space.run_by_default
-end
-
-begin
-  recipe = space[opts[:recipe]]
 rescue Saper::RecipeNotFound => e
-  Trollop::die("`%s` recipe not found" % opts[:input])
+  Trollop::die("Recipe not found: %s" % opts[:input])
 rescue Saper::ActionNotFound => e
   Trollop::die("Invalid action: %s" % e.message)
 rescue Saper::InvalidArgument => e
-  Trolltop::die("Invalid action argument")
-end
-
-if opts[:input].nil? && recipe.input_required?
-  Trollop::die("No input specified, action requires %s" % recipe.input_required.inspect)
+  Trollop::die("Invalid action argument")
+rescue Exception => e
+  puts e.backtrace
 end
-
-puts recipe.run(opts[:input]).results

data/lib/saper.rb

@@ -1,37 +1,80 @@
 module Saper
   
-  def self.require_multiple(dir)
-    Dir[File.dirname(__FILE__) + "/" + dir].each { |file| require file }
-  end
-  
+  require 'bundler/setup'
   require 'reverse_markdown'
   require 'json'
   require 'vremya'
   require 'nokogiri'
   require 'securerandom'
   require 'mechanize'
+  require 'jpath'
 
-  require_relative "lib/json_search"
-  require_relative "lib/mechanize"
-  require_relative "lib/nokogiri"
-  
-  require_relative "saper/version"
+  require_relative "saper/patches/mechanize"
+  require_relative "saper/patches/nokogiri"
   require_relative "saper/version"
-  require_relative "saper/core/item"
-  require_multiple "saper/items/*.rb"
-  require_relative "saper/core/argument"
-  require_multiple "saper/arguments/*.rb"
+
   require_relative "saper/core/action"
-  require_multiple "saper/actions/*.rb"
-  require_relative "saper/core/error"
-  require_relative "saper/core/namespace"
-  require_relative "saper/core/type"
-  require_relative "saper/core/recipe"
+  require_relative "saper/core/argument"
+  require_relative "saper/core/browser"
+  require_relative "saper/core/dsl"
   require_relative "saper/core/error"
+  require_relative "saper/core/item"
   require_relative "saper/core/keychain"
-  require_relative "saper/core/dsl"
-  require_relative "saper/core/browser"
   require_relative "saper/core/logger"
+  require_relative "saper/core/namespace"
+  require_relative "saper/core/recipe"
+  require_relative "saper/core/result"
   require_relative "saper/core/runtime"
+  require_relative "saper/core/stack"
+  require_relative "saper/core/type"
+  
+  require_relative "saper/arguments/attribute"
+  require_relative "saper/arguments/recipe"
+  require_relative "saper/arguments/service"
+  require_relative "saper/arguments/text"
+  require_relative "saper/arguments/timezone"
+  require_relative "saper/arguments/url"
+  require_relative "saper/arguments/variable"
+  require_relative "saper/arguments/xpath"
+  
+  require_relative "saper/items/atom"
+  require_relative "saper/items/document"
+  require_relative "saper/items/html"
+  require_relative "saper/items/json"
+  require_relative "saper/items/markdown"
+  require_relative "saper/items/nothing"
+  require_relative "saper/items/text"
+  require_relative "saper/items/time"
+  require_relative "saper/items/url"
+  require_relative "saper/items/xml"
+  
+  require_relative "saper/actions/append_with"
+  require_relative "saper/actions/convert_to_html"
+  require_relative "saper/actions/convert_to_json"
+  require_relative "saper/actions/convert_to_markdown"
+  require_relative "saper/actions/convert_to_time"
+  require_relative "saper/actions/convert_to_xml"
+  require_relative "saper/actions/create_atom"
+  require_relative "saper/actions/fetch"
+  require_relative "saper/actions/fetch_with_token"
+  require_relative "saper/actions/find"
+  require_relative "saper/actions/find_first"
+  require_relative "saper/actions/get_attribute"
+  require_relative "saper/actions/get_contents"
+  require_relative "saper/actions/get_text"
+  require_relative "saper/actions/nothing"
+  require_relative "saper/actions/prepend_with"
+  require_relative "saper/actions/remove_after"
+  require_relative "saper/actions/remove_before"
+  require_relative "saper/actions/remove_matching"
+  require_relative "saper/actions/remove_tags"
+  require_relative "saper/actions/replace"
+  require_relative "saper/actions/run_recipe"
+  require_relative "saper/actions/run_recipe_and_save"
+  require_relative "saper/actions/save"
+  require_relative "saper/actions/select_matching"
+  require_relative "saper/actions/set_input"
+  require_relative "saper/actions/skip_tags"
+  require_relative "saper/actions/split"
   
 end

data/lib/saper/actions/append_with.rb

@@ -5,7 +5,7 @@ module Saper
       argument :text
       accepts :text, :returns => :text
       
-      run do |input, string|
+      run do |runtime, input, string|
         Items::Text.new "%s%s" % [input, string]
       end
       

data/lib/saper/actions/convert_to_html.rb

@@ -5,7 +5,7 @@ module Saper
       accepts :text, :returns => :html
       accepts :document, :returns => :html
       
-      run do |input|
+      run do |runtime, input|
         input.to_html
       end
       

data/lib/saper/actions/convert_to_json.rb

@@ -5,8 +5,12 @@ module Saper
       accepts :text, :returns => :json
       accepts :document, :returns => :json
       
-      run do |input|
-        input.to_json
+      run do |runtime, input|
+        begin
+          input.to_json
+        rescue Saper::InvalidItem
+          nil
+        end
       end
       
     end

data/lib/saper/actions/convert_to_markdown.rb

@@ -4,7 +4,7 @@ module Saper
       
       accepts :html, :returns => :markdown
       
-      run do |input|
+      run do |runtime, input|
         input.to_markdown
       end
       

data/lib/saper/actions/convert_to_time.rb

@@ -6,10 +6,47 @@ module Saper
       argument :text, :optional => true
       accepts :text, :returns => :time
       
-      run do |input, format, tz|
+      run do |runtime, input, format, tz|
+        tz = nil if tz && tz.empty?
         input.to_time(format, tz)
       end
       
+      # Format elements
+      # %Y  - Year with century (can be negative, 4 digits at least)
+      # %C  - year / 100 (round down.  20 in 2009)
+      # %y  - year % 100 (00..99)
+      # %m  - Month of the year, zero-padded (01..12)
+      # %-m - Month of the year, no-padded (1..12)
+      # %B  - The full month name (``January'')
+      # %^B - Month name uppercased (``JANUARY'')
+      # %b  - Abbreviated month name (``Jan'')
+      # %^b - Abbreviated uppercased month (``JAN'')
+      # %d  - Day of the month, zero-padded (01..31)
+      # %-d - Day of the month, no-padded (1..31)
+      # %e  - Day of the month, blank-padded ( 1..31)
+      # %j  - Day of the year (001..366)
+      # %H  - Hour of the day, 24-hour clock, zero-padded (00..23)
+      # %k  - Hour of the day, 24-hour clock, blank-padded ( 0..23)
+      # %I  - Hour of the day, 12-hour clock, zero-padded (01..12)
+      # %l  - Hour of the day, 12-hour clock, blank-padded ( 1..12)
+      # %P  - Meridian indicator, lowercase (``am'' or ``pm'')
+      # %p  - Meridian indicator, uppercase (``AM'' or ``PM'')
+      # %M  - Minute of the hour (00..59)
+      # %S  - Second of the minute (00..59)
+      # %L  - Millisecond of the second (000..999)
+      # %N  - Fractional seconds digits, default is 9 digits (nanosecond)
+      # %z  - Time zone as hour and minute offset from UTC (e.g. +0900)
+      # %:z - hour and minute offset from UTC with a colon (e.g. +09:00)
+      # %Z  - Time zone abbreviation name
+      # %A  - The full weekday name (``Sunday'')
+      # %^A - Weekday, uppercased (``SUNDAY'')
+      # %a  - Weekday, abbreviated (``Sun'')
+      # %^a - Weekday, uppercased (``SUN'')
+      # %u  - Day of the week (Monday is 1, 1..7)
+      # %w  - Day of the week (Sunday is 0, 0..6)
+      # %s  - Number of seconds since 1970-01-01 00:00:00 UTC.
+      # %Q  - Number of milliseconds since 1970-01-01 00:00:00 UTC.
+      
     end
   end
 end

data/lib/saper/actions/convert_to_xml.rb

@@ -5,7 +5,7 @@ module Saper
       accepts :text, :returns => :xml
       accepts :document, :returns => :xml
       
-      run do |input|
+      run do |runtime, input|
         input.to_xml
       end
       

data/lib/saper/actions/create_atom.rb

@@ -4,8 +4,12 @@ module Saper
       
       accepts :anything, :returns => :atom
       
-      run do |input|
-        Items::Atom.new(variables)
+      run do |runtime, input|
+        if runtime.is_a?(Runtime)
+          Items::Atom.new(runtime.variables)
+        else
+          raise RuntimeMissing
+        end
       end
       
       # Overrides default logic

data/lib/saper/actions/fetch.rb

@@ -2,11 +2,12 @@ module Saper
   module Actions
     class Fetch < Action
       
+      accepts :text, :returns => :document
       accepts :url, :returns => :document
       
-      run do |input|
+      run do |runtime, input|
         begin
-          browser.get(input)
+          runtime.browser.get(input)
         rescue SocketError
           raise(UnreachableURL, input)
         end

data/lib/saper/actions/fetch_with_token.rb

@@ -0,0 +1,18 @@
+module Saper
+  module Actions
+    class FetchWithToken < Action
+      
+      argument :url
+      argument :service
+      
+      run do |runtime, input, url, service|
+        begin
+          runtime.browser.post_with_bearer_token(url, input.to_native.to_s, runtime.keychain.token(service))
+        rescue SocketError
+          raise(UnreachableURL, input)
+        end
+      end
+      
+    end
+  end
+end

data/lib/saper/actions/find.rb

@@ -9,7 +9,7 @@ module Saper
       accepts :xml,  :returns => :xml
       accepts :json, :returns => :json
       
-      run do |input, xpath|
+      run do |runtime, input, xpath|
         input.find_all(xpath)
       end
       

data/lib/saper/actions/find_first.rb

@@ -7,7 +7,7 @@ module Saper
       accepts :xml,  :returns => :xml
       accepts :json, :returns => :json
       
-      run do |input, xpath|
+      run do |runtime, input, xpath|
         input.find(xpath)
       end
       

data/lib/saper/actions/get_attribute.rb

@@ -6,8 +6,13 @@ module Saper
       accepts :xml, :returns => :text
       accepts :html, :returns => :text
       
-      run do |input, name|
-        input[name]
+      run do |runtime, input, name|
+        value = input[name]
+        if value.nil?
+          Items::Nothing.new 
+        else
+          Items::Text.new value
+        end
       end
       
     end

data/lib/saper/actions/get_contents.rb

@@ -5,7 +5,7 @@ module Saper
       accepts :xml, :returns => :text
       accepts :html, :returns => :text
       
-      run do |input|
+      run do |runtime, input|
         input.inner_html
       end
       

data/lib/saper/actions/get_text.rb

@@ -5,7 +5,7 @@ module Saper
       accepts :xml, :returns => :text
       accepts :html, :returns => :text
       
-      run do |input|
+      run do |runtime, input|
         input.inner_text
       end
       

data/lib/saper/actions/nothing.rb

@@ -0,0 +1,11 @@
+module Saper
+  module Actions
+    class Nothing < Action
+      
+      run do |runtime, input|
+        input
+      end
+      
+    end
+  end
+end