redi_search 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f59647d0daeafbfc902948adde6dfb3e61d92b7d1b79762921926f4e8e8ae3ca
-  data.tar.gz: 7ba39058e621c59f18a33d26a11d35df2b8ce0ae7fafb94de8916d5c0296cab9
+  metadata.gz: 7b7bc12a1d3a50de259ae10c27658e164d3ef84b65f0c4108c925138e53c1239
+  data.tar.gz: 899ac067a70ee3f5d43c833a59aa32546ca4e18a57beaba3bccabc496ffff96a
 SHA512:
-  metadata.gz: 918b4df4305480f2e4251a0a30c6a1e1ecbfd9a1125a4140e5020c3986bc9591ef7f87ac680eb83670dd51b15756d747c918ee14617dbeb2e110823ccef17a29
-  data.tar.gz: 25ee1578bbe420f001099e1bd78c9eaf68273924da34a42949dd70d78552dbe32fc334ba008177d8113874cc349f342405637302b21272b6198f79059dfc15e1
+  metadata.gz: 131f1b1c9a4e2dad0740da6398a41a5ea01725e6e7dc02b9d604b252d3ad2612d3d23946fa1029e2d897c879b9b8c1c2951a73b1d7e4bca415d65998c0d8d0b8
+  data.tar.gz: c1a6d747b27f77054c797feee442359306a36609fe1d8d8483467df93916ea4b2e7af7a1db5c3bd442aba04e54dad0131ac673dc6aa10ddba89b63ef48dbad37

data/.github/workflows/lint.yml

@@ -0,0 +1,20 @@
+name: lint
+
+on: [push]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Ruby 2.7
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.7.x
+    - name: Install dependencies
+      run: |
+        sudo apt-get install libsqlite3-dev
+        gem install bundler --no-document
+        bundle install
+    - name: Run tests
+      run: bundle exec rubocop --config=./.rubocop.yml --parallel

data/.github/workflows/tests.yml

@@ -0,0 +1,44 @@
+name: tests
+
+on: [push]
+
+jobs:
+  unit:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [ '2.5.x', '2.6.x', '2.7.x' ]
+        gemfile: [ 'Gemfile', 'gemfiles/activerecord_51.gemfile', 'gemfiles/activerecord_52.gemfile' ]
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Ruby ${{ matrix.ruby }}
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - name: Install dependencies
+      run: |
+        sudo apt-get install libsqlite3-dev -y
+        gem install bundler --no-document
+        BUNDLE_GEMFILE=${{ matrix.gemfile }} bundle install
+    - name: Run tests
+      run: BUNDLE_GEMFILE=${{ matrix.gemfile }} bundle exec rake test:unit
+  integration:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        redi_search: [ '1.4.28', '1.6.13', 'edge' ]
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Ruby 2.7
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.7.x
+    - name: Install dependencies
+      run: |
+        sudo apt-get install libsqlite3-dev -y
+        gem install bundler --no-document
+        bundle install
+        docker run -d -p 6379:6379 redislabs/redisearch:${{ matrix.redi_search }} --protected-mode no --loadmodule /usr/lib/redis/modules/redisearch.so
+    - name: Run tests
+      run: |
+        bundle exec rake test:integration

data/.rubocop.yml

@@ -35,16 +35,16 @@ Layout/AccessModifierIndentation:
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#indent-public-private-protected
   Enabled: false
 
-Layout/AlignArray:
+Layout/ArrayAlignment:
   Description: Align the elements of an array literal if they span more than one line.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#align-multiline-arrays
   Enabled: true
 
-Layout/AlignHash:
+Layout/HashAlignment:
   Description: Align the elements of a hash literal if they span more than one line.
   Enabled: true
 
-Layout/AlignParameters:
+Layout/ParameterAlignment:
   Description: Align the parameters of a method call if they span more than one line.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-double-indent
   Enabled: true
@@ -150,7 +150,7 @@ Layout/InitialIndentation:
   Description: Checks the indentation of the first non-blank non-comment line in a file.
   Enabled: false
 
-Layout/IndentFirstArgument:
+Layout/FirstArgumentIndentation:
   Description: Checks the indentation of the first parameter in a method call.
   Enabled: false
 
@@ -164,19 +164,19 @@ Layout/IndentationWidth:
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#spaces-indentation
   Enabled: true
 
-Layout/IndentFirstArrayElement:
+Layout/FirstArrayElementIndentation:
   Description: Checks the indentation of the first element in an array literal.
   Enabled: false
 
