stretchy 0.1.2 → 0.2.0

data/lib/stretchy/filters/exists_filter.rb

@@ -2,10 +2,13 @@ module Stretchy
   module Filters
     class ExistsFilter < Base
 
+      contract field: {type: :field, required: true}
+
       # CAUTION: this will match empty strings
       # see http://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-exists-filter.html
       def initialize(field)
         @field = field
+        validate!
       end
 
       def to_search

data/lib/stretchy/filters/geo_filter.rb

@@ -2,16 +2,16 @@ module Stretchy
   module Filters
     class GeoFilter < Base
 
-      contract distance: {type: :distance},
-                    lat: {type: :lat},
-                    lng: {type: :lng},
-                  field: {type: :field}
+      contract distance: {type: :distance, required: true},
+                    lat: {type: :lat, required: true},
+                    lng: {type: :lng, required: true},
+                  field: {type: :field, required: true}
 
-      def initialize(field: 'coords', distance: '50km', lat:, lng:)
-        @field    = field
-        @distance = distance
-        @lat      = lat
-        @lng      = lng
+      def initialize(options = {})
+        @field    = options[:field]
+        @distance = options[:distance]
+        @lat      = options[:lat]
+        @lng      = options[:lng]
         validate!
       end
 

data/lib/stretchy/filters/range_filter.rb

@@ -3,13 +3,15 @@ module Stretchy
     class RangeFilter < Base
 
       contract field: {type: :field},
-                 min: {type: Numeric},
-                 max: {type: Numeric}
+                 min: {type: [Numeric, Time]},
+                 max: {type: [Numeric, Time]}
 
-      def initialize(field:, min:, max:)
-        @field = field
-        @min   = min
-        @max   = max
+      def initialize(options = {})
+        @field = options[:field]
+        @min   = options[:min]
+        @max   = options[:max]
+        validate!
+        require_one(min: @min, max: @max)
       end
 
       def to_search

data/lib/stretchy/filters/terms_filter.rb

@@ -2,20 +2,28 @@ module Stretchy
   module Filters
     class TermsFilter < Base
 
-      contract field: {type: :field},
-              values: {type: Array}
+      contract field: {type: :field, required: true},
+              values: {type: Array,  required: true}
 
-      def initialize(field:, values:)
-        @field = field
-        @values = Array(values)
-        validate!
+      def initialize(field_or_opts = {}, terms = [])
+        if field_or_opts.is_a?(Hash)
+          @terms = field_or_opts
+        else
+          @terms = { field_or_opts => Array(terms) }
+        end
+        validate_terms!
+      end
+
+      def validate_terms!
+        exc = Stretchy::Errors::ContractError.new("Terms cannot be blank")
+        raise exc if @terms.none? || @terms.any? do |field, terms|
+          terms.none?
+        end
       end
 
       def to_search
         {
-          terms: {
-            @field => @values
-          }
+          terms: @terms
         }
       end
     end

data/lib/stretchy/queries/bool_query.rb

@@ -0,0 +1,21 @@
+module Stretchy
+  module Queries
+    class BoolQuery < Base
+
+      def initialize(options = {})
+        @must       = Array(options[:must])
+        @must_not   = Array(options[:must_not])
+        @should     = Array(options[:should])
+      end
+
+      def to_search
+        json = {}
+        json[:must]     = @must.map(&:to_search)      if @must.any?
+        json[:must_not] = @must_not.map(&:to_search)  if @must_not.any?
+        json[:should]   = @should.map(&:to_search)    if @should.any?
+        { bool: json }
+      end
+
+    end
+  end
+end

data/lib/stretchy/queries/filtered_query.rb

@@ -5,10 +5,11 @@ module Stretchy
       contract query: {type: Base},
               filter: {type: Stretchy::Filters::Base}
 
-      def initialize(query: nil, filter:)
-        @query  = query
-        @filter = filter
+      def initialize(options = {})
+        @query  = options[:query]
+        @filter = options[:filter]
         validate!
+        require_one(query: @query, filter: @filter)
       end
 
       def to_search

data/lib/stretchy/queries/function_score_query.rb

@@ -5,7 +5,7 @@ module Stretchy
       SCORE_MODES = %w(multiply sum avg first max min)
       BOOST_MODES = %w(multiply replace sum avg max min)
 
