saper 0.5.2 → 0.5.3

data/lib/saper/core/error.rb

@@ -1,7 +1,7 @@
 module Saper
   
   # Generic exception acting as a parent class for all exceptions in Saper library.
-  class Error < Exception; end
+  class Error < StandardError; end
   
   # FileUnreadable is raised whenever a recipe file cannot be read.
   class FileUnreadable < Error; end
@@ -33,6 +33,9 @@ module Saper
   # InvalidInput is raised whenever Saper::Action does not support this type of input.
   class InvalidInput < Error; end
   
+  # InvalidOutput is raised when execution of an action yields unexpected results.
+  class InvalidOutput < Error; end
+  
   # RecipeNotFound is raised whenever action calls a recipe that cannot be found.
   class RecipeNotFound < Error; end
   

data/lib/saper/core/keychain.rb

@@ -2,7 +2,7 @@ module Saper
   class Keychain
     
     # @todo
-    def self.load(path)
+    def self.load(path, options = {})
       case File.extname(path)
       when '.yaml'
         load_yaml(path)
@@ -31,7 +31,7 @@ module Saper
     
     # Returns a new keychain instance
     # @return [Saper::Keychain]
-    def initialize(services = {})
+    def initialize(services = {}, options = {})
       @services = Hash[services.map { |k,v| [k.to_s, v] }]
     end
     

data/lib/saper/core/logger.rb

@@ -9,66 +9,21 @@ module Saper
       @io = io || StringIO.new
     end
     
-    def download(url)
-      io.write "%s %s\r\n" % [bold("Downloading"), url]
+    def executing_recipe(recipe)
+      io.write "Executing recipe: %s\n" % recipe.id
     end
     
-    def runtime(instance, indent = 0)
-      io.write bold("Recipe tree\r\n") if indent == 0
-      io.write "%s%s\r\n" % [" " * indent, action(instance)]
-      instance.children.each do |child|
-        runtime(child, indent + 1)
-      end
+    def new_browser(browser)
+      io.write "New browser: %s\n" % browser.agent
     end
     
-    def bold(string)
-      "\033[1m%s\033[0m" % string
+    def new_post_request(url)
+      io.write "Posting to %s\n" % url
     end
     
-    def red(string)
-      "\033[31m%s\033[0m" % string
+    def new_get_request(url)
+      io.write "Getting %s\n" % url
     end
-    
-    def green(string)
-      "\033[32m%s\033[0m" % string
-    end
-    
-    def action(instance)
-      "%s %s > %s" % [action_name(instance), action_input(instance), action_output(instance)]
-    end
-    
-    def action_input(instance)
-      item(instance.input)
-    end
-    
-    def action_output(instance)
-      item(instance.action.multiple? ? instance.output : instance.output.first)
-    end
-    
-    def action_name(instance)
-      instance.error? ? red(instance.action.name) : green(instance.action.name)
-    end
-    
-    def item(instance)
-      case instance
-      when Array
-        "[%s]" % instance.map { |i| item(i) }.join(",")
-      when nil
-        'nil'
-      when Items::Document
-        'Document'
-      when Items::HTML
-        'HTML'
-      when String
-        '%s' % instance
-      when Items::Text
-        '%s' % instance.to_s
-      when Items::Atom
-        '%s' % instance.to_hash
-      else
-        instance.class
-      end
-    end
-    
+        
   end
 end

data/lib/saper/core/recipe.rb

@@ -52,16 +52,36 @@ module Saper
       @options[:name].nil? ? nil : @options[:name].to_s
     end
     
+    # Returns `true` if recipe accepts specified type as input.
+    # @param type [Symbol]
+    # @return [Boolean]
+    def accepts?(type)
+      actions.each do |action|
+        unless action.accepts?(type)
+          return false
+        end
+        type = action.output_for(type)
+      end
+      true
+    end
+    
+    # Sets (one) or returns (all) acceptable input types.
+    # @param input [Symbol]
+    # @return [Array<Symbol>]
+    def accepts
+      Action::INPUT_TYPES.select { |type| accepts?(type) }
+    end
+    
     # Returns a list of data types required as input.
     # @return [Array<Symbol>]
-    def input_required
-      empty? ? [] : actions.first.requires
+    def requires
+      accepts.include?(:nothing) ? [] : accepts
     end
     
     # Returns `true` if recipe requires some input.
     # @return [Boolean]
-    def input_required?
-      !input_required.empty?
+    def requires?
+      !requires.empty?
     end
     
     # Adds a new action to the end of the recipe and returns self.
@@ -94,9 +114,10 @@ module Saper
       unless runtime.is_a?(Runtime)
         runtime = Runtime.new({}, runtime || {})
       end
+      runtime.logger.executing_recipe(self)
       stack = Stack.new(runtime, input)
       enum  = enum_for(:each_stack, stack)
-      Result.new(enum.to_a)
+      Result.new(enum)
     end
     
     # Returns `true` if recipe contains no actions.
@@ -141,6 +162,10 @@ module Saper
         yield stack
         return nil
       end
+      if stack.filtered?
+        yield stack
+        return nil
+      end
       if index >= actions.size
         yield stack
         return nil
@@ -162,9 +187,15 @@ module Saper
       rescue Saper::Error => error
         results = error
       end
+      if results.is_a?(Items::Nothing) && results.filtered?
+        yield stack.add(results); return nil
+      end
       unless results.is_a?(Array)
         yield stack.add(results); return nil
       end
+      if results.empty?
+        yield stack.add(Items::Nothing.new)
+      end
       results.each do |result|
         yield stack.copy.add(result)
       end

data/lib/saper/core/result.rb

@@ -4,14 +4,34 @@ module Saper
     # @todo
     attr_reader :stacks
     
+    # @todo
+    attr_reader :duration
+    
     # @todo
     def initialize(stacks = [])
-      @stacks = stacks.to_a
+      started   = Time.now
+      @stacks   = stacks.to_a
+      @duration = Time.now - started
       if block_given?
         yield self
       end
     end
     
+    # @todo
+    def http_requests
+      browser.requests
+    end
+    
+    # @todo
+    def bytes_sent
+      browser.sent
+    end
+    
+    # @todo
+    def bytes_received
+      browser.received
+    end
+    
     # @todo
     def success?
       not failure?
@@ -19,7 +39,7 @@ module Saper
     
     # @todo
     def failure?
-      stacks.all?(&:error?)
+      filtered_stacks.all?(&:error?)
     end
     
     # @todo
@@ -34,17 +54,17 @@ module Saper
     
     # @todo
     def to_saper_array
-      stacks.map(&:result)
+      filtered_stacks.map(&:result)
     end
     
     # @todo
     def to_native_array
-      to_saper_array.map(&:to_native)
+      to_saper_array.map { |i| i.is_a?(Saper::Item) ? i.to_native : i }
     end
     
     # @todo
     def to_serialized_array
-      to_saper_array.map(&:serialize)
+      to_saper_array.map { |i| i.is_a?(Saper::Item) ? i.serialize : i }
     end
     
     # @todo
@@ -68,5 +88,16 @@ module Saper
       JSON.dump(serialize)
     end
     
+    private
+    
+    def filtered_stacks
+      stacks.reject(&:filtered?)
+    end
+    
+    # @todo
+    def browser
+      stacks.first.runtime.browser
+    end
+    
   end
 end

data/lib/saper/core/runtime.rb

@@ -15,6 +15,9 @@ module Saper
     # @return [Hash]
     attr_reader :variables
     
+    # @todo
+    attr_reader :logger
+    
     # Returns a new Saper::Runtime instance.
     # @param variables [Hash]
     # @param options [Hash]
@@ -23,24 +26,27 @@ module Saper
     # @option options [String, Symbol] :agent User-Agent type or string
     # @return [Saper::Runtime]
     def initialize(variables = {}, options = {})
-      if options.nil?
-        puts self.inspect
-        raise 'stop'
+      unless options.is_a?(Hash)
+        options = {}
+      end
+      if options[:logger].is_a?(Logger)
+        @logger = options[:logger]
+      else
+        @logger = Logger.new
+      end
+      if options[:browser].is_a?(Browser)
+        @browser = options[:browser]
+      else
+        @browser = Browser.new(:agent => options[:agent], :logger => logger)
       end
       if options[:keychain].is_a?(Keychain)
         @keychain = options[:keychain]
       end
       if options[:keychain].is_a?(String)
-        @keychain = Keychain.load(options[:keychain])
+        @keychain = Keychain.load(options[:keychain], :logger => logger)
       end
       unless @keychain.is_a?(Keychain)
-        @keychain = Keychain.new
-      end
-      if options[:browser].is_a?(Browser)
-        @browser = options[:browser]
-      end
-      unless @browser.is_a?(Browser)
-        @browser = Browser.new(:agent => options[:agent])
+        @keychain = Keychain.new({}, :logger => logger)
       end
       @variables = variables
       if block_given?

data/lib/saper/core/stack.rb

@@ -14,7 +14,13 @@ module Saper
     # @param items [Saper::Item]
     # @return [Saper::Stack]
     def initialize(runtime, *items)
-      @runtime, @items = runtime, items.flatten
+      @runtime  = runtime
+      @items    = items.flatten
+    end
+    
+    # @todo
+    def size
+      @items.size
     end
     
     # Returns a duplicate instance of self.
@@ -36,12 +42,22 @@ module Saper
       error? ? Items::Nothing.new : last
     end
     
+    # @todo
+    def error
+      error? ? last : nil
+    end
+    
     # Returns the result of the last action.
     # @return [Saper::Item]
     def last
       @items.last || Items::Nothing.new
     end
     
+    # @todo
+    def filtered?
+      last.is_a?(Items::Nothing) && last.filtered?
+    end
+    
     # @todo
     def error?
       last.is_a?(Saper::Error)

data/lib/saper/items/html.rb

@@ -118,7 +118,7 @@ module Saper
       
       # @todo
       def to_s
-        @noko.is_a?(Nokogiri::HTML::Document) ? to_native : @noko.to_s
+        @noko.is_a?(Nokogiri::HTML::Document) ? to_native : @noko.to_s.strip
       end
       
     end

data/lib/saper/items/nothing.rb

@@ -2,11 +2,20 @@ module Saper
   module Items
     class Nothing < Item
       
+      # @todo
+      def initialize(opts = {})
+        @opts = opts
+      end
+      
       # @todo
       def nil?
         true
       end
       
+      def filtered?
+        @opts[:filtered] == true
+      end
+      
       # @todo
       def to_native
         nil

data/lib/saper/items/xml.rb

@@ -26,10 +26,14 @@ module Saper
           raise(InvalidItem, string)
         end
         begin
-          Nokogiri::XML.parse(string, uri, charset)
+          noko = Nokogiri::XML.parse(string, uri, charset)
         rescue
           raise(InvalidItem, string)
         end
+        if noko.root.nil?
+          raise(InvalidItem, string)
+        end
+        noko
       end
       
       # @todo

data/lib/saper/version.rb

@@ -1,3 +1,3 @@
 module Saper
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/lib/tungsten/lib/README

@@ -0,0 +1,5 @@
+# https://github.com/rubysl/rubysl-net-http/blob/2.0/lib/rubysl/net/http/http.rb
+# https://github.com/rubysl/rubysl-net-http/blob/2.0/lib/net/http/generic_request.rb
+# https://github.com/rubysl/rubysl-net-http/blob/2.0/lib/net/http/header.rb
+# https://github.com/sparklemotion/http-cookie
+

data/lib/tungsten/lib/test.rb

@@ -0,0 +1,18 @@
+require './tungsten'
+
+#a = Tungsten::Connection.new("www.yandex.ru", 80)
+#b = Net::HTTP::Get.new('/')
+c = Tungsten.get("https://www.yandex.ru")
+
+puts c.code.class
+puts c.headers
+puts c.redirect?
+puts c.headers["Location"]
+#d = a.request(c)
+#puts d.code
+#puts d.message
+
+#d.each_capitalized do |k, v|
+#  puts "%s: %s" % [k, v]
+#end
+

data/lib/tungsten/lib/tungsten.rb

@@ -0,0 +1,33 @@
+require "net/http"
+require "uri"
+
+require_relative "tungsten/headers"
+require_relative "tungsten/jar"
+require_relative "tungsten/request"
+require_relative "tungsten/response"
+
+module Tungsten
+  
+  AGENTS = {
+    :ie6      => 'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)',
+    :ie7      => 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; .NET CLR 1.1.4322; .NET CLR 2.0.50727)',
+    :ie8      => 'Mozilla/5.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0; .NET CLR 1.1.4322; .NET CLR 2.0.50727)',
+    :ie9      => 'Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)',
+    :mozilla  => 'Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.4b) Gecko/20030516 Mozilla Firebird/0.6',
+    :safari   => 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_2) AppleWebKit/534.51.22 (KHTML, like Gecko) Version/5.1.1 Safari/534.51.22',
+    :iphone   => 'Mozilla/5.0 (iPhone; U; CPU like Mac OS X; en) AppleWebKit/420+ (KHTML, like Gecko) Version/3.0 Mobile/1C28 Safari/419.3',
+    :ipad     => 'Mozilla/5.0 (iPad; U; CPU OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B334b Safari/531.21.10',
+    :android  => 'Mozilla/5.0 (Linux; U; Android 3.0; en-us; Xoom Build/HRI39) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 Safari/534.13',
+    :tungsten => 'Mozilla/5.0 (compatible; Tungsten Ruby client)'
+  }
+  
+  def self.get(*args, &block)
+    Request.new(:get, *args, &block).response
+  end
+  
+  def self.post(*args, &block)
+    Request.new(:get, *args, &block).response
+  end
+  
+end
+