-Layout/IndentAssignment:
+Layout/AssignmentIndentation:
   Description: Checks the indentation of the first line of the right-hand-side of a multi-line assignment.
   Enabled: true
 
-Layout/IndentFirstHashElement:
+Layout/FirstHashElementIndentation:
   Description: Checks the indentation of the first key in a hash literal.
   Enabled: false
 
-Layout/IndentHeredoc:
+Layout/HeredocIndentation:
   Description: This cops checks the indentation of the here document bodies.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#squiggly-heredocs
   Enabled: true
@@ -327,12 +327,15 @@ Layout/SpaceInsideStringInterpolation:
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#string-interpolation
   Enabled: false
 
-Layout/Tab:
+Layout/IndentationStyle:
   Description: No hard tabs.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#spaces-indentation
   Enabled: false
 
-Layout/TrailingBlankLines:
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+
+Layout/TrailingEmptyLines:
   Description: Checks trailing blank lines and final newline.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#newline-eof
   Enabled: false
@@ -399,7 +402,7 @@ Lint/DuplicateMethods:
   Description: Check for duplicate method definitions.
   Enabled: true
 
-Lint/DuplicatedKey:
+Lint/DuplicateHashKey:
   Description: Check for duplicate keys in hash literals.
   Enabled: true
 
@@ -432,10 +435,6 @@ Layout/EndAlignment:
   Description: Align ends correctly.
   Enabled: true
 
-Lint/EndInMethod:
-  Description: END blocks should not be placed inside method definitions.
-  Enabled: true
-
 Lint/EnsureReturn:
   Description: Do not use return in an ensure block.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-return-ensure
@@ -449,7 +448,7 @@ Lint/FormatParameterMismatch:
   Description: The number of parameters to format/sprint must match the fields.
   Enabled: true
 
-Lint/HandleExceptions:
+Lint/SuppressedException:
   Description: Don't suppress exception.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#dont-hide-exceptions
   Enabled: true
@@ -483,7 +482,7 @@ Lint/Loop:
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#loop-with-break
   Enabled: true
 
-Lint/MultipleCompare:
+Lint/MultipleComparison:
   Description: Use `&&` operator to compare multiple value.
   Enabled: true
 
@@ -558,7 +557,7 @@ Lint/ShadowingOuterLocalVariable:
   Description: Do not use the same name as outer local variable for block arguments or block local variables.
   Enabled: true
 
-Lint/StringConversionInInterpolation:
+Lint/RedundantStringCoercion:
   Description: Checks for Object#to_s usage in string interpolation.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-to-s
   Enabled: true
@@ -571,11 +570,11 @@ Lint/UnifiedInteger:
   Description: Use Integer instead of Fixnum or Bignum
   Enabled: true
 
-Lint/UnneededRequireStatement:
+Lint/RedundantRequireStatement:
   Description: Checks for unnecessary `require` statement.
   Enabled: true
 
-Lint/UnneededSplatExpansion:
+Lint/RedundantSplatExpansion:
   Description: Checks for splat unnecessarily being called on literals
   Enabled: true
 
@@ -646,7 +645,6 @@ Metrics/BlockLength:
     - Rakefile
     - "**/*.rake"
     - spec/**/*.rb
-    - 'config/routes.rb'
     - 'config/environments/*.rb'
 
 Metrics/BlockNesting:
@@ -664,12 +662,15 @@ Metrics/CyclomaticComplexity:
   Description: A complexity metric that is strongly correlated to the number of test cases needed to validate a method.
   Enabled: true
 
-Metrics/LineLength:
+Layout/LineLength:
   Description: Limit lines to 80 characters.
   StyleGuide: '#80-character-limits'
   Enabled: true
+  Max: 80
   Exclude:
     - 'db/**/*'
+    - 'config/initializers/**/*'
+    - 'config/environments/**/*'
 
 Metrics/MethodLength:
   Description: Avoid methods longer than 10 lines of code.
@@ -773,13 +774,13 @@ Performance/CaseWhenSplat:
 
 Performance/Count:
   Description: Use `count` instead of `select...size`, `reject...size`, `select...count`, `reject...count`, `select...length`, and `reject...length`.
-  SafeMode: true
+  SafeAutoCorrect: true
   Enabled: true
 
 Performance/Detect:
   Description: Use `detect` instead of `select.first`, `find_all.first`, `select.last`, and `find_all.last`.
   Reference: 'https://github.com/JuanitoFatas/fast-ruby#enumerabledetect-vs-enumerableselectfirst-code'
-  SafeMode: true
+  SafeAutoCorrect: true
   Enabled: true
 
 Performance/DoubleStartEndWith:
@@ -821,6 +822,9 @@ Performance/RedundantMerge:
   Reference: https://github.com/JuanitoFatas/fast-ruby#hashmerge-vs-hash-code
   Enabled: true
 
+Style/ExponentialNotation:
+  Enabled: true
+
 Style/RedundantSortBy:
   Description: Use `sort` instead of `sort_by { |x| x }`.
   Enabled: true
@@ -946,10 +950,6 @@ Style/BlockDelimiters:
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#single-line-blocks
   Enabled: true
 
-Style/BracesAroundHashParameters:
-  Description: Enforce braces style around hash parameters.
-  Enabled: false
-
 Style/CaseEquality:
   Description: Avoid explicit use of the case equality operator(===).
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-case-equality
@@ -1073,7 +1073,7 @@ Style/EmptyMethod:
 Style/EndBlock:
   Description: Avoid the use of END blocks.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-END-blocks
-  Enabled: false
+  Enabled: true
 
 Style/Encoding:
   Description: Use UTF-8 as the source file encoding.
@@ -1256,7 +1256,7 @@ Style/MultipleComparison:
 
 Style/MutableConstant:
   Description: Do not assign mutable objects to constants.
-  Enabled: true
+  Enabled: false
 
 Style/NegatedIf:
   Description: Favor unless over if for negative conditions (or control flow or).
@@ -1547,15 +1547,15 @@ Style/UnlessElse:
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-else-with-unless
   Enabled: true
 
-Style/UnneededCapitalW:
+Style/RedundantCapitalW:
   Description: Checks for %W when interpolation is not needed.
   Enabled: false
 
-Style/UnneededInterpolation:
+Style/RedundantInterpolation:
   Description: Checks for strings that are just an interpolated expression.
   Enabled: true
 
-Style/UnneededPercentQ:
+Style/RedundantPercentQ:
   Description: Checks for %q/%Q when single quotes or double quotes would do.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#percent-q
   Enabled: false
@@ -1598,3 +1598,37 @@ Style/YodaCondition:
 Style/ZeroLengthPredicate:
   Description: Use #empty? when testing for objects of length 0.
   Enabled: true
+
+Lint/RaiseException:
+  Description: Checks for `raise` or `fail` statements which are raising `Exception` class.
+  Enabled: true
+Lint/StructNewOverride:
+  Description: 'Disallow overriding the `Struct` built-in methods via `Struct.new`.'
+  Enabled: true
+Style/HashEachMethods:
+  Description: 'Use Hash#each_key and Hash#each_value.'
+  Enabled: true
+  Safe: false
+Style/HashTransformKeys:
+  Description: 'Prefer `transform_keys` over `each_with_object` and `map`.'
+  Enabled: true
+  Safe: false
+Style/HashTransformValues:
+  Description: 'Prefer `transform_values` over `each_with_object` and `map`.'
+  Enabled: true
+  Safe: false
+
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: true
+Lint/DeprecatedOpenSSLConstant:
+  Enabled: true
+Style/SlicingWithRange:
+  Enabled: true
+Lint/MixedRegexpCaptureTypes:
+  Enabled: true
+Style/RedundantRegexpCharacterClass:
+  Enabled: true
+Style/RedundantRegexpEscape:
+  Enabled: true
+Style/RedundantFetchBlock:
+  Enabled: true

data/Gemfile

@@ -15,4 +15,4 @@ gem "rubocop-performance"
 gem "simplecov"
 gem "sqlite3"
 
-gem "activerecord", "6.0.0.rc2"
+gem "activerecord", "~> 6.0.0"

data/README.md

@@ -6,7 +6,7 @@
 
 # RediSearch
 
