tanker 1.1.1 → 1.1.2

data/Gemfile

@@ -1,15 +1,17 @@
 source "http://rubygems.org"
 
-gem 'jeweler'
 gem 'json', '>= 1.5.1'
-gem 'will_paginate', '>= 2.3.15'
-gem 'kaminari'
 
 group :test do 
   gem 'rspec', '>= 2.5.0'
-  gem 'ruby-debug19'
   gem 'activerecord', '>= 3.0.7'
   gem 'sqlite3'
 end
 
+group :development do
+  gem 'jeweler'
+  gem 'will_paginate', '>= 2.3.15'
+  gem 'kaminari'
+end
+
 

data/README.rdoc

@@ -139,12 +139,12 @@ Disable pagination of search results
 
 == Fetching attributes and snippets
 
-As of version 1.1 Tanker supports fetching attributes and snippets directly from the Index. If you use either of this search options
+As of version 1.1 Tanker supports fetching attributes and snippets directly from the Index. If you use either of these search options
 your Model instances will be instanced from the attributes coming from the index not by making another trip to the database.
 
 This can represent a major speed increase for your queries but it also means that you will only have available the attributes
 you indexed in your model. There are edge cases that are not tested so please help us have this feature be super stable and
-have everyone bennefit from the speed this entails.
+have everyone benefit from the speed this entails.
 
 Example:
   

data/Rakefile

@@ -9,9 +9,8 @@ begin
     gem.description = %Q{IndexTank is a great search indexing service, this gem tries to make any orm keep in sync with indextank with ease}
     gem.email = "kidpollo@gmail.com"
     gem.homepage = "http://github.com/kidpollo/tanker"
-    gem.authors = ["@kidpollo", "Jack Danger Canty"]
-    #gem.add_development_dependency "rspec", ">= 2.0.0.beta.22"
-    #gem.add_dependency 'will_paginate', '>= 2.3.15'
+    gem.authors = ["Francisco Viramontes", "Jack Danger Canty"]
+    gem.files.exclude 'spec/integration_spec.rb'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/lib/tanker.rb

@@ -232,7 +232,7 @@ module Tanker
 
         self.tanker_config.index_name = name
 
-        config = ModelConfig.new(name, block)
+        config = ModelConfig.new(name, {}, block)
         config.indexes.each do |key, value|
           self.tanker_config.indexes << [key, value]
         end
@@ -286,7 +286,7 @@ module Tanker
     attr_accessor :index_name
     attr_accessor :options
 
-    def initialize(index_name, options = {}, block)
+    def initialize(index_name, options, block)
       @index_name = index_name
       @options    = options
       @indexes    = []

data/lib/tanker/paginated_array.rb

@@ -9,8 +9,9 @@ module Tanker
 
     attr_reader :limit_value, :offset_value, :total_count
 
-    def initialize(original_array, limit_val = default_per_page, offset_val, total_count)
-      @limit_value, @offset_value, @total_count = limit_val, offset_val, total_count
+    def initialize(original_array, limit_val, offset_val, total_count)
+      @limit_value = limit_val || default_per_page
+      @offset_value, @total_count = offset_val, total_count
       super(original_array)
     end
 

data/spec/tanker_spec.rb

@@ -105,7 +105,8 @@ describe Tanker do
       end
 
       dummy_instance = @dummy_class.new
-      Hash[*dummy_instance.tanker_config.indexes.flatten].keys.should == [:something, :something_else]
+      Hash[*dummy_instance.tanker_config.indexes.flatten].keys.include?(:something).should == true       
+      Hash[*dummy_instance.tanker_config.indexes.flatten].keys.include?(:something_else).should == true
     end
 
     it 'should overwrite previously indexed fields if re-indexed' do
@@ -176,7 +177,8 @@ describe Tanker do
 
       dummy_instance = dummy_class.new
       dummy_instance.tanker_config.index_name.should == 'another index'
-      Hash[*dummy_instance.tanker_config.indexes.flatten].keys.should == [:name, :email]
+      Hash[*dummy_instance.tanker_config.indexes.flatten].keys.include?(:name).should == true
+      Hash[*dummy_instance.tanker_config.indexes.flatten].keys.include?(:email).should == true
 
       Tanker.instance_variable_set(:@included_in, Tanker.included_in - [dummy_class])
     end
@@ -487,7 +489,7 @@ describe Tanker do
     end
   end
 
-  describe "Kaminari support" do
+  describe "with Kaminari support" do
 
     before :all do
       Tanker.configuration = {:url => 'http://api.indextank.com', :pagination_backend => :kaminari}
@@ -497,6 +499,12 @@ describe Tanker do
       Tanker.configuration = {}
     end
 
+    # Need to do this for tests to pass on 1.8.7. If not tanker.rb is
+    # reloaded Tanker::KaminariPaginatedArray const gets removed (!?)
+    before :each do
+      load 'tanker.rb'
+    end
+
     it 'should raise error message if Kaminari gem is not required' do
       Person.tanker_index.should_receive(:search).and_return(
         {

data/tanker.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tanker}
-  s.version = "1.1.1"
+  s.version = "1.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{@kidpollo}, %q{Jack Danger Canty}]
-  s.date = %q{2011-06-06}
+  s.authors = [%q{Francisco Viramontes}, %q{Jack Danger Canty}]
+  s.date = %q{2011-06-13}
   s.description = %q{IndexTank is a great search indexing service, this gem tries to make any orm keep in sync with indextank with ease}
   s.email = %q{kidpollo@gmail.com}
   s.extra_rdoc_files = [
@@ -31,7 +31,6 @@ Gem::Specification.new do |s|
     "lib/tanker/railtie.rb",
     "lib/tanker/tasks/tanker.rake",
     "lib/tanker/utilities.rb",
-    "spec/integration_spec.rb",
     "spec/integration_spec_conf.rb.example",
     "spec/spec_helper.rb",
     "spec/tanker_spec.rb",
@@ -53,19 +52,19 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<jeweler>, [">= 0"])
       s.add_runtime_dependency(%q<json>, [">= 1.5.1"])
-      s.add_runtime_dependency(%q<will_paginate>, [">= 2.3.15"])
-      s.add_runtime_dependency(%q<kaminari>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<will_paginate>, [">= 2.3.15"])
+      s.add_development_dependency(%q<kaminari>, [">= 0"])
     else
-      s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<json>, [">= 1.5.1"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<will_paginate>, [">= 2.3.15"])
       s.add_dependency(%q<kaminari>, [">= 0"])
     end
   else
-    s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<json>, [">= 1.5.1"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<will_paginate>, [">= 2.3.15"])
     s.add_dependency(%q<kaminari>, [">= 0"])
   end

metadata

@@ -2,37 +2,37 @@
 name: tanker
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors: 
-- "@kidpollo"
+- Francisco Viramontes
 - Jack Danger Canty
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-06-06 00:00:00 Z
+date: 2011-06-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: json
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: jeweler
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.1
-  type: :runtime
+        version: "0"
+  type: :development
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -43,7 +43,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         version: 2.3.15
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -54,7 +54,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: *id004
 description: IndexTank is a great search indexing service, this gem tries to make any orm keep in sync with indextank with ease
@@ -81,12 +81,12 @@ files:
 - lib/tanker/railtie.rb
 - lib/tanker/tasks/tanker.rake
 - lib/tanker/utilities.rb
-- spec/integration_spec.rb
 - spec/integration_spec_conf.rb.example
 - spec/spec_helper.rb
 - spec/tanker_spec.rb
 - spec/utilities_spec.rb
 - tanker.gemspec
+- spec/integration_spec.rb
 homepage: http://github.com/kidpollo/tanker
 licenses: []