-      contract functions: {responds_to: :to_search, array: true},
+      contract functions: {type: Stretchy::Boosts::Base, array: true},
                    query: {type: Base},
                   filter: {type: Stretchy::Filters::Base},
               score_mode: {type: String, in: SCORE_MODES},

data/lib/stretchy/queries/match_query.rb

@@ -8,10 +8,17 @@ module Stretchy
             operator: {type: String, in: OPERATORS},
               string: {type: String}
 
-      def initialize(string, field: '_all', operator: 'and')
-        @field    = field
-        @operator = operator
-        @string   = string
+      def initialize(options = {})
+        case options
+        when String
+          @field    = '_all'
+          @string   = options
+          @operator = 'and'
+        when Hash
+          @field    = options[:field]    || '_all'
+          @string   = options[:string]
+          @operator = options[:operator] || 'and'
+        end
         validate!
       end
 
@@ -19,7 +26,7 @@ module Stretchy
         {
           match: {
             @field => {
-              query: @string,
+              query:    @string,
               operator: @operator
             }
           }

data/lib/stretchy/results/base.rb

@@ -0,0 +1,45 @@
+module Stretchy
+  module Results
+    class Base
+
+      def initialize(request_json, options = {})
+        @request  = request_json
+        @index    = options[:index]
+        @type     = options[:type]
+      end
+
+      def response
+        @response ||= Stretchy.search(type: @type, body: request_json)
+      end
+
+      def ids
+        @ids ||= response['hits']['hits'].map{|h| h['_id'] =~ /\d+(\.\d+)?/ ? h['_id'].to_i : h['_id'] }
+      end
+
+      def hits
+        @hits ||= response['hits']['hits'].map do |hit|
+          merge_fields = hit.reject{|field, _| field == '_source' }
+          hit['_source'].merge(merge_fields)
+        end
+      end
+      alias :results :hits
+
+      def took
+        @took ||= response['took']
+      end
+
+      def shards
+        @shards ||= response['_shards']
+      end
+
+      def total
+        @total ||= response['hits']['total']
+      end
+
+      def max_score
+        @max_score ||= response['hits']['max_score']
+      end
+
+    end
+  end
+end

data/lib/stretchy/results/null_results.rb

@@ -0,0 +1,22 @@
+module Stretchy
+  module Results
+    class NullResults < Base
+      # use this class when you don't want to actually run
+      # a search, or catch an exception or something
+
+      def response
+        @response ||= {
+          'took'      => 0,
+          'timed_out' => false,
+          '_shards'   => {},
+          'hits'      => {
+            'total'     => 0,
+            'max_score' => 0,
+            'hits'      => []
+          }
+        }
+      end
+
+    end
+  end
+end

data/lib/stretchy/utils/contract.rb

@@ -29,10 +29,22 @@ module Stretchy
         end
       end
 
+      def require_one(options = {})
+        if options.values.all?{|v| self.class.is_empty?(v) }
+          raise Stretchy::Errors::ContractError.new("One of #{options.keys.join(', ')} must be present")
+        end
+      end
+
       module ClassMethods
 
         attr_reader :contracts
 
+        def is_empty?(value)
+          value.nil? ||
+          (value.respond_to?(:any?) && !value.any?) ||
+          (value.respond_to?(:length) && value.length == 0)
+        end
+
         def contract(var, options = {})
           @contracts ||= {}
           if var.is_a?(Hash)
@@ -56,7 +68,7 @@ module Stretchy
           case type
           when :distance
             msg = "Expected #{name} to be a distance measure, but #{value} is not a valid distance"
-            fail_assertion(msg) unless value.match(DISTANCE_FORMAT)
+            fail_assertion(msg) unless String(value).match(DISTANCE_FORMAT)
           when :lat
             msg = "Expected #{name} to be between 90 and -90, but was #{value}"
             value = Float(value) rescue nil
@@ -71,6 +83,9 @@ module Stretchy
 
             msg = "Expected #{name} to be a string, symbol, or number, but was blank"
             fail_assertion(msg) if value.is_a?(String) && value.empty?
+          when Array
+            msg = "Expected #{name} to be one of #{type.map{|t| t.name}}, but got #{value.class.name}"
+            fail_assertion(msg) unless type.any?{|t| value.is_a?(t)}
           else
             msg = "Expected #{name} to be of type #{type}, but found #{value.class.name}"
             fail_assertion(msg) unless value.is_a?(type)

data/lib/stretchy/version.rb

@@ -1,3 +1,3 @@
 module Stretchy
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/lib/stretchy.rb

@@ -1,5 +1,6 @@
 require 'json'
 require 'logger'
+require 'forwardable'
 require 'excon'
 require 'elasticsearch'
 
@@ -9,10 +10,18 @@ require 'stretchy/utils/client_actions'
 require 'stretchy/boosts/base'
 require 'stretchy/filters/base'
 require 'stretchy/queries/base'
+require 'stretchy/clauses/base'
+require 'stretchy/results/base'
 
-Dir[File.join(File.dirname(__FILE__), 'stretchy', '**', '*.rb')].each do |path|
-  require path unless path =~ /utils/ || path =~ /base/
-end
+grep_require = ->(matches){
+  Dir[File.join(File.dirname(__FILE__), 'stretchy', '**', '*.rb')].each do |path|
+    require path if path =~ matches
+  end
+}
+
+grep_require.call(/utils/)
+grep_require.call(/base/)
+grep_require.call(/(?!utils|base)/)
 
 module Stretchy
 

data/stretchy.gemspec

@@ -22,8 +22,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency "elasticsearch",  "~> 1.0"
   spec.add_dependency "excon",          "~> 0.45"
 
-  spec.add_development_dependency "bundler",  "~> 1.8"
-  spec.add_development_dependency "rake",     "~> 10.0"
-  spec.add_development_dependency "rspec",    "~> 3.2"
-  spec.add_development_dependency "fuubar",   "~> 2.0"
+  spec.add_development_dependency "bundler",        "~> 1.8"
+  spec.add_development_dependency "rake",           "~> 10.0"
+  spec.add_development_dependency "rspec",          "~> 3.2"
+  spec.add_development_dependency "fuubar",         "~> 2.0"
+  spec.add_development_dependency "pry",            "~> 0.10"
+  spec.add_development_dependency "awesome_print",  "~> 1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stretchy
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - agius
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-21 00:00:00.000000000 Z
+date: 2015-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch
@@ -94,6 +94,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
 description: Build queries for Elasticsearch with a chainable interface like ActiveRecord's.
 email:
 - andrew@atevans.com
@@ -113,6 +141,15 @@ files:
 - lib/stretchy/boosts/filter_boost.rb
 - lib/stretchy/boosts/geo_boost.rb
 - lib/stretchy/boosts/random_boost.rb
+- lib/stretchy/builders/boost_builder.rb
+- lib/stretchy/builders/match_builder.rb
+- lib/stretchy/builders/where_builder.rb
+- lib/stretchy/clauses/base.rb
+- lib/stretchy/clauses/boost_clause.rb
+- lib/stretchy/clauses/boost_match_clause.rb
+- lib/stretchy/clauses/boost_where_clause.rb
+- lib/stretchy/clauses/match_clause.rb
+- lib/stretchy/clauses/where_clause.rb
 - lib/stretchy/errors/contract_error.rb
 - lib/stretchy/filters/and_filter.rb
 - lib/stretchy/filters/base.rb
@@ -123,14 +160,14 @@ files:
 - lib/stretchy/filters/query_filter.rb
 - lib/stretchy/filters/range_filter.rb
 - lib/stretchy/filters/terms_filter.rb
-- lib/stretchy/null_query.rb
 - lib/stretchy/queries/base.rb
+- lib/stretchy/queries/bool_query.rb
 - lib/stretchy/queries/filtered_query.rb
 - lib/stretchy/queries/function_score_query.rb
 - lib/stretchy/queries/match_all_query.rb
 - lib/stretchy/queries/match_query.rb
-- lib/stretchy/query.rb
-- lib/stretchy/request_body.rb
+- lib/stretchy/results/base.rb
+- lib/stretchy/results/null_results.rb
 - lib/stretchy/utils/client_actions.rb
 - lib/stretchy/utils/configuration.rb
 - lib/stretchy/utils/contract.rb

data/lib/stretchy/null_query.rb

@@ -1,30 +0,0 @@
-module Stretchy
-  class NullQuery
-    def initialize(options = {})
-    end
-
-    def response
-      {}
-    end
-
-    def id_response
-      {}
-    end
-
-    def results
-      []
-    end
-
-    def ids
-      []
-    end
-
-    def shards
-      []
-    end
-
-    def total
-      0
-    end
-  end
-end