stockboy 0.6.0 → 0.7.0

data/lib/stockboy/provider_repeater.rb

@@ -0,0 +1,64 @@
+require 'stockboy/provider'
+
+module Stockboy
+  class ProviderRepeater
+
+    YIELD_ONCE = proc { |output, provider| output << provider }
+
+    attr_reader :base_provider
+
+    def initialize(provider, &yielder)
+      @orig_provider = provider
+      @base_provider = provider.dup
+      @yielder = yielder || YIELD_ONCE
+    end
+
+    def data
+      # return base_provider.data unless block_given?
+      return nil unless block_given?
+      each do |nth_provider|
+        yield nth_provider.data
+      end
+    end
+
+    def clear
+      @base_provider = @orig_provider.dup
+      super
+    end
+
+    def each
+      return to_enum unless block_given?
+      enum = to_enum
+      while true
+        begin
+          provider = enum.next
+          unless provider.respond_to? :data
+            raise ArgumentError, "expected Provider, got #{provider.class}"
+          end
+        rescue StopIteration
+          return $!.result
+        end
+        y = yield provider
+        provider.clear
+        enum.feed y
+      end
+    end
+
+    def to_enum
+      Enumerator.new do |y|
+        begin
+          @yielder.call(y, base_provider)
+        rescue LocalJumpError
+          raise $!, "use output << provider instead of yield", $!.backtrace
+        end
+      end
+    end
+
+    private
+
+    def method_missing(method, *args, &block)
+      base_provider.public_send(method, *args, &block)
+    end
+
+  end
+end

data/lib/stockboy/providers/file.rb

@@ -78,7 +78,7 @@ module Stockboy::Providers
     private
 
     def fetch_data
-      errors.add(:base, "File #{file_name} not found") unless matching_file
+      errors << "file #{file_name} not found" unless matching_file
       data_file = ::File.new(matching_file, 'r') if matching_file
       validate_file(data_file)
       if valid?
@@ -89,7 +89,8 @@ module Stockboy::Providers
     end
 
     def validate
-      errors.add_on_blank [:file_dir, :file_name]
+      errors << "file_dir must be specified" if file_dir.blank?
+      errors << "file_name must be specified" if file_name.blank?
       errors.empty?
     end
 
@@ -98,7 +99,7 @@ module Stockboy::Providers
     end
 
     def validate_file(data_file)
-      return errors.add :response, "No matching files" unless data_file
+      return errors << "no matching files" unless data_file
       validate_file_newer(data_file)
       validate_file_smaller(data_file)
       validate_file_larger(data_file)
@@ -107,21 +108,21 @@ module Stockboy::Providers
     def validate_file_newer(data_file)
       @data_time ||= data_file.mtime
       if file_newer && @data_time < file_newer
-        errors.add :response, "No new files since #{file_newer}"
+        errors << "no new files since #{file_newer}"
       end
     end
 
     def validate_file_smaller(data_file)
       @data_size ||= data_file.size
       if file_smaller && @data_size > file_smaller
-        errors.add :response, "File size larger than #{file_smaller}"
+        errors << "file size larger than #{file_smaller}"
       end
     end
 
     def validate_file_larger(data_file)
       @data_size ||= data_file.size
       if file_larger && @data_size < file_larger
-        errors.add :response, "File size smaller than #{file_larger}"
+        errors << "file size smaller than #{file_larger}"
       end
     end
   end

data/lib/stockboy/providers/ftp.rb

@@ -114,7 +114,7 @@ module Stockboy::Providers
         response
       end
     rescue Net::FTPError => e
-      errors.add :response, e.message
+      errors << e.message
       logger.warn e.message
     end
 
@@ -161,7 +161,8 @@ module Stockboy::Providers
     end
 
     def validate
-      errors.add_on_blank [:host, :file_name]
+      errors << "host must be specified" if host.blank?
+      errors << "file_name must be specified" if file_name.blank?
       errors.empty?
     end
 
@@ -175,7 +176,7 @@ module Stockboy::Providers
     end
 
     def validate_file(data_file)
-      return errors.add :response, "No matching files" unless data_file
+      return errors << "No matching files" unless data_file
       validate_file_newer(data_file)
       validate_file_smaller(data_file)
       validate_file_larger(data_file)
@@ -184,21 +185,21 @@ module Stockboy::Providers
     def validate_file_newer(data_file)
       @data_time ||= client { |ftp| ftp.mtime(data_file) }
       if file_newer and @data_time < file_newer
-        errors.add :response, "No new files since #{file_newer}"
+        errors << "No new files since #{file_newer}"
       end
     end
 
     def validate_file_smaller(data_file)
       @data_size ||= client { |ftp| ftp.size(data_file) }
       if file_smaller and @data_size > file_smaller
-        errors.add :response, "File size larger than #{file_smaller}"
+        errors << "File size larger than #{file_smaller}"
       end
     end
 
     def validate_file_larger(data_file)
       @data_size ||= client { |ftp| ftp.size(data_file) }
       if file_larger and @data_size < file_larger
-        errors.add :response, "File size smaller than #{file_larger}"
+        errors << "File size smaller than #{file_larger}"
       end
     end
   end

data/lib/stockboy/providers/http.rb

@@ -132,7 +132,8 @@ module Stockboy::Providers
     private
 
     def validate
-      errors.add_on_blank [:uri, :method]
+      errors << "uri must be specified" if uri.blank?
+      errors << "method (:get, :post) must be specified" if method.blank?
       errors.empty?
     end
 
@@ -142,7 +143,7 @@ module Stockboy::Providers
       request.auth.basic(username, password) if username && password
       response = HTTPI.send(method, request)
       if response.error?
-        errors.add :response, "HTTP respone error: #{response.code}"
+        errors << "HTTP response error: #{response.code}"
       else
         @data = response.body
       end

data/lib/stockboy/providers/imap.rb

@@ -162,7 +162,7 @@ module Stockboy::Providers
       end
       yield @open_client
     rescue ::Net::IMAP::Error => e
-      errors.add :response, "IMAP connection error"
+      errors << "IMAP connection error"
     ensure
       if first_connection
         @open_client.disconnect
@@ -253,7 +253,9 @@ module Stockboy::Providers
     end
 
     def validate
-      errors.add_on_blank [:host, :username, :password]
+      errors << "host must be specified" if host.blank?
+      errors << "username must be specified" if username.blank?
+      errors << "password must be specified" if password.blank?
       errors.empty?
     end
 
@@ -281,7 +283,7 @@ module Stockboy::Providers
     end
 
     def validate_file(data_file)
-      return errors.add :response, "No matching attachments" unless data_file
+      return errors << "No matching attachments" unless data_file
       validate_file_smaller(data_file)
       validate_file_larger(data_file)
     end
@@ -289,14 +291,14 @@ module Stockboy::Providers
     def validate_file_smaller(data_file)
       @data_size ||= data_file.bytesize
       if file_smaller && @data_size > file_smaller
-        errors.add :response, "File size larger than #{file_smaller}"
+        errors << "File size larger than #{file_smaller}"
       end
     end
 
     def validate_file_larger(data_file)
       @data_size ||= data_file.bytesize
       if file_larger && @data_size < file_larger
-        errors.add :response, "File size smaller than #{file_larger}"
+        errors << "File size smaller than #{file_larger}"
       end
     end
   end

data/lib/stockboy/providers/soap.rb

@@ -34,12 +34,24 @@ module Stockboy::Providers
     #
     dsl_attr :request
 
+    # @return [Symbol]
+    # @example
+    #   env_namespace :soapenv
+    #
+    dsl_attr :env_namespace
+
     # @return [String]
     # @!attribute [rw] namespace
     #   Optional if specified in WSDL
     #
     dsl_attr :namespace
 
+    # @return [Hash]
+    # @!attribute [rw] namespaces
+    #   Optional if specified in WSDL
+    #
+    dsl_attr :namespaces
+
     # @return [String]
     # @!attribute [rw] namespace_id
     #   Optional if specified in WSDL
@@ -62,6 +74,45 @@ module Stockboy::Providers
     #
     dsl_attr :message
 
+    # Message tag name
+    #
+    # @!attribute [rw] message_tag
+    # @return [String]
+    # @example
+    #   message_tag "GetResult"
+    #
+    dsl_attr :message_tag
+
+    # @return [String]
+    # @example
+    #   soap_action "urn:processMessage"
+    #
+    dsl_attr :soap_action
+
+    # XML string to override the Soap headers
+    #
+    # @!attribute [rw] soap_header
+    # @return [String]
+    # @example
+    #   soap_header "<soapenv:Header xmlns:wsa="http://www.w3.org/2005/08/addressing">..."
+    #
+    dsl_attr :soap_header
+
+    # @return [Hash]
+    # @example
+    #   attributes {}
+    #
+    dsl_attr :attributes
+
+    # Change the default response type, default :hash
+    #
+    # @!attribute [rw] response_format
+    # @return [Symbol]
+    # @example
+    #   response_format :xml
+    #
+    dsl_attr :response_format
+
     # Hash of optional HTTP request headers
     #
     # @!attribute [rw] headers
@@ -71,12 +122,22 @@ module Stockboy::Providers
     #
     dsl_attr :headers
 
+    # Array of WSSE Auth values
+    #
+    # @!attribute [rw] wsse_auth
+    # @return [Array]
+    # @example
+    #   wsse_auth ["Username", "Password"]
+    #
+    dsl_attr :wsse_auth
+
     # @!endgroup
 
     # Initialize a new SOAP provider
     #
     def initialize(opts={}, &block)
       super
+      @response_format = opts[:response_format] || :hash
       DSL.new(self).instance_eval(&block) if block_given?
     end
 
@@ -100,21 +161,36 @@ module Stockboy::Providers
       end
       opts[:convert_response_tags_to] = ->(tag) { string_pool(tag) }
       opts[:namespace] = namespace if namespace
+      opts[:namespaces] = namespaces if namespaces
       opts[:namespace_identifier] = namespace_id if namespace_id
+      opts[:env_namespace] = env_namespace if env_namespace
       opts[:headers] = headers if headers
+      opts[:wsse_auth] = wsse_auth if wsse_auth
       opts
     end
 
     def validate
-      errors.add_on_blank(:endpoint) unless wsdl
+      errors << "endpoint or wsdl must be specified" if endpoint.blank? unless wsdl
       errors.blank?
     end
 
     def fetch_data
       with_string_pool do
-        @data = client.call(@request, message: message).body
+        response = client.call(
+          @request,
+          message:         message,
+          message_tag:     message_tag,
+          soap_action:     soap_action,
+          soap_header:     soap_header,
+          attributes:      attributes
+        )
+        @data = case response_format
+        when :xml
+          response.xml
+        else
+          response.body
+        end
       end
     end
-
   end
 end

data/lib/stockboy/registry.rb

@@ -38,5 +38,16 @@ module Stockboy
       @registry
     end
 
+    def build(key, options, block)
+      case key
+      when Symbol
+        find(key).new(options, &block)
+      when Class
+        key.new(options, &block)
+      else
+        key
+      end
+    end
+
   end
 end

data/lib/stockboy/translator.rb

@@ -45,6 +45,7 @@ module Stockboy
       context = OpenStruct.new(context) if context.is_a? Hash
       translate(context)
     end
+    alias_method :[], :call
 
     # String representation for a more helpful representation
     #

data/lib/stockboy/version.rb

@@ -1,3 +1,3 @@
 module Stockboy
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/spec/stockboy/attribute_map_spec.rb

@@ -12,14 +12,15 @@ module Stockboy
     end
 
     describe ".new" do
+      let(:row) { Attribute.new(:email, "email", []) }
+
       it "initializes from hash attribute" do
-        row = Attribute.new(:email, "email", [])
         map = AttributeMap.new(:email => row)
         map[:email].should == row
       end
     end
 
-    it "captures same destination as default" do
+    it "sets same destination as default" do
       subject[:email].should == Attribute.new(:email, "email", [])
     end
 
@@ -55,5 +56,15 @@ module Stockboy
       subject.map(&:to).should == [:email, :updated_at]
     end
 
+    describe "#insert" do
+      subject(:map) { AttributeMap.new }
+
+      it "sets options from hash" do
+        upcase = ->(r) { r.upcase }
+        map.insert :test, from: "Test", as: upcase
+        map[:test].should == Attribute.new(:test, "Test", [upcase])
+      end
+    end
+
   end
 end

data/spec/stockboy/configurator_spec.rb

@@ -72,6 +72,27 @@ module Stockboy
         subject.attributes &proc{}
         subject.config[:attributes].should be attribute_map
       end
+
+      it "replaces existing attributes" do
+        subject.attribute :first_name
+        subject.attributes do last_name end
+        subject.config[:attributes][:first_name].should be_nil
+        subject.config[:attributes][:last_name].should be_an Attribute
+      end
+    end
+
+    describe "#attribute" do
+      it "inserts a single attribute" do
+        subject.attribute :test, from: "Test"
+        subject.config[:attributes][:test].should == Attribute.new(:test, "Test", [])
+      end
+
+      it "respects existing attributes added first" do
+        subject.attributes do first_name end
+        subject.attribute :last_name
+        subject.config[:attributes][:first_name].should be_an Attribute
+        subject.config[:attributes][:last_name].should be_an Attribute
+      end
     end
 
     describe "#on" do