-[![Build Status](https://travis-ci.com/npezza93/redi_search.svg?branch=master)](https://travis-ci.com/npezza93/redi_search)
+![Build Status](https://github.com/npezza93/redi_search/workflows/tests/badge.svg)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/c6437acac5684de2549d/test_coverage)](https://codeclimate.com/github/npezza93/redi_search/test_coverage)
 [![Maintainability](https://api.codeclimate.com/v1/badges/c6437acac5684de2549d/maintainability)](https://codeclimate.com/github/npezza93/redi_search/maintainability)
 

data/lib/redi_search.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "delegate"
+require "forwardable"
 require "redis"
 require "active_support/lazy_load_hooks"
 

data/lib/redi_search/log_subscriber.rb

@@ -35,7 +35,7 @@ module RediSearch
       color("#{event.payload[:name]} (#{event.duration.round(1)}ms)", RED, true)
     end
 
-    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength
+    # rubocop:disable Metrics/MethodLength
     def action_color(action)
       case action.to_sym
       when :search, :spellcheck then YELLOW
@@ -46,7 +46,7 @@ module RediSearch
       when :explaincli then BLUE
       end
     end
-    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/MethodLength
+    # rubocop:enable Metrics/MethodLength
 
     def command_string(event)
       event.payload[:query].flatten.map.with_index do |arg, i|

data/lib/redi_search/schema/field.rb

@@ -11,9 +11,8 @@ module RediSearch
 
       def boolean_options_string
         boolean_options.map do |option|
-          unless FALSES.include?(send(option))
-            option.to_s.upcase.split("_").join
-          end
+          option.to_s.upcase.split("_").join unless
+            FALSES.include?(send(option))
         end.compact
       end
     end

data/lib/redi_search/search.rb

@@ -13,6 +13,7 @@ module RediSearch
     include Clauses
 
     attr_reader :term_clause, :used_clauses, :index, :clauses
+
     def_delegator :index, :model
 
     def initialize(index, term = nil, **term_options)

data/lib/redi_search/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RediSearch
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

data/redi_search.gemspec

@@ -31,5 +31,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", ">= 1.17", "< 3"
   spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_development_dependency "rake", "~> 12.0"
+  spec.add_development_dependency "rake", "~> 13.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redi_search
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Nick Pezza
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-03 00:00:00.000000000 Z
+date: 2020-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -90,14 +90,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 description: 
 email: npezza93@gmail.com
 executables: []
@@ -107,9 +107,10 @@ files:
 - ".github/ISSUE_TEMPLATE/bug_report.md"
 - ".github/ISSUE_TEMPLATE/feature_request.md"
 - ".github/logo.svg"
+- ".github/workflows/lint.yml"
+- ".github/workflows/tests.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - Appraisals
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -193,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: RediSearch ruby wrapper that can integrate with Rails

data/.travis.yml

@@ -1,63 +0,0 @@
----
-env:
-  global:
-    - CC_TEST_REPORTER_ID=fec34310f03fd2cc767a85fa23d5102f3dca67b9cc967a48d9940027731394e8
-sudo: false
-language: ruby
-cache:
-  directories:
-   - gemfiles/vendor/bundle
-   - /home/travis/.rvm/
-services: docker
-jobs:
-  include:
-    - stage: Integration Tests
-      script: |
-        docker run -d -p 6379:6379 redislabs/redisearch:1.4.12 --protected-mode no --loadmodule /usr/lib/redis/modules/redisearch.so
-        bundle exec rake test:integration
-      rvm: 2.6
-      gemfile: Gemfile
-      name: RediSearch 1.4.12
-    - stage: Integration Tests
-      script: |
-        docker run -d -p 6379:6379 redislabs/redisearch:1.4.11 --protected-mode no --loadmodule /usr/lib/redis/modules/redisearch.so
-        bundle exec rake test:integration
-      rvm: 2.6
-      gemfile: Gemfile
-      name: RediSearch 1.4.11
-    - stage: Integration Tests
-      script: |
-        docker run -d -p 6379:6379 redislabs/redisearch:1.4.10 --protected-mode no --loadmodule /usr/lib/redis/modules/redisearch.so
-        bundle exec rake test:integration
-      rvm: 2.6
-      gemfile: Gemfile
-      name: RediSearch 1.4.10
-    - stage: Unit Tests
-      script: |
-        curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-        chmod +x ./cc-test-reporter
-        ./cc-test-reporter before-build
-        bundle exec rake test:unit
-        if [[ "$TRAVIS_TEST_RESULT" == 0 ]]; then ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT; fi
-      rvm: 2.6
-      gemfile: Gemfile
-      name: Ruby 2.6 and Rails 6.0rc2
-    - stage: Unit Tests
-      script: bundle exec rake test:unit
-      rvm: 2.6
-      gemfile: gemfiles/activerecord_52.gemfile
-      name: Ruby 2.6 and Rails 5.2
-    - stage: Unit Tests
-      script: bundle exec rake test:unit
-      rvm: 2.6
-      gemfile: gemfiles/activerecord_51.gemfile
-      name: Ruby 2.6 and Rails 5.1
-    - stage: Unit Tests
-      script: bundle exec rake test:unit
-      rvm: 2.5
-      gemfile: Gemfile
-      name: Ruby 2.5 and Rails 6.0rc2
-    - stage: Lint
-      script: bundle exec rubocop --config=./.rubocop.yml
-      rvm: 2.6
-      name: Rubocop