algoliasearch-rails 1.9.1 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cbdcfe7f8699286453342d8bf324eb3368b4575
-  data.tar.gz: 21526f15062e4c576c6a3cf24cf4e2dcbda8840e
+  metadata.gz: e635be8a862c1b400648ec0873a4b6fc0a3130cd
+  data.tar.gz: 538164527a1e15d90b0633857a274ac2cdf8af0a
 SHA512:
-  metadata.gz: ff280f0b1e519117e6906b65098a385d42f7e98823534fbf3796bcf4d44875cbb04bbcb4cc676681f0f5d4acdccf59972287f429176af31c99f1eacb0bc9c51b
-  data.tar.gz: fc656606f50370e9e64c5636a7b1ba2253e9dba93f6af652a337d89d2ccfb1166198c1abb314c721aad7209dd1e604ffeeee67c0928af1ea8b8b7d9e389c801e
+  metadata.gz: 09612510c5fc94be32f0e24d11878c81b9a748e8c0c137fbc8faa35c9c00921f61eaad8a3235eff78c3d9249d83b86410e0be3c8e84da7cd37520be2e853764a
+  data.tar.gz: 7b56015514e9eae09cd479a0dd16168abfdfe8fca3db309afea5904f9a222af2804995928f974e829b55527b6b3288726a28cce967847bcd1f74f185fe7a3fcd

data/ChangeLog

@@ -1,10 +1,13 @@
 CHANGELOG
 
+2014-03-17  1.9.2
+
+      * Raise an exception while attempting to index a non-saved object (blank objectID)
+
 2014-03-06  1.9.1
 
       * When using MongoId, the `reindex!` method was calling add_objects too many times. (credits go to sush.io)
 
-
 2014-02-24  1.9.0
 
       * Upgrade to algoliasearch 1.2.5 and algoliasearch-client-js 2.4.2

data/Gemfile

@@ -6,7 +6,7 @@ gem 'rubysl', '~> 2.0', platform: :rbx
 
 group :test do 
   gem 'rspec', '>= 2.5.0'
-  gem 'activerecord', '>= 3.0.7'
+  gem 'rails', '>= 3.0.7'
   gem 'sqlite3', platform: [:rbx, :ruby]
   gem 'jdbc-sqlite3', platform: :jruby
   gem 'activerecord-jdbc-adapter', platform: :jruby
@@ -18,9 +18,12 @@ group :test do
 end
 
 group :development do
-  gem 'will_paginate', '>= 2.3.15'
-  gem 'kaminari'
   gem 'travis'
   gem 'rake'
   gem 'rdoc'
 end
+
+group :test, :development do
+  gem 'will_paginate', '>= 2.3.15'
+  gem 'kaminari'
+end

data/Gemfile.lock

@@ -2,6 +2,9 @@ GEM
   remote: http://rubygems.org/
   specs:
     ZenTest (4.9.5)
+    actionmailer (4.0.2)
+      actionpack (= 4.0.2)
+      mail (~> 2.5.4)
     actionpack (4.0.2)
       activesupport (= 4.0.2)
       builder (~> 3.1.0)
@@ -33,8 +36,8 @@ GEM
       httpclient (~> 2.3)
       json (>= 1.5.1)
     arel (4.0.1)
-    atomic (1.1.14)
-    atomic (1.1.14-java)
+    atomic (1.1.15)
+    atomic (1.1.15-java)
     autotest (4.4.6)
       ZenTest (>= 4.4.1)
     autotest-fsevent (0.2.9)
@@ -63,6 +66,7 @@ GEM
       net-http-persistent (>= 2.7)
       net-http-pipeline
     highline (1.6.20)
+    hike (1.2.3)
     httpclient (2.3.4.1)
     i18n (0.6.9)
     jdbc-sqlite3 (3.7.2.1)
@@ -76,13 +80,17 @@ GEM
     launchy (2.4.2-java)
       addressable (~> 2.3)
       spoon (~> 0.0.1)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
     method_source (0.8.2)
     mime-types (1.25.1)
     minitest (4.7.5)
-    multi_json (1.8.4)
+    multi_json (1.9.0)
     multipart-post (1.2.0)
     net-http-persistent (2.9.1)
     net-http-pipeline (1.0.1)
+    polyglot (0.3.4)
     pry (0.9.12.6)
       coderay (~> 1.0)
       method_source (~> 0.8)
@@ -97,6 +105,19 @@ GEM
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
+    rails (4.0.2)
+      actionmailer (= 4.0.2)
+      actionpack (= 4.0.2)
+      activerecord (= 4.0.2)
+      activesupport (= 4.0.2)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.2)
+      sprockets-rails (~> 2.0.0)
+    railties (4.0.2)
+      actionpack (= 4.0.2)
+      activesupport (= 4.0.2)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
     rake (10.1.1)
     rdoc (4.1.1)
       json (~> 1.4)
@@ -314,13 +335,24 @@ GEM
     slop (3.4.7)
     spoon (0.0.4)
       ffi
+    sprockets (2.10.1)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.0.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
     sqlite3 (1.3.8)
     sys-uname (0.9.2)
       ffi (>= 1.0.0)
-    thread_safe (0.1.3)
-      atomic
-    thread_safe (0.1.3-java)
-      atomic
+    thor (0.18.1)
+    thread_safe (0.2.0)
+      atomic (>= 1.1.7, < 2)
+    thread_safe (0.2.0-java)
+      atomic (>= 1.1.7, < 2)
+    tilt (1.4.1)
     travis (1.6.7)
       addressable (~> 2.3)
       backports
@@ -332,9 +364,12 @@ GEM
       pry (~> 0.9)
       pusher-client (~> 0.4)
       typhoeus (~> 0.6)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
     typhoeus (0.6.7)
       ethon (~> 0.6.2)
-    tzinfo (0.3.38)
+    tzinfo (0.3.39)
     websocket (1.0.7)
     will_paginate (3.0.5)
 
@@ -343,7 +378,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (>= 3.0.7)
   activerecord-jdbc-adapter
   activerecord-jdbcsqlite3-adapter
   algoliasearch (~> 1.2)
@@ -353,6 +387,7 @@ DEPENDENCIES
   jdbc-sqlite3
   json (>= 1.5.1)
   kaminari
+  rails (>= 3.0.7)
   rake
   rdoc
   redgreen

data/VERSION

@@ -1 +1 @@
-1.9.1
+1.9.2

data/algoliasearch-rails.gemspec

@@ -6,11 +6,11 @@
 
 Gem::Specification.new do |s|
   s.name = "algoliasearch-rails"
-  s.version = "1.9.1"
+  s.version = "1.9.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Algolia"]
-  s.date = "2014-03-06"
+  s.date = "2014-03-17"
   s.description = "AlgoliaSearch integration to your favorite ORM"
   s.email = "contact@algolia.com"
   s.extra_rdoc_files = [

data/lib/algoliasearch-rails.rb

@@ -187,30 +187,34 @@ module AlgoliaSearch
 
     def algolia_index!(object, synchronous = false)
       return if @algolia_without_auto_index_scope
+      object_id = algolia_object_id_of(object)
+      raise ArgumentError.new("Cannot index a blank objectID") if object_id.blank?
       algolia_ensure_init
       if algolia_indexable?(object)
         if synchronous
-          @algolia_index.add_object!(algolia_index_settings.get_attributes(object), algolia_object_id_of(object))
+          @algolia_index.add_object!(algolia_index_settings.get_attributes(object), object_id)
         else
-          @algolia_index.add_object(algolia_index_settings.get_attributes(object), algolia_object_id_of(object))
+          @algolia_index.add_object(algolia_index_settings.get_attributes(object), object_id)
         end
       elsif algolia_conditional_index?
         # remove non-indexable objects
         if synchronous
-          @algolia_index.delete_object!(algolia_object_id_of(object))
+          @algolia_index.delete_object!(object_id)
         else
-          @algolia_index.delete_object(algolia_object_id_of(object))
+          @algolia_index.delete_object(object_id)
         end
       end
     end
 
     def algolia_remove_from_index!(object, synchronous = false)
       return if @algolia_without_auto_index_scope
+      object_id = algolia_object_id_of(object)
+      raise ArgumentError.new("Cannot index a blank objectID") if object_id.blank?
       algolia_ensure_init
       if synchronous
-        @algolia_index.delete_object!(algolia_object_id_of(object))
+        @algolia_index.delete_object!(object_id)
       else
-        @algolia_index.delete_object(algolia_object_id_of(object))
+        @algolia_index.delete_object(object_id)
       end
     end
 

data/lib/algoliasearch/pagination/kaminari.rb

@@ -2,36 +2,29 @@ unless defined? Kaminari
   raise(AlgoliaSearch::BadConfiguration, "AlgoliaSearch: Please add 'kaminari' to your Gemfile to use kaminari pagination backend")
 end
 
+require "kaminari/models/array_extension"
+
 module AlgoliaSearch
   module Pagination
-    class Kaminari < Array
-      include ::Kaminari::ConfigurationMethods::ClassMethods
-      include ::Kaminari::PageScopeMethods
-
-      attr_reader :limit_value, :offset_value, :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
+    class Kaminari < ::Kaminari::PaginatableArray
 
-      def page(num = 1)
-        self
+      def initialize(array, options)
+        super(array, options)
       end
 
       def limit(num)
+        # noop
         self
       end
 
-      def current_page
-        offset_value+1
+      def offset(num)
+        # noop
+        self
       end
 
       class << self
         def create(results, total_hits, options = {})
-          instance = new(results, options[:per_page], options[:page]-1, total_hits)
-          instance
+          new results, offset: ((options[:page] - 1) * options[:per_page]), limit: options[:per_page], total_count: total_hits
         end
       end
     end

data/spec/spec_helper.rb

@@ -8,13 +8,21 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'algoliasearch-rails'
 require 'rspec'
+require 'rails/all'
 
 raise "missing ALGOLIA_APPLICATION_ID or ALGOLIA_API_KEY environment variables" if ENV['ALGOLIA_APPLICATION_ID'].nil? || ENV['ALGOLIA_API_KEY'].nil?
 
-AlgoliaSearch.configuration = { application_id: ENV['ALGOLIA_APPLICATION_ID'], api_key: ENV['ALGOLIA_API_KEY'] }
+Thread.current[:algolia_hosts] = nil
 
 RSpec.configure do |c|
   c.mock_with :rspec
   c.filter_run focus: true
   c.run_all_when_everything_filtered = true
 end
+
+# avoid concurrent access to the same index
+def safe_index_name(name)
+  return name if ENV['TRAVIS'].to_s != "true"
+  id = ENV['TRAVIS_JOB_NUMBER'].split('.').last
+  "#{name}_travis-#{id}"
+end

data/spec/utilities_spec.rb

@@ -1,5 +1,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
 
+AlgoliaSearch.configuration = { application_id: ENV['ALGOLIA_APPLICATION_ID'], api_key: ENV['ALGOLIA_API_KEY'] }
+
 describe AlgoliaSearch::Utilities do
 
   before(:each) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: algoliasearch-rails
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.9.2
 platform: ruby
 authors:
 - Algolia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2014-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json