solrbee 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 356cd5b312edac759a4090191b33a48282a49b379bf44aecdf224ec47ce73fd0
-  data.tar.gz: f0d399ed8c9eccfe86fffd3492ba248fe7b736407aee26a2465afa54962d89bd
+  metadata.gz: 393fd5007989a615a71cf31c0a774d83ebbca8336e9b3ec14ad559258142f365
+  data.tar.gz: 43d7a6f001622631805071b0e95ed0311b02d1af81b1219f3d19760b7c5c1f0c
 SHA512:
-  metadata.gz: 7002601a792323c6533157152f92cab212e23fffd006f714f89b6f3610a20e4dfa35fab27451bb7a93b9e1f0e920e8b7081720e261143bb5568264a8d3817449
-  data.tar.gz: d29a32a7d00f985bf38bf1f7c36a044f78064739999b318ef4d3070eb1e411a04124c7c3e9140a6afce92ef28df018c6caa1554b82a5a44d307292d41d7af95f
+  metadata.gz: b19fb64da3cbed12d11351fa84786125948515814122787fc6e131160f3e124c12895d6bc97990e076db723b8ca679a9cb84578e184e1d714e9f726a89380ad8
+  data.tar.gz: 6f3b14f05faf6cc4afae23d3f35ced388e2f9d86f925254c6354210d47ede80dcae8c27c61a89e5da5a331aa1e43903ff3cf3893b9e07dff718ff7113fba7f9e

data/Makefile

@@ -1,8 +1,10 @@
 SHELL = /bin/bash
 
+SOLR_URL = http://localhost:8983/solr/solrbee
+
 .PHONY : test
 test:
 	docker run --rm -d -p 8983:8983 --name solrbee-test solr:8 solr-precreate solrbee
 	while ! curl -fs http://localhost:8983/solr/solrbee/admin/ping 2>/dev/null ; do sleep 1 ; done
-	bundle exec rake
+	SOLR_URL=$(SOLR_URL) bundle exec rake
 	docker stop solrbee-test

data/lib/solrbee.rb

@@ -6,7 +6,6 @@ require "hashie"
 
 require "solrbee/version"
 require "solrbee/response"
-require "solrbee/request"
 require "solrbee/query"
 require "solrbee/client"
 require "solrbee/cursor"

data/lib/solrbee/api_methods.rb

@@ -2,59 +2,60 @@ module Solrbee
   module ApiMethods
 
     def ping
-      response = Request.execute(self, '/admin/ping')
-      response.status
+      response = request(path: '/admin/ping')
+      response['status']
     end
 
     def schema
-      response = Request.execute(self, '/schema')
-      response.schema
+      response = request(path: '/schema')
+      response['schema']
     end
 
     def schema_name
-      response = Request.execute(self, '/schema/name')
-      response.name
+      response = request(path: '/schema/name')
+      response['name']
     end
 
     def schema_version
-      response = Request.execute(self, '/schema/version')
-      response.version
+      response = request(path: '/schema/version')
+      response['version']
     end
 
     def fields(**params)
-      response = Request.execute(self, '/schema/fields', params: params)
-      response.fields
+      response = request(path: '/schema/fields', params: params)
+      response['fields']
     end
 
     def field(field_name, **params)
-      response = Request.execute(self, '/schema/fields/%s' % field_name, params: params)
-      response.field
+      response = request(path: '/schema/fields/%s' % field_name, params: params)
+      response['field']
     end
 
     def unique_key
-      @unique_key ||= Request.execute(self, '/schema/uniquekey').uniqueKey
+      response = request(path: '/schema/uniquekey')
+      response['uniqueKey']
     end
 
     def field_types(**params)
-      response = Request.execute(self, '/schema/fieldtypes', params: params)
-      response.fieldTypes
+      response = request(path: '/schema/fieldtypes', params: params)
+      response['fieldTypes']
     end
 
     def field_type(field_name, **params)
-      response = Request.execute(self, '/schema/fieldtypes/%s' % field_name, params: params)
-      response.fieldType
+      response = request(path: '/schema/fieldtypes/%s' % field_name, params: params)
+      response['fieldType']
     end
 
     def field_names
-      fields.map(&:name)
+      fields.map { |f| f['name'] }
     end
 
     def field_type_names
-      field_types.map(&:name)
+      field_types.map { |f| f['name'] }
     end
 
     def modify_schema(commands)
-      Request.execute(self, '/schema', data: commands)
+      request(path: '/schema', data: commands)
     end
 
     def add_field(field)
@@ -70,24 +71,23 @@ module Solrbee
     end
 
     # "real-time get"
-    # Note: Using POST here for simpler params.
-    def get_by_id(*ids)
-      response = Request.execute(self, '/get', params: { id: ids.join(',') })
-      response.doc || response.docs
+    def get_by_id(*ids, **params)
+      response = request(path: '/get', params: params.merge(id: ids.join(',')))
+      response['response']['doc'] || response['response']['docs']
     end
 
     def index(*docs, **params)
-      Request.execute(self, '/update/json/docs', data: docs, params: params)
+      request(path: '/update/json/docs', data: docs, params: params)
     end
     alias_method :add, :index
     alias_method :update, :index
 
     def delete(*ids)
-      Request.execute(self, '/update', data: { delete: ids })
+      request(path: '/update', data: { delete: ids })
     end
 
-    def query(params)
-      Request.execute(self, '/query', data: Query.new(params))
+    def query(**params)
+      request(path: '/query', data: params)
     end
 
   end

data/lib/solrbee/client.rb

@@ -8,13 +8,14 @@ module Solrbee
   class Client
     include ApiMethods
 
-    attr_reader :collection, :uri
+    attr_reader :uri
 
-    def initialize(collection)
-      @collection = collection
-      @uri = URI(Solrbee.solr_url).tap do |u|
-        u.path += '/%s' % URI.encode_www_form_component(collection)
-      end
+    def self.cursor(url: nil)
+      new(url: url).cursor
+    end
+
+    def initialize(url: nil)
+      @uri = URI(url || ENV['SOLR_URL'])
     end
 
     def connection
@@ -27,5 +28,25 @@ module Solrbee
       Cursor.new(self)
     end
 
+    def request(path:, data: nil, params: {})
+      req_class = data ? Net::HTTP::Post : Net::HTTP::Get
+
+      req_uri = uri.dup.tap do |u|
+        u.path += path
+        u.query = URI.encode_www_form(params) unless params.empty?
+      end
+
+      req = req_class.new(req_uri)
+      req['Accept'] = 'application/json'
+
+      if data
+        req['Content-Type'] = 'application/json'
+        req.body = JSON.dump(data)
+      end
+
+      http_response = connection.request(req)
+      JSON.parse(http_response.body)
+    end
+
   end
 end

data/lib/solrbee/cursor.rb

@@ -1,8 +1,8 @@
 module Solrbee
   #
-  # Summary
+  # SUMMARY
   #
-  # > client = Solrbee::Client.new('mycollection'))
+  # > client = Solrbee::Client.new
   # > cursor = Solrbee::Cursor.new(client)
   # > query = { query: 'foo:bar', sort: 'title ASC', limit: 10 }
   # > results = cursor.execute(query)
@@ -25,10 +25,10 @@ module Solrbee
 
         while true
           response = client.query(q)
-          break if response.num_found == 0
-          break if response.nextCursorMark == q.params.cursorMark
-          response.docs.each { |doc| yielder << doc }
-          q.params.cursorMark = response.nextCursorMark
+          break if response['response']['numFound'] == 0
+          break if response['nextCursorMark'] == q.params.cursorMark
+          response['response']['docs'].each { |doc| yielder << doc }
+          q.params.cursorMark = response['nextCursorMark']
         end
       end
     end

data/lib/solrbee/version.rb

@@ -1,3 +1,3 @@
 module Solrbee
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solrbee
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - David Chandek-Stark
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-05 00:00:00.000000000 Z
+date: 2020-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -101,8 +101,6 @@ files:
 - lib/solrbee/client.rb
 - lib/solrbee/cursor.rb
 - lib/solrbee/query.rb
-- lib/solrbee/request.rb
-- lib/solrbee/response.rb
 - lib/solrbee/version.rb
 - solrbee.gemspec
 homepage: https://github.com/dchandekstark/solrbee

data/lib/solrbee/request.rb

@@ -1,45 +0,0 @@
-module Solrbee
-  class Request
-
-    attr_reader :client, :path, :data, :params
-
-    def self.execute(*args)
-      new(*args).execute
-    end
-
-    def initialize(client, path, data: nil, params: {})
-      @client = client
-      @path = path
-      @data = data
-      @params = params
-    end
-
-    def request_class
-      data ? Net::HTTP::Post : Net::HTTP::Get
-    end
-
-    def headers
-      Hash.new.tap do |h|
-        h['Accept']       = 'application/json'
-        h['Content-Type'] = 'application/json' if data
-      end
-    end
-
-    def uri
-      client.uri.dup.tap do |u|
-        u.path += path
-        unless params.empty?
-          u.query = URI.encode_www_form(params)
-        end
-      end
-    end
-
-    def execute
-      req = request_class.new(uri, headers)
-      req.body = JSON.dump(data) if data
-      http_response = client.connection.request(req)
-      Response.new JSON.parse(http_response.body)
-    end
-
-  end
-end

data/lib/solrbee/response.rb

@@ -1,25 +0,0 @@
-require 'hashie'
-
-module Solrbee
-  class Response < Hashie::Mash
-
-    disable_warnings
-
-    def header
-      responseHeader
-    end
-
-    def num_found
-      response.numFound
-    end
-
-    def docs
-      response.docs
-    end
-
-    def doc
-      response.doc
-    end
-
-  end
-end