saper 0.5.1 → 0.5.2

data/lib/saper/actions/prepend_with.rb

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

data/lib/saper/actions/remove_after.rb

@@ -5,8 +5,8 @@ module Saper
       argument :text
       accepts :text, :returns => :text
       
-      run do |input, separator|
-        input.split(separator, 2).first
+      run do |runtime, input, separator|
+        Items::Text.new input.split(separator, 2).first
       end
       
     end

data/lib/saper/actions/remove_before.rb

@@ -5,8 +5,8 @@ module Saper
       argument :text
       accepts :text, :returns => :text
       
-      run do |input, separator|
-        input.split(separator, 2).last
+      run do |runtime, input, separator|
+        Items::Text.new input.split(separator, 2).last
       end
       
     end

data/lib/saper/actions/remove_matching.rb

@@ -5,8 +5,8 @@ module Saper
       argument :text
       accepts :text, :returns => :text
       
-      run do |input, pattern|
-        input.to_s =~ Regexp.new(pattern) ? nil : input
+      run do |runtime, input, pattern|
+        input.to_s =~ Regexp.new(pattern) ? Items::Nothing.new : input
       end
       
     end

data/lib/saper/actions/remove_tags.rb

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

data/lib/saper/actions/replace.rb

@@ -6,7 +6,7 @@ module Saper
       argument :text
       accepts :text, :returns => :text
       
-      run do |input, what, with|
+      run do |runtime, input, what, with|
         input.gsub(what, with)
       end
       

data/lib/saper/actions/run_recipe.rb

@@ -5,8 +5,8 @@ module Saper
       argument :recipe
       accepts :anything, :returns => Proc.new { |instance| nil } # TODO
       
-      run do |input, subrecipe|
-        recipe(subrecipe, input)
+      run do |runtime, input, subrecipe|
+        subrecipe.run(input).to_saper
       end
       
       # Overrides default logic

data/lib/saper/actions/run_recipe_and_save.rb

@@ -6,9 +6,9 @@ module Saper
       argument :recipe
       accepts :anything
       
-      run do |input, variable, subrecipe|
-        result = recipe(subrecipe, input)
-        self[variable] = result unless result.nil?
+      run do |runtime, input, variable, subrecipe|
+        result = subrecipe.run(input).to_saper
+        runtime[variable] = result unless result.nil?
         input
       end
       

data/lib/saper/actions/save.rb

@@ -5,8 +5,8 @@ module Saper
       argument :variable
       accepts :anything
       
-      run do |input, variable|
-        self[variable] = input
+      run do |runtime, input, variable|
+        runtime[variable] = input
       end
       
     end

data/lib/saper/actions/select_matching.rb

@@ -5,8 +5,8 @@ module Saper
       argument :text
       accepts :text, :returns => :text
       
-      run do |input, pattern|
-        input.to_s =~ Regexp.new(pattern) ? input : nil
+      run do |runtime, input, pattern|
+        input.to_s =~ Regexp.new(pattern) ? input : Items::Nothing.new
       end
       
     end

data/lib/saper/actions/set_input.rb

@@ -5,7 +5,7 @@ module Saper
       argument :text
       accepts :anything, :returns => :text
       
-      run do |input, string|
+      run do |runtime, input, string|
         string
       end
       

data/lib/saper/actions/skip_tags.rb

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

data/lib/saper/actions/split.rb

@@ -8,7 +8,7 @@ module Saper
       accepts :document, :returns => :text
       accepts :html, :returns => :html
       
-      run do |input, separator|
+      run do |runtime, input, separator|
         case input
         when Items::HTML
           input.inner_html.split(separator).map { |string| Item.new(:text, string).to_html }

data/lib/saper/arguments/attribute.rb

@@ -2,10 +2,16 @@ module Saper
   module Arguments
     class Attribute < Argument
       
+      # @todo
       def valid?(value)
         value.is_a?(Symbol) || value.is_a?(String)
       end
       
+      # @todo
+      def normalize(value)
+        value.to_s
+      end
+      
     end
   end
 end

data/lib/saper/arguments/recipe.rb

@@ -1,19 +1,24 @@
 module Saper
   module Arguments
     class Recipe < Argument
-  
+      
+      # @todo
       def valid?(value)
-        value.is_a?(Symbol) || value.is_a?(String)
+        value.is_a?(Symbol) || value.is_a?(String) || value.is_a?(Numeric)
       end
       
+      # @todo
       def normalize(value)
         if value.is_a?(Recipe)
           return value
         end
-        if value.is_a?(String)
-          value = value.to_sym
+        if value.is_a?(Symbol)
+          value = value.to_s
+        end
+        if value.is_a?(Numeric)
+          value = value.to_s
         end
-        unless value.is_a?(Symbol)
+        unless value.is_a?(String)
           raise InvalidArgument
         end
         if action.nil?
@@ -28,11 +33,12 @@ module Saper
         value
       end
       
-      #
+      # @todo
       def serialize
         value.id
       end
       
+      # @todo
       def to_string
         value.id.inspect
       end

data/lib/saper/arguments/service.rb

@@ -0,0 +1,12 @@
+module Saper
+  module Arguments
+    class Service < Argument
+      
+      # @todo
+      def valid?(value)
+        value.is_a?(Symbol) || value.is_a?(String)
+      end
+    
+    end
+  end
+end

data/lib/saper/arguments/text.rb

@@ -2,6 +2,7 @@ module Saper
   module Arguments
     class Text < Argument
       
+      # @todo
       def valid?(value)
         value.is_a?(String)
       end

data/lib/saper/arguments/timezone.rb

@@ -1,7 +1,8 @@
 module Saper
   module Arguments
     class Timezone < Argument
-  
+      
+      # @todo
       def valid?(value)
         value.is_a?(String)
       end

data/lib/saper/arguments/url.rb

@@ -0,0 +1,12 @@
+module Saper
+  module Arguments
+    class URL < Argument
+      
+      # @todo
+      def valid?(value)
+        value.is_a?(String)
+      end
+    
+    end
+  end
+end

data/lib/saper/arguments/variable.rb

@@ -1,7 +1,8 @@
 module Saper
   module Arguments
     class Variable < Argument
-    
+      
+      # @todo
       def valid?(value)
         value.is_a?(String) || value.is_a?(Symbol)
       end

data/lib/saper/arguments/xpath.rb

@@ -1,7 +1,8 @@
 module Saper
   module Arguments
     class XPath < Argument
-  
+      
+      # @todo
       def valid?(value)
         value.is_a?(String)
       end

data/lib/saper/core/action.rb

@@ -52,7 +52,7 @@ module Saper
         return @types.nil? ? [] : @types.keys
       end
       if input == :anything
-        return Item.subclasses.keys.map { |type| accepts(type.to_sym, options) }
+        return @types = {}
       end
       output = options[:returns] || input
       unless Item.exists?(input)
@@ -65,11 +65,35 @@ module Saper
       @types[input] = output
     end
     
+    # Returns `true` if action accepts no input.
+    # @return [Boolean]
+    def self.accepts_nothing?
+      @types.nil?
+    end
+
+    # Returns `true` if action accepts at least some kind of input.
+    # @return [Boolean]
+    def self.accepts_something?
+      !accepts_nothing? && !accepts_anything?
+    end
+    
+    # Returns `true` if action accepts any kind of input.
+    # @return [Boolean]
+    def self.accepts_anything?
+      @types.empty?
+    end
+    
     # Returns `true` if action accepts specified type as input.
     # @param type [Symbol]
     # @return [Boolean]
     def self.accepts?(type)
-      @types.nil? ? false : @types.keys.include?(type)
+      if accepts_nothing?
+        return false
+      end
+      if accepts_anything?
+        return true
+      end
+      accepts.include?(type)
     end
     
     # Saves Proc that encapsulates action logic and will be used later for data processing.
@@ -116,8 +140,12 @@ module Saper
       end
     end
     
+    # @todo
     attr_reader :options
     
+    # @todo
+    attr_reader :arguments
+    
     # Returns a new instance of Saper::Action.
     # @return [Saper::Action]
     def initialize(*args)
@@ -139,24 +167,26 @@ module Saper
     # @param input [object] input
     # @return [void] depends on action type
     def run(input = nil, runtime = nil)
+      runtime ||= Runtime.new
+      input = validate_input(input)
+      block.call(runtime, input, *args)
+    end
+    
+    # @todo
+    def validate_input(input)
+      unless self.class.accepts_something?
+        return input
+      end
       unless input.is_a?(Item)
         input = self.class.accepts.map { |type| Item.try(type, input) }.compact.first
       end
       if input.nil?
-        input = Items::Nothing.new
+        raise(InvalidInput, input)
       end
       unless self.class.accepts?(input.type)
         raise(InvalidInput, input)
       end
-      if runtime.nil?
-        begin
-          block.call(input, *args)
-        rescue NameError
-          raise RuntimeMissing
-        end
-      else
-        runtime.instance_exec(input, *args, &self.block)
-      end
+      input
     end
     
     # Returns human readable action name.
@@ -198,7 +228,7 @@ module Saper
     # Returns Proc that encapsulates action logic (i.e. processes data).
     # @return [Proc]
     def block
-      self.class.run || Proc.new { |input, *args| input }
+      self.class.run || Proc.new { |runtime, input, *args| input }
     end
     
     # Returns string representation of Action.

data/lib/saper/core/argument.rb

@@ -43,7 +43,11 @@ module Saper
       end
     end
     
-    # @todo
+    # Returns a new instacne of Saper::Argument.
+    # @option opts[Object] :value
+    # @option opts[Saper::Action] :action
+    # @option opts[Boolean] :optional
+    # @return [Saper::Argument]
     def initialize(opts = {})
       @value = nil
       @opts  = opts
@@ -52,7 +56,9 @@ module Saper
       end
     end
     
-    # @todo
+    # Sets new value and returns self.
+    # @param value [Object]
+    # @return [self]
     def set(value)
       unless valid?(value)
         raise InvalidArgument, value
@@ -62,42 +68,52 @@ module Saper
       self
     end
     
-    # @todo
+    # Returns true if supplied value is accepted by this argument type. Subclasses should override this method.
+    # @param value [Object]
+    # @return [Boolean]
     def valid?(value)
       true
     end
     
-    # @todo
+    # Returns normalized value.
+    # Subclasses should overrid this method. Subclasses may override this method.
+    # @param value [Object]
+    # @param value [Object]
     def normalize(value)
       value
     end
     
-    # @todo
+    # Returns argument value. Subclasses may override this method.
+    # @return [Object]
     def value
       @value
     end
     
-    # @todo
+    # Returns serialized representation of argument's value. Subclasses may override this method.
     def serialize
       value
     end
     
-    # @todo
+    # Returns true if argument value is mandatory.
+    # @return [Boolean]
     def mandatory?
       not optional?
     end
     
-    # @todo
-    def action
-      @opts[:action]
-    end
-    
-    # @todo
+    # Returns true if argument value is optional.
+    # @return [Boolean]
     def optional?
       @opts[:optional] == true
     end
     
-    # @todo
+    # Returns parent Action instance that this Argument belongs to.
+    # @return [Saper::Action]
+    def action
+      @opts[:action]
+    end
+    
+    # Returns String representation of argument's value.
+    # @return [String]
     def to_string
       value.to_s.inspect
     end