stretchy 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 124aff086e4d044125b18f641bce3e440a3bec66
-  data.tar.gz: ee1b4ddda1669c13c7c17a9189fd1cda072f77b6
+  metadata.gz: 0a7be2bbcc9690d42a0a9ca01601b4936b52dcf2
+  data.tar.gz: a53b3d3201f42f90f807324ec96b6d1049a4037c
 SHA512:
-  metadata.gz: 7a4375aca6e56a4755a693b3d346f945fe6d7aebe819064cbbeeb7e80e66588645ab17be24f8ed88b1ca89738d8eb6f9755cf2f79ccd35c9a60c8a862fd160e3
-  data.tar.gz: dac8575ff96c77ea601051da8fb08489c19c3b17245deed2ff6be48ed58fd2ad9054848025c52a43980a7112ac3277ad604c73ae0f1b1904a6d7eedab42d0715
+  metadata.gz: 1171e1dfe7ce1255a911bdd471d6c40aab58b1fa90ba88016d4dff49d0e463effcf9b1194d7e9470d3186e40905ffc7aca941c32a1c45458231aa2376c6993b1
+  data.tar.gz: 731cd339625a1a8ffbd398066d751a5424831f5f210eed1dd6ecd152cc27e93424042c8ad7da7d851858899c2b4cb05093382e1a41885dca4e3981949daee182

data/lib/stretchy/filters/not_filter.rb

@@ -4,22 +4,25 @@ module Stretchy
   module Filters
     class NotFilter < Base
 
-      contract :filter, type: Base
+      attr_reader :filters
 
-      def initialize(filters)
-        filters = Array(filters)
+      contract :filters, { type: Base, array: true, required: true }
 
-        if filters.count == 1
-          @filter = filters.first
+      def initialize(*filters)
+        @filters = Array(filters).flatten
+        validate!
+      end
+
+      def filter
+        if @filters.count > 1
+          AndFilter.new(@filters)
         else
-          @filter = AndFilter.new(filters)
+          @filters.first
         end
-
-        validate!
       end
 
       def to_search
-        { not: @filter.to_search }
+        { not: filter.to_search }
       end
     end
   end

data/lib/stretchy/results/base.rb

@@ -2,14 +2,31 @@ module Stretchy
   module Results
     class Base
 
-      def initialize(request_json, options = {})
-        @request  = request_json
-        @index    = options[:index]
-        @type     = options[:type]
+      extend Forwardable
+
+      attr_reader :clause, :index_name
+
+      delegate [:type] => :clause
+
+      def initialize(clause)
+        @clause     = clause
+        @index_name = clause.index_name || Stretchy.index_name
+      end
+
+      def limit
+        clause.get_limit
+      end
+
+      def offset
+        clause.get_offset
+      end
+
+      def request
+        @request ||= {query: clause.to_search}
       end
 
       def response
-        @response ||= Stretchy.search(type: @type, body: request_json)
+        @response ||= Stretchy.search(type: type, body: request, from: offset, size: limit)
       end
 
       def ids
@@ -42,6 +59,4 @@ module Stretchy
 
     end
   end
-end
-
-require 'stretchy/results/null_results'
+end

data/lib/stretchy/results/null_results.rb

@@ -6,6 +6,24 @@ module Stretchy
       # use this class when you don't want to actually run
       # a search, or catch an exception or something
 
+      def initialize(clause = nil)
+        @clause       = clause
+        @index_name   = clause.index_name if clause.is_a?(Stretchy::Clauses::Base)
+        @index_name ||= Stretchy.index_name
+      end
+
+      def request
+        {}
+      end
+
+      def limit
+        0
+      end
+
+      def offset
+        0
+      end
+
       def response
         @response ||= {
           'took'      => 0,

data/lib/stretchy/utils/client_actions.rb

@@ -21,20 +21,28 @@ module Stretchy
         Stretchy::Clauses::Base.new(*args, &block)
       end
 
-      def search(type:, body:, fields: nil)
-        options = { index: index_name, type: type, body: body }
-        options[:fields] = fields if fields.is_a?(Array)
+      def search(options = {})
+        params = {}
+        params[:index]  = options[:index] || index_name
+        params[:type]   = options[:type]
+        params[:fields] = Array(options[:fields]) if options[:fields]
+        params[:body]   = options[:body]
 
-        client.search(options)
+        client.search(params)
       end
 
-      def index(type:, body:, id: nil)
-        id ||= body['id'] || body['_id'] || body[:id] || body[:_id]
-        client.index(index: index_name, type: type, id: id, body: body)
+      def index(options = {})
+        index = options[:index] || index_name
+        type  = options[:type]
+        body  = options[:body]
+        id    = options[:id] || options['id'] || body['id'] || body['_id'] || body[:id] || body[:_id]
+        client.index(index: index, type: type, id: id, body: body)
       end
 
-      def bulk(type:, documents:)
-        requests = documents.flat_map do |document|
+      def bulk(options = {})
+        type      = options[:type]
+        documents = options[:documents]
+        requests  = documents.flat_map do |document|
           id = document['id'] || document['_id'] || document[:id] || document[:_id]
           [
             { index: { '_index' => index_name, '_type' => type, '_id' => id } },

data/lib/stretchy/utils/contract.rb

@@ -17,6 +17,7 @@ module Stretchy
           
           if options[:array]
             self.class.assert_type(name, value, type: Array)
+            self.class.assert_required(name, value, {}) if options[:required]
           end
 
           ASSERTIONS.each do |assertion|
@@ -60,7 +61,7 @@ module Stretchy
         end
 
         def assert_required(name, value, options)
-          msg = "Expected to have param #{name}, but got nil"
+          msg = "Expected to have param #{name}, but got an #{value.inspect}"
           fail_assertion(msg) if is_empty?(value)
         end
 

data/lib/stretchy/version.rb

@@ -1,3 +1,3 @@
 module Stretchy
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stretchy
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - agius
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-05-07 00:00:00.000000000 Z
+date: 2015-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch