solrbee 0.1.2 → 0.5.0

data/lib/rom/solr/response_handler.rb

@@ -0,0 +1,12 @@
+module ROM
+  module Solr
+    class ResponseHandler
+
+      # @return [Hash] Parsed JSON object from Solr response body
+      def self.call(response, dataset)
+        JSON.parse(response.body, symbolize_names: true)
+      end
+
+    end
+  end
+end

data/lib/rom/solr/schema.rb

@@ -0,0 +1,7 @@
+module ROM
+  module Solr
+    class Schema < ROM::Schema
+
+    end
+  end
+end

data/lib/rom/solr/schema_info_dataset.rb

@@ -0,0 +1,19 @@
+module ROM
+  module Solr
+    class SchemaInfoDataset < Dataset
+
+      configure do |config|
+        config.default_base_path = 'schema'
+
+        config.default_response_handler = Proc.new do |*args|
+          ResponseHandler.call(*args).values.flatten
+        end
+
+        config.default_request_handler = Proc.new do |dataset|
+          RequestHandler.call(dataset.add_params(omitHeader: true))
+        end
+      end
+
+    end
+  end
+end

data/lib/rom/solr/schema_info_repo.rb

@@ -0,0 +1,29 @@
+require 'forwardable'
+
+module ROM
+  module Solr
+    class SchemaInfoRepo < Repository[:schema_info]
+      extend Forwardable
+
+      auto_struct false
+
+      VALUES = %i[ schema_name
+                   similarity
+                   unique_key
+                   version
+                   info
+                   field
+                   field_type
+                   dynamic_field
+                   copy_field
+                   ]
+
+      def_delegators :schema_info, :fields, :field_types, :dynamic_fields, :copy_fields
+
+      VALUES.each do |name|
+        define_method name, proc { |*args| schema_info.send(name, *args).one! }
+      end
+
+    end
+  end
+end

data/lib/rom/solr/utils.rb

