economic-rest 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c1e6cd8398ada10e60ee54c7750618790ec1f145152934f9a228f2e228f97be
-  data.tar.gz: 845c784dd8abc40f995bdcee7148db930d4bebde720b00db9049a4479bf6c5d9
+  metadata.gz: bc4ebe704f751fe2eb86534e9824041037228be63e53192c3d8655665ae88389
+  data.tar.gz: 4ba74d3b99d0a9be802d595283e49f432cf6dcafe03f767f48df7485972534bf
 SHA512:
-  metadata.gz: a41250f0b8d8608229c72b72e3fd9292d62d07a3e359db9b9a07304c2bfc88b689d8f5f3a0b75cd042575bd091da5a03b74809dd2a03e350b10a7324b0e4b0e1
-  data.tar.gz: ecffa7cc7962df6d423d2f16dd9dd508d171090b18276fef97b86474239233f9131fb85c79c1f24a55429ebebf51a656f6ec97a9b9579082e74e99a0fe61688d
+  metadata.gz: d99c732ed08f7af6ce94c9b482473d92451bf410926e83acae511f847f79f6306e125b35c9e1bcb00c98ea7abafb1c24a5253898b061d0812197cc60c8f8687d
+  data.tar.gz: c5660a285d9b69e4a5205e1f2507c644cdd1ce3500057c022e6b0c38bcba0d1bf0585273c41fc5056f1a35a1415f345f1dd2f8042210cb4b1dfd976aa034d1e6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    economic-rest (0.1.4)
+    economic-rest (0.1.5)
       rest-client
 
 GEM

data/lib/economic/base_repo.rb

@@ -10,7 +10,7 @@ module Economic
         { 'X-AppSecretToken': Session.app_secret_token, 'X-AgreementGrantToken': Session.agreement_grant_token, 'Content-Type': 'application/json' }
       end
 
-      def fetch(endpoint:, page_or_id: nil, pageindex: 0)
+      def fetch(endpoint:, page_or_id: nil, pageindex: 0, filter_text: '')
         url = ''
         url << URL
         url << endpoint.to_s if endpoint
@@ -19,6 +19,7 @@ module Economic
                else
                  "/#{page_or_id}"
                end
+        url << "&filter=#{filter_text}" unless filter_text == ''
         response = RestClient.get(url, headers)
         test_response(response)
       end
@@ -36,14 +37,14 @@ module Economic
         test_response(response)
       end
 
-      def all
+      def all(filter_text: '')
         pagination = {}
         pageindex = 0
         entries = []
 
         # Loop until last page, last page does not have a 'nextPage'
         while pagination['nextPage'] || pageindex.zero?
-          response = fetch(endpoint: endpoint_name, pageindex: pageindex)
+          response = fetch(endpoint: endpoint_name, pageindex: pageindex, filter_text: filter_text)
 
           hash = JSON.parse(response.body)
           hash['collection'].each do |entry_hash|
@@ -57,19 +58,7 @@ module Economic
       end
 
       def filter(filter_text)
-        entries = []
-        url = ''
-        url << URL
-        url << endpoint_name
-        url << "?filter=#{filter_text}"
-        response = RestClient.get(url, headers)
-        response = test_response(response)
-
-        hash = JSON.parse(response.body)
-        hash['collection'].each do |entry_hash|
-          entries.push model.new(entry_hash)
-        end
-        entries
+        all(filter_text: filter_text)
       end
 
       def updated_after(date)

data/lib/economic/rest/version.rb

@@ -1,5 +1,5 @@
 module Economic
   module Rest
-    VERSION = '0.1.5'.freeze
+    VERSION = '0.1.6'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: economic-rest
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Peter Klogborg