tire 0.1.2 → 0.1.3

data/lib/tire/results/collection.rb

@@ -21,7 +21,7 @@ module Tire
                        document.update( {'id' => h['_id']} )
 
                        # Update the document with meta information
-                       ['_score', '_version', 'sort', 'highlight'].each { |key| document.update( {key => h[key]} || {} ) }
+                       ['_score', '_type', '_index', '_version', 'sort', 'highlight'].each { |key| document.update( {key => h[key]} || {} ) }
 
                        object = Configuration.wrapper.new(document)
                        # TODO: Figure out how to circumvent mass assignment protection for id in ActiveRecord

data/lib/tire/results/pagination.rb

@@ -9,7 +9,7 @@ module Tire
 
       def total_pages
         result = @total.to_f / (@options[:per_page] ? @options[:per_page].to_i : 10 )
-        result < 1 ? 1 : result.round
+        result < 1 ? 1 : result.ceil
       end
 
       def current_page

data/lib/tire/version.rb

@@ -1,3 +1,3 @@
 module Tire
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/test/unit/results_collection_test.rb

@@ -41,7 +41,7 @@ module Tire
       context "wrapping results" do
 
         setup do
-          @response = { 'hits' => { 'hits' => [ { '_id' => 1, '_score' => 0.5, '_source' => { :title => 'Test', :body => 'Lorem' } } ] } }
+          @response = { 'hits' => { 'hits' => [ { '_id' => 1, '_score' => 0.5, '_index' => 'testing', '_type' => 'article', '_source' => { :title => 'Test', :body => 'Lorem' } } ] } }
         end
 
         should "wrap hits in Item by default" do
@@ -83,6 +83,16 @@ module Tire
           assert_equal 1, document.id
         end
 
+        should "return index" do
+          document =  Results::Collection.new(@response).first
+          assert_equal "testing", document._index
+        end
+
+        should "return type" do
+          document =  Results::Collection.new(@response).first
+          assert_equal "article", document._type
+        end
+
       end
 
       context "while paginating results" do
@@ -90,19 +100,24 @@ module Tire
         setup do
           @default_response = { 'hits' => { 'hits' => [{'_id' => 1, '_score' => 1, '_source' => {:title => 'Test'}},
                                                        {'_id' => 2},
-                                                       {'_id' => 3}],
-                                            'total' => 3,
+                                                       {'_id' => 3},
+                                                       {'_id' => 4}],
+                                            'total' => 4,
                                             'took'  => 1 } }
           @collection = Results::Collection.new( @default_response, :per_page => 1, :page => 2 )
         end
 
         should "return total entries" do
-          assert_equal 3, @collection.total
-          assert_equal 3, @collection.total_entries
+          assert_equal 4, @collection.total
+          assert_equal 4, @collection.total_entries
         end
 
         should "return total pages" do
-          assert_equal 3, @collection.total_pages
+          assert_equal 4, @collection.total_pages
+          @collection = Results::Collection.new( @default_response, :per_page => 2, :page => 2 )
+          assert_equal 2, @collection.total_pages
+          @collection = Results::Collection.new( @default_response, :per_page => 3, :page => 2 )
+          assert_equal 2, @collection.total_pages
         end
 
         should "return total pages when per_page option not set" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tire
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Karel Minarik
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-03 00:00:00 +02:00
+date: 2011-05-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency