flexi-json 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d23543bb36512b335987eb6c12815956d98b170f2148fbbf12b92454064a96c
-  data.tar.gz: 8872ba4b925901cdeee8dcf27e5a409ca3784366dcf64ad370e60cdfe919bc54
+  metadata.gz: 067cc7f0c8adc0d54bc8910ff6e67425c2c14c4f4bf49051e12f0ce103b31abf
+  data.tar.gz: 555b479c6e2662d3a5a78378c933bd2f4685f7d04d7ce1134301258a557b27c3
 SHA512:
-  metadata.gz: 7acf01abdf37decc0f5d5d8a230da8b91f542d0dbb6c81efb90d5f229a1245b58764c0ba05fe0aa59b72348e3ef26b3b5484fc12f8700b108a49f3a0a4481c74
-  data.tar.gz: b6d8d236da0e37f0a9fd8a3785403363f5fc783820ea1ba351d7cf2647ec4f5666b24928ccd68a2eac6e0be94d4a41e707deb9acc948402acb8f91d4050a28dd
+  metadata.gz: fa132fb46b6ebf35818dce444ac95ba9648da13ba9dea057f5d3084c6a6daa6ac753afb79cef3863bd56da7cdd1741514a9d6c5de9df108475d44db69e110dc4
+  data.tar.gz: 0307bae70965e8e846fb6abfa5050d3065a9f0a8563117a44d228a1d54adf4f5d2d3f99aefa0daadf6ed31fe8927cdd0e2c757dab3f4f2baf2fae263532e3a1b

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# Version: 0.4.2 (23-09-2024)
+
+* [#25](https://github.com/GD-Personal/flexi-json/pull/25): A bug from [v0.4.0](https://github.com/GD-Personal/flexi-json/releases/tag/v0.4.0) was introduced where the advanced search function don't work properly when the options. 
+
 # Version: 0.4.1 (22-09-2024)
 
 * [0270c44](https://github.com/GD-Personal/flexi-json/commit/0270c44d7ffabd88ed0b69b09f1e98910257d99b): Update the readme and changelog

data/README.md

@@ -53,8 +53,11 @@ flexi_json.find_duplicates("email,full_name")
 
 ## Advanced search
 ```ruby
-options = {matched_all: true, exact_match: false}
-flexi_json.search({first_name: "john", address: "sydney"}, options)
+search_query = {first_name: "john", address: "sydney"}
+flexi_json.search(
+  search_query, 
+  options: {matched_all: true, exact_match: false}
+)
 # => [#<Flexi::Json::Dataset:0x0000ffffa0f5f668 @address="Sydney Australia", @attributes={:name=>"John", :address=>"Sydney Australia"}, @name="John", @searchable_fields=["name", "address"]>]
 ```
 

data/lib/flexi/json/dataset.rb

@@ -12,20 +12,22 @@ module Flexi
         end
       end
 
-      def matches?(query, fields = searchable_fields, options: Flexi::Json::Configuration.default_match_options)
-        validateable_fields = query.is_a?(Hash) ? query.keys.map(&:to_s) : fields
-        valid_fields = validateable_fields&.select { |field| searchable_fields.include?(field) } || searchable_fields
+      def matches?(query, fields = nil, options: nil)
+        options ||= Flexi::Json::Configuration.default_match_options
+
+        valid_fields = validateable_fields(query, fields)&.select do |field|
+          searchable_fields.include?(field)
+        end || searchable_fields
 
         return false if valid_fields.empty?
 
         matching_method = options[:match_all] ? :all? : :any?
         valid_fields.public_send(matching_method) do |field|
           search_query = query.is_a?(Hash) ? query[field.to_sym] : query
-          if options[:exact_match]
-            attributes[field.to_sym].to_s.downcase == search_query.to_s.downcase
-          else
-            attributes[field.to_sym].to_s.downcase.include?(search_query.to_s.downcase)
-          end
+          attribute_value = attributes[field.to_sym].to_s.downcase
+          query_value = search_query.to_s.downcase
+
+          options[:exact_match] ? attribute_value == query_value : attribute_value.include?(query_value)
         end
       end
 
@@ -35,6 +37,16 @@ module Flexi
 
       private
 
+      def validateable_fields(query, fields)
+        if query.is_a?(Hash)
+          query.keys.map(&:to_s)
+        elsif fields.is_a?(String)
+          fields.delete(" ").split(",")
+        elsif fields.is_a?(Array)
+          [fields || searchable_fields].flatten
+        end
+      end
+
       # Method to validate that a key is a valid method name and not dangerous
       def valid_key?(key)
         key.match?(/\A[a-z_][a-zA-Z0-9_]*\z/) && !dangerous_method?(key)

data/lib/flexi/json/searcher.rb

@@ -10,8 +10,8 @@ module Flexi
         @result = []
       end
 
-      def search(query, fields = nil)
-        @result = @data.select { |data| data.matches?(query, fields) }
+      def search(query, fields = nil, options: nil)
+        @result = @data.select { |data| data.matches?(query, fields, options: options) }
       end
 
       def find_duplicates(keys)

data/lib/flexi/json/version.rb

@@ -2,6 +2,6 @@
 
 module Flexi
   module Json
-    VERSION = "0.4.1"
+    VERSION = "0.4.2"
   end
 end

data/lib/flexi/json.rb

@@ -10,12 +10,10 @@ module Flexi::Json
   class << self
     attr_writer :configuration
 
-    # Access or initialize the configuration object
     def configuration
       @configuration ||= Flexi::Json::Configuration.instance
     end
 
-    # Configure block for setting custom configurations
     def configure
       yield(configuration)
     end
@@ -26,8 +24,8 @@ module Flexi::Json
     end
   end
 
-  def search(query = "", fields = nil)
-    @searcher.search(query, fields)
+  def search(query = "", fields = nil, options: nil)
+    @searcher.search(query, fields, options: options)
   end
 
   def find_duplicates(keys)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flexi-json
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Gerda Decio