lsolr 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4274e0bfec1e74ca2120624580aad73461057f1d5912d83ae0dba8ff82b52a5
-  data.tar.gz: a5cb76c8d965d86d6d6b541604fc1a8a23b6a73ba68ae566953677f68b1d95da
+  metadata.gz: 6b61a359f44587f3d0427b918647b04a7f43ce6a9ec9e394ae4ca09c68f59386
+  data.tar.gz: f4b20307a1239c0277d218670401a5187c85df9a0147aae90a1435fb13c68dbe
 SHA512:
-  metadata.gz: dcd93b2d0e788cac40d2f942dd67a4245b6bd20d5dcb89d296c5d8fe29379975e8e220399f77201c3e416a9d308044f55a4f9720d5c74022df5b0aeb12adb893
-  data.tar.gz: 83e1c44d830e10fedf551c0fc77baf77adcc191a4da69defbfd8792a8deca754958e3c0751e7afacae73f6d7197bc02ab4942663a5636fd685152db64e8b3aae
+  metadata.gz: 40abee52d81c47d9a1ff70c86045d58f17869c43f2b8fc7cf054229ce50597b9a86a8a93a309e090c3ecf1d459676f2f9105ec409f24162a328c64c8cf9289b7
+  data.tar.gz: bb8d98b7c36eebc3425665d1d3c7661eed341e997aa8c09c2a1b99a9c3f78dd5fe50630e0183844c6446db14eb2bff0acfb33c7f0bd52d509ff75397200b6f09

data/lib/lsolr.rb

@@ -66,7 +66,6 @@ require 'date'
 #    #=> 'a:1 AND b:2'
 class LSolr
   ArgumentError = Class.new(::ArgumentError)
-  RangeError = Class.new(::RangeError)
   TypeError = Class.new(::TypeError)
   IncompleteQueryError = Class.new(StandardError)
 
@@ -84,13 +83,15 @@ class LSolr
   PROXIMITY = '~'
   BOOST = '^'
   CONSTANT_SCORE = '^='
-  PHRASE_MATCH_DELIMITER = ' '
-  MULTI_VALUE_MATCH_DELIMITER = ' '
-  FUZZY_MATCH_DISTANCE_RANGE = (0.0..2.0).freeze
-  FORMAT_DATE_TIME = '%Y-%m-%dT%H:%M:%SZ' # rubocop:disable Style/FormatStringToken
+
+  DELIMITER_SPACE = ' '
+
+  RANGE_FUZZY_MATCH_DISTANCE = (0.0..2.0).freeze
+
+  FORMAT_DATE_TIME = '%Y-%m-%dT%H:%M:%SZ'
   FORMAT_MILLISECOND_FOR_DATE_TYPE = '%Q'
   FORMAT_MILLISECOND_FOR_TIME_TYPE = '%L'
-  FORMAT_SECOND = '%s' # rubocop:disable Style/FormatStringToken
+  FORMAT_SECOND = '%s'
   FORMAT_INSPECT = '#<%<class>s:%<object>#018x `%<query>s`>'
 
   PARENTHESIS_LEFT = '('
@@ -114,7 +115,7 @@ class LSolr
       case params
       when Hash then params.map { |f, v| build_query(f, v) }.reduce { |a, e| a.and(e) }
       when String then build_raw_query(params)
-      else raise TypeError, "Could not build solr query. Please specify a Hash or String value. #{params.inspect} given."
+      else raise TypeError, "Could not build solr query. Please specify a Hash or String value. `#{params}` given."
       end
     rescue TypeError => e
       raise ArgumentError, "#{e.message} It is not a supported type."
@@ -130,14 +131,12 @@ class LSolr
       when Array then build_array_query(field, value)
       when Range then build_range_query(field, value)
       when Enumerator then build_enumerator_query(field, value)
-      else raise TypeError, "Could not build solr query. field: #{field.inspect}, value: #{value.inspect} given."
+      else raise TypeError, "Could not build solr query. field: `#{field}`, value: `#{value}` given."
       end
     end
 
     def build_array_query(field, values)
-      return new(field) if values.empty?
-
-      new(field).match_in(values)
+      values.empty? ? new(field) : new(field).match_in(values)
     end
 
     def build_range_query(field, value)
@@ -220,7 +219,7 @@ class LSolr
   #
   # @raise [LSolr::ArgumentError] if specified field name is empty
   def field(name)
-    raise ArgumentError, "The field name must be a not empty string value. #{name.inspect} given." unless present_string?(name)
+    raise ArgumentError, "The field name must be a not empty string value. `#{name}` given." unless present_string?(name)
 
     @field = name.to_s
     self
@@ -234,7 +233,7 @@ class LSolr
   #
   # @raise [LSolr::ArgumentError] if specified raw query string is empty
   def raw(query)
-    raise ArgumentError, "The raw query must be a not empty string value. #{query.inspect} given." unless present_string?(query)
+    raise ArgumentError, "The raw query must be a not empty string value. `#{query}` given." unless present_string?(query)
 
     @raw = query.to_s
     self
@@ -273,7 +272,7 @@ class LSolr
   #
   # @raise [LSolr::ArgumentError] if specified boost factor is invalid
   def boost(factor)
-    raise ArgumentError, "The boost factor must be a positive number. #{factor.inspect} given." unless valid_boost_factor?(factor)
+    raise ArgumentError, "The boost factor must be a positive number. `#{factor}` given." unless valid_boost_factor?(factor)
 
     @boost = "#{BOOST}#{factor}"
     self
@@ -289,7 +288,7 @@ class LSolr
   #
   # @raise [LSolr::ArgumentError] if specified score number is invalid
   def constant_score(score)
-    raise ArgumentError, "The constant score must be a number. #{score.inspect} given." unless valid_score?(score)
+    raise ArgumentError, "The constant score must be a number. `#{score}` given." unless valid_score?(score)
 
     @constant_score = "#{CONSTANT_SCORE}#{score}"
     self
@@ -319,10 +318,10 @@ class LSolr
   #
   # @raise [LSolr::ArgumentError] if specified value is a empty array or not array
   def match_in(values)
-    raise ArgumentError, "#{values.inspect} given. It must be a not empty array." unless present_array?(values)
+    raise ArgumentError, "`#{values}` given. It must be a not empty array." unless present_array?(values)
 
     values = values.map { |v| clean(v) }
-    @value = "(#{values.join(MULTI_VALUE_MATCH_DELIMITER)})"
+    @value = "(#{values.join(DELIMITER_SPACE)})"
     self
   end
 
@@ -361,8 +360,8 @@ class LSolr
   #
   # @return [LSolr] self instance
   def phrase_match(values, distance: 0)
-    value = values.map { |v| clean(v).split }.flatten.join(PHRASE_MATCH_DELIMITER)
-    proximity_match = distance > 0 ? "#{PROXIMITY}#{distance}" : ''
+    value = values.map { |v| clean(v).split }.flatten.join(DELIMITER_SPACE)
+    proximity_match = distance.to_s.to_i > 0 ? "#{PROXIMITY}#{distance}" : ''
     @value = %("#{value}"#{proximity_match})
     self
   end
@@ -376,9 +375,9 @@ class LSolr
   #
   # @return [LSolr] self instance
   #
-  # @raise [LSolr::RangeError] if specified distance is out of range
+  # @raise [LSolr::ArgumentError] if specified distance is out of range
   def fuzzy_match(value, distance: 2.0)
-    raise RangeError, "Out of #{FUZZY_MATCH_DISTANCE_RANGE}. #{distance} given." unless FUZZY_MATCH_DISTANCE_RANGE.member?(distance)
+    raise ArgumentError, "Out of #{RANGE_FUZZY_MATCH_DISTANCE}. `#{distance}` given." unless valid_fuzzy_match_distance?(distance)
     @value = "#{clean(value).split.join}#{PROXIMITY}#{distance}"
     self
   end
@@ -500,6 +499,10 @@ class LSolr
     v.is_a?(Float) || v.is_a?(Integer)
   end
 
+  def valid_fuzzy_match_distance?(v)
+    (v.is_a?(Float) || v.is_a?(Integer)) && RANGE_FUZZY_MATCH_DISTANCE.member?(v)
+  end
+
   def clean(value, symbols: RESERVED_SYMBOLS)
     value.to_s
          .tr(symbols.join, REPLACEMENT_CHAR)
@@ -518,12 +521,12 @@ class LSolr
     msec_str = case date
                when Date then date.strftime(FORMAT_MILLISECOND_FOR_DATE_TYPE).gsub(date.strftime(FORMAT_SECOND), '')
                when Time then date.strftime(FORMAT_MILLISECOND_FOR_TIME_TYPE)
-               else raise TypeError, "Could not format dates or times. Given value: #{date.inspect}"
+               else raise TypeError, "Could not format dates or times. `#{date}` given."
                end
 
     return date.strftime(FORMAT_DATE_TIME) if msec_str == '000'
 
-    "#{date.strftime('%Y-%m-%dT%H:%M:%S')}.#{msec_str}Z" # rubocop:disable Style/FormatStringToken
+    "#{date.strftime('%Y-%m-%dT%H:%M:%S')}.#{msec_str}Z"
   end
 
   def link(another, operator)

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: lsolr
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Taishi Kasuga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-18 00:00:00.000000000 Z
+date: 2018-02-19 00:00:00.000000000 Z
 dependencies: []
-description: LSolr is a query builder of Apache Solr standard Lucene type query for
-  Ruby.
+description: LSolr is a query builder for Apache Solr in Ruby. It supports only the
+  standard query.
 email: supercaracal@yahoo.co.jp
 executables: []
 extensions: []
@@ -41,5 +41,5 @@ rubyforge_project:
 rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
-summary: A query builder of Apache Solr for Ruby
+summary: A query builder for Apache Solr in Ruby
 test_files: []