solrbee 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77127390eb03bfbd53eec6916f7873fab49b6436f4acb94c528f2cec7ed5f76b
-  data.tar.gz: '08ab2300881e0fdacaafa0007d1a17031a2b11bebfe2ade9cbf533a02a7b2b42'
+  metadata.gz: 356cd5b312edac759a4090191b33a48282a49b379bf44aecdf224ec47ce73fd0
+  data.tar.gz: f0d399ed8c9eccfe86fffd3492ba248fe7b736407aee26a2465afa54962d89bd
 SHA512:
-  metadata.gz: 5642a45f1013a4ddf33f4a339f0990ec218d7c3ebce3e6b3e1a0811c81256a6c155df333d7894618de9cb4a8b9e7c9eac5f178237474e96cd2de5ec7193cee83
-  data.tar.gz: bba5257728a581433cf72dbd4dce18ab5f8f7baea95afca7dca75c16f5fc17b509110c9e8ecb9a87713960f3eccf951d0bf11a0afe8b4ba01de2f331fcefd095
+  metadata.gz: 7002601a792323c6533157152f92cab212e23fffd006f714f89b6f3610a20e4dfa35fab27451bb7a93b9e1f0e920e8b7081720e261143bb5568264a8d3817449
+  data.tar.gz: d29a32a7d00f985bf38bf1f7c36a044f78064739999b318ef4d3070eb1e411a04124c7c3e9140a6afce92ef28df018c6caa1554b82a5a44d307292d41d7af95f

data/Makefile

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

data/README.md

@@ -25,7 +25,17 @@ Or install it yourself as:
 
 ## Usage
 
-
+```
+$ bundle console
+irb(main):001:0> client = Solrbee::Client.new('solrbee')
+=> #<Solrbee::Client:0x00007fd3410d7c50 @collection="solrbee", @uri=#<URI::HTTP http://localhost:8983/solr/solrbee>>
+irb(main):002:0> client.unique_key
+=> "id"
+irb(main):003:0> client.schema_version
+=> 1.6
+irb(main):004:0> client.schema_name
+=> "default-config"
+```
 
 ## Development
 

data/lib/solrbee.rb

@@ -1,6 +1,12 @@
+require "json"
+require "net/http"
+require "uri"
+
+require "hashie"
+
 require "solrbee/version"
 require "solrbee/response"
-require "solrbee/request_params"
+require "solrbee/request"
 require "solrbee/query"
 require "solrbee/client"
 require "solrbee/cursor"
@@ -9,6 +15,8 @@ module Solrbee
 
   class Error < StandardError; end
 
+  API_VERSION = 'V1'
+
   # Single-valued field types
   STRING  = "string"
   LONG    = "plong"

data/lib/solrbee/api_methods.rb

@@ -1,42 +1,47 @@
 module Solrbee
   module ApiMethods
 
+    def ping
+      response = Request.execute(self, '/admin/ping')
+      response.status
+    end
+
+    def schema
+      response = Request.execute(self, '/schema')
+      response.schema
+    end
+
     def schema_name
-      response = get('/schema/name')
+      response = Request.execute(self, '/schema/name')
       response.name
     end
 
     def schema_version
-      response = get('/schema/version')
+      response = Request.execute(self, '/schema/version')
       response.version
     end
 
-    def schema
-      response = get('/schema')
-      response.schema
-    end
-
     def fields(**params)
-      response = get('/schema/fields', **params)
+      response = Request.execute(self, '/schema/fields', params: params)
       response.fields
     end
 
     def field(field_name, **params)
-      response = get('/schema/fields/%s' % field_name, **params)
+      response = Request.execute(self, '/schema/fields/%s' % field_name, params: params)
       response.field
     end
 
     def unique_key
-      @unique_key ||= get('/schema/uniquekey').uniqueKey
+      @unique_key ||= Request.execute(self, '/schema/uniquekey').uniqueKey
     end
 
     def field_types(**params)
-      response = get('/schema/fieldtypes', **params)
+      response = Request.execute(self, '/schema/fieldtypes', params: params)
       response.fieldTypes
     end
 
     def field_type(field_name, **params)
-      response = get('/schema/fieldtypes/%s' % field_name, **params)
+      response = Request.execute(self, '/schema/fieldtypes/%s' % field_name, params: params)
       response.fieldType
     end
 
@@ -48,37 +53,41 @@ module Solrbee
       field_types.map(&:name)
     end
 
+    def modify_schema(commands)
+      Request.execute(self, '/schema', data: commands)
+    end
+
     def add_field(field)
-      post('/schema', {"add-field"=>field})
+      modify_schema("add-field"=>field)
     end
 
-    def delete_field(field)
-      post('/schema', {"delete-field"=>{"name"=>field.name}})
+    def delete_field(field_name)
+      modify_schema("delete-field"=>{"name"=>field_name})
     end
 
     def replace_field(field)
-      post('/schema', {"replace-field"=>field})
+      modify_schema("replace-field"=>field)
     end
 
     # "real-time get"
     # Note: Using POST here for simpler params.
     def get_by_id(*ids)
-      response = post('/get', params: { id: ids })
+      response = Request.execute(self, '/get', params: { id: ids.join(',') })
       response.doc || response.docs
     end
 
     def index(*docs, **params)
-      post('/update/json/docs', docs, **params)
+      Request.execute(self, '/update/json/docs', data: docs, params: params)
     end
     alias_method :add, :index
     alias_method :update, :index
 
     def delete(*ids)
-      post('/update', delete: ids)
+      Request.execute(self, '/update', data: { delete: ids })
     end
 
     def query(params)
-      post('/query', Query.new(params))
+      Request.execute(self, '/query', data: Query.new(params))
     end
 
   end

data/lib/solrbee/client.rb

@@ -23,34 +23,6 @@ module Solrbee
       end
     end
 
-    # :get -> Net::HTTP::Get
-    def request_class(method)
-      Net::HTTP.const_get(method.to_s.downcase.capitalize)
-    end
-
-    def request(method, path, **params)
-      req_uri = uri.dup
-      req_uri.path += path
-      unless params.empty?
-        req_uri.query = URI.encode_www_form RequestParams.new(params)
-      end
-      req = request_class(method).new(req_uri, {'Accept'=>'application/json'})
-      yield req if block_given?
-      res = connection.request(req)
-      Response.new JSON.parse(res.body)
-    end
-
-    def get(path, **params)
-      request(:get, path, **params)
-    end
-
-    def post(path, data, **params)
-      request(:post, path, **params) do |req|
-        req['Content-Type'] = 'application/json'
-        req.body = JSON.dump(data)
-      end
-    end
-
     def cursor
       Cursor.new(self)
     end

data/lib/solrbee/query.rb

@@ -5,16 +5,15 @@ module Solrbee
   # A query targeting the JSON Request API.
   #
   class Query < Hashie::Trash
-
-    property :query,  from: :q,     default: '*:*'
+    property :query,  from: :q,    default: '*:*'
     property :filter, from: :fq
-    property :limit,  from: :rows,  default: 10
+    property :limit,  from: :rows, default: 10
     property :fields, from: :fl
     property :sort
     property :offset, from: :start
     property :facet
     property :queries
-    property :params, default: {}
+    property :params,              default: {}
 
     # Build a query for a Cursor
     def self.cursor(params, unique_key)

data/lib/solrbee/request.rb

@@ -0,0 +1,45 @@
+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/version.rb

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

metadata

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

data/lib/solrbee/request_params.rb

@@ -1,13 +0,0 @@
-require 'hashie'
-
-module Solrbee
-  #
-  # For marshalling various API request query parameters
-  #
-  class RequestParams < Hashie::Trash
-    property :showDefaults,   from: :show_defaults
-    property :includeDynamic, from: :include_dynamic
-    property :fl
-    property :commit
-  end
-end