solrb 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b698f0cc5aaf1aca1a12590a060170a79a3b27e4fb127db8cb033a824c9f3cc
-  data.tar.gz: 79dc166b65a24840210ab63cdbff757a9a0ddeaaa24c431e7a67e80b04e7f528
+  metadata.gz: ea33f82de9a9b3bb71a87821df6be65e39e1156704ed713c556752781257012a
+  data.tar.gz: 8b06c57da1f0948858a1ea97c8adc9e318e53f5288549eb80236d1e1c6e54a88
 SHA512:
-  metadata.gz: fa4c469edc453402ddf80004e3e6f182688331b4d05e8ed126867aa568951ceccd66a3433bebede91f8f52a91f91b78b2fcabb4b0d5699002c384713e34b08c5
-  data.tar.gz: d46f7dbccc62f80ef3e59e0077fb3f59f35ed55ccc54e8d79e9bd0add7bd3a9fa288095afa5c3d875c5ca251c3c3d3aa2b933a48422d1aefe409f6224fc37d47
+  metadata.gz: c7b5cd5683b89b389d9d39a8e026a0483a2f9daa6c435a967bc93723150d8fddfc3f804496fece068fb06d9fd2732892fbe9305ca2b3876180f8d8433f270a36
+  data.tar.gz: bf7ca512022d6edbf347c6d0d2697aa90b1d1fc610d6dd8674cc5d78c30ce7e513f463538877857624ae002826e0fa0c3582712c53cd46835c77170a0e960ada

data/.github/workflows/reviewdog.yml

@@ -0,0 +1,20 @@
+---
+name: reviewdog
+'on': [push]
+jobs:
+  rubocop:
+    name: runner / rubocop
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.5.1
+          bundler-cache: true
+      - uses: reviewdog/action-rubocop@v1
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          rubocop_version: '0.80.1'
+          rubocop_extensions: ''
+          reporter: github-check
+          fail_on_error: true

data/.github/workflows/tests.yaml

@@ -0,0 +1,37 @@
+---
+name: Tests
+'on': [push]
+
+env:
+  SOLR_URL: http://localhost:8983/solr/test-core
+
+jobs:
+  rspec:
+    name: Rspec on Ruby ${{ matrix.ruby }}
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: ['2.5', '2.6', '2.7', '3.0']
+    services:
+      solr:
+        image: solr:7.4.0
+        ports:
+          - 8983:8983
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - name: Create a test core
+        run: |
+          curl 'http://localhost:8983/solr/admin/cores?action=CREATE&name=test-core&configSet=_default'
+
+      - name: Disable field type guessing
+        run: |
+          curl http://localhost:8983/solr/test-core/config -d '{"set-user-property": {"update.autoCreateFields":"false"}}'
+
+      - name: Rspec
+        run: bundle exec rspec --format progress

data/.rubocop.yml

@@ -1,19 +1,20 @@
 AllCops:
   Exclude:
-    - db/schema.rb
-    - node_modules/**/*
     - bin/*
+    - vendor/**/*
+    - pkg/**/*
   TargetRubyVersion: '2.5'
-Metrics/LineLength:
+  DisabledByDefault: true
+Layout/LineLength:
   Max: 120
-Documentation:
+Style/Documentation:
   Enabled: false
-FrozenStringLiteralComment:
+Style/FrozenStringLiteralComment:
   Enabled: false
 Metrics/MethodLength:
   Max: 20
 Metrics/AbcSize:
-  Max: 20
+  Enabled: false
  # Removing Blocks Cop for RSpec
 Style/BlockDelimiters:
   Exclude:
@@ -28,3 +29,6 @@ Metrics/BlockLength:
     - '**/*.rake'
     - 'spec/**/*'
     - 'config/environments/**/*'
+Layout/SpaceInsideHashLiteralBraces:
+  Exclude:
+    - 'spec/**/*'

data/lib/solr/cloud/configuration.rb

@@ -18,7 +18,8 @@ module Solr
       end
 
       def build_zookeeper_connection
-        Solr::Cloud::ZookeeperConnection.new(zookeeper_url: zookeeper_url.is_a?(Array) ? zookeeper_url.join(',') : zookeeper_url,
+        zookeeper_url = zookeeper_url.is_a?(Array) ? zookeeper_url.join(',') : zookeeper_url
+        Solr::Cloud::ZookeeperConnection.new(zookeeper_url: zookeeper_url,
                                              zookeeper_auth_user: zookeeper_auth_user,
                                              zookeeper_auth_password: zookeeper_auth_password)
       end

data/lib/solr/configuration.rb

@@ -11,7 +11,8 @@ module Solr
   class Configuration
     extend Forwardable
 
-    delegate [:zookeeper_url, :zookeeper_url=, :zookeeper_auth_user=, :zookeeper_auth_password=] => :@cloud_configuration
+    delegate [:zookeeper_url, :zookeeper_url=, :zookeeper_auth_user=,
+      :zookeeper_auth_password=] => :@cloud_configuration
     delegate [:master_url, :master_url=, :slave_url, :slave_url=, :disable_read_from_master,
       :disable_read_from_master=, :nodes_gray_list, :nodes_gray_list=] => :@master_slave_configuration
 

data/lib/solr/connection.rb

@@ -3,9 +3,11 @@ module Solr
   class Connection
     INSTRUMENT_KEY = 'request.solrb'.freeze
 
-    def initialize(url, faraday_options: Solr.configuration.faraday_options, faraday_configuration: Solr.configuration.faraday_configuration)
+    def initialize(url, faraday_options: Solr.configuration.faraday_options,
+        faraday_configuration: Solr.configuration.faraday_configuration)
       # Allow mock the connection for testing
-      @raw_connection = Solr.configuration.test_connection || build_faraday_connection(url, faraday_options, faraday_configuration)
+      @raw_connection = Solr.configuration.test_connection
+      @raw_connection ||= build_faraday_connection(url, faraday_options, faraday_configuration)
       freeze
     end
 

data/lib/solr/query/handler.rb

@@ -8,7 +8,7 @@ module Solr
       attr_reader :query, :rows, :start, :runner_options
 
       def self.call(opts)
-        new(opts).call
+        new(**opts).call
       end
 
       def initialize(query:, rows:, start:, runner_options: {})

data/lib/solr/query/http_request_builder.rb

@@ -8,7 +8,7 @@ module Solr
       attr_reader :query, :start, :rows
 
       def self.call(opts)
-        new(opts).call
+        new(**opts).call
       end
 
       def initialize(query:, start:, rows:)

data/lib/solr/request/runner.rb

@@ -16,7 +16,7 @@ module Solr
       attr_reader :request, :response_parser, :node_selection_strategy
 
       def self.call(opts)
-        new(opts).call
+        new(**opts).call
       end
 
       def initialize(request:,
@@ -39,7 +39,7 @@ module Solr
             solr_response = Solr::Response::Parser.call(raw_response)
             raise Solr::Errors::SolrQueryError, solr_response.error_message unless solr_response.ok?
             return solr_response
-          rescue Faraday::ConnectionFailed, Faraday::TimeoutError, Errno::EADDRNOTAVAIL => e
+          rescue Faraday::ConnectionFailed, Faraday::TimeoutError, Errno::EADDRNOTAVAIL, Timeout::Error => e
             if Solr.master_slave_enabled?
               Solr.configuration.nodes_gray_list.add(node_url)
             end

data/lib/solr/version.rb

@@ -1,3 +1,3 @@
 module Solr
-  VERSION = '0.2.7'.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.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Adriano Luz
 - Valentin Vasilyev
 - Vladislav Syabruk
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-02-17 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,8 +147,8 @@ 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"
@@ -264,7 +250,7 @@ homepage: https://github.com/machinio/solrb
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -279,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