finapps 2.2.13 → 2.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e5336f7f84372902606d737ef74a07be99b7178
-  data.tar.gz: b19bc5d2f1833367a6eee7c094ea1a14eab08142
+  metadata.gz: cf5f0601a67422163160e5df827d28996565c17a
+  data.tar.gz: 3377656058a00af66d5d8a9be2b5bf5f8e40ef05
 SHA512:
-  metadata.gz: f756dd81fe95d4fede02dd56e431138ae30a20bf1d244da71d1943ebd766e96b6e095f0bf0b8d1d0ea52a190ce973073bb901db21cd60b6c22486865d8b1d9d0
-  data.tar.gz: cc6ed19800f26b060440660fa00725fe48f0524e45dcfaceb2a2f2cdc67d262031092becd2c534d1f3ed09ea282fcc9fdc031fc3a3e2bd04330e48a5e9ac2ab1
+  metadata.gz: 3a019a8f4a409566a26fa73bee5b928f437b88d20be84d1b18842d48a11dd3c93612b7b4009bb3a344e24838afb0abf1df70812d0103b9eab6bd015a075c1d46
+  data.tar.gz: 4ed6c7b2925748098e1182e9ffc59543384f9bc5a07aebcaa313410023b9c8a5399b8570bfef8f6b8de10ea17dbf546f91b2e1e91d1d569cd1fe969aac81585e

data/lib/finapps.rb

@@ -23,6 +23,7 @@ require 'finapps/rest/order_statuses'
 require 'finapps/rest/password_resets'
 require 'finapps/rest/operators'
 require 'finapps/rest/operators_password_resets'
+require 'finapps/utils/query_builder'
 
 # require 'finapps/rest/configuration'
 # require 'finapps/rest/credentials'

data/lib/finapps/rest/operators.rb

@@ -1,12 +1,15 @@
 # frozen_string_literal: true
+require_relative '../utils/query_builder'
+
 module FinApps
   module REST
     class Operators < FinAppsCore::REST::Resources
+      include FinApps::Utils::QueryBuilder
+
       def list(params=nil)
         return super if params.nil?
-
-        path = "#{endpoint}/#{ERB::Util.url_encode(params)}"
-        super path
+        raise FinAppsCore::InvalidArgumentsError.new 'Invalid argument: params' unless params.is_a? Hash
+        super build_query_path(end_point, params)
       end
 
       def show(id)

data/lib/finapps/rest/orders.rb

@@ -1,7 +1,11 @@
 # frozen_string_literal: true
+require_relative '../utils/query_builder'
+
 module FinApps
   module REST
     class Orders < FinAppsCore::REST::Resources # :nodoc:
+      include FinApps::Utils::QueryBuilder
+
       def show(id)
         not_blank(id, :id)
         super
@@ -16,14 +20,12 @@ module FinApps
       # :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
+      # :filter - mongo object to filter
       #     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)
+        super build_query_path(end_point, params)
       end
 
       def update(id, params)
@@ -37,15 +39,6 @@ module FinApps
 
         super params, 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/utils/query_builder.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+module FinApps
+  module Utils
+    module QueryBuilder
+      def build_query_path(root_url, params)
+        page = params[:page] ? "page=#{params[:page]}" : ''
+        requested = params[:requested] ? "&requested=#{params[:requested]}" : ''
+        sort = params[:sort] ? "&sort=#{ERB::Util.url_encode(params[:sort])}" : ''
+        filter = params[:filter] ? "&filter=#{ERB::Util.url_encode(params[:filter])}" : ''
+        "#{root_url}?#{page}#{requested}#{sort}#{filter}"
+      end
+    end
+  end
+end

data/lib/finapps/version.rb

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

data/spec/utils/query_builder_spec.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+class FakeClass
+  include FinApps::Utils::QueryBuilder
+end
+
+RSpec.describe FinApps::Utils::QueryBuilder do
+  describe '#build_query_path' do
+    subject { FakeClass.new }
+    let(:end_point) { 'orders' }
+
+    context 'with full params' do
+      let(:params) { {page: '1', requested: '20', sort: '-date', filter: '{"role": "1"}'} }
+      it 'returns correct string' do
+        correct_string = 'orders?page=1&requested=20&sort=-date&filter=%7B%22role%22%3A%20%221%22%7D'
+        expect(subject.build_query_path(end_point, params)).to eq(correct_string)
+      end
+    end
+
+    context 'with partial params' do
+      let(:params) { {page: '1', filter: '{"role": "1"}'} }
+      it 'returns correct string' do
+        expect(subject.build_query_path(end_point, params)).to eq('orders?page=1&filter=%7B%22role%22%3A%20%221%22%7D')
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: finapps
 version: !ruby/object:Gem::Version
-  version: 2.2.13
+  version: 2.2.14
 platform: ruby
 authors:
 - Erich Quintero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-21 00:00:00.000000000 Z
+date: 2017-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: finapps_core
@@ -249,6 +249,7 @@ files:
 - lib/finapps/rest/user_institutions_forms.rb
 - lib/finapps/rest/user_institutions_statuses.rb
 - lib/finapps/rest/version.rb
+- lib/finapps/utils/query_builder.rb
 - lib/finapps/version.rb
 - lib/tasks/releaser.rake
 - spec/rest/client_spec.rb
@@ -298,6 +299,7 @@ files:
 - spec/support/fixtures/user_institution_status.json
 - spec/support/fixtures/user_institutions_list.json
 - spec/support/fixtures/user_institutions_show.json
+- spec/utils/query_builder_spec.rb
 homepage: https://github.com/finapps/ruby-client
 licenses:
 - MIT
@@ -346,5 +348,6 @@ test_files:
 - spec/rest/order_statuses_spec.rb
 - spec/rest/sessions_spec.rb
 - spec/support/fake_api.rb
+- spec/utils/query_builder_spec.rb
 - spec/spec_helpers/client.rb
 - spec/spec_helper.rb