finapps 2.2.11 → 2.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9345f2ee1b07ebc04aaafd850699f01d7410c75
-  data.tar.gz: 7f1363fcc09f46ad078f900eccde69d9a007ec74
+  metadata.gz: 48c57f559c6d4687e2fa9b6b38551e333bad8980
+  data.tar.gz: 321871ba46163cc9bd419bccde9f97abd53705cb
 SHA512:
-  metadata.gz: 9e0fbdf8e8b2307aaf9a897316c619fc7500969095393605bf8d16537e4b84c5405a797b86d233d2338d803e61f80d8fa73c6abd08c474eb34fd02cd4557cefd
-  data.tar.gz: ef218718b47c393cb40a14513dfb14e2e9be8295bef9a7ebe97cb271965c7a5da2986062e5fa1f8ad0f9bb5d128e8bd00f1d56211610c91f5c99a57f18c97606
+  metadata.gz: ac05fb45a25f60dd341bed1133d8a4cd316996d99c19084cdacf34724e70031f7a603290fa98b8585102df868f0eb361c03891c3058899fc16943db2171c4189
+  data.tar.gz: 7d7f8ce65c7c354802915fee55e77c050beec6cc0cec2cdb247818d94888e9bde98704ee55fd6d8b4330613856c36492de8ffc376f451ad4de19a92bb63637a4

data/lib/finapps/rest/orders.rb

@@ -12,20 +12,18 @@ module FinApps
         super params
       end
 
-      # GET /v2/list/orders/:page/:requested/:sort/:asc
+      # GET /v2/list/orders?page=1&requested=25&sort=-date
       # :page - page number requested
       # :requested - number of results per page requested
       # :sort - sort order
       #   options:
       #     date - the date of the order
       #     status - the status of the order
-      # :asc - sort order true for asc false for desc
-      def list # (params=nil) # params hash with optional keys [:page, :requested, :sort, :asc]
-        super 'orders?page=1&requested=500&sort=-date'
-        # TODO: change to support https://github.com/finapps/api/blob/develop/misc/docs/iav.md#get-list-of-orders
-        # return super 'orders?page=1&requested=500&sort=-date' # if params.nil?
-        # raise FinAppsCore::InvalidArgumentsError.new 'Invalid argument: params' unless params.is_a? Hash
-        # super build_path(params)
+      #     descending - append "-" before option for descending sort
+      def list(params=nil) # params hash with optional keys [:page, :sort, :requested]
+        return super if params.nil?
+        raise FinAppsCore::InvalidArgumentsError.new 'Invalid argument: params' unless params.is_a? Hash
+        super build_path(params)
       end
 
       def update(id, params)
@@ -40,20 +38,14 @@ module FinApps
         super params, path
       end
 
-      # private
-      #
-      # def build_path(p)
-      #   # TODO: change to support https://github.com/finapps/api/blob/develop/misc/docs/iav.md#get-list-of-orders
-      #
-      #   page = p[:page] || 1
-      #   requested = p[:requested] || 100
-      #   sort = p[:sort] || 'date'
-      #   asc = p[:asc]
-      #   end_point = 'orders'
-      #   path = end_point.dup
-      #   [page, requested, sort, asc].each_with_index {|a| path << "/#{ERB::Util.url_encode(a)}" }
-      #   path
-      # end
+      private
+
+      def build_path(p)
+        page = p[:page] ? "page=#{ERB::Util.url_encode(p[:page])}" : ''
+        requested = p[:requested] ? "&requested=#{ERB::Util.url_encode(p[:requested])}" : ''
+        sort = p[:sort] ? "&sort=#{ERB::Util.url_encode(p[:sort])}" : ''
+        "#{end_point}?#{page}#{requested}#{sort}"
+      end
     end
   end
 end

data/lib/finapps/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module FinApps
-  VERSION = '2.2.11'
+  VERSION = '2.2.12'
 end

data/spec/rest/orders_spec.rb

@@ -1,4 +1,6 @@
 # frozen_string_literal: true
+require 'spec_helpers/client'
+
 RSpec.describe FinApps::REST::Orders do
   include SpecHelpers::Client
 
@@ -64,16 +66,28 @@ RSpec.describe FinApps::REST::Orders do
       it('returns no error messages') { expect(subject[ERROR_MESSAGES]).to be_empty }
     end
 
-    # context 'when including partial params' do
-    #   subject { FinApps::REST::Orders.new(client).list(params) }
-    #   let(:params) { {page: 2, sort: 'status'} }
-    #
-    #   it { expect { subject }.not_to raise_error }
-    #   it('returns an array') { expect(subject).to be_a(Array) }
-    #   it('performs a get and returns the response') { expect(subject[RESULTS]).to respond_to(:orders) }
-    #   it('each order contains a consumer_id') { expect(subject[RESULTS].orders).to all(respond_to(:consumer_id)) }
-    #   it('returns no error messages') { expect(subject[ERROR_MESSAGES]).to be_empty }
-    # end
+    context 'when invalid params are provided' do
+      subject { FinApps::REST::Orders.new(client).list(invalid_params) }
+      let(:invalid_params) { %w(this is an array) }
+
+      it { expect { subject }.to raise_error(FinAppsCore::InvalidArgumentsError) }
+    end
+
+    context 'when including valid params' do
+      subject { FinApps::REST::Orders.new(client).list(params) }
+      let(:params) { {page: 2, sort: 'status'} }
+
+      it { expect { subject }.not_to raise_error }
+      it('returns an array') { expect(subject).to be_a(Array) }
+      it('performs a get and returns the response') { expect(subject[RESULTS]).to respond_to(:orders) }
+      it('each order contains a consumer_id') { expect(subject[RESULTS].orders).to all(respond_to(:consumer_id)) }
+      it('returns no error messages') { expect(subject[ERROR_MESSAGES]).to be_empty }
+      it 'sends proper request' do
+        subject
+        url = "#{FinAppsCore::REST::Defaults::DEFAULTS[:host]}/v2/orders?page=2&sort=status"
+        expect(WebMock).to have_requested(:get, url)
+      end
+    end
   end
 
   describe '#update' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: finapps
 version: !ruby/object:Gem::Version
-  version: 2.2.11
+  version: 2.2.12
 platform: ruby
 authors:
 - Erich Quintero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-28 00:00:00.000000000 Z
+date: 2017-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: finapps_core