algoliasearch-rails 1.25.0 → 3.0.1

data/algoliasearch-rails.gemspec

@@ -21,7 +21,6 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".rspec",
-    ".travis.yml",
     "CHANGELOG.MD",
     "Gemfile",
     "Gemfile.lock",
@@ -34,6 +33,7 @@ Gem::Specification.new do |s|
     "lib/algoliasearch/configuration.rb",
     "lib/algoliasearch/pagination.rb",
     "lib/algoliasearch/pagination/kaminari.rb",
+    "lib/algoliasearch/pagination/pagy.rb",
     "lib/algoliasearch/pagination/will_paginate.rb",
     "lib/algoliasearch/railtie.rb",
     "lib/algoliasearch/tasks/algoliasearch.rake",
@@ -79,19 +79,19 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<json>, [">= 1.5.1"])
-      s.add_runtime_dependency(%q<algoliasearch>, [">= 1.26.0", "< 2.0.0"])
+      s.add_runtime_dependency(%q<algolia>, [">= 3.5.2"])
       s.add_development_dependency(%q<will_paginate>, [">= 2.3.15"])
       s.add_development_dependency(%q<kaminari>, [">= 0"])
-      s.add_development_dependency "travis"
+      s.add_development_dependency(%q<pagy>, [">= 0"])
       s.add_development_dependency "rake"
       s.add_development_dependency "rdoc"
     else
       s.add_dependency(%q<json>, [">= 1.5.1"])
-      s.add_dependency(%q<algoliasearch>, [">= 1.26.0", "< 2.0.0"])
+      s.add_dependency(%q<algolia>, [">= 3.5.2"])
     end
   else
     s.add_dependency(%q<json>, [">= 1.5.1"])
-    s.add_dependency(%q<algoliasearch>, [">= 1.26.0", "< 2.0.0"])
+    s.add_dependency(%q<algolia>, [">= 3.5.2"])
   end
 end
 

data/lib/algoliasearch/algolia_job.rb

@@ -1,6 +1,6 @@
 module AlgoliaSearch
   class AlgoliaJob < ::ActiveJob::Base
-    queue_as :algoliasearch
+    queue_as { AlgoliaSearch.configuration[:queue_name] }
 
     def perform(record, method)
       record.send(method)

data/lib/algoliasearch/configuration.rb

@@ -1,14 +1,43 @@
 module AlgoliaSearch
   module Configuration
+    def initialize
+      @client = nil
+    end
+
     def configuration
       @@configuration || raise(NotConfigured, "Please configure AlgoliaSearch. Set AlgoliaSearch.configuration = {application_id: 'YOUR_APPLICATION_ID', api_key: 'YOUR_API_KEY'}")
     end
 
     def configuration=(configuration)
-      @@configuration = configuration.merge(
-          :user_agent => "Algolia for Rails (#{AlgoliaSearch::VERSION}); Rails (#{Rails::VERSION::STRING})"
-      )
-      Algolia.init @@configuration
+      @@configuration = default_configuration
+                          .merge(configuration)
+    end
+
+    def client
+      if @client.nil?
+        setup_client
+      end
+
+      @client
+    end
+
+    def setup_client
+      @client = Algolia::SearchClient.create(
+        @@configuration[:application_id],
+        @@configuration[:api_key],
+        {
+          user_agent_segments: [
+            "Algolia for Rails (#{AlgoliaSearch::VERSION})",
+            "Rails (#{defined?(::Rails::VERSION::STRING) ? ::Rails::VERSION::STRING : 'unknown'})",
+            @@configuration[:append_to_user_agent]
+          ].compact
+        })
+    end
+
+    def default_configuration
+      {
+        queue_name: 'algoliasearch'
+      }
     end
   end
 end

data/lib/algoliasearch/pagination/kaminari.rb

@@ -9,7 +9,7 @@ module AlgoliaSearch
     class Kaminari < ::Kaminari::PaginatableArray
 
       def initialize(array, options)
-        super(array, options)
+        super(array, **options)
       end
 
       def limit(num)

data/lib/algoliasearch/pagination/pagy.rb

@@ -0,0 +1,29 @@
+unless defined? Pagy
+  raise(AlgoliaSearch::BadConfiguration, "AlgoliaSearch: Please add 'pagy' to your Gemfile to use Pagy pagination backend")
+end
+
+module AlgoliaSearch
+  module Pagination
+    class Pagy
+
+      def self.create(results, total_hits, options = {})
+        vars = {
+          count: total_hits,
+          page: options[:page],
+          items: options[:per_page]
+        }
+
+        pagy_version = Gem::Version.new(::Pagy::VERSION)
+        pagy = if pagy_version >= Gem::Version.new('9.0')
+                 ::Pagy.new(**vars)
+               else
+                 ::Pagy.new(vars)
+               end
+
+        [pagy, results]
+      end
+    end
+
+  end
+end
+

data/lib/algoliasearch/pagination.rb

@@ -3,6 +3,7 @@ module AlgoliaSearch
 
     autoload :WillPaginate, 'algoliasearch/pagination/will_paginate'
     autoload :Kaminari, 'algoliasearch/pagination/kaminari'
+    autoload :Pagy, 'algoliasearch/pagination/pagy'
 
     def self.create(results, total_hits, options = {})
       return results if AlgoliaSearch.configuration[:pagination_backend].nil?

data/lib/algoliasearch/utilities.rb

@@ -2,7 +2,7 @@ module AlgoliaSearch
   module Utilities
     class << self
       def get_model_classes
-        if defined?(Rails.autoloaders) && Rails.autoloaders.zeitwerk_enabled?
+        if Rails.application && defined?(Rails.autoloaders) && Rails.autoloaders.zeitwerk_enabled?
           Zeitwerk::Loader.eager_load_all
         elsif Rails.application
           Rails.application.eager_load!

data/lib/algoliasearch/version.rb

@@ -1,3 +1,3 @@
 module AlgoliaSearch
-  VERSION = '1.25.0'
+  VERSION = '3.0.1'
 end