solrbee 0.3.0 → 0.4.0

data/lib/rom/solr/select_cursor.rb

@@ -0,0 +1,56 @@
+require 'delegate'
+
+module ROM
+  module Solr
+    #
+    # Wraps a DocumentsDataset to provide pagination with a cursor.
+    #
+    class SelectCursor < SimpleDelegator
+
+      def initialize(dataset)
+        params = { cursorMark: '*' }
+
+        # Sort must include a sort on unique key (id).
+        sort = dataset.params[:sort]
+        unless /\bid\b/ =~ sort
+          params[:sort] = Array.wrap(sort).append('id ASC').join(',')
+        end
+
+        super dataset.add_params(params)
+      end
+
+      def each(&block)
+        return to_enum unless block_given?
+
+        while true
+          __getobj__.each(&block)
+
+          break if last_page?
+
+          move_cursor
+        end
+      end
+
+      def cursor_mark
+        params[:cursorMark]
+      end
+
+      def next_cursor_mark
+        response[:nextCursorMark]
+      end
+
+      def last_page?
+        cursor_mark == next_cursor_mark
+      end
+
+      def move_cursor
+        __setobj__(next_page)
+      end
+
+      def next_page
+        __getobj__.add_params(cursorMark: next_cursor_mark)
+      end
+
+    end
+  end
+end

data/lib/solrbee.rb

@@ -1,39 +1,28 @@
 require "solrbee/version"
-require "solrbee/array"
+
 require "rom/solr"
 
 module Solrbee
 
-  # Factory method
-  #
-  # @return [ROM::Solr::Gateway] a gateway instance
-  def self.gateway
-    ROM::Gateway.setup(:solr)
-  end
+  DEFAULT_URI = ENV.fetch('SOLR_URL', 'http://localhost:8983/solr').freeze
 
-  # Factory method
-  #
-  # @return [Solrbee::Documents] a ROM relation for searching
   def self.documents
-    container.relations[:search]
+    ROM::Solr::DocumentRepo.new(container)
   end
 
-  def self.schema
-    container.relations[:schema_info]
+  def self.schema_info
+    ROM::Solr::SchemaInfoRepo.new(container)
   end
 
-  # @return [ROM::Configuration] configuration
-  def self.config
-    @config ||= ROM::Configuration.new(:solr) do |config|
-      config.register_relation(
-        ROM::Solr::SelectRelation,
-        ROM::Solr::SchemaRelation
+  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'
       )
-    end
-  end
 
-  def self.container
-    ROM.container(config)
+      yield config if block_given?
+    end
   end
 
 end

data/lib/solrbee/version.rb

@@ -1,3 +1,3 @@
 module Solrbee
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/solrbee.gemspec

@@ -22,7 +22,6 @@ 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"
 

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,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: solrbee
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - David Chandek-Stark
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-18 00:00:00.000000000 Z
+date: 2020-12-31 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: hashie
-  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
   requirement: !ruby/object:Gem::Requirement
@@ -126,21 +112,30 @@ files:
 - 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/datasets/select_dataset.rb
+- lib/rom/solr/document_repo.rb
+- lib/rom/solr/documents_dataset.rb
 - lib/rom/solr/gateway.rb
-- lib/rom/solr/paginated_dataset.rb
 - lib/rom/solr/relation.rb
-- lib/rom/solr/relations/schema_relation.rb
-- lib/rom/solr/relations/select_relation.rb
-- lib/rom/solr/request.rb
-- lib/rom/solr/response.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/schemaless.rb
+- lib/rom/solr/schema_info_dataset.rb
+- lib/rom/solr/schema_info_repo.rb
+- lib/rom/solr/select_cursor.rb
 - lib/solrbee.rb
-- lib/solrbee/array.rb
 - lib/solrbee/version.rb
 - solrbee.gemspec
+- test.sh
 homepage: https://github.com/dchandekstark/solrbee
 licenses:
 - MIT

data/lib/rom/solr/datasets/select_dataset.rb

@@ -1,53 +0,0 @@
-module ROM
-  module Solr
-    class SelectDataset < Dataset
-
-      config.default_enum_on = [ 'response', 'docs' ]
-      config.default_params  = { q: '*:*', start: 0, rows: 20, cursorMark: '*', sort: 'id ASC' }
-
-      # @override
-      def each
-        while true
-          enumerable_response.each { |doc| yield(doc) }
-          break if last_page?
-          update_cursor_mark
-        end
-      end
-
-      def num_found
-        response.dig('response', 'numFound')
-      end
-
-      def cursor_mark
-        params[:cursorMark]
-      end
-
-      def next_cursor_mark
-        response['nextCursorMark']
-      end
-
-      def page_size
-        params[:rows]
-      end
-
-      def last_cursor?
-        cursor_mark == next_cursor_mark
-      end
-
-      def one_page?
-        num_found <= page_size
-      end
-
-      def last_page?
-        one_page? || last_cursor?
-      end
-
-      private
-
-      def update_cursor_mark
-        add_params(cursorMark: next_cursor_mark)
-      end
-
-    end
-  end
-end

data/lib/rom/solr/paginated_dataset.rb

@@ -1,62 +0,0 @@
-module ROM
-  module Solr
-    class PaginatedDataset
-
-      attr_reader :dataset
-
-      def initialize(dataset)
-        ds = dataset
-               .default_params(rows: 20)
-               .remove_params(:start)
-               .add_params(cursorMark: '*')
-
-        if ds.param?(:sort)
-          unless ds.params[:sort] =~ /\bid\b/
-            ds = ds.sort('%{sort},id ASC' % ds.params)
-          end
-        else
-          ds = ds.sort('id ASC')
-        end
-
-        @dataset = ds
-      end
-
-      def each
-        while true
-          yield dataset
-          break if last_page?
-          @dataset = dataset.add_params(cursorMark: next_cursor_mark)
-        end
-      end
-
-      def cursor_mark
-        dataset.params[:cursorMark]
-      end
-
-      def next_cursor_mark
-        dataset.response['nextCursorMark']
-      end
-
-      def page_size
-        dataset.params[:rows]
-      end
-
-      def total_size
-        dataset.num_found
-      end
-
-      def last_cursor?
-        cursor_mark == next_cursor_mark
-      end
-
-      def one_page?
-        total_size <= page_size
-      end
-
-      def last_page?
-        one_page? || last_cursor?
-      end
-
-    end
-  end
-end

data/lib/rom/solr/relations/schema_relation.rb

@@ -1,75 +0,0 @@
-module ROM
-  module Solr
-    class SchemaRelation < Relation
-
-      schemaless(:schema, as: :schema_info)
-
-      # GET /schema
-      def info
-        fetch('schema')
-      end
-
-      def schema_name
-        with_path(:name).fetch(:name)
-      end
-
-      def version
-        with_path('version').fetch('version')
-      end
-
-      def unique_key
-        with_path('uniquekey').fetch('uniqueKey')
-      end
-
-      def similarity
-        with_path('similarity').fetch('similarity')
-      end
-
-      # @param opts [Hash]
-      def fields(**opts)
-        default_opts = { showDefaults: true }
-        with_path('fields')
-          .with_enum_on('fields')
-          .add_params(default_opts.merge(opts))
-      end
-
-      # @param name [String, Symbol] field name
-      # @param opts [Hash]
-      def field(name, **opts)
-        with_path('fields', name)
-          .add_params(opts)
-          .fetch('field')
-      end
-
-      # @param opts [Hash]
-      def field_types(**opts)
-        with_path('fieldtypes')
-          .with_enum_on('fieldTypes')
-          .add_params(opts)
-      end
-
-      # @param name [String, Symbol] field type name
-      # @param opts [Hash]
-      def field_type(name, **opts)
-        with_path('fieldtypes', name).add_params(opts).fetch('fieldType')
-      end
-
-      # @param opts [Hash]
-      def dynamic_fields(**opts)
-        with_path('dynamicfields').with_enum_on('dynamicFields').add_params(opts)
-      end
-
-      # @param name [String, Symbol] dynamic field name
-      # @param opts [Hash]
-      def dynamic_field(name, **opts)
-        with_path('dynamicfields', name).add_params(opts).fetch('dynamicField')
-      end
-
-      # @param opts [Hash]
-      def copy_fields(**opts)
-        with_path('copyfields').with_enum_on('copyFields').add_params(opts)
-      end
-
-    end
-  end
-end

data/lib/rom/solr/relations/select_relation.rb

@@ -1,43 +0,0 @@
-module ROM
-  module Solr
-    class SelectRelation < Relation
-
-      schemaless :select, as: :search
-
-      def filter(*fq)
-        add_param_values(:fq, fq)
-      end
-      alias_method :fq, :filter
-
-      def query(q)
-        add_params(q: q)
-      end
-      alias_method :q, :query
-
-      def fields(*fl)
-        add_params(fl: fl)
-      end
-      alias_method :fl, :fields
-
-      def start(offset)
-        add_params(start: offset.to_i)
-      end
-      alias_method :offset, :start
-
-      def rows(limit)
-        add_params(rows: limit.to_i)
-      end
-      alias_method :limit, :rows
-
-      def sort(crit)
-        add_params(sort: crit)
-      end
-
-      # @override Don't have to enumerate to get count (may not be exact)
-      def count
-        dataset.num_found
-      end
-
-    end
-  end
-end