solrb 0.2.3 → 0.2.8

data/lib/solr/response/parser.rb

@@ -12,7 +12,7 @@ module Solr
       def call
         # 404 is a special case, it didn't hit Solr (more likely than not)
         return not_found_response if @raw_response.status == 404
-        parsed_body = JSON.parse(@raw_response.body).freeze
+        parsed_body = @raw_response.body ? JSON.parse(@raw_response.body).freeze : {}
         http_status = parse_http_status
         header = parse_header(parsed_body)
         solr_error = parse_solr_error(parsed_body)

data/lib/solr/support/url_helper.rb

@@ -18,11 +18,16 @@ module Solr
       end
 
       def core_url
-        Solr.cloud_enabled? ? solr_cloud_url : current_core.uri
+        if Solr.cloud_enabled? || Solr.master_slave_enabled?
+          solr_cloud_or_master_slave_url
+        else
+          current_core.uri
+        end
       end
 
-      def solr_cloud_url
-        File.join(Solr.active_nodes_for(collection: current_core.name.to_s).first, current_core.name.to_s)
+      def solr_cloud_or_master_slave_url
+        url = Solr.active_nodes_for(collection: current_core.name.to_s).first
+        File.join(url, current_core.name.to_s)
       end
 
       def current_core

data/lib/solr/version.rb

@@ -1,3 +1,3 @@
 module Solr
-  VERSION = '0.2.3'.freeze
+  VERSION = '0.2.8'.freeze
 end

data/solrb.gemspec

@@ -24,12 +24,11 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'addressable'
   spec.add_runtime_dependency 'faraday'
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rspec_junit_formatter'
-  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop', '~> 0.80.1'
   spec.add_development_dependency 'simplecov'
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: solrb
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.8
 platform: ruby
 authors:
 - Adriano Luz
 - Valentin Vasilyev
 - Vladislav Syabruk
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-04-04 00:00:00.000000000 Z
+date: 2021-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -44,16 +44,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -110,34 +110,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rspec_junit_formatter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.80.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.80.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -152,7 +138,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - adriano.luz@machinio.com
 - valentin@machinio.com
@@ -161,13 +147,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
-- ".circleci/run-with-local-config.sh"
+- ".github/workflows/reviewdog.yml"
+- ".github/workflows/tests.yaml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -198,8 +183,13 @@ files:
 - lib/solr/errors/solr_url_not_defined_error.rb
 - lib/solr/errors/zookeeper_required.rb
 - lib/solr/grouped_document_collection.rb
+- lib/solr/helper_methods.rb
 - lib/solr/indexing/document.rb
 - lib/solr/indexing/request.rb
+- lib/solr/master_slave/configuration.rb
+- lib/solr/master_slave/helper_methods.rb
+- lib/solr/master_slave/nodes_gray_list/disabled.rb
+- lib/solr/master_slave/nodes_gray_list/in_memory.rb
 - lib/solr/query/handler.rb
 - lib/solr/query/http_request_builder.rb
 - lib/solr/query/request.rb
@@ -235,10 +225,11 @@ files:
 - lib/solr/query/response/field_facets.rb
 - lib/solr/query/response/parser.rb
 - lib/solr/query/response/spellcheck.rb
+- lib/solr/request/cloud/first_shard_leader_node_selection_strategy.rb
+- lib/solr/request/cloud/leader_node_selection_strategy.rb
 - lib/solr/request/default_node_selection_strategy.rb
-- lib/solr/request/first_shard_leader_node_selection_strategy.rb
 - lib/solr/request/http_request.rb
-- lib/solr/request/leader_node_selection_strategy.rb
+- lib/solr/request/master_slave/master_node_selection_strategy.rb
 - lib/solr/request/node_selection_strategy.rb
 - lib/solr/request/runner.rb
 - lib/solr/response.rb
@@ -259,7 +250,7 @@ homepage: https://github.com/machinio/solrb
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -274,9 +265,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Solr Ruby client with a nice object-oriented API
 test_files: []

data/.circleci/config.yml

@@ -1,69 +0,0 @@
-# Ruby CircleCI 2.0 configuration file
-#
-# Check https://circleci.com/docs/2.0/language-ruby/ for more details
-#
-version: 2
-jobs:
-  build:
-    docker:
-      # primary image where all specs are run
-      - image: circleci/ruby:2.5.1-node-browsers
-        environment:
-          SOLR_URL: http://localhost:8983/solr/test-core
-      # service images that primary image will use
-      - image: solr:7.4.0
-
-    working_directory: ~/repo
-
-    steps:
-      - checkout
-
-      # Download and cache dependencies
-      - restore_cache:
-          keys:
-          - v1-dependencies-{{ checksum "Gemfile.lock" }}
-          # fallback to using the latest cache if no exact match is found
-          - v1-dependencies-
-
-      - run:
-          name: install dependencies
-          command: |
-            bundle install --jobs=4 --retry=3 --path vendor/bundle
-
-      - save_cache:
-          paths:
-            - ./vendor/bundle
-          key: v1-dependencies-{{ checksum "Gemfile.lock" }}
-
-      - run:
-          name: Wait for Solr
-          command: dockerize -wait tcp://localhost:8983 -timeout 1m
-
-      - run:
-          name: Create a test core
-          command: curl 'http://localhost:8983/solr/admin/cores?action=CREATE&name=test-core&configSet=_default'
-
-      - run:
-          name: Disable field type guessing
-          command: |
-            curl http://localhost:8983/solr/test-core/config -d '{"set-user-property": {"update.autoCreateFields":"false"}}'
-
-
-      - run:
-          name: run tests
-          command: |
-            mkdir /tmp/test-results
-            TEST_FILES="$(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)"
-
-            bundle exec rspec --format progress \
-                            --format RspecJunitFormatter \
-                            --out /tmp/test-results/rspec.xml \
-                            --format progress \
-                            $TEST_FILES
-
-      # collect reports
-      - store_test_results:
-          path: /tmp/test-results
-      - store_artifacts:
-          path: /tmp/test-results
-          destination: test-results

data/.circleci/run-with-local-config.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-curl --user ${CIRCLE_TOKEN}: \
-    --request POST \
-    --form revision=67d7c5937163 \
-    --form config=@config.yml \
-    --form notify=false \
-        https://circleci.com/api/v1.1/project/github/machinio/solrb/tree/master

data/Gemfile.lock

@@ -1,83 +0,0 @@
-PATH
-  remote: .
-  specs:
-    solrb (0.2.2)
-      addressable
-      faraday
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
-    ast (2.4.0)
-    byebug (10.0.2)
-    coderay (1.1.2)
-    diff-lcs (1.3)
-    docile (1.3.1)
-    faraday (0.15.4)
-      multipart-post (>= 1.2, < 3)
-    jaro_winkler (1.5.1)
-    json (2.1.0)
-    method_source (0.9.0)
-    multipart-post (2.0.0)
-    parallel (1.12.1)
-    parser (2.5.1.2)
-      ast (~> 2.4.0)
-    powerpack (0.1.2)
-    pry (0.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.6.0)
-      byebug (~> 10.0)
-      pry (~> 0.10)
-    public_suffix (3.0.3)
-    rainbow (3.0.0)
-    rake (10.5.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    rspec_junit_formatter (0.4.1)
-      rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.59.1)
-      jaro_winkler (~> 1.5.1)
-      parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
-      powerpack (~> 0.1)
-      rainbow (>= 2.2.2, < 4.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.10.0)
-    simplecov (0.16.1)
-      docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    unicode-display_width (1.4.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.16)
-  pry
-  pry-byebug
-  rake (~> 10.0)
-  rspec (~> 3.0)
-  rspec_junit_formatter
-  rubocop
-  simplecov
-  solrb!
-
-BUNDLED WITH
-   1.16.6

data/lib/solr/request/first_shard_leader_node_selection_strategy.rb

@@ -1,24 +0,0 @@
-module Solr
-  module Request
-    class FirstShardLeaderNodeSelectionStrategy < NodeSelectionStrategy
-      def call
-        leader = first_shard_leader_replica_node_for(collection: collection_name)
-        replicas = solr_cloud_active_nodes_urls.shuffle
-        ([leader] + replicas).flatten.uniq
-      end
-
-      private
-
-      def first_shard_leader_replica_node_for(collection:)
-        shards = Solr.shards_for(collection: collection)
-        return unless shards
-        first_shard_name = shards.sort.first
-        Solr.leader_replica_node_for(collection: collection, shard: first_shard_name)
-      end
-
-      def solr_cloud_active_nodes_urls
-        Solr.active_nodes_for(collection: collection_name)
-      end
-    end
-  end
-end

data/lib/solr/request/leader_node_selection_strategy.rb

@@ -1,18 +0,0 @@
-module Solr
-  module Request
-    class LeaderNodeSelectionStrategy < NodeSelectionStrategy
-      def call
-        [leader_replica_node_for(collection: collection_name)]
-      end
-
-      private
-
-      def leader_replica_node_for(collection:)
-        shards = Solr.shards_for(collection: collection)
-        return unless shards
-        first_shard_name = shards.sort.first
-        Solr.leader_replica_node_for(collection: collection, shard: first_shard_name)
-      end
-    end
-  end
-end