conduit 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3bb1b8f51e94f9a01e34b93b204ddcc665f0fa97
-  data.tar.gz: 83f0645c72bea202ad14ee8feda10aeb2a343847
+  metadata.gz: b37e7362d4af2ed4841798aff5b04f2285cce7eb
+  data.tar.gz: 99da695bd5abdb9233a3957482741ea9b05dc1fd
 SHA512:
-  metadata.gz: 017b4f44d22ef1b74dd5d032ca1a8f52978e4e27abf59e730144d6a818891425613433b3a8e360174d7e06dbd4c4dfed0568b92a0a4fa7ce479136f474d47835
-  data.tar.gz: 41918d02a479a3fc530ca6061dc54d2982543f37cf7ac43b79ea4e43f5fdc64f48eb8fd9ad5f375f92dc70d6883c10480fe739742fa9849a6372345d7119cb3a
+  metadata.gz: 37d02a757f479664b1eac37eff9e07e45c7b4ef254b5311e96961818f2d5f663e545508ca10cd1e001e8eb706b9bbba3dc5a689f2f477ca43944a1f17d187659
+  data.tar.gz: 84b2e662f55f271a1aad27044ff3ea14379de08014faa24cb15a637ff1ffcedadaddfdc7b6e2a29bfe121276fbf79850d57866145dde2c0e35ed0b8d510a4a75

data/lib/conduit/core/action.rb

@@ -4,7 +4,7 @@
 #
 # e.g.
 # => class MyAction < Conduit::Core::Action
-# =>   required_attributes :foo, :bar
+# =>   required_attributes :foo, :bar, [:either, :or]
 # =>   optional_attributes :baz
 # => end
 #
@@ -107,7 +107,7 @@ module Conduit
         # will default to `nil`.
         #
         def attributes_with_values
-          attributes.inject({}) do |hash, attribute|
+          attributes.to_a.flatten.inject({}) do |hash, attribute|
             hash.tap do |h|
               h[attribute] = @options[attribute]
             end
@@ -168,6 +168,8 @@ module Conduit
         #
         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? }}
           if missing_keys.any?
             raise ArgumentError,
               "Missing keys: #{missing_keys.join(', ')}"

data/lib/conduit/version.rb

@@ -1,3 +1,3 @@
 module Conduit
-  VERSION = '1.0.4'
+  VERSION = '1.1.0'
 end

data/spec/classes/core/action_spec.rb

@@ -17,26 +17,41 @@ 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].to_set
+        subject.class.requirements.should == [:foo, :bar, :baz, [:either, :or]].to_set
       end
     end
 
     describe '.attributes' do
       it 'returns an array of known attributes' do
-        subject.class.requirements.should == [:foo, :bar, :baz].to_set
+        subject.class.requirements.should == [:foo, :bar, :baz, [: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)
+      lambda { described_class.new(attrs) }.should raise_error(ArgumentError)
+    end
+
+    it "doesn't raise an error if only one key is missing" do
+      attrs.delete(:either)
+      attrs[:or] = "value of or"
+      lambda { described_class.new(attrs) }.should_not raise_error
+    end
+  end
+
   context 'with an instance' do
     describe '#attributes_with_values' do
       context 'with optional attribute not set' do
-        let (:attrs) { request_attributes.merge(buz: nil) }
+        let (:attrs) { request_attributes.merge(buz: nil, or: nil) }
         its(:attributes_with_values) { should eq(attrs) }
       end
 
       context 'with optional attribute set' do
-        let (:attrs) { request_attributes.merge(buz: "value for buz") }
+        let (:attrs) { request_attributes.merge(buz: "value for buz", or: nil) }
         subject { described_class.new(attrs) }
         its(:attributes_with_values) { should eq(attrs) }
       end

data/spec/support/helper.rb

@@ -2,9 +2,10 @@ module Helper
 
   def request_attributes
     {
-      foo: 'value for foo',
-      bar: 'value for bar',
-      baz: 'value for baz'
+      foo: "value for foo",
+      bar: "value for bar",
+      baz: "value for baz",
+      either: "value for either"
     }
   end
 

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

@@ -3,7 +3,7 @@ module Conduit::Driver::MyDriver
 
     remote_url 'http://foo.com/api.xml'
 
-    required_attributes :foo, :bar, :baz
+    required_attributes :foo, :bar, :baz, [:either, :or]
     optional_attributes :buz
 
     private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conduit
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Mike Kelley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-11 00:00:00.000000000 Z
+date: 2016-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -237,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Conduit is an interface for debit platforms.
@@ -262,3 +262,4 @@ test_files:
 - spec/support/xml/xml_modified_request.xml
 - spec/support/xml/xml_request.xml
 - spec/support/xml/xml_response.xml
+has_rdoc: