redi_search_rails 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 382515dc3277d39c0c8389db1424fe6d73cda0ca
-  data.tar.gz: 86727dec2fe4a6e642314d0a805571dfac49efd7
+  metadata.gz: 53fd6d815f84aaacba7a129c7e5bd574124b1937
+  data.tar.gz: 6e00184db536350ce5e3d30e9c25f182b7fb8ea1
 SHA512:
-  metadata.gz: 50dc588fb78895feefec03a17d88a080b37fab8e285519a954583401509d41b5ce5a4c30c00d387a4a68771f69a89f57db932d427d57deda660b27046268dd2c
-  data.tar.gz: ab851b7e3b939cc017c7ce0956ca6dfc3e075cf3e54e639a73cd8422d1ef5899d3861a3d9362127bb4482bec8158a312119b2e823eb227258a4a37a40f1be143
+  metadata.gz: 914e17adff80e11950a6b63af883ef90b9e1bd97f2884e07b6ceea8d3d7f177d46e5411dcee5c879100d2a353943b5b506fab71dc4b411d362400060f2e6130b
+  data.tar.gz: 730fb0ee494f8c79c7d5ffd6f28edc59b720737f5ae1d8855c8e522487ccb1816e24011030e1250a03055f496709965ffeadae642d3db355081abb3b9f638a0c

data/README.md

@@ -44,7 +44,7 @@ User.ft_add(User.where(id: 1))
 # => search
 User.ft_search('keyword here')
 # => output
-[1, "gid://application_name/User/unique_id", ["name", "Bob", "age", "100"]]
+[{"id": "gid://application_name/User/unique_id", "name": "Bob", "age": "100"}, {...}]
 ```
 
 As unique identifier (doc_id) for records in Redis it uses https://github.com/rails/globalid.  You need to make sure you models support it if you are using ORM other than ActiveRecord.  

data/lib/redi_search_rails.rb

@@ -14,26 +14,37 @@ module RediSearchRails
     # @see https://github.com/dmitrypol/redi_search_rails
     # @param schema [Hash]  name: 'TEXT', age: 'NUMERIC'
     def redi_search_schema(schema)
-      @@schema = schema.to_a.flatten
-      @@fields = schema.keys
-      @@model = self.name.constantize
-      @@index_name = @@model.to_s
-      @@score = 1
+      @schema = schema.to_a.flatten
+      @fields = schema.keys
+      @model = self.name.constantize
+      @index_name = @model.to_s
+      @score = 1
     end
 
     # search the index for specific keyword(s)
     #
     # @param keyword [String]  'some keyword'
-    # @return [Array]   [1, "gid://application_name/User/unique_id", ["name", "Bob", "age", "100"]]
+    # @return [Array]   [{"id": "gid://application_name/User/unique_id", "name": "Bob", "age": "100"}, ...]
     # @raise [RuntimeError]
     def ft_search keyword
-      results = REDI_SEARCH.call('FT.SEARCH', @@index_name, keyword,
+      results = REDI_SEARCH.call('FT.SEARCH', @index_name, keyword,
        #'LIMIT', 0, 1000,
        #'NOCONTENT', #'VERBATIM',  #'WITHSCORES', #'NOSTOPWORDS', #'WITHPAYLOADS',
       )
-      return results
+      # => [1, "gid://application_name/User/unique_id", ["name", "Bob", "age", "100"]]
+      # => transform into array of hashes
+      output = []
+      results.shift  # => remove count
+      results.each_slice(2) do |result|
+        attributes = {}
+        result[1].each_slice(2) do |attribute|
+          attributes[attribute[0]] = attribute[1]
+        end
+        output << {id: result[0]}.merge(attributes)
+      end
+      return output
     rescue Exception => e
-      Rails.logger.error e
+      Rails.logger.error e if defined? Rails
       return e.message
     end
 
@@ -41,13 +52,13 @@ module RediSearchRails
     #
     # @return [String]
     def ft_create
-      REDI_SEARCH.call('FT.CREATE', @@index_name,
+      REDI_SEARCH.call('FT.CREATE', @index_name,
         #'NOFIELDS', 'NOSCOREIDX', 'NOOFFSETS',
-        'SCHEMA', @@schema
+        'SCHEMA', @schema
       )
       ft_optimize
     rescue Exception => e
-      Rails.logger.error e
+      Rails.logger.error e if defined? Rails
       return e.message
     end
 
@@ -55,9 +66,9 @@ module RediSearchRails
     #
     # @return [String]
     def ft_add_all
-      @@model.all.each {|record| ft_add(record) }
+      @model.all.each {|record| ft_add(record) }
     rescue Exception => e
-      Rails.logger.error e
+      Rails.logger.error e if defined? Rails
       return e.message
     end
 
@@ -67,14 +78,14 @@ module RediSearchRails
     # @return [String]
     def ft_add record
       fields = []
-      @@fields.each { |field| fields.push(field, record.send(field)) }
-      REDI_SEARCH.call('FT.ADD', @@index_name, record.to_global_id, @@score,
+      @fields.each { |field| fields.push(field, record.send(field)) }
+      REDI_SEARCH.call('FT.ADD', @index_name, record.to_global_id.to_s, @score,
         'REPLACE',
         #'NOSAVE', 'PAYLOAD', record.name,
         'FIELDS', fields
       )
     rescue Exception => e
-      Rails.logger.error e
+      Rails.logger.error e if defined? Rails
       return e.message
     end
 
@@ -84,9 +95,9 @@ module RediSearchRails
     # @return [String]
     def ft_del record
       doc_id = record.to_global_id
-      REDI_SEARCH.call('FT.DEL', @@index_name, doc_id)
+      REDI_SEARCH.call('FT.DEL', @index_name, doc_id)
     rescue Exception => e
-      Rails.logger.error e
+      Rails.logger.error e if defined? Rails
       return e.message
     end
 
@@ -94,9 +105,9 @@ module RediSearchRails
     #
     # @return [String]
     def ft_optimize
-      REDI_SEARCH.call('FT.OPTIMIZE', @@index_name)
+      REDI_SEARCH.call('FT.OPTIMIZE', @index_name)
     rescue Exception => e
-      Rails.logger.error e
+      Rails.logger.error e if defined? Rails
       return e.message
     end
 
@@ -104,9 +115,9 @@ module RediSearchRails
     #
     # @return [String]
     def ft_drop
-      REDI_SEARCH.call('FT.DROP', @@index_name)
+      REDI_SEARCH.call('FT.DROP', @index_name)
     rescue Exception => e
-      Rails.logger.error e
+      Rails.logger.error e if defined? Rails
       return e.message
     end
 
@@ -114,9 +125,9 @@ module RediSearchRails
     #
     # @return [String]
     def ft_info
-      REDI_SEARCH.call('FT.INFO', @@index_name)
+      REDI_SEARCH.call('FT.INFO', @index_name)
     rescue Exception => e
-      Rails.logger.error e
+      Rails.logger.error e if defined? Rails
       return e.message
     end
 

data/lib/redi_search_rails/version.rb

@@ -1,3 +1,3 @@
 module RediSearchRails
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/redi_search_rails.gemspec

@@ -33,8 +33,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.14"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "activemodel", "~> 5.0.0"
+  spec.add_development_dependency "activemodel", ">= 4.2.8"
+  spec.add_development_dependency "awesome_print"
   # =>
-  spec.add_runtime_dependency "activesupport", "~> 5.0.0"
+  spec.add_runtime_dependency "activesupport", ">= 4.2.8"
   spec.add_runtime_dependency "redis", "~> 3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redi_search_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Dmitry Polyakovsky
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-08 00:00:00.000000000 Z
+date: 2017-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,30 +56,44 @@ dependencies:
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 4.2.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 4.2.8
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  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: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 4.2.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 4.2.8
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement