redi_search 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80c2f21d79b96177bfd7c5ea162aaee7bbf0d4034cc2481378c05da6abba5658
-  data.tar.gz: 7fbd1ea8542c4149bea54eff5f25d7e10f3e80ae9cae07d3f0e6203897035c63
+  metadata.gz: 5ae66b8370802c6acf6c50487cc751e526bd7afa69be14bf56e0e5b8db416511
+  data.tar.gz: ccffbbb3db86598eb132225091cf3cfae3bfac692bca430d2484e7c97f0ab81c
 SHA512:
-  metadata.gz: 1a54204869d964261321d808c5a721b8185b05f22af6c484486492b5975539e94c4bf926bc57eb240c2a15f1bf3ced3842b32900a72244a5c007831896b3ca40
-  data.tar.gz: 1960a094f4d3aac5dd2ea02735d450d1dd67bab8bbb270c315048553a478c7413d766c06a6ffd8f1e8fa216f15ec84936817425e48d6462994d214d24083da29
+  metadata.gz: 037fd2b21e9e296e3b143f4d878a9e9cb37406f99c66b22f54a218d1a3d12c046034b19d011b875b2cd5ab3d9a1bb81c4f10b4c862196d01e8a408a2d6436156
+  data.tar.gz: 17e0f4dccd59d130c3d76314cff4b2a94da725b1b5bdc2478aaf39dde5c3a34d178cbafb04db45bf5488a8a7006bb043ed14247e46a47a64d362cc94b6fe52f1

data/.github/workflows/lint.yml

@@ -17,6 +17,6 @@ jobs:
         ruby-version: 3.0
     - name: Install rubocop
       run: |
-        gem install rubocop rubocop-performance rubocop-minitest
+        gem install rubocop rubocop-performance rubocop-minitest rubocop-rake
     - name: Lint
       run: rubocop --config=./.rubocop.yml --parallel

data/.rubocop.yml

@@ -1,6 +1,7 @@
 require:
   - rubocop-minitest
   - rubocop-performance
+  - rubocop-rake
 AllCops:
   NewCops: enable
   Exclude:

data/Gemfile

@@ -9,10 +9,10 @@ gemspec
 gem "appraisal", "~> 2.2"
 gem "faker"
 gem "mocha"
-gem "pry"
 gem "rubocop"
 gem "rubocop-minitest"
 gem "rubocop-performance"
+gem "rubocop-rake"
 gem "simplecov"
 gem "sqlite3"
 

data/Rakefile

@@ -20,5 +20,6 @@ Rake::TestTask.new("test:integration") do |t|
   t.test_files = FileList["test/integration/**/*_test.rb"]
 end
 
+desc "run all tests"
 task test: [:default]
 task default: ["test:integration", "test:unit", :rubocop]

data/bin/console

@@ -5,7 +5,7 @@ require "bundler/setup"
 require "redi_search"
 
 require "faker"
-require "pry"
+require "irb"
 require "active_support/logger"
 require "active_record"
 
@@ -34,4 +34,8 @@ def seed_users(count = 10_000)
   User.reindex
 end
 
-Pry.start
+def reload!
+  exec($0)
+end
+
+IRB.start

data/gemfiles/activerecord_60.gemfile

@@ -5,7 +5,6 @@ source "https://rubygems.org"
 gem "appraisal", "~> 2.2"
 gem "faker"
 gem "mocha"
-gem "pry"
 gem "rubocop"
 gem "rubocop-minitest"
 gem "rubocop-performance"

data/gemfiles/activerecord_61.gemfile

@@ -5,7 +5,6 @@ source "https://rubygems.org"
 gem "appraisal", "~> 2.2"
 gem "faker"
 gem "mocha"
-gem "pry"
 gem "rubocop"
 gem "rubocop-minitest"
 gem "rubocop-performance"

data/lib/redi_search/add_field.rb

@@ -29,7 +29,7 @@ module RediSearch
     end
 
     def field_schema
-      @field_schema ||= Schema.make_field(field_name, raw_schema)
+      @field_schema ||= Schema.make_field(field_name, raw_schema).to_a
     end
   end
 end

data/lib/redi_search/document.rb

@@ -11,8 +11,8 @@ module RediSearch
       def for_object(index, record, serializer: nil, only: [])
         object_to_serialize = serializer&.new(record) || record
 
-        field_values = index.schema.fields.map do |field|
-          next unless only.empty? || only.include?(field.to_sym)
+        field_values = index.schema.fields.map(&:name).map do |field|
+          next unless only.empty? || only.include?(field)
 
           [field.to_s, object_to_serialize.public_send(field)]
         end.compact.to_h
@@ -41,11 +41,15 @@ module RediSearch
     end
 
     def schema_fields
-      @schema_fields ||= index.schema.fields.map(&:to_s)
+      @schema_fields ||= index.schema.fields.map do |field|
+        field.name.to_s
+      end
     end
 
     def redis_attributes
-      attributes.to_a.flatten
+      attributes.flat_map do |field, value|
+        [field, index.schema[field.to_sym].serialize(value)]
+      end
     end
 
     def document_id

data/lib/redi_search/index.rb

@@ -80,7 +80,7 @@ module RediSearch
     end
 
     def fields
-      schema.fields.map(&:to_s)
+      schema.fields.map { |field| field.name.to_s }
     end
 
     def reindex(documents, recreate: false)

data/lib/redi_search/schema.rb

@@ -12,7 +12,7 @@ module RediSearch
       schema, options = options.to_a.flatten
 
       Object.const_get("RediSearch::Schema::#{schema.to_s.capitalize}Field").
-        new(field_name, **options.to_h).to_a
+        new(field_name, **options.to_h)
     end
 
     def initialize(raw)
@@ -20,17 +20,22 @@ module RediSearch
     end
 
     def to_a
-      raw.map do |field_name, options|
-        self.class.make_field(field_name, options)
-      end.flatten
+      fields.map(&:to_a).flatten
+    end
+
+    def [](field)
+      fields.group_by(&:name)[field]&.first
     end
 
     def fields
-      raw.keys
+      @fields ||= raw.map do |field_name, options|
+        self.class.make_field(field_name, options)
+      end.flatten
     end
 
     def add_field(field_name, options)
       raw[field_name] = options
+      @fields = nil
       self
     end
 

data/lib/redi_search/schema/field.rb

@@ -3,6 +3,14 @@
 module RediSearch
   class Schema
     class Field
+      def name
+        @name&.to_sym
+      end
+
+      def serialize(value)
+        value
+      end
+
       private
 
       FALSES = [

data/lib/redi_search/schema/geo_field.rb

@@ -20,7 +20,7 @@ module RediSearch
 
       private
 
-      attr_reader :name, :sortable, :no_index
+      attr_reader :sortable, :no_index
 
       def boolean_options
         %i(sortable no_index)

data/lib/redi_search/schema/numeric_field.rb

@@ -20,7 +20,7 @@ module RediSearch
 
       private
 
-      attr_reader :name, :sortable, :no_index
+      attr_reader :sortable, :no_index
 
       def boolean_options
         %i(sortable no_index)

data/lib/redi_search/schema/tag_field.rb

@@ -20,9 +20,13 @@ module RediSearch
         query
       end
 
+      def serialize(value)
+        value.join(separator)
+      end
+
       private
 
-      attr_reader :name, :separator, :sortable, :no_index
+      attr_reader :separator, :sortable, :no_index
 
       def boolean_options
         %i(sortable no_index)

data/lib/redi_search/schema/text_field.rb

@@ -24,7 +24,7 @@ module RediSearch
 
       private
 
-      attr_reader :name, :weight, :phonetic, :sortable, :no_index, :no_stem
+      attr_reader :weight, :phonetic, :sortable, :no_index, :no_stem
 
       def boolean_options
         %i(sortable no_index no_stem)

data/lib/redi_search/version.rb

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

data/redi_search.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.name          = "redi_search"
   spec.version       = RediSearch::VERSION
   spec.authors       = "Nick Pezza"
-  spec.email         = "npezza93@gmail.com"
+  spec.email         = "pezza@hey.com"
 
   spec.summary       = %q(RediSearch ruby wrapper that can integrate with Rails)
   spec.homepage      = "https://github.com/npezza93/redi_search"
@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.5.0"
 
-  spec.add_runtime_dependency "activesupport", ">= 5.2", "< 6.2"
+  spec.add_runtime_dependency "activesupport", ">= 5.1", "< 6.2"
   spec.add_runtime_dependency "redis", ">= 4.0", "< 5.0"
 
   spec.add_development_dependency "bundler", ">= 1.17", "< 3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redi_search
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Nick Pezza
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-05 00:00:00.000000000 Z
+date: 2021-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.2'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.2'
@@ -99,7 +99,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '13.0'
 description:
-email: npezza93@gmail.com
+email: pezza@hey.com
 executables: []
 extensions: []
 extra_rdoc_files: []