dilute 0.0.2 → 0.0.3

data/lib/dilute/modelize.rb

@@ -20,8 +20,10 @@ module Dilute::Modelize
     end
 
     def all(query = {}, page_size = 10)
-      search_results = type.search(size: page_size, query: {match_all: {}})
-      search_results.raw["hits"]["hits"].collect {|r| new(r) }
+
+      # search_results = type.search(size: page_size, query: {match_all: {}})
+      # search_results.raw["hits"]["hits"].collect {|r| new(r) }
+      Dilute::Query.new(self)
     end
 
     def define_type(options = {}, &blk)

data/lib/dilute/query.rb

@@ -0,0 +1,45 @@
+class Dilute::Query
+  attr_reader :for_class, :options, :chained, :results, :from_elastic_search
+  include Enumerable
+
+  def initialize(for_class, options = {}, chained = true)
+    @for_class, @options, @chained = for_class, options, chained
+  end
+
+  def match(q)
+    merge_or_chain(:match, q)
+  end
+
+  def to_query
+    query = options.reject {|k,v| v.nil? || v.empty? }
+    query[:match_all] ||= {} unless query[:match]
+    query
+  end
+
+  def execute!
+    @results ||= begin
+      search_results = for_class.type.search(size: 25, query: to_query)
+      @from_elastic_search = search_results
+      search_results.raw["hits"]["hits"].collect {|r| for_class.new(r) }
+    end
+  end
+
+  def to_a
+    execute!
+    results
+  end
+
+  def each(*args, &block)
+    return enum_for(__callee__) unless block_given?
+    to_a.each(*args, &block)
+  end
+
+  private
+
+  def merge_or_chain(key, to_merge)
+    new_options = chained ? options.dup : options
+    new_options[key] ||= {}
+    new_options[key].merge!(to_merge)
+    chained ? self.class.new(for_class, new_options) : new_options[key]
+  end
+end

data/lib/dilute/version.rb

@@ -1,3 +1,3 @@
 module Dilute
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/modelize_integration_spec.rb

@@ -1,15 +1,16 @@
 require_relative "spec_helper"
 require "pry"
+require 'pp'
 
 describe Dilute::Modelize do
   let(:dilute_class) do
     Class.new do
       include Dilute::Modelize
 
-      define_type(index_name: :dilute_test_suite, type_name: :abstract) do
+      define_type(type_name: :abstract) do
         attribute(:data).not_indexed
         attribute(:header).not_indexed
-        attribute(:keys).index_analyzer("keyword")
+        attribute(:keys).not_indexed# .index_analyzer("keyword")
         attribute(:created_at, :date)
       end
     end
@@ -33,15 +34,38 @@ describe Dilute::Modelize do
     expect(dilute_class.find(saved.id).data).to eq(test_data)
   end
 
-  it "should retreive many saved documents" do
-    destroy_test_index!
-    10.times { dilute_class.new({data: test_data}).save }
-    sleep 1
-    expect(dilute_class.all({}, 5)).to have(5).items
-  end
-
   it "I have no idea what I'm doing." do
     true
+    # That's why you see the sleep 1s and such.
+  end
+
+  context "searching" do
+    before { destroy_test_index! }
+    it "should find docs" do
+      destroy_test_index!
+      saved
+      sleep 1
+      all = dilute_class.all
+      expect(all.to_a).to have(1).item
+      expect(all.first.data).to eq(test_data)
+    end
+
+    it "should find docs matching pattern" do
+      dilute_class.new({keys: %w(taga tagb tagc)}).save
+      dilute_class.new({keys: %w(tagb tagc)}).save
+      sleep 1
+      search = dilute_class.all.match(keys: "taga")
+      expect(search.to_a).to have(1).item
+    end
+
+    it "should find docs matching very short word" do
+      dilute_class.new({keys: %w(a)}).save
+      dilute_class.new({keys: %w(b)}).save
+      sleep 1
+      search = dilute_class.all.match(keys: "a")
+      expect(search.to_a).to have(1).item
+    end
+
   end
 
   context "infering the index name" do
@@ -63,8 +87,6 @@ describe Dilute::Modelize do
       expect(new_diluted.attributes["_index"]).to eq "default_dilute_index_name"
       expect(new_diluted.attributes["_type"]).to eq "test_name_for_dilutes"
     end
-
-
   end
 
 end

data/spec/query_spec.rb

@@ -0,0 +1,20 @@
+require_relative "spec_helper"
+
+describe Dilute::Query do
+
+  let(:model_class) { Class.new }
+  let(:query) { Dilute::Query.new(model_class) }
+
+  it "should create new" do
+    expect(query).to be_kind_of Dilute::Query
+  end
+
+  it "should chain match queries" do
+    expect(query.match({foo: "bar"})).to be_kind_of Dilute::Query
+  end
+
+  it "should have updated options in chained query" do
+    expect(query.match({foo: "bar"}).options[:match]).to eq({foo: "bar"})
+  end
+
+end

data/spec/spec_helper.rb

@@ -22,5 +22,9 @@ def destroy_test_index!
   require "stretcher"
   server = Stretcher::Server.new("http://localhost:9200", log_level: :info)
   index  = server.index("default_dilute_index_name")
-  index.delete
+  begin
+    index.delete
+  rescue Stretcher::RequestError::NotFound
+    # Index didn't exist to begin with.
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dilute
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-24 00:00:00.000000000 Z
+date: 2013-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stretcher
@@ -142,9 +142,11 @@ files:
 - lib/dilute.rb
 - lib/dilute/attribute.rb
 - lib/dilute/modelize.rb
+- lib/dilute/query.rb
 - lib/dilute/type.rb
 - lib/dilute/version.rb
 - spec/modelize_integration_spec.rb
+- spec/query_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses:
@@ -159,12 +161,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3890611216473297716
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3890611216473297716
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -173,5 +181,5 @@ specification_version: 3
 summary: An ActiveRecord-ish thing for using ElasticSearch through Stretcher.
 test_files:
 - spec/modelize_integration_spec.rb
+- spec/query_spec.rb
 - spec/spec_helper.rb
-has_rdoc: