crunchbase4 0.2.2 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b73d116afcbec0aff28ccf3b7d32ca87085350d8503965e2e9073dbdf5a86593
-  data.tar.gz: a05828ca45439cba39a99a9688cd6830d51cd88ec7c1ec45527e28948e7ca73a
+  metadata.gz: d5364cb9aabb82ee80de4b80201a09d64e6f5734b09387f61645a0b46baf28c6
+  data.tar.gz: 2a7dcd16421ee17bda69bdaca71c4dbd5c0fa744af83f7de846e9ec70d9ba5ba
 SHA512:
-  metadata.gz: c7617367a3fd087f23f963a5d3b29034854de56cc03c5a7f4b8d8d368ac57d8f755418dfa29cbf9a1ba64cc26189af7400fb15c6ed153eadcc8e7e7c9b21612c
-  data.tar.gz: fd0f8739cda3b88dccafdf754c2422be13f5978128f8dd6ccbaadb7ef7858cd22a9996ea32e125bc24d4b4dfb90f3429d8d7549361db0977db03c0ad77d634b1
+  metadata.gz: c9b72b41e01a1eea4b5826d54203a5f780bc2a5cd598c4a9a12d27b887740800e5d4b96458511cc8882710476125ed326615cc2feabc557163164e9b099e9448
+  data.tar.gz: 7ffb3c67fc3f604c3e360032ce6d9beca8616c9a827fea484fb5a6aa236bcf45b5862dce2aaf589558ec589fe2fbabc9480874422d3634842bfed9a535237be9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    crunchbase4 (0.2.2)
+    crunchbase4 (0.2.5)
       faraday
       faraday_curl
       faraday_middleware
@@ -17,8 +17,25 @@ GEM
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.5.0)
-    faraday (1.0.1)
+    faraday (1.8.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
       multipart-post (>= 1.2, < 3)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
     faraday_curl (0.0.2)
       faraday (>= 0.9.0)
     faraday_middleware (1.2.0)
@@ -64,6 +81,7 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
     ruby-progressbar (1.10.1)
+    ruby2_keywords (0.0.5)
     safe_yaml (1.0.5)
     unicode-display_width (1.7.0)
     vcr (6.0.0)

data/README.md

@@ -433,6 +433,18 @@ args = {
   after_id: 'uuid'                        # optional
 }
 
+response = client.recent_updates(args)
+
+args = {
+  scope_name: 'press_reference',             # must
+  from_date: '2020-05-05',                   # optional
+  to_date: '2020-05-05',                     # optional
+  field_ids: %w[title posted_on publisher],  # default %[uuid created_at updated_at]
+  sort: 'desc'                              # default `desc`
+  before_id: 'uuid'                         # optional
+  after_id: 'uuid'                          # optional
+}
+
 response = client.recent_updates(args)
 ```
 

data/lib/crunchbase/searches/client.rb

@@ -73,8 +73,10 @@ module Crunchbase
           'field_ids' => field_ids,
           'order' => @conditions['order'],
           'query' => @conditions['query'],
+          'before_id' => @conditions['before_id'],
+          'after_id' => @conditions['after_id'],
           'limit' => limit
-        }
+        }.delete_if { |_, v| v.nil? }
       end
     end
   end

data/lib/crunchbase/utilities/search_query_parameters.rb

@@ -11,7 +11,7 @@ module Crunchbase
       #
       # Search Query Parameters
       #
-      #   order_field_id: sort field, default field will be updated_at
+      #   order_field_ids: sort field, default field will be updated_at
       #   field_ids: array of field_id strings
       #     Fields to include as columns in the search result entities
       #   query: Search query to perform on the designated entity
@@ -26,33 +26,28 @@ module Crunchbase
       #     Used to paginate search results to the next page.
       #     after_id should be the uuid of the last item in the current page. May not be provided simultaneously with before_id.
       def query_parameters(args)
-        order_field_id = args[:order_field_id] || 'updated_at'
+        order_field_ids = args[:order_field_ids] || ['updated_at']
+        order_conditions = order_field_ids.map { |field_id| { 'field_id' => field_id, 'sort' => (args[:sort] || 'desc'), 'nulls' => 'last' } }
 
         params = {
           'field_ids' => default_field_ids + (args[:field_ids] || []).uniq,
-          'order' => [{ 'field_id' => order_field_id, 'sort' => (args[:sort] || 'desc'), 'nulls' => 'last' }],
+          'order' => order_conditions,
           'limit' => args[:limit] || 1000
         }
+        # Pagination
+        params['before_id'] = args[:before_id] unless args[:before_id].nil?
+        params['after_id'] = args[:after_id] unless args[:after_id].nil?
 
-        unless args[:date].nil?
-          params.merge!(
-            'query' => [
-              {
-                'type' => 'predicate',
-                'field_id' => order_field_id,
-                'operator_id' => 'gte',
-                'values' => [
-                  args[:date]
-                ]
-              }
-            ]
-          )
+        # Date Ranges
+        unless (queries = build_predicate_queries(args, order_field_ids)).empty?
+          params['query'] = queries
         end
-        params.merge!('before_id' => args[:before_id]) unless args[:before_id].nil?
-        params.merge!('after_id' => args[:after_id]) unless args[:after_id].nil?
+
         params
       end
 
+      private
+
       def default_field_ids
         @default_field_ids ||= %w[
           uuid
@@ -60,6 +55,34 @@ module Crunchbase
           updated_at
         ]
       end
+
+      def build_predicate_queries(args, order_field_ids)
+        # Date Ranges
+        queries = []
+        if !args[:date].nil? || !args[:from_date].nil?
+          queries << {
+            'type' => 'predicate',
+            'field_id' => order_field_ids[0],
+            'operator_id' => 'gte',
+            'values' => [
+              args[:date] || args[:from_date]
+            ]
+          }
+        end
+
+        unless args[:to_date].nil?
+          queries << {
+            'type' => 'predicate',
+            'field_id' => order_field_ids[0],
+            'operator_id' => 'lte',
+            'values' => [
+              args[:to_date]
+            ]
+          }
+        end
+
+        queries
+      end
     end
   end
 end

data/lib/crunchbase/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Crunchbase
-  VERSION = '0.2.2'
+  VERSION = '0.2.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crunchbase4
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.5
 platform: ruby
 authors:
 - Encore Shao
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-25 00:00:00.000000000 Z
+date: 2023-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday