stretchy 0.5.4 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e89b4db78287311b18d1964f21e210c549e3a20
-  data.tar.gz: 002026655ed60c198509f4f67897d6329fc445e9
+  metadata.gz: e36573d3774c867031bf443889b538d83cd97976
+  data.tar.gz: 90490ce53bb095a4d160b25dc4db38bca87ea92f
 SHA512:
-  metadata.gz: fa27184fa1228b2e6e5107b55087543295074d37e6d3cbae553d0642752f94e1609ddc90fe403b3707c38556207ac9c107f8be07ad2c40358d0d5f6b92eba54c
-  data.tar.gz: 54852ff84be76940874ffd8275a4edbc9e1854de29d699aa25f8d5c1c180292546d3b9fd8a19bba2d31f2b9b596906c781f7de89ac389758d32b4bcab6f80221
+  metadata.gz: adcd1104eae7977fd773e29bfbaa1e28f56e5c79408c7c3b3d68533ed8afd7e53b9d12f8f12acbba2a33a27b8b9d97bdc32aebcb0a5ac004013fb084dfa4b51d
+  data.tar.gz: 6bc2768805817f20749aa6eb2f8ef615cc71b1b87a8ae5b3eca4cc5d85e2f08b702a4793bd1e5f11bc7cb1bc9c450f4c60af054ac23b4e300195dd153d62e25d

data/.rubocop.yml

@@ -0,0 +1,260 @@
+# This configuration was generated by `rubocop --auto-gen-config`
+# on 2015-12-09 14:43:24 -0800 using RuboCop version 0.32.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Lint/BlockAlignment:
+  Enabled: false
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: AlignWith, SupportedStyles, AutoCorrect.
+Lint/EndAlignment:
+  Enabled: false
+
+# Offense count: 1
+Lint/HandleExceptions:
+  Enabled: false
+
+# Offense count: 3
+# Cop supports --auto-correct.
+Lint/UnusedBlockArgument:
+  Enabled: true
+
+# Offense count: 2
+Lint/UselessAssignment:
+  Enabled: true
+
+# Offense count: 5
+Metrics/AbcSize:
+  Max: 15
+
+# Offense count: 2
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 250
+
+# Offense count: 1
+Metrics/CyclomaticComplexity:
+  Max: 7
+
+# Offense count: 3
+# Configuration parameters: AllowURI, URISchemes.
+Metrics/LineLength:
+  Max: 80
+
+# Offense count: 8
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 20
+
+# Offense count: 2
+# Configuration parameters: CountComments.
+Metrics/ModuleLength:
+  Max: 250
+
+# Offense count: 14
+# Cop supports --auto-correct.
+Style/Alias:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle, SupportedLastArgumentHashStyles.
+Style/AlignHash:
+  Enabled: false
+
+# Offense count: 7
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods.
+Style/BlockDelimiters:
+  Enabled: false
+
+# Offense count: 3
+# Cop supports --auto-correct.
+Style/BlockEndNewline:
+  Enabled: false
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/BracesAroundHashParameters:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/ClosingParenthesisIndentation:
+  Enabled: false
+
+# Offense count: 18
+Style/Documentation:
+  Enabled: false
+
+# Offense count: 3
+Style/DoubleNegation:
+  Enabled: false
+
+# Offense count: 5
+# Cop supports --auto-correct.
+Style/ElseAlignment:
+  Enabled: false
+
+# Offense count: 16
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/EmptyLinesAroundBlockBody:
+  Enabled: false
+
+# Offense count: 6
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/EmptyLinesAroundClassBody:
+  Enabled: false
+
+# Offense count: 6
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/EmptyLinesAroundModuleBody:
+  Enabled: false
+
+# Offense count: 4
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/FirstParameterIndentation:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, UseHashRocketsWithSymbolValues.
+Style/HashSyntax:
+  Enabled: false
+
+# Offense count: 16
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/IndentHash:
+  Enabled: false
+
+# Offense count: 18
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/IndentationConsistency:
+  Enabled: false
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: Width.
+Style/IndentationWidth:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/LineEndConcatenation:
+  Enabled: false
+
+# Offense count: 3
+# Cop supports --auto-correct.
+Style/MultilineBlockLayout:
+  Enabled: false
+
+# Offense count: 10
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/MultilineOperationIndentation:
+  Enabled: false
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: PreferredDelimiters.
+Style/PercentLiteralDelimiters:
+  Enabled: false
+
+# Offense count: 1
+# Configuration parameters: NamePrefix, NamePrefixBlacklist.
+Style/PredicateName:
+  Enabled: false
+
+# Offense count: 3
+# Configuration parameters: SupportedStyles.
+Style/RaiseArgs:
+  EnforcedStyle: compact
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/RedundantSelf:
+  Enabled: false
+
+# Offense count: 4
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/SignalException:
+  Enabled: false
+
+# Offense count: 4
+# Cop supports --auto-correct.
+Style/SingleSpaceBeforeFirstArg:
+  Enabled: false
+
+# Offense count: 9
+# Cop supports --auto-correct.
+Style/SpaceAfterComma:
+  Enabled: false
+
+# Offense count: 6
+# Cop supports --auto-correct.
+# Configuration parameters: MultiSpaceAllowedForOperators.
+Style/SpaceAroundOperators:
+  Enabled: false
+
+# Offense count: 5
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/SpaceBeforeBlockBraces:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/SpaceBeforeSemicolon:
+  Enabled: false
+
+# Offense count: 25
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
+Style/SpaceInsideBlockBraces:
+  Enabled: false
+
+# Offense count: 145
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SupportedStyles.
+Style/SpaceInsideHashLiteralBraces:
+  Enabled: false
+
+# Offense count: 33
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/StringLiterals:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: ExactNameMatch, AllowPredicates, AllowDSLWriters, IgnoreClassMethods, Whitelist.
+Style/TrivialAccessors:
+  Enabled: false
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/UnneededPercentQ:
+  Enabled: false
+
+# Align with the style guide.
+Style/CollectionMethods:
+  PreferredMethods:
+    collect: 'map'
+    collect!: 'map!'
+    inject: 'reduce'
+    detect: 'find'
+    find_all: 'select'

data/.ruby-version

@@ -1 +1 @@
-2.2.2
+2.2.3

data/CHANGELOG.md

@@ -0,0 +1,12 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](http://semver.org/), although
+"minor" (0.x) changes will include breaking changes until a stable 1.0 release.
+
+## [Unreleased]
+
+## [0.6.0] - 2015-12-15
+### Changed
+
+* [FEATURE] compatible with [new query / filter contexts](https://www.elastic.co/guide/en/elasticsearch/reference/current/query-filter-context.html) for Elasticsearch 2.0+
+

data/Dockerfile

@@ -0,0 +1,8 @@
+FROM ruby:2.2.0
+RUN apt-get update -qq && apt-get install -y build-essential libpq-dev
+RUN gem install bundler
+RUN mkdir /stretchy
+WORKDIR /stretchy
+ADD . /stretchy
+RUN bundle install
+

data/docker-compose.yml

@@ -0,0 +1,13 @@
+elastic:
+  image: elasticsearch:2.1
+web:
+  build: .
+  command: bundle exec rake
+  environment:
+    ELASTICSEARCH_URL: 'elastic:9200'
+  volumes:
+    - .:/stretchy
+  ports:
+    - "3000:3000"
+  links:
+    - elastic

data/lib/stretchy/and_collector.rb

@@ -24,131 +24,54 @@ module Stretchy
     def node
       @node ||= if boost_nodes.any?
         function_score_node
-      elsif filter_nodes.any?
-        filtered_query_node
       elsif query_nodes.any?
-        single_query_node
+        query_node
       else
         Node.new({match_all: {}}, context)
       end
     end
 
     def query_nodes
-      @query_nodes ||= collect_nodes nodes do |n|
-        n.context?(:query)  &&
-        !n.context?(:boost) &&
-        !n.context?(:filter)
-      end
-    end
-
-    def filter_node
-      @filter_node ||= if query_nodes.any?
-        if boost_nodes.any?
-          Node.new({query: function_score_node.json}, context)
-        elsif filter_nodes.any?
-          Node.new({query: filtered_query_node.json}, context)
-        else
-          Node.new({query: single_query_node.json}, context)
-        end
-      else
-        Node.new(compile_nodes(filter_nodes).json, context)
-      end
-    end
-
-    def filter_json
-      filter_node.json
-    end
-
-    def filter_nodes
-      @filter_nodes ||= begin
-        node_arr = collect_nodes nodes do |n|
-          n.context?(:filter) &&
-          !n.context?(:query) &&
-          !n.context?(:boost)
-        end
-        node_arr += Array(compile_query_filter_node)
-        node_arr.compact
-      end
-    end
-
-    def query_filter_nodes
-      @query_filter_nodes ||= collect_nodes nodes do |n|
-        n.context?(:filter) &&
-        n.context?(:query)  &&
-        !n.context?(:boost)
-      end
+      @query_nodes ||= nodes.reject {|n| n.context? :boost }
     end
 
     def boost_nodes
-      @boost_nodes ||= collect_nodes nodes do |n|
-        n.context?(:boost)
-      end
+      @boost_nodes ||= nodes.select {|n| n.context? :boost }
     end
 
     private
 
-      def collect_nodes(node_arr)
-        coll = []
-        node_arr.each do |n|
-          next unless yield(n)
-
-          if n.respond_to? :node
-            coll << Node.new(n.node.json, n.context)
-          else
-            coll << n
-          end
+      def query_node
+        if query_nodes.size > 1 || multicontext?(query_nodes)
+          compile_bool query_nodes
+        else
+          query_nodes.first
         end
-        coll.compact
       end
 
-      def compile_nodes(node_arr)
-        if node_arr.size > 1 ||
-           node_arr.any?{|n| n.context?(:must_not) || n.context?(:should)}
-
-          compile_bool(node_arr)
-        else
-          node_arr.first
-        end
+      def multicontext?(node_arr)
+        Array(node_arr).any? {|n| n.context?(:must_not) || n.context?(:should) }
       end
 
       def compile_bool(bool_nodes)
         split_nodes = split_nodes_for_bool(bool_nodes)
-        bool_json = {}
-        if split_nodes[:should_not].size > 0
-          bool_json[:should] = [
-            {
-              bool: {
-                must:     split_nodes[:should].map(&:as_json),
-                must_not: split_nodes[:should_not].map(&:as_json)
-              }
-            }
-          ]
-        else
-          bool_json[:should] = split_nodes[:should].map(&:as_json)
+        refined = bool_ctx.each_with_object(split_nodes) do |k, hash|
+          hash[k] = Array(compile_bool(hash[k])) if multicontext? hash[k]
         end
-        bool_json[:must_not] = split_nodes[:must_not].map(&:as_json)
-        bool_json[:must]     = split_nodes[:must].map(&:as_json)
+        bool_json = Hash[refined.map{|k,v| [k, v.map(&:as_json)] }]
         Node.new(bool: bool_json)
       end
 
+      def bool_ctx
+        [:filter, :must_not, :should]
+      end
+
       def split_nodes_for_bool(bool_nodes)
-        split_nodes = {must: [], must_not: [], should: [], should_not: []}
-        bool_nodes.each do |n|
-          if n.context?(:should)
-            if n.context?(:must_not)
-              split_nodes[:should_not] << n
-            else
-              split_nodes[:should] << n
-            end
-          else
-            if n.context?(:must_not)
-              split_nodes[:must_not] << n
-            else
-              split_nodes[:must] << n
-            end
-          end
+        bool_nodes.each_with_object({}) do |n, hash|
+          key = bool_ctx.find{|c| n.context? c } || :must
+          hash[key] ||= []
+          hash[key] << Node.new(n.json, n.context.merge(key => nil))
         end
-        split_nodes
       end
 
       def compile_boost_functions
@@ -164,36 +87,13 @@ module Stretchy
         end
       end
 
-      def compile_query_filter_node
-        compiled = compile_nodes(query_filter_nodes)
-        Node.new(query: compiled.json) if compiled
-      end
-
       def function_score_node
         function_score_json = compile_function_score_options
         function_score_json[:functions] = compile_boost_functions
-
-        if query_nodes.any?
-          function_score_json[:query]   = filtered_query_node.json
-        elsif filter_nodes.any?
-          function_score_json[:filter]  = filter_node.json
-        end
+        function_score_json[:query] = query_node.json if query_nodes.any?
 
         Node.new({function_score: function_score_json}, context)
       end
 
-      def filtered_query_node
-        filtered_json = {}
-        q = compile_nodes(query_nodes)
-        f = compile_nodes(filter_nodes)
-        filtered_json[:query]   = q.json  if q
-        filtered_json[:filter]  = f.json  if f
-        Node.new({filtered: filtered_json}, context)
-      end
-
-      def single_query_node
-        Node.new(compile_nodes(query_nodes).json, context)
-      end
-
   end
 end

data/lib/stretchy/api.rb

@@ -11,19 +11,11 @@ module Stretchy
 
     attr_reader :collector, :opts, :root, :body, :context
 
+    delegate [:with_context, :json, :as_json] => :collector
+
     delegate [
-      :total,
-      :total_count,
-      :length,
-      :size,
-      :total_pages,
-      :results,
-      :hits,
-      :to_a,
-      :ids,
-      :scores,
-      :explanations,
-      :aggregations
+      :total, :total_count, :length, :size, :total_pages, :results, :hits,
+      :to_a, :ids, :scores, :explanations, :aggregations, :each
     ] => :results_obj
 
     def initialize(opts = {})
@@ -130,20 +122,19 @@ module Stretchy
     end
 
     def range(params = {})
-      require_context!
       add_params params, nil, :range_node
     end
 
     def geo_distance(params = {})
-      add_params params, :filter, :geo_distance_node
+      add_params params, nil, :geo_distance_node
     end
 
     def boost(params = {}, options = {})
-      return add_context(:boost) unless params.any?
+      return add_context(:boost) if Utils.is_empty? params
 
       subcontext = context.merge(boost: true)
       if params.is_a? self.class
-        boost_json = options.merge(filter: params.filter_node.json)
+        boost_json = options.merge(filter: params.json)
         add_nodes Node.new(boost_json, subcontext)
       else
         add_nodes Factory.raw_boost_node(params, subcontext)
@@ -184,21 +175,8 @@ module Stretchy
       results_obj.ids.count
     end
 
-    def method_missing(method, *args, &block)
-      if collector.respond_to?(method)
-        collector.send(method, *args, &block)
-      else
-        super
-      end
-    end
-
     private
 
-      def require_context!
-        return true if context?(:query) || context?(:filter)
-        raise 'You must specify either query or filter context'
-      end
-
       def args_to_context(*args)
         args.reduce({}) do |ctx, item|
           next ctx if item.nil?

data/lib/stretchy/factory.rb

@@ -58,12 +58,13 @@ module Stretchy
     end
 
     def context_nodes(params, context = default_context)
+      # binding.pry
       if context[:boost]
         params_to_boost(params, context)
-      elsif context[:query]
-        params_to_queries(dotify_params(params, context), context)
-      else
+      elsif context[:filter] && !context[:query]
         params_to_filters(dotify_params(params, context), context)
+      else
+        params_to_queries(dotify_params(params, context), context)
       end
     end
 
@@ -74,14 +75,7 @@ module Stretchy
       nodes               = context_nodes(params, subcontext)
       collector           = AndCollector.new(nodes, subcontext)
 
-      if context[:query]
-        Node.new(boost_params.merge(filter: {query: collector.json}), context)
-      else
-        Node.new(
-          boost_params.merge(filter: collector.filter_node.json),
-          context
-        )
-      end
+      Node.new(boost_params.merge(filter: collector.json), context)
     end
 
     def params_to_queries(params, context = default_context)
@@ -119,19 +113,16 @@ module Stretchy
     end
 
     def nested(params, path, context = default_context)
-      type, json = if context[:query]
-        nodes = params_to_queries(params, context)
-        json  = AndCollector.new(nodes, context).json
-        [:query, json]
+      nodes = if context[:filter] && !context[:query]
+        params_to_filters(params, context)
       else
-        nodes = params_to_filters(params, context)
-        json  = AndCollector.new(nodes, context).filter_json
-        [:filter, json]
+        params_to_queries(params, context)
       end
+      json  = AndCollector.new(nodes, context).json
 
       Node.new({nested: {
         path:   path,
-        type => json
+        query:  json
       }}, context)
     end
 

data/lib/stretchy/utils.rb

@@ -5,7 +5,9 @@ module Stretchy
       # detects empty string, empty array, empty hash, nil
       def is_empty?(arg = nil)
         return true if arg.nil?
-        if arg.respond_to?(:any?)
+        if arg.respond_to?(:collector)
+          !arg.collector.any?
+        elsif arg.respond_to?(:any?)
           !arg.any? {|a| !is_empty?(a) }
         elsif arg.respond_to?(:empty?)
           arg.empty?

data/lib/stretchy/version.rb

@@ -1,3 +1,3 @@
 module Stretchy
-  VERSION = "0.5.4"
+  VERSION = "0.6.0"
 end

data/solano.yml

@@ -1,9 +1,9 @@
 ---
-ruby_version: ruby-2.2.2
+ruby_version: ruby-2.2.3
 bundler_version: 1.9.4
 test_pattern:
   - spec/**/*_spec.rb
 elasticsearch:
-  version: '1.6'
+  version: '2.1'
 java:
-  java_version: java-7-openjdk
+  java_version: java-7-openjdk

data/stretchy.gemspec

@@ -22,8 +22,7 @@ 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 "rake",           "~> 10.4"
   spec.add_development_dependency "rspec",          "~> 3.2"
   spec.add_development_dependency "fuubar",         "~> 2.0"
   spec.add_development_dependency "pry",            "~> 0.10"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stretchy
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.6.0
 platform: ruby
 authors:
 - agius
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-12 00:00:00.000000000 Z
+date: 2015-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch
@@ -38,34 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.45'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -145,14 +131,18 @@ extra_rdoc_files: []
 files:
 - ".editorconfig"
 - ".gitignore"
+- ".rubocop.yml"
 - ".ruby-version"
 - ".yardopts"
+- CHANGELOG.md
 - CONTRIBUTING.md
+- Dockerfile
 - Gemfile
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
+- docker-compose.yml
 - lib/stretchy.rb
 - lib/stretchy/and_collector.rb
 - lib/stretchy/api.rb
@@ -185,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Query builder for Elasticsearch