lsolr 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2f767515aadc312c4eb075eade0bec49647961b
-  data.tar.gz: 5783b321efaf0866d3fe2561734adb41be08631e
+  metadata.gz: 05c41bbf755a942358b8103e341c059d3a062da1
+  data.tar.gz: 0a74f0bb97acf6dcc385433964d90cba915b84c0
 SHA512:
-  metadata.gz: 58056c0bd27ea5974d9d8ba219312e896ca7e18cd844c61b4e189bc9ccb09cf404781f0d337f88a3a2c484b1b5ae26111c0dd863e66e2ba2c327beca54aa0a97
-  data.tar.gz: 81a26a8ee3957c6cc2b45b1e153350407ce2079ef08dfbfe99acf3ce807fd21534478a32ab750e443eb645106b7ee63e0a7d2e9b7751ad10b66bf48d7180d2ba
+  metadata.gz: b97854d45e33b3f03dc64f1a985a892d3a94169d7a2a14d0970d9adb926094dbcc21cda9e878f4f5f7cd40678ddf2071bd8d5624312981f73926260b882eeb2a
+  data.tar.gz: 6e18db2a61a038353498e3cd4c1992a51e510d517aeecb448c05a4cb96321f08e046839ff58c48909fb4f338bfc9c4deaece64bdfd5f9fc73d5bb99749b0d4ae

data/lib/lsolr.rb

@@ -84,11 +84,15 @@ class LSolr
   class << self
     # Builds composite query and returns builder instance.
     #
-    # @param params [Hash{Symbol => String, Integer, Float, true, false, Range, Date, Time}] query terms
+    # @param params [Hash{Symbol => String, Integer, Float, true, false, Range, Date, Time}, String] query terms or a raw query
     #
     # @return [LSolr] a instance
     def build(params)
-      params.map { |f, v| build_query(f, v) }.reduce { |a, e| a.and(e) }
+      case params
+      when Hash then params.map { |f, v| build_query(f, v) }.reduce { |a, e| a.and(e) }
+      when String then new.raw(params)
+      else raise TypeError, 'Could not build solr query. Please specify a Hash or String value.'
+      end
     end
 
     private
@@ -106,7 +110,7 @@ class LSolr
     end
 
     def build_array_query(field, values)
-      return LSolr.new(field) if values.empty?
+      return new(field) if values.empty?
 
       values.map { |v| build_query(field, v) }.reduce { |a, e| a.or(e) }.wrap
     end
@@ -128,28 +132,29 @@ class LSolr
 
   # Create a new query builder instance.
   #
-  # @param field [String] a field name
+  # @param field [String, Symbol] a field name
   # @return [LSolr] a instance
-  def initialize(field)
-    raise ArgumentError, 'Please specify a field name.' if field.nil? || field.empty?
-
+  def initialize(field = '')
     @expr_not = ''
-    @field = field
+    @field = field.to_s
     @value = ''
     @range_first = ''
     @range_last = ''
     @boost = ''
     @left_parentheses = []
     @right_parentheses = []
+    @raw = ''
   end
 
   # Returns Apache Solr standard lucene type query string.
   #
   # @return [String] a stringified query
   def to_s # rubocop:disable Metrics/AbcSize
-    @value = "#{@range_first} #{TO} #{@range_last}" if range_search?
-    raise IncompleteQueryError, 'Please specify a search value.' if blank?
+    raise IncompleteQueryError, 'Please specify search field and value.' if blank?
 
+    return @raw unless @raw.empty?
+
+    @value = "#{@range_first} #{TO} #{@range_last}" if range_search?
     expr = "#{expr_not}#{left_parentheses.join}#{@field}:#{@value}#{right_parentheses.join}"
     expr = "#{prev} #{operator} #{expr}" if !prev.nil? && prev.present?
     "#{expr}#{@boost}"
@@ -157,11 +162,12 @@ class LSolr
 
   alias to_str to_s
 
-  # A query is blank if value is empty in expression.
+  # A query is blank if term is incomplete in expression.
   #
   # @return [true, false]
   def blank?
-    @value.empty? && (@range_first.empty? || @range_last.empty?)
+    managed_query_absence = @field.empty? || (@value.empty? && (@range_first.empty? || @range_last.empty?))
+    managed_query_absence && @raw.empty?
   end
 
   # A query is present if it's not blank.
@@ -171,6 +177,26 @@ class LSolr
     !blank?
   end
 
+  # Sets a field name.
+  #
+  # @param f [String, Symbol] a field name
+  #
+  # @return [LSolr] self instance
+  def field(f)
+    @field = f.to_s
+    self
+  end
+
+  # Sets a raw query.
+  #
+  # @param q [String] raw query
+  #
+  # @return [LSolr] self instance
+  def raw(q)
+    @raw = q.to_s
+    self
+  end
+
   # Adds parentheses to query expression.
   #
   # @see https://lucene.apache.org/solr/guide/7_1/the-standard-query-parser.html#grouping-terms-to-form-sub-queries Grouping Terms to Form Sub-Queries

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lsolr
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Taishi Kasuga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-18 00:00:00.000000000 Z
+date: 2018-02-14 00:00:00.000000000 Z
 dependencies: []
 description: LSolr is a query builder of Apache Solr standard Lucene type query for
   Ruby.