slingshot-rb 0.0.8 → 0.0.9

data/test/unit/rubyext_hash_test.rb

@@ -0,0 +1,19 @@
+require 'test_helper'
+
+module Slingshot
+
+  class RubyCoreExtensionsTest < Test::Unit::TestCase
+
+    context "Hash" do
+
+      should "have to_indexed_json doing the same as to_json" do
+        [{}, { 1 => 2 }, { 3 => 4, 5 => 6 }, { nil => [7,8,9] }].each do |h|
+          assert_equal Yajl::Parser.parse(h.to_json), Yajl::Parser.parse(h.to_indexed_json)
+        end
+      end
+
+    end
+
+  end
+
+end

data/test/unit/search_facet_test.rb

@@ -13,35 +13,53 @@ module Slingshot::Search
       context "generally" do
 
         should "encode facets with defaults for current query" do
-          assert_equal( { :foo => { :terms => {:field=>'bar',:size=>10} } }.to_json, Facet.new('foo').terms(:bar).to_json )
+          assert_equal( { :foo => { :terms => {:field=>'bar',:size=>10,:all_terms=>false} } }.to_json,
+                        Facet.new('foo').terms(:bar).to_json )
         end
 
         should "encode facets as global" do
-          assert_equal( { :foo => { :terms => {:field=>'bar',:size=>10}, :global => true } }.to_json,
+          assert_equal( { :foo => { :terms => {:field=>'bar',:size=>10,:all_terms=>false}, :global => true } }.to_json,
                         Facet.new('foo', :global => true).terms(:bar).to_json )
         end
 
         should "encode facet options" do
-          assert_equal( { :foo => { :terms => {:field=>'bar',:size=>5} } }.to_json,
-                        Facet.new('foo').terms(:bar, 5).to_json )
+          assert_equal( { :foo => { :terms => {:field=>'bar',:size=>5,:all_terms=>false} } }.to_json,
+                        Facet.new('foo').terms(:bar, :size => 5).to_json )
         end
 
         should "encode facets when passed as a block" do
           f = Facet.new('foo') do
             terms :bar
           end
-          assert_equal( { :foo => { :terms => {:field=>'bar',:size=>10} } }.to_json, f.to_json )
+          assert_equal( { :foo => { :terms => {:field=>'bar',:size=>10,:all_terms=>false} } }.to_json, f.to_json )
+        end
+
+      end
+
+      context "terms facet" do
+
+        should "encode the default all_terms option" do
+          assert_equal false, Facet.new('foo') { terms :foo }.to_hash['foo'][:terms][:all_terms]
+        end
+
+        should "encode the all_terms option" do
+          assert_equal true, Facet.new('foo') { terms :foo, :all_terms => true }.to_hash['foo'][:terms][:all_terms]
         end
 
       end
 
       context "date histogram" do
 
-        should "encode the JSON" do
-          f = Facet.new('date') { date :published_on, 'day' }
+        should "encode the JSON with default values" do
+          f = Facet.new('date') { date :published_on, :interval => 'day' }
           assert_equal({ :date => { :date_histogram => { :field => 'published_on', :interval => 'day' } } }.to_json, f.to_json)
         end
 
+        should "encode the JSON with custom interval" do
+          f = Facet.new('date') { date :published_on, :interval => 'month' }
+          assert_equal({ :date => { :date_histogram => { :field => 'published_on', :interval => 'month' } } }.to_json, f.to_json)
+        end
+
       end
 
     end

data/test/unit/search_filter_test.rb

@@ -11,6 +11,9 @@ module Slingshot::Search
       end
 
       should "encode simple filter declarations as JSON" do
+        assert_equal( { :terms => {} }.to_json,
+                      Filter.new('terms').to_json )
+
         assert_equal( { :terms => { :tags => ['foo'] } }.to_json,
                       Filter.new('terms', :tags => ['foo']).to_json )
 

data/test/unit/search_query_test.rb

@@ -10,6 +10,12 @@ module Slingshot::Search
         assert_respond_to Query.new, :to_json
       end
 
+      should "allow a block to be given" do
+        assert_equal( { :term => { :foo => 'bar' } }.to_json, Query.new do
+          term(:foo, 'bar')
+        end.to_json)
+      end
+
       should "allow search for single term" do
         assert_equal( { :term => { :foo => 'bar' } }, Query.new.term(:foo, 'bar') )
       end
@@ -37,6 +43,11 @@ module Slingshot::Search
         assert_equal( { :match_all => { } }, Query.new.all )
       end
 
+      should "search for documents by IDs" do
+        assert_equal( { :ids => { :values => [1, 2], :type => 'foo' }  },
+                      Query.new.ids([1, 2], 'foo') )
+      end
+
     end
 
   end

data/test/unit/search_sort_test.rb

@@ -35,6 +35,14 @@ module Slingshot::Search
         assert_equal [ :foo, {:bar => 'desc'}, :_score ].to_json, s.to_json
       end
 
+      should "encode fields deeper in json" do
+        s = Sort.new { field 'author.name' }
+        assert_equal [ 'author.name' ].to_json, s.to_json
+
+        s = Sort.new { field 'author.name', :desc }
+        assert_equal [ {'author.name' => 'desc'} ].to_json, s.to_json
+      end
+
     end
 
   end

data/test/unit/search_test.rb

@@ -15,6 +15,20 @@ module Slingshot
         assert_respond_to Search::Search.new('index'), :query
       end
 
+      should "allow to pass block to query" do
+        Search::Query.any_instance.expects(:instance_eval)
+
+        Search::Search.new('index').query { string 'foo' }
+      end
+
+      should "allow to pass block with argument to query, allowing to use local variables from outer scope" do
+        foo = 'bar'
+        query_block = lambda { |query| query.string foo }
+        Search::Query.any_instance.expects(:instance_eval).never
+
+        Search::Search.new('index').query &query_block
+      end
+
       should "store indices as an array" do
         s = Search::Search.new('index1') do;end
         assert_equal ['index1'], s.indices

data/test/unit/slingshot_test.rb

@@ -9,7 +9,45 @@ module Slingshot
       should "have the DSL methods available" do
         assert_respond_to Slingshot, :search
         assert_respond_to Slingshot, :index
+        assert_respond_to Slingshot, :configure
       end
+
+      context "DSL" do
+
+        should "allow searching with a block" do
+          Search::Search.expects(:new).returns( stub(:perform => true) )
+
+          Slingshot.search 'dummy' do
+            query 'foo'
+          end
+        end
+
+        should "allow searching with a Ruby Hash" do
+          Slingshot::Configuration.client.expects(:post).
+            with('http://localhost:9200/dummy/_search','{"query":{"query_string":{"query":"foo"}}}').
+            returns( stub(:body => '{}') )
+          Slingshot::Results::Collection.expects(:new)
+
+          Slingshot.search 'dummy', :query => { :query_string => { :query => 'foo' }}
+        end
+
+        should "allow searching with a JSON string" do
+          Slingshot::Configuration.client.expects(:post).
+            with('http://localhost:9200/dummy/_search','{"query":{"query_string":{"query":"foo"}}}').
+            returns( stub(:body => '{}') )
+          Slingshot::Results::Collection.expects(:new)
+
+          Slingshot.search 'dummy', '{"query":{"query_string":{"query":"foo"}}}'
+        end
+
+        should "raise an error when passed incorrect payload" do
+          assert_raise(ArgumentError) do
+            Slingshot.search 'dummy', 1
+          end
+        end
+
+      end
+
     end
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: slingshot-rb
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Karel Minarik
@@ -15,13 +15,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-24 00:00:00 +02:00
+date: 2011-05-01 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: rake
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 8
+        - 0
+        version: 0.8.0
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -33,11 +49,11 @@ dependencies:
         - 0
         version: 1.0.0
   type: :runtime
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rest-client
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -49,27 +65,43 @@ dependencies:
         - 0
         version: 1.6.0
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: yajl-ruby
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">"
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 63
         segments: 
         - 0
-        - 7
-        - 9
-        version: 0.7.9
+        - 8
+        - 0
+        version: 0.8.0
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: activemodel
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: turn
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -79,11 +111,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: shoulda
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -93,11 +125,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -107,11 +139,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id006
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: sdoc
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -121,11 +153,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id007
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: rcov
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -135,8 +167,36 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id008
-description: "   Ruby API for the ElasticSearch search engine/database.\n   A work in progress, currently.\n"
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: supermodel
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id012
+description: "   Slingshot is a Ruby client for the ElasticSearch search engine/database.\n\n   It provides Ruby-like API for fluent communication with the ElasticSearch server\n   and blends with ActiveModel class for convenient usage in Rails applications.\n\n   It allows to delete and create indices, define mapping for them, supports\n   the bulk API, and presents an easy-to-use DSL for constructing your queries.\n\n   It has full ActiveRecord/ActiveModel compatibility, allowing you to index\n   your models (incrementally upon saving, or in bulk), searching and\n   paginating the results.\n"
 email: karmi@karmi.cz
 executables: []
 
@@ -152,6 +212,7 @@ files:
 - README.markdown
 - Rakefile
 - examples/dsl.rb
+- examples/rails-application-template.rb
 - examples/slingshot-dsl.rb
 - lib/slingshot-rb.rb
 - lib/slingshot.rb
@@ -160,15 +221,27 @@ files:
 - lib/slingshot/dsl.rb
 - lib/slingshot/index.rb
 - lib/slingshot/logger.rb
+- lib/slingshot/model/callbacks.rb
+- lib/slingshot/model/import.rb
+- lib/slingshot/model/indexing.rb
+- lib/slingshot/model/naming.rb
+- lib/slingshot/model/persistence.rb
+- lib/slingshot/model/persistence/attributes.rb
+- lib/slingshot/model/persistence/finders.rb
+- lib/slingshot/model/persistence/storage.rb
+- lib/slingshot/model/search.rb
 - lib/slingshot/results/collection.rb
 - lib/slingshot/results/item.rb
+- lib/slingshot/results/pagination.rb
 - lib/slingshot/rubyext/hash.rb
+- lib/slingshot/rubyext/symbol.rb
 - lib/slingshot/search.rb
 - lib/slingshot/search/facet.rb
 - lib/slingshot/search/filter.rb
 - lib/slingshot/search/highlight.rb
 - lib/slingshot/search/query.rb
 - lib/slingshot/search/sort.rb
+- lib/slingshot/tasks.rb
 - lib/slingshot/version.rb
 - slingshot.gemspec
 - slingshot.png
@@ -177,22 +250,39 @@ files:
 - test/fixtures/articles/3.json
 - test/fixtures/articles/4.json
 - test/fixtures/articles/5.json
+- test/integration/active_model_searchable_test.rb
+- test/integration/active_record_searchable_test.rb
 - test/integration/facets_test.rb
 - test/integration/filters_test.rb
 - test/integration/highlight_test.rb
 - test/integration/index_mapping_test.rb
 - test/integration/index_store_test.rb
+- test/integration/persistent_model_test.rb
 - test/integration/query_string_test.rb
 - test/integration/results_test.rb
 - test/integration/sort_test.rb
+- test/models/active_model_article.rb
+- test/models/active_model_article_with_callbacks.rb
+- test/models/active_model_article_with_custom_index_name.rb
+- test/models/active_record_article.rb
 - test/models/article.rb
+- test/models/persistent_article.rb
+- test/models/persistent_articles_with_custom_index_name.rb
+- test/models/supermodel_article.rb
+- test/models/validated_model.rb
 - test/test_helper.rb
+- test/unit/active_model_lint_test.rb
 - test/unit/client_test.rb
 - test/unit/configuration_test.rb
 - test/unit/index_test.rb
 - test/unit/logger_test.rb
+- test/unit/model_callbacks_test.rb
+- test/unit/model_import_test.rb
+- test/unit/model_persistence_test.rb
+- test/unit/model_search_test.rb
 - test/unit/results_collection_test.rb
 - test/unit/results_item_test.rb
+- test/unit/rubyext_hash_test.rb
 - test/unit/search_facet_test.rb
 - test/unit/search_filter_test.rb
 - test/unit/search_highlight_test.rb
@@ -235,29 +325,46 @@ rubyforge_project: slingshot
 rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
-summary: Ruby API for ElasticSearch
+summary: Ruby client for ElasticSearch
 test_files: 
 - test/fixtures/articles/1.json
 - test/fixtures/articles/2.json
 - test/fixtures/articles/3.json
 - test/fixtures/articles/4.json
 - test/fixtures/articles/5.json
+- test/integration/active_model_searchable_test.rb
+- test/integration/active_record_searchable_test.rb
 - test/integration/facets_test.rb
 - test/integration/filters_test.rb
 - test/integration/highlight_test.rb
 - test/integration/index_mapping_test.rb
 - test/integration/index_store_test.rb
+- test/integration/persistent_model_test.rb
 - test/integration/query_string_test.rb
 - test/integration/results_test.rb
 - test/integration/sort_test.rb
+- test/models/active_model_article.rb
+- test/models/active_model_article_with_callbacks.rb
+- test/models/active_model_article_with_custom_index_name.rb
+- test/models/active_record_article.rb
 - test/models/article.rb
+- test/models/persistent_article.rb
+- test/models/persistent_articles_with_custom_index_name.rb
+- test/models/supermodel_article.rb
+- test/models/validated_model.rb
 - test/test_helper.rb
+- test/unit/active_model_lint_test.rb
 - test/unit/client_test.rb
 - test/unit/configuration_test.rb
 - test/unit/index_test.rb
 - test/unit/logger_test.rb
+- test/unit/model_callbacks_test.rb
+- test/unit/model_import_test.rb
+- test/unit/model_persistence_test.rb
+- test/unit/model_search_test.rb
 - test/unit/results_collection_test.rb
 - test/unit/results_item_test.rb
+- test/unit/rubyext_hash_test.rb
 - test/unit/search_facet_test.rb
 - test/unit/search_filter_test.rb
 - test/unit/search_highlight_test.rb