@@ -0,0 +1,36 @@
+require 'date'
+require 'time'
+
+module ROM
+  module Solr
+    module Utils
+
+      def phrase(value)
+        if value.match?(/ /)
+          '"%s"' % value.gsub(/"/, '\"')
+        else
+          value
+        end
+      end
+
+      # Escape a Solr query value
+      #
+      # @param value [String] raw value
+      # @return [String] escaped value
+      def escape(value)
+        value
+          .gsub(ESCAPE_CHARS, '\\1')
+          .gsub(DOUBLE_AMPERSAND, '\&\&')
+          .gsub(DOUBLE_PIPE, '\|\|')
+      end
+
+      # Formats a value as a Solr date.
+      def solr_date(value)
+        DateTime.parse(value.to_s).to_time.utc.iso8601
+      end
+
+      extend self
+
+    end
+  end
+end

data/lib/solrbee.rb

@@ -1,39 +1,33 @@
-require "json"
-require "net/http"
-require "uri"
+require 'solrbee/version'
 
-require "hashie"
-
-require "solrbee/version"
-require "solrbee/response"
-require "solrbee/request"
-require "solrbee/query"
-require "solrbee/client"
-require "solrbee/cursor"
+require 'dry-types'
+require 'rom/solr'
 
 module Solrbee
 
-  class Error < StandardError; end
+  DEFAULT_URI = ENV.fetch('SOLR_URL', 'http://localhost:8983/solr').freeze
 
-  API_VERSION = 'V1'
+  def self.documents
+    ROM::Solr::DocumentRepo.new(container)
+  end
 
-  # Single-valued field types
-  STRING  = "string"
-  LONG    = "plong"
-  INT     = "pint"
-  DATE    = "pdate"
-  BOOLEAN = "boolean"
+  def self.schema_info
+    ROM::Solr::SchemaInfoRepo.new(container)
+  end
 
-  # Multi-valued field types
-  MSTRING  = "strings"
-  MLONG    = "plongs"
-  MINT     = "pints"
-  MDATE    = "pdates"
-  MBOOLEAN = "booleans"
+  def self.container(uri: DEFAULT_URI)
+    ROM.container(:solr, uri: uri) do |config|
+      config.auto_registration(
+        File.expand_path('../rom/solr/', __FILE__),
+        namespace: 'ROM::Solr'
+      )
+
+      yield config if block_given?
+    end
+  end
 
-  # Base URL
-  def self.solr_url
-    ENV.fetch('SOLR_URL', 'http://localhost:8983/solr').sub(/\/\z/, '')
+  module Types
+    include Dry.Types()
   end
 
 end

data/lib/solrbee/version.rb

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

data/solrbee.gemspec

@@ -22,7 +22,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "hashie"
+  spec.add_dependency "rom"
+  spec.add_dependency "rom-http"
+  spec.add_dependency "dry-types"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

data/test.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+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
+
+SOLR_URL=http://localhost:8983/solr/solrbee bundle exec rake
+code=$?
+
+docker stop solrbee-test
+
+exit $code

metadata

@@ -1,17 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: solrbee
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.5.0
 platform: ruby
 authors:
 - David Chandek-Stark
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-05 00:00:00.000000000 Z
+date: 2021-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: hashie
+  name: rom
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rom-http
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: dry-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -96,15 +124,36 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- config/api.yml
+- lib/rom/solr.rb
+- lib/rom/solr/array.rb
+- lib/rom/solr/commands.rb
+- lib/rom/solr/commands/create_documents.rb
+- lib/rom/solr/commands/delete_documents.rb
+- lib/rom/solr/commands/delete_documents_by_query.rb
+- lib/rom/solr/commands/update_documents.rb
+- lib/rom/solr/dataset.rb
+- lib/rom/solr/document_repo.rb
+- lib/rom/solr/documents_dataset.rb
+- lib/rom/solr/documents_paginator.rb
+- lib/rom/solr/gateway.rb
+- lib/rom/solr/query.rb
+- lib/rom/solr/query_builder.rb
+- lib/rom/solr/query_templates.rb
+- lib/rom/solr/relation.rb
+- lib/rom/solr/relations/documents_relation.rb
+- lib/rom/solr/relations/schema_info_relation.rb
+- lib/rom/solr/repository.rb
+- lib/rom/solr/request_handler.rb
+- lib/rom/solr/response_handler.rb
+- lib/rom/solr/schema.rb
+- lib/rom/solr/schema_info_dataset.rb
+- lib/rom/solr/schema_info_repo.rb
+- lib/rom/solr/utils.rb
 - lib/solrbee.rb
-- lib/solrbee/api_methods.rb
-- 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
+- test.sh
 homepage: https://github.com/dchandekstark/solrbee
 licenses:
 - MIT

data/lib/solrbee/api_methods.rb

@@ -1,94 +0,0 @@
-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 = Request.execute(self, '/schema/name')
-      response.name
-    end
-
-    def schema_version
-      response = Request.execute(self, '/schema/version')
-      response.version
-    end
-
-    def fields(**params)
-      response = Request.execute(self, '/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
-    end
-
-    def unique_key
-      @unique_key ||= Request.execute(self, '/schema/uniquekey').uniqueKey
-    end
-
-    def field_types(**params)
-      response = Request.execute(self, '/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
-    end
-
-    def field_names
-      fields.map(&:name)
-    end
-
-    def field_type_names
-      field_types.map(&:name)
-    end
-
-    def modify_schema(commands)
-      Request.execute(self, '/schema', data: commands)
-    end
-
-    def add_field(field)
-      modify_schema("add-field"=>field)
-    end
-
-    def delete_field(field_name)
-      modify_schema("delete-field"=>{"name"=>field_name})
-    end
-
-    def 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 = Request.execute(self, '/get', params: { id: ids.join(',') })
-      response.doc || response.docs
-    end
-
-    def index(*docs, **params)
-      Request.execute(self, '/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 })
-    end
-
-    def query(params)
-      Request.execute(self, '/query', data: Query.new(params))
-    end
-
-  end
-end

data/lib/solrbee/client.rb

@@ -1,31 +0,0 @@
-require "net/http"
-require "uri"
-require "json"
-
-require "solrbee/api_methods"
-
-module Solrbee
-  class Client
-    include ApiMethods
-
-    attr_reader :collection, :uri
-
-    def initialize(collection)
-      @collection = collection
-      @uri = URI(Solrbee.solr_url).tap do |u|
-        u.path += '/%s' % URI.encode_www_form_component(collection)
-      end
-    end
-
-    def connection
-      Net::HTTP.new(uri.host, uri.port).tap do |http|
-        http.use_ssl = true if uri.scheme == 'https'
-      end
-    end
-
-    def cursor
-      Cursor.new(self)
-    end
-
-  end
-end

data/lib/solrbee/cursor.rb

@@ -1,37 +0,0 @@
-module Solrbee
-  #
-  # Summary
-  #
-  # > client = Solrbee::Client.new('mycollection'))
-  # > cursor = Solrbee::Cursor.new(client)
-  # > query = { query: 'foo:bar', sort: 'title ASC', limit: 10 }
-  # > results = cursor.execute(query)
-  # > results.each do |doc|
-  #   ...
-  # > end
-  #
-  class Cursor
-
-    attr_reader :client
-
-    def initialize(client)
-      @client = client
-    end
-
-    # @return [Enumerator] an enumerator of query results
-    def execute(query)
-      Enumerator.new do |yielder|
-        q = Query.cursor(query, client.unique_key)
-
-        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
-        end
-      end
-    end
-
-  end
-end