typesense 0.4.0 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c74454a48a4f170bbb99bb5e382199c8842e84ec5d2fbd6198106df89b45977
-  data.tar.gz: ca4772c87e84fabe0cef3af42bfb6e1bb889e305b402d9a2e2f83b10bdbe6d1b
+  metadata.gz: daf1095f05bf1b0a6a8dce800dcbd08d80c6711615dd96bd533bdff561bcfd4b
+  data.tar.gz: c3f22c5657cfbffd5eea14862f81cf32af19a699354f8f6cecd45850c7d22b26
 SHA512:
-  metadata.gz: d1ab99d6e52d15257c8e664d765b1debb063d151d364916b273cef1658537dadcd0241e76fffa5807be50b15c83891b76c2aaef7105c875be2c3bb70728b88e0
-  data.tar.gz: db20bce0c42a7713a3c5fa25ca1c7a17bb6724bd8949b5dc16202d11538b348d806d960f0def0712e118d856184da8650a3b12ba861037754e20e172856d38c0
+  metadata.gz: 3933ca65c765545244d66c18e4c2a20b390ed7c3f9d3ef0134596f6f929826748eace3cfc14e9985e93bd091e5463d990d4173ba6b1f3e5e6a31a3681615822d
+  data.tar.gz: 704d5853d7c232d66d05aa037c26f3adfa9089599ae68c74c90af69e02bfc28cc5a87e51958cfb56acc7d64b75c7d53129bb514af736e299348abfa233b5fd0f

data/.rubocop.yml

@@ -11,3 +11,24 @@ Metrics/BlockLength:
     - 'spec/**/*'
     - 'Gemfile'
     - 'typesense.gemspec'
+
+Style/Documentation:
+  Enabled: false
+
+RSpec/ExampleLength:
+  Enabled: false
+
+Metrics/MethodLength:
+  Enabled: false
+
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/ClassLength:
+  Enabled: false
+
+Metrics/CyclomaticComplexity:
+  Enabled: false
+
+Metrics/PerceivedComplexity:
+  Enabled: false

data/.rubocop_todo.yml

@@ -17,46 +17,7 @@ Lint/SuppressedException:
   Exclude:
     - 'examples/collections_and_documents.rb'
     - 'examples/search.rb'
-
-# Offense count: 3
-# Configuration parameters: IgnoredMethods.
-Metrics/AbcSize:
-  Max: 43
-
-# Offense count: 1
-# Configuration parameters: CountComments.
-Metrics/ClassLength:
-  Max: 184
-
-# Offense count: 3
-# Configuration parameters: IgnoredMethods.
-Metrics/CyclomaticComplexity:
-  Max: 11
-
-# Offense count: 5
-# Configuration parameters: CountComments, ExcludedMethods.
-Metrics/MethodLength:
-  Max: 29
-
-# Offense count: 3
-# Configuration parameters: IgnoredMethods.
-Metrics/PerceivedComplexity:
-  Max: 11
-
-# Offense count: 25
-# Configuration parameters: Max.
-RSpec/ExampleLength:
-  Exclude:
-    - 'spec/typesense/alias_spec.rb'
-    - 'spec/typesense/aliases_spec.rb'
-    - 'spec/typesense/api_call_spec.rb'
-    - 'spec/typesense/collection_spec.rb'
-    - 'spec/typesense/collections_spec.rb'
-    - 'spec/typesense/debug_spec.rb'
-    - 'spec/typesense/document_spec.rb'
-    - 'spec/typesense/documents_spec.rb'
-    - 'spec/typesense/override_spec.rb'
-    - 'spec/typesense/overrides_spec.rb'
+    - 'examples/keys.rb'
 
 # Offense count: 10
 RSpec/MultipleExpectations:

data/README.md

@@ -33,8 +33,9 @@ Tests are also a good place to know how the the library works internally: [spec]
 
 | Typesense Server | typesense-ruby |
 |------------------|----------------|
+| \>= v0.12.1 | \>= v0.5.0 |
+| \>= v0.12.0 | \>= v0.4.0 |
 | <= v0.11 | <= v0.3.0 |
-| \>= v0.12 | \>= v0.4.0 |
 
 ## Development
 

data/examples/client_initialization.rb

@@ -11,7 +11,7 @@ AwesomePrint.defaults = {
 ## Setup
 #
 ### Option 1: Start a single-node cluster
-#     $ docker run -i -p 8108:8108 -v/tmp/typesense-server-data-1b/:/data -v`pwd`/typesense-server-peers:/typesense-server-peers typesense/typesense:0.12.rc9 --data-dir /data --api-key=xyz --search-only-api-key=abcd --listen-port 8108 --enable-cors
+#     $ docker run -i -p 8108:8108 -v/tmp/typesense-server-data-1b/:/data -v`pwd`/typesense-server-peers:/typesense-server-peers typesense/typesense:0.12.1.rc1 --data-dir /data --api-key=xyz --listen-port 8108 --enable-cors
 #
 ### Option 2: Start a 3-node cluster
 #
@@ -19,13 +19,13 @@ AwesomePrint.defaults = {
 #   $ echo '172.17.0.2:8107:8108,172.17.0.3:7107:7108,172.17.0.4:9107:9108' > `pwd`/typesense-server-peers
 #
 # Start node 1:
-#   $ docker run -i -p 8108:8108 -p 8107:8107 -v/tmp/typesense-server-data-1b/:/data -v`pwd`/typesense-server-peers:/typesense-server-peers typesense/typesense:0.12.rc9 --data-dir /data --api-key=xyz --search-only-api-key=abcd --listen-port 8108 --peering-port 8107 --enable-cors --nodes=/typesense-server-peers
+#   $ docker run -i -p 8108:8108 -p 8107:8107 -v/tmp/typesense-server-data-1b/:/data -v`pwd`/typesense-server-peers:/typesense-server-peers typesense/typesense:0.12.1.rc1 --data-dir /data --api-key=xyz --listen-port 8108 --peering-port 8107 --enable-cors --nodes=/typesense-server-peers
 #
 # Start node 2:
-#   $ docker run -i -p 7108:7108 -p 7107:7107 -v/tmp/.typesense-server-data-2b/:/data -v`pwd`/typesense-server-peers:/typesense-server-peers typesense/typesense:0.12.rc9 --data-dir /data --api-key=xyz --search-only-api-key=abcd --listen-port 7108 --peering-port 7107 --enable-cors --nodes=/typesense-server-peers
+#   $ docker run -i -p 7108:7108 -p 7107:7107 -v/tmp/.typesense-server-data-2b/:/data -v`pwd`/typesense-server-peers:/typesense-server-peers typesense/typesense:0.12.1.rc1 --data-dir /data --api-key=xyz --listen-port 7108 --peering-port 7107 --enable-cors --nodes=/typesense-server-peers
 #
 # Start node 3:
-#   $ docker run -i -p 9108:9108 -p 9107:9107 -v/tmp/.typesense-server-data-3b/:/data -v`pwd`/typesense-server-peers:/typesense-server-peers typesense/typesense:0.12.rc9 --data-dir /data --api-key=xyz --search-only-api-key=abcd --listen-port 9108 --peering-port 9107 --enable-cors --nodes=/typesense-server-peers
+#   $ docker run -i -p 9108:9108 -p 9107:9107 -v/tmp/.typesense-server-data-3b/:/data -v`pwd`/typesense-server-peers:/typesense-server-peers typesense/typesense:0.12.1.rc1 --data-dir /data --api-key=xyz --listen-port 9108 --peering-port 9107 --enable-cors --nodes=/typesense-server-peers
 #
 # Note: Be sure to add `--license-key=<>` at the end when starting a Typesense Premium server
 

data/examples/keys.rb

@@ -0,0 +1,127 @@
+# frozen_string_literal: true
+
+##
+# These examples walk you through operations to manage API Keys
+
+require_relative './client_initialization'
+
+# Let's setup some test data for this example
+schema = {
+  'name' => 'users',
+  'fields' => [
+    {
+      'name' => 'company_id',
+      'type' => 'int32',
+      'facet' => false
+    },
+    {
+      'name' => 'user_name',
+      'type' => 'string',
+      'facet' => false
+    },
+    {
+      'name' => 'login_count',
+      'type' => 'int32',
+      'facet' => false
+    },
+    {
+      'name' => 'country',
+      'type' => 'string',
+      'facet' => true
+    }
+  ],
+  'default_sorting_field' => 'company_id'
+}
+
+# We have four users, belonging to two companies: 124 and 126
+documents = [
+  {
+    'company_id' => 124,
+    'user_name' => 'Hilary Bradford',
+    'login_count' => 10,
+    'country' => 'USA'
+  },
+  {
+    'company_id' => 124,
+    'user_name' => 'Nile Carty',
+    'login_count' => 100,
+    'country' => 'USA'
+  },
+  {
+    'company_id' => 126,
+    'user_name' => 'Tahlia Maxwell',
+    'login_count' => 1,
+    'country' => 'France'
+  },
+  {
+    'company_id' => 126,
+    'user_name' => 'Karl Roy',
+    'login_count' => 2,
+    'country' => 'Germany'
+  }
+]
+
+# Delete if the collection already exists from a previous example run
+begin
+  @typesense.collections['users'].delete
+rescue Typesense::Error::ObjectNotFound
+end
+
+# create a collection
+@typesense.collections.create(schema)
+
+# Index documents
+documents.each do |document|
+  @typesense.collections['users'].documents.create(document)
+end
+
+# Generate an API key and restrict it to only allow searches
+# You want to use this API Key in the browser instead of the master API Key
+unscoped_search_only_api_key_response = @typesense.keys.create({
+                                                                 'description' => 'Search-only key.',
+                                                                 'actions' => ['documents:search'],
+                                                                 'collections' => ['*']
+                                                               })
+ap unscoped_search_only_api_key_response
+
+# Save the key returned, since this will be the only time the full API Key is returned, for security purposes
+unscoped_search_only_api_key = unscoped_search_only_api_key_response['value']
+
+# Side note: you can also retrieve metadata of API keys using the ID returned in the above response
+unscoped_search_only_api_key_response = @typesense.keys[unscoped_search_only_api_key_response['id']].retrieve
+ap unscoped_search_only_api_key_response
+
+# We'll now use this search-only API key to generate a scoped search API key that can only access documents that have company_id:124
+#  This is useful when you store multi-tenant data in a single Typesense server, but you only want
+#  a particular tenant to access their own data. You'd generate one scoped search key per tenant.
+#  IMPORTANT: scoped search keys should only be generated *server-side*, so as to not leak the unscoped main search key to clients
+scoped_search_only_api_key = @typesense.keys.generate_scoped_search_key(unscoped_search_only_api_key, { 'filter_by': 'company_id:124' })
+ap "scoped_search_only_api_key: #{scoped_search_only_api_key}"
+
+# Now let's search the data using the scoped API Key for company_id:124
+# You can do searches with this scoped_search_only_api_key from the server-side or client-side
+scoped_typesense_client = Typesense::Client.new({
+                                                  'nodes': [{
+                                                    'host': 'localhost',
+                                                    'port': '8108',
+                                                    'protocol': 'http'
+                                                  }],
+                                                  'api_key': scoped_search_only_api_key
+                                                })
+
+search_results = scoped_typesense_client.collections['users'].documents.search({
+                                                                                 'q' => 'Hilary',
+                                                                                 'query_by' => 'user_name'
+                                                                               })
+ap search_results
+
+# Search for a user that exists, but is outside the current key's scope
+search_results = scoped_typesense_client.collections['users'].documents.search({
+                                                                                 'q': 'Maxwell',
+                                                                                 'query_by': 'user_name'
+                                                                               })
+ap search_results # Will return empty result set
+
+# Now let's delete the unscoped_search_only_api_key. You'd want to do this when you need to rotate keys for example.
+results = @typesense.keys[unscoped_search_only_api_key_response['id']].delete
+ap results

data/lib/typesense.rb

@@ -15,5 +15,9 @@ require_relative 'typesense/overrides'
 require_relative 'typesense/override'
 require_relative 'typesense/aliases'
 require_relative 'typesense/alias'
+require_relative 'typesense/keys'
+require_relative 'typesense/key'
 require_relative 'typesense/debug'
+require_relative 'typesense/health'
+require_relative 'typesense/metrics'
 require_relative 'typesense/error'

data/lib/typesense/api_call.rb

@@ -82,8 +82,9 @@ module Typesense
           # If response is 2xx return the object, else raise the response as an exception
           return response_object.parsed_response if response_object.response.code_type <= Net::HTTPSuccess # 2xx
 
-          raise custom_exception_klass_for(response_object.response), response_object.parsed_response['message'] || 'Error message not available'
-        rescue Net::ReadTimeout, Net::OpenTimeout,
+          exception_message = (response_object.parsed_response && response_object.parsed_response['message']) || 'Error'
+          raise custom_exception_klass_for(response_object.response), exception_message
+        rescue SocketError, Net::ReadTimeout, Net::OpenTimeout,
                EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError,
                Errno::EINVAL, Errno::ENETDOWN, Errno::ENETUNREACH, Errno::ENETRESET, Errno::ECONNABORTED, Errno::ECONNRESET,
                Errno::ETIMEDOUT, Errno::ECONNREFUSED, Errno::EHOSTDOWN, Errno::EHOSTUNREACH,

data/lib/typesense/client.rb

@@ -5,14 +5,20 @@ module Typesense
     attr_reader :configuration
     attr_reader :collections
     attr_reader :aliases
+    attr_reader :keys
     attr_reader :debug
+    attr_reader :health
+    attr_reader :metrics
 
     def initialize(options = {})
       @configuration = Configuration.new(options)
       @api_call = ApiCall.new(@configuration)
       @collections = Collections.new(@api_call)
       @aliases = Aliases.new(@api_call)
+      @keys = Keys.new(@api_call)
       @debug = Debug.new(@api_call)
+      @health = Health.new(@api_call)
+      @metrics = Metrics.new(@api_call)
     end
   end
 end

data/lib/typesense/health.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Typesense
+  class Health
+    RESOURCE_PATH = '/health'
+
+    def initialize(api_call)
+      @api_call = api_call
+    end
+
+    def retrieve
+      @api_call.get(RESOURCE_PATH)
+    end
+  end
+end

data/lib/typesense/key.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Typesense
+  class Key
+    def initialize(id, api_call)
+      @id = id
+      @api_call = api_call
+    end
+
+    def retrieve
+      @api_call.get(endpoint_path)
+    end
+
+    def delete
+      @api_call.delete(endpoint_path)
+    end
+
+    private
+
+    def endpoint_path
+      "#{Keys::RESOURCE_PATH}/#{@id}"
+    end
+  end
+end

data/lib/typesense/keys.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'base64'
+
+module Typesense
+  class Keys
+    RESOURCE_PATH = '/keys'
+
+    def initialize(api_call)
+      @api_call = api_call
+      @keys = {}
+    end
+
+    def create(parameters)
+      @api_call.post(RESOURCE_PATH, parameters)
+    end
+
+    def retrieve
+      @api_call.get(RESOURCE_PATH)
+    end
+
+    def generate_scoped_search_key(search_key, parameters)
+      parameters_json = JSON.dump(parameters)
+      digest = Base64.encode64(OpenSSL::HMAC.digest('sha256', search_key, parameters_json)).gsub("\n", '')
+      key_prefix = search_key[0...4]
+      raw_scoped_key = "#{digest}#{key_prefix}#{parameters_json}"
+      Base64.encode64(raw_scoped_key).gsub("\n", '')
+    end
+
+    def [](id)
+      @keys[id] ||= Key.new(id, @api_call)
+    end
+  end
+end

data/lib/typesense/metrics.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Typesense
+  class Metrics
+    RESOURCE_PATH = '/metrics.json'
+
+    def initialize(api_call)
+      @api_call = api_call
+    end
+
+    def retrieve
+      @api_call.get(RESOURCE_PATH)
+    end
+  end
+end

data/lib/typesense/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Typesense
-  VERSION = '0.4.0'
+  VERSION = '0.5.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: typesense
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.4
 platform: ruby
 authors:
 - Typesense, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-23 00:00:00.000000000 Z
+date: 2020-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -229,6 +229,7 @@ files:
 - examples/aliases.rb
 - examples/client_initialization.rb
 - examples/collections_and_documents.rb
+- examples/keys.rb
 - examples/overrides.rb
 - examples/search.rb
 - lib/typesense.rb
@@ -243,6 +244,10 @@ files:
 - lib/typesense/document.rb
 - lib/typesense/documents.rb
 - lib/typesense/error.rb
+- lib/typesense/health.rb
+- lib/typesense/key.rb
+- lib/typesense/keys.rb
+- lib/typesense/metrics.rb
 - lib/typesense/override.rb
 - lib/typesense/overrides.rb
 - lib/typesense/version.rb