solrbee 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77e7ebc45077bb8016d699124b9d4de397adba4d6166e0b3f64bb07693c51a3f
-  data.tar.gz: 846ea941962ac61ac49195bc0a05ef4356fbc0937a96055af43320c833b41b5d
+  metadata.gz: 11deb067a219ff325c0aa6dfaeb14422674cfd2a30338d14a1f00fa3f2081550
+  data.tar.gz: b6566f900e8a437feb379dba1e7f8de64e9c5a4b821cc501256ce0ee58da52e1
 SHA512:
-  metadata.gz: 278f91339f713389ab9858471f35f8a72d07ae1e00083e931cade7af50aee540ba8abf1bd42a79f1a1ffa11ab3b081f8a3231035642ff61091abc7f8f3306da5
-  data.tar.gz: a143efa02fed4ee7e10c063bf4c4db6df6df5f9bbf40ba820c004c4961e206545d980ed615f566b99c996f30db184a49fce7a005d990ebbca4b9028cddadaebf
+  metadata.gz: aa65e21c6552dc4d4276ecfdc1a4089e69d3625af84d014cb6353183a9e145ed8adf34158b180e2c70d1718d211e35b32fbd545438bd13753d171484b1577010
+  data.tar.gz: 78fd833f50640f5f875be47160a87642f2b612c90906e3d349e68042f5d267b4b375727babcc8c2512c90006e7e858535e2382ecfc638d7dff333822f20e04c4

data/Gemfile

@@ -2,4 +2,5 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "rom-http", git: "https://github.com/rom-rb/rom-http.git"
+gem 'rom', '5.2.4'
+gem 'rom-http', git: 'https://github.com/rom-rb/rom-http.git'

data/Makefile

@@ -1,10 +1,5 @@
 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
-	SOLR_URL=$(SOLR_URL) bundle exec rake
-	docker stop solrbee-test
+	./test.sh

data/README.md

@@ -25,17 +25,7 @@ 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"
-```
+TODO
 
 ## Development
 

data/config/api.yml

@@ -1,45 +1,22 @@
-v1:
-  ping:
-    path: /admin/ping
-    response_key: status
-
-  schema:
-    path: /schema
-    response_key: schema
-
-  schema_name:
-    path: /schema/name
-    response_key: name
-
-  schema_version:
-    path: /schema/version
-    response_key: version
-
-  fields:
-    path: /schema/fields
-    response_key: fields
-
-  field:
-    path: /schema/fields/%{name}
-    response_key: field
-
-  unique_key:
-    path: /schema/uniquekey
-    response_key: uniqueKey
-
-  field_types:
-    path: /schema/fieldtypes
-    response_key: fieldTypes
-
-  field_type:
-    path: /schema/fieldtypes/%{name}
-    response_key: fieldType
-
-  update:
-    path: /update
-
-  update_json:
-    path: /update/json
-
-  update_json_docs:
-    path: /update/json/docs
+    field_types:
+      path: fieldtypes
+      key: fieldTypes
+    field_type:
+      desc: GET /schema/fieldtype/[name]
+      path: fieldtypes/%{name}
+      args:
+        - name
+      key: fieldType
+    dynamic_fields:
+      desc: GET /schema/dynamicfields
+      path: dynamicfields
+      key: dynamicFields
+    dynamic_field:
+      desc: GET /schema/dynamicfields/[name]
+      args:
+        - name
+      path: dynamicfields/%{name}
+      key: dynamicField
+    copy_fields:
+      path: copyfields
+      key: copyFields

data/lib/rom/solr.rb

@@ -1,22 +1,51 @@
 require 'rom-http'
+require 'securerandom'
 
-require_relative 'solr/request'
-require_relative 'solr/response'
+module ROM
+  module Solr
+
+    def self.dataset_class(name)
+      prefix = name.to_s.split(/[_\/]/).map(&:capitalize).join('')
+      const_name = "#{prefix}Dataset"
+      const_defined?(const_name, false) ? const_get(const_name, false) : Dataset
+    end
+
+    module Types
+      include ROM::HTTP::Types
+    end
+
+    UUID = Types::String.default { SecureRandom.uuid }
+
+  end
+end
 
+# Utilities
+require_relative 'solr/array'
+
+# Handlers
+require_relative 'solr/request_handler'
+require_relative 'solr/response_handler'
+
+# Datasets
 require_relative 'solr/dataset'
-require_relative 'solr/datasets/select_dataset'
+require_relative 'solr/documents_dataset'
+require_relative 'solr/schema_info_dataset'
 
+# Gateway
 require_relative 'solr/gateway'
 
-require_relative 'solr/schemaless'
+# Schemas
+require_relative 'solr/schema'
 
+# Relations
 require_relative 'solr/relation'
-require_relative 'solr/relations/schema_relation'
-require_relative 'solr/relations/select_relation'
 
-module ROM
-  module Solr
-  end
+# Repositories
+require_relative 'solr/repository'
+require_relative 'solr/schema_info_repo'
+require_relative 'solr/document_repo'
 
-  register_adapter(:solr, ROM::Solr)
-end
+# Commands
+require_relative 'solr/commands'
+
+ROM.register_adapter(:solr, ROM::Solr)

data/lib/rom/solr/commands.rb

@@ -0,0 +1,17 @@
+module ROM
+  module Solr
+    module Commands
+      class Create < ROM::Commands::Create
+        adapter :solr
+      end
+
+      class Update < ROM::Commands::Update
+        adapter :solr
+      end
+
+      class Delete < ROM::Commands::Delete
+        adapter :solr
+      end
+    end
+  end
+end

data/lib/rom/solr/commands/create_documents.rb

@@ -0,0 +1,15 @@
+module ROM
+  module Solr
+    module Commands
+      class CreateDocuments < Create
+
+        relation :documents
+
+        def execute(docs)
+          relation.insert(docs)
+        end
+
+      end
+    end
+  end
+end

data/lib/rom/solr/commands/delete_documents.rb

@@ -0,0 +1,15 @@
+module ROM
+  module Solr
+    module Commands
+      class DeleteDocuments < Delete
+
+        relation :documents
+
+        def execute(docs)
+          relation.delete(docs)
+        end
+
+      end
+    end
+  end
+end

data/lib/rom/solr/commands/delete_documents_by_query.rb

@@ -0,0 +1,15 @@
+module ROM
+  module Solr
+    module Commands
+      class DeleteDocumentsByQuery < Delete
+
+        relation :documents
+
+        def execute(query)
+          relation.delete_by_query(query).response
+        end
+
+      end
+    end
+  end
+end

data/lib/rom/solr/commands/update_documents.rb

@@ -0,0 +1,15 @@
+module ROM
+  module Solr
+    module Commands
+      class UpdateDocuments < Update
+
+        relation :documents
+
+        def execute(docs)
+          relation.update(docs)
+        end
+
+      end
+    end
+  end
+end

data/lib/rom/solr/dataset.rb

@@ -2,60 +2,42 @@ module ROM
   module Solr
     class Dataset < ROM::HTTP::Dataset
 
-      # Key or array of keys to pass to response.dig(*keys)
-      # for enumeration of the dataset values.
-      setting :default_enum_on, reader: true
-      option :enum_on, default: ->{ self.class.default_enum_on }
-
-      # Default query parameters
-      setting :default_params, EMPTY_HASH, reader: true
-      option :params, type: Types::Hash, default: ->{ self.class.default_params }
-
-      # Request and response handlers
-      config.default_response_handler = Response
-      config.default_request_handler = Request
-
-      # @override Handles multiple path segments and nils
-      def with_path(segments)
-        s = Array.wrap(segments)
-        return self if s.empty?
-        with_options(path: s.compact.join('/'))
-      end
+      setting :default_response_key, reader: true
+      setting :default_content_type, reader: true
+      setting :default_base_path,    reader: true
 
-      def with_enum_on(keys)
-        k = Array.wrap(keys)
-        return self if k.empty?
-        with_options(enum_on: k)
+      configure do |config|
+        config.default_response_handler = ResponseHandler
+        config.default_request_handler  = RequestHandler
       end
 
-      # Coerce param value to an Array and set new value
-      # to set union with other Array of values.
-      def add_param_values(key, val)
-        new_val = Array.wrap(params[key]) | Array.wrap(val)
-        add_params(key => new_val)
+      option :response_key, default: proc { self.class.default_response_key }
+      option :request_data, type: Types::String, default: proc { EMPTY_STRING }
+      option :content_type, type: Types::String, default: proc { self.class.default_content_type }
+      option :base_path,    type: Types::Path,   default: proc { self.class.default_base_path || EMPTY_STRING }
+
+      # @override Query parameters are valid with POST, too.
+      def uri
+        uri_s = [options[:uri], path].compact.reject(&:empty?).join('/')
+
+        URI(uri_s).tap do |u|
+          u.query = param_encoder.call(params) if has_params?
+        end
       end
 
       # @override
-      def add_params(new_params = {})
-        return self if new_params.nil? || new_params.empty?
-        with_params params.merge(new_params).compact
-      end
+      def each(&block)
+        return to_enum unless block_given?
 
-      def default_params(defaults = {})
-        with_params defaults.merge(params)
+        enumerable_data.each(&block)
       end
 
-      # @override Seems good to have no-op when params not changed?
-      def with_params(new_params)
-        if params == new_params
-          self
-        else
-          with_options(params: new_params)
-        end
+      def with_request_data(data)
+        with_options(request_data: data)
       end
 
-      def param?(key)
-        params.key?(key)
+      def with_response_key(*path)
+        with_options(response_key: path)
       end
 
       # Copies and makes private superclass #response method
@@ -67,23 +49,20 @@ module ROM
         cache.fetch_or_store(:response) { __response__ }
       end
 
-      # @override
-      def each(&block)
-        return to_enum unless block_given?
-        enumerable_response.each(&block)
+      def has_request_data?
+        !request_data.nil? && !request_data.empty?
       end
 
-      def enumerable_response
-        if options[:enum_on].nil?
-          Array.wrap(response)
-        else
-          keys = Array.wrap options[:enum_on]
-          Array.wrap response.dig(*keys)
-        end
+      def has_params?
+        params.any?
       end
 
       private
 
+      def enumerable_data
+        Array.wrap(response_key ? response.dig(*response_key) : response)
+      end
+
       def cache
         @cache ||= Concurrent::Map.new
       end

data/lib/rom/solr/document_repo.rb

@@ -0,0 +1,33 @@
+module ROM
+  module Solr
+    class DocumentRepo < Repository[:documents]
+
+      auto_struct false
+
+      def find(id)
+        documents.by_unique_key(id).one!
+      end
+
+      def search
+        documents
+      end
+
+      def all
+        documents.all
+      end
+
+      def create(docs)
+        documents.command(:create_documents).call(docs)
+      end
+
+      def delete(docs)
+        documents.command(:delete_documents).call(docs)
+      end
+
+      def update(docs)
+        documents.command(:update_documents).call(docs)
+      end
+
+    end
+  end
+end

data/lib/rom/solr/documents_dataset.rb

@@ -0,0 +1,12 @@
+module ROM
+  module Solr
+    class DocumentsDataset < Dataset
+
+      configure do |config|
+        config.default_response_key = [:response, :docs]
+        config.default_base_path    = 'select'
+      end
+
+    end
+  end
+end

data/lib/rom/solr/gateway.rb

@@ -4,20 +4,9 @@ module ROM
 
       adapter :solr
 
-      def initialize(config = {})
-        config[:uri]     ||= ENV.fetch('SOLR_URL', 'http://localhost:8983/solr')
-        config[:headers] ||= { Accept: 'application/json' }
-        super
-      end
-
+      # @override
       def dataset(name)
-        dataset_class(name).new config.merge(base_path: name)
-      end
-
-      def dataset_class(name)
-        prefix = name.to_s.split(/_/).map(&:capitalize).join('')
-        const_name = "#{prefix}Dataset"
-        ROM::Solr.const_defined?(const_name, false) ? ROM::Solr.const_get(const_name, false) : Dataset
+        ROM::Solr.dataset_class(name).new(config)
       end
 
     end