stretchy 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7075f76a33416244fc3786635bdda19d1e2e5b6a
-  data.tar.gz: 3d8eadb1cef913e2e7cc97e97c7df1ef2c917410
+  metadata.gz: be619dd65900ce5277436c2431d0c9c7740cd494
+  data.tar.gz: c7315e692b34f98ec01e413e347746022eabe835
 SHA512:
-  metadata.gz: be3d26637a9a1baf77b661bd5f48082f1b640e66c7e64314787347ce920cb9c98bd00abb2f03271c7c3e8617df70ad5738d4915676de55bfb20bb0129e0c2c73
-  data.tar.gz: ee74c3c737df88b99f1240fe81fc16319a42fef2d61f7134e24026f2a77da2571f4e7dbd9c80e80ac71a9d92824ecac99c5e974609325a43681bb6e5f1a67272
+  metadata.gz: c77565e3ef0f69497770aa5a1b9311e153f4080aa414d6f1e981b0bec26c7237a97e6aebce5d392b6e8f311e857a39f6b28cca7c93759bbd0937641d94751e14
+  data.tar.gz: 78b2637b0f5c5aa946c5c4d23475a95036a811897c16968758982d5cf3310fcb486189323c99e66684f6b932cd5af5995c419d24da6ddef04e0fb6da9b1ad6c3

data/lib/stretchy/builders/query_builder.rb

@@ -21,7 +21,7 @@ module Stretchy
       def add_matches(field, new_matches, options = {})
         @matches[field] += Array(new_matches)
         opts = {}
-        [:operator, :slop, :minimum_should_match, :type].each do |opt|
+        [:operator, :slop, :minimum_should_match, :min, :type].each do |opt|
           opts[opt] = options[opt] if options[opt]
         end
         @query_opts[field] = opts

data/lib/stretchy/clauses/boost_clause.rb

@@ -21,6 +21,7 @@ module Stretchy
       extend Forwardable
 
       delegate [:geo, :range] => :where
+      delegate [:fulltext]    => :match
 
       # 
       # Changes query state to "match" in the context
@@ -32,7 +33,9 @@ module Stretchy
       # 
       # @return [BoostMatchClause] query with boost match state
       def match(params = {}, options = {})
-        BoostMatchClause.new(base).boost_match(params, options)
+        clause = BoostMatchClause.new(base)
+        clause = clause.boost_match(params, options) unless params.empty? && options.empty?
+        clause
       end
 
       # 

data/lib/stretchy/clauses/boost_match_clause.rb

@@ -37,10 +37,12 @@ module Stretchy
       end
 
       def fulltext(params = {}, options = {})
-        weight = params.delete(:weight) || options[:weight]
-        options[:min] = 1
-        options[:slop] = MatchClause::FULLTEXT_SLOP
-        clause = MatchClause.new.match(params, options)
+        _params = hashify_params(params)
+        weight = _params.delete(:weight) || options[:weight]
+        options[:min]  ||= MatchClause::FULLTEXT_MIN
+        options[:slop] ||= MatchClause::FULLTEXT_SLOP
+        options[:type] ||= Queries::MatchQuery::MATCH_TYPES.first
+        clause = MatchClause.new.match(_params, options)
         boost  = clause.to_boost(weight)
         base.boost_builder.add_boost(boost) if boost
         Base.new(base)
@@ -83,7 +85,7 @@ module Stretchy
       private
 
         def match_function(params = {}, options = {})
-          weight = params.delete(:weight) || options[:weight]
+          weight = hashify_params(params).delete(:weight) || options[:weight]
           clause = MatchClause.new.match(params, options)
           boost  = clause.to_boost(weight)
           base.boost_builder.add_boost(boost) if boost

data/lib/stretchy/queries/match_query.rb

@@ -12,7 +12,7 @@ module Stretchy
       attribute :operator,  String
       attribute :type,      String
       attribute :slop,      Integer
-      attribute :min,       String
+      attribute :min,       Integer
       attribute :max,       Float
 
       validations do
@@ -26,6 +26,10 @@ module Stretchy
         rule :max,       type: Numeric
       end
 
+      def after_initialize(params)
+        @min ||= params[:minimum_should_match]
+      end
+
       def option_attributes
         return @opts if @opts
         @opts = {}

data/lib/stretchy/utils/validation.rb

@@ -59,8 +59,8 @@ module Stretchy
         def initialize(attributes = nil)
           self.class.attribute_set.set(self, attributes) if attributes
           set_default_attributes
-          validate!
           after_initialize(attributes) if respond_to?(:after_initialize)
+          validate!
         end
 
       end

data/lib/stretchy/version.rb

@@ -1,3 +1,3 @@
 module Stretchy
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stretchy
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - agius
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-19 00:00:00.000000000 Z
+date: 2015-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch