conduit 1.1.3 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 13455d3175a2f4f12d437b0d5b98281100c34aea
-  data.tar.gz: 67ccea510d9ab5d79dfa5f53aea8d8eaf43d4cc2
+SHA256:
+  metadata.gz: '076538899ab77d0cedd2ce54f2ed7ebc32f2e8115c4fe4ab989d514eb95d898e'
+  data.tar.gz: 61f027e5162aa9795173276bf6fe8b09c8dac1227618f5926a1805920628ce1d
 SHA512:
-  metadata.gz: 5704fbbd6096ca6d3dfed6b6487822f0cb1029ab4eb56f71e75adb75760d3c1bd0e4d91449b4cd5472e2cc3ae0288b83821028a392f6f416558fd3b1d4d2d423
-  data.tar.gz: c42597f27b9d51696fbfc79fa106fc868eee60215909f5c27de28be273916f9f7f86b202c0597998efef138847c0756a1bfffbc1954cac8af52d2dde54384df3
+  metadata.gz: 03bd45482b484b23efb0e36b0c146ade9cf14bbf7664a85e641c2e3a6b7621b5f5cf11ec885f5bf94f176e2ac01002108859db277e1ca2232d95df1db5e7da12
+  data.tar.gz: 6d9fb2f3d7a637484ed4e3e915d688ec95cb46172788a957982825cd60714ad0e3be7397d01cfca7d01c902165b4d31e9f0b07f9b6fcf940aecaab5d98beb85c

data/lib/conduit/api_response.rb

@@ -1,11 +1,14 @@
 module Conduit
   class ApiResponse
-    attr_reader :body, :parser, :raw_response
+    attr_reader :body, :parser, :raw_response, :http_status
 
     def initialize(options = {})
       @raw_response = options[:raw_response]
       @body         = options[:body] ||= @raw_response.body
       @parser       = options[:parser]
+      @http_status  = options[:http_status] ||= begin
+        @raw_response.try(:http_status) || @raw_response.try(:status)
+      end
     end
   end
 end

data/lib/conduit/cli.rb

@@ -113,14 +113,11 @@ module Conduit
       # add gemspec dependencies
       str = "  # Dependencies\n"\
             "  #\n"\
-            "  spec.add_dependency \"conduit\", \"~> 1.0.4\"\n"\
+            "  spec.add_dependency \"conduit\", \"~> 1.0.6\"\n"\
             "  # xml parser\n"\
-            "  spec.add_dependency \"nokogiri\"\n"\
-            "  # to get string inflectors\n"\
-            "  spec.add_dependency \"activesupport\"\n\n"\
+            "  spec.add_dependency \"nokogiri\"\n\n"\
             "  # Development Dependencies\n"\
             "  #\n"\
-            "  spec.add_development_dependency \"shoulda-matchers\"\n"\
             "  # to compare xml files in tests\n"\
             "  spec.add_development_dependency \"equivalent-xml\"\n"\
             "  spec.add_development_dependency \"rspec-its\"\n"\

data/lib/conduit/core/action.rb

@@ -77,7 +77,7 @@ module Conduit
       module InstanceMethods
         extend Forwardable
 
-        def initialize(**options)
+        def initialize(options)
           @options = options
           validate!(options)
         end
@@ -129,15 +129,28 @@ module Conduit
 
         # Method called to make the actual request.
         #
-        # Override to customize.
-        #
         def perform_request
-          response = request(body: view, method: :post)
+          response = request(request_options)
           parser_instance = parser_class.new(response.body)
-
           Conduit::ApiResponse.new(raw_response: response, parser: parser_instance)
         end
 
+        def request_options
+          { body: http_body, method: http_method, headers: http_headers }
+        end
+
+        def http_body
+          view
+        end
+
+        def http_method
+          :post
+        end
+
+        def http_headers
+          {}
+        end
+
         # Entry method. Calls either the mocker or the `perform_request`
         # method.
         #
@@ -164,12 +177,16 @@ module Conduit
         # an ArgumentError listing missing attributes.
         #
         def validate!(options)
-          missing_keys = (requirements.to_a - options.keys)
-          either_keys = requirements.select { |key| key.is_a?(Array) }
-          missing_keys.reject! { |_key| either_keys.any? { |either| (either & options.keys).present? } }
+          missing_keys = requirements.reject do |required_attribute|
+            if required_attribute.is_a?(Array)
+              (required_attribute & options.keys).present?
+            else
+              options.keys.include?(required_attribute)
+            end
+          end
+
           if missing_keys.any?
-            raise ArgumentError,
-              "Missing keys: #{missing_keys.join(', ')}"
+            raise ArgumentError, "Missing keys: #{missing_keys}"
           end
         end
 
@@ -205,9 +222,8 @@ module Conduit
           # In ruby 2.0.0 we can't do `const_defined? MyDriver::Decorators::FooDecorator`
           # so we have to check each module one by one.
           if Conduit.const_defined?(driver_name.classify) &&
-             Conduit.const_get(driver_name.classify).const_defined?("Decorators") &&
-             Conduit.const_get("#{driver_name.classify}::Decorators").const_defined?("#{action_name}Decorator")
-
+            Conduit.const_get(driver_name.classify).const_defined?("Decorators") &&
+            Conduit.const_get("#{driver_name.classify}::Decorators").const_defined?("#{action_name}Decorator")
             Conduit.const_get("#{driver_name.classify}::Decorators::#{action_name}Decorator")
           else
             Conduit::Core::Decorator
@@ -217,7 +233,7 @@ module Conduit
         # Indicates whether the request should be mocked or not.
         #
         def mock_mode?
-          @options.key?(:mock_status) && (!@options[:mock_status].nil? && !@options[:mock_status].empty?)
+          @options.key?(:mock_status) && @options[:mock_status].present?
         end
       end
     end

data/lib/conduit/core/request_mocker.rb

@@ -40,7 +40,7 @@ module Conduit
         Excon.stubs.clear
       end
 
-      # Wrapps the block inside a mocking state.
+      # Wraps the block inside a mocking state.
       #
       def with_mocking
         mock and yield.tap { unmock }
@@ -77,7 +77,7 @@ module Conduit
 
       # Allowed statuses.
       def response_statuses
-        %i(success failure error)
+        %i[success failure error]
       end
 
       # Mocked error response.

data/lib/conduit/error.rb

@@ -1,7 +1,7 @@
 module Conduit
   class Error < OpenStruct
-    def initialize(message:, **attributes)
-      super(message: message, **attributes)
+    def initialize(message:, code: nil)
+      super(message: message, code: code)
     end
 
     def to_s

data/lib/conduit/storage/aws.rb

@@ -2,10 +2,7 @@
 # The job of this class is to provide storage
 # functionality for conduit.
 #
-# TODO: Support multiple storage providers
-#
-
-require "aws-sdk"
+require "aws-sdk-s3"
 
 module Conduit
   module Storage
@@ -18,29 +15,28 @@ module Conduit
       end
 
       module ClassMethods
-        # Configure AWS::S3 with credentials if provided, else, assume
+        # Configure Aws::S3 with credentials if provided, else, assume
         # IAM will provide them.
         #
         def configure
-          if [:aws_access_key_id, :aws_access_secret].all? { |key| config.key?(key) }
-            AWS.config(
-              access_key_id:     config[:aws_access_key_id],
-              secret_access_key: config[:aws_access_secret]
-            )
+          if %i[aws_access_key_id aws_access_secret].all? { |key| config.key?(key) }
+            credentials = ::Aws::Credentials.new(config[:aws_access_key_id],
+                                               config[:aws_access_secret])
+            ::Aws.config.update(credentials: credentials)
           else
-            AWS.config
+            ::Aws.config
           end
         end
 
-        # Primary connection object to AWS::S3
+        # Primary connection object to Aws::S3
         #
         # Configurable in:
         # config/initializers/conduit.rb
         # TODO: Update how conduit gets
         # the credentials for s3
         #
-        def connection
-          @connection ||= AWS::S3.new
+        def s3
+          @s3 ||= ::Aws::S3::Resource.new
         end
 
         # Bucket we want to work with
@@ -50,40 +46,46 @@ module Conduit
         #
         def bucket
           @bucket ||= begin
-            bucket = config[:bucket]
-            connection.buckets.create(bucket) unless connection.buckets[bucket].exists?
-            connection.buckets[bucket]
+            bucket_name = config[:bucket]
+            bucket = s3.bucket(bucket_name)
+
+            if bucket.exists?
+              bucket
+            else
+              s3.buckets.create(bucket)
+              s3.bucket(bucket)
+            end
           end
         end
 
-        # Write a file to AWS::S3
+        # Write a file to Aws::S3
         #
         # e.g.
         # => Conduit::Storage.write('/path/to/file', 'foo')
         #
         def write(key, content)
-          bucket.objects[key].write(content)
+          bucket.object(key).put(body: content)
         end
 
-        # Read a file from AWS::S3
+        # Read a file from Aws::S3
         #
         # e.g.
         # => Conduit::Storage.read('/path/to/file')
         #
         def read(key)
-          bucket.objects[key].read
-        rescue AWS::S3::Errors::NoSuchKey
+          bucket.object(key).get.body.read
+        rescue ::Aws::S3::Errors::NoSuchKey
           nil
         end
 
-        # Delete a file from AWS::S3
+        # Delete a file from Aws::S3
         #
         # e.g.
         # => Conduit::Storage.delete('/path/to/file')
         #
         def delete(key)
-          bucket.objects[key].delete
-        rescue AWS::S3::Errors::NoSuchKey
+          bucket.object(key).delete
+        rescue ::Aws::S3::Errors::NoSuchKey
           nil
         end
       end

data/lib/conduit/version.rb

@@ -1,3 +1,3 @@
 module Conduit
-  VERSION = "1.1.3".freeze
+  VERSION = "1.4.0".freeze
 end

data/spec/classes/core/action_spec.rb

@@ -16,19 +16,20 @@ shared_examples_for Conduit::Core::Action do
 
     describe ".requirements" do
       it "returns an array of required attributes" do
-        subject.class.requirements.should == [:foo, :bar, :baz, [:either, :or]].to_set
+        subject.class.requirements.should == [:foo, :bar, :baz, %i[either or]].to_set
       end
     end
 
     describe ".attributes" do
       it "returns an array of known attributes" do
-        subject.class.requirements.should == [:foo, :bar, :baz, [:either, :or]].to_set
+        subject.class.requirements.should == [:foo, :bar, :baz, %i[either or]].to_set
       end
     end
   end
 
   context "action has an array in its required_attibutes field" do
     let(:attrs) { request_attributes }
+
     it "raises an error if missing both of the keys" do
       attrs.delete(:either)
       attrs.delete(:or)
@@ -135,6 +136,10 @@ shared_examples_for Conduit::Core::Action do
       it "should return the raw_content" do
         subject.perform.body.should_not be_nil
       end
+
+      it "returns http_status" do
+        subject.perform.http_status.should eql 200
+      end
     end
   end
 end

data/spec/classes/core/driver_spec.rb

@@ -4,7 +4,7 @@ shared_examples_for Conduit::Core::Driver do
   context "without an instance" do
     describe ".credentials" do
       it "returns an array of required credentials" do
-        subject.credentials.should == [:username, :password].to_set
+        subject.credentials.should == %i[username password].to_set
       end
     end
 
@@ -16,7 +16,7 @@ shared_examples_for Conduit::Core::Driver do
 
     describe ".permitted_attributes" do
       it "returns the union of required and optional attributes" do
-        subject.permitted_attributes.should == [:subdomain, :mock].to_set
+        subject.permitted_attributes.should == %i[subdomain mock].to_set
       end
     end
 

data/spec/classes/core/parser_spec.rb

@@ -15,7 +15,7 @@ shared_examples_for Conduit::Core::Parser do
   context "with an instance" do
     describe "#attributes" do
       it "returns an array of known attributes" do
-        subject.attributes.should == [:foo, :bar, :baz].to_set
+        subject.attributes.should == %i[foo bar baz].to_set
       end
 
       it "defines a method for foo" do

data/spec/spec_helper.rb

@@ -5,7 +5,7 @@ Bundler.setup
 
 require "rspec"
 require "rspec/its"
-require "shoulda/matchers"
+require "pry"
 require "conduit"
 
 # Load all of the _spec.rb files

data/spec/storage/aws_spec.rb

@@ -0,0 +1,44 @@
+require "spec_helper"
+require "aws-sdk-s3"
+
+describe "Conduit::Storage::Aws" do
+  before do
+    stub_aws_responses
+
+    Conduit.configure do |config|
+      config.storage_config = { provider: :aws, bucket: "my-bucket" }
+    end
+  end
+
+  def stub_aws_responses
+    Aws.config = {
+      stub_responses: true,
+      s3: {
+        stub_responses: {
+          list_buckets: { buckets: [{ name: "my-bucket" }] },
+          get_object: { body: "data" }
+        }
+      }
+    }
+  end
+
+  describe "#write" do
+    it "writes an s3 object to the bucket" do
+      Conduit::Storage.write("foo.txt", "data").
+        should be_a(Aws::S3::Types::PutObjectOutput)
+    end
+  end
+
+  describe "#read" do
+    it "reads from an s3 object" do
+      Conduit::Storage.read("foo.txt").should eql("data")
+    end
+  end
+
+  describe "#delete" do
+    it "deletes an s3 object" do
+      Conduit::Storage.delete("foo.txt").
+        should be_a(Aws::S3::Types::DeleteObjectOutput)
+    end
+  end
+end

data/spec/support/my_driver/actions/foo.rb

@@ -2,7 +2,7 @@ module Conduit::Driver::MyDriver
   class Foo < Conduit::Core::Action
     remote_url "http://foo.com/api.xml"
 
-    required_attributes :foo, :bar, :baz, [:either, :or]
+    required_attributes :foo, :bar, :baz, %i[either or]
     optional_attributes :buz
 
     private

data/spec/support/my_driver/parsers/foo.rb

@@ -1,4 +1,5 @@
 require "nokogiri"
+require_relative "../actions/foo.rb"
 
 module Conduit::Driver::MyDriver
   class Foo::Parser < Conduit::Core::Parser

metadata

@@ -1,31 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: conduit
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.4.0
 platform: ruby
 authors:
 - Mike Kelley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-20 00:00:00.000000000 Z
+date: 2020-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-v1
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -80,76 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: shoulda-matchers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-its
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 
 email:
 - mike@codezombie.org
@@ -204,6 +134,7 @@ files:
 - spec/classes/core/request_mocker_spec.rb
 - spec/classes/util_spec.rb
 - spec/spec_helper.rb
+- spec/storage/aws_spec.rb
 - spec/support/helper.rb
 - spec/support/my_driver/actions/foo.rb
 - spec/support/my_driver/driver.rb
@@ -236,29 +167,29 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Conduit is an interface for debit platforms.
 test_files:
-- spec/classes/core/action_spec.rb
+- spec/spec_helper.rb
+- spec/classes/core/request_mocker_spec.rb
 - spec/classes/core/driver_spec.rb
 - spec/classes/core/parser_spec.rb
-- spec/classes/core/request_mocker_spec.rb
+- spec/classes/core/action_spec.rb
 - spec/classes/util_spec.rb
-- spec/spec_helper.rb
+- spec/storage/aws_spec.rb
 - spec/support/helper.rb
-- spec/support/my_driver/actions/foo.rb
-- spec/support/my_driver/driver.rb
 - spec/support/my_driver/parsers/foo.rb
-- spec/support/my_driver/request_mockers/fixtures/foo/failure.xml.erb
-- spec/support/my_driver/request_mockers/fixtures/foo/success.xml.erb
+- spec/support/my_driver/driver.rb
+- spec/support/my_driver/actions/foo.rb
 - spec/support/my_driver/request_mockers/foo.rb
-- spec/support/my_driver/views/foo.erb
+- spec/support/my_driver/request_mockers/fixtures/foo/success.xml.erb
+- spec/support/my_driver/request_mockers/fixtures/foo/failure.xml.erb
 - spec/support/my_driver/views/layout.erb
-- spec/support/xml/failure_mock.xml
-- spec/support/xml/success_mock.xml
-- spec/support/xml/xml_modified_request.xml
+- spec/support/my_driver/views/foo.erb
 - spec/support/xml/xml_request.xml
+- spec/support/xml/xml_modified_request.xml
 - spec/support/xml/xml_response.xml
+- spec/support/xml/success_mock.xml
+- spec/support/xml/failure_mock.xml