meilisearch-rails 0.4.1 → 0.5.2

data/meilisearch-rails.gemspec

@@ -1,19 +1,21 @@
-require File.join(File.dirname(__FILE__), 'lib', 'meilisearch', 'version')
+lib = File.expand_path('lib', __dir__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
-require 'date'
+require 'meilisearch/rails/version'
 
 Gem::Specification.new do |s|
   s.name = 'meilisearch-rails'
-  s.version = MeiliSearch::VERSION
+  s.version = MeiliSearch::Rails::VERSION
 
-  s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
   s.authors = ['Meili']
-  s.description = 'MeiliSearch integration for Ruby on Rails. See https://github.com/meilisearch/MeiliSearch'
   s.email = 'bonjour@meilisearch.com'
-  s.homepage = 'http://github.com/meilisearch/meilisearch-rails'
-  s.licenses = ['MIT']
+
+  s.description = 'Meilisearch integration for Ruby on Rails. See https://github.com/meilisearch/meilisearch'
+  s.homepage = 'https://github.com/meilisearch/meilisearch-rails'
+  s.summary = 'Meilisearch integration for Ruby on Rails.'
+  s.licenses = 'MIT'
+
   s.require_paths = ['lib']
-  s.summary = 'MeiliSearch integration for Ruby on Rails.'
 
   s.extra_rdoc_files = [
     'LICENSE',
@@ -31,6 +33,6 @@ Gem::Specification.new do |s|
   ]
 
   s.required_ruby_version = '>= 2.6.0'
-  s.add_dependency('json', ['>= 1.5.1'])
-  s.add_dependency('meilisearch', ['>= 0.15.4'])
+
+  s.add_dependency 'meilisearch', '~> 0.18'
 end

metadata

@@ -1,44 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: meilisearch-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Meili
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-25 00:00:00.000000000 Z
+date: 2022-05-18 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: meilisearch
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.4
+        version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.4
-description: MeiliSearch integration for Ruby on Rails. See https://github.com/meilisearch/MeiliSearch
+        version: '0.18'
+description: Meilisearch integration for Ruby on Rails. See https://github.com/meilisearch/meilisearch
 email: bonjour@meilisearch.com
 executables: []
 extensions: []
@@ -52,18 +38,18 @@ files:
 - README.md
 - Rakefile
 - lib/meilisearch-rails.rb
-- lib/meilisearch/configuration.rb
-- lib/meilisearch/errors.rb
-- lib/meilisearch/ms_job.rb
-- lib/meilisearch/pagination.rb
-- lib/meilisearch/pagination/kaminari.rb
-- lib/meilisearch/pagination/will_paginate.rb
-- lib/meilisearch/railtie.rb
-- lib/meilisearch/tasks/meilisearch.rake
-- lib/meilisearch/utilities.rb
-- lib/meilisearch/version.rb
+- lib/meilisearch/rails/configuration.rb
+- lib/meilisearch/rails/errors.rb
+- lib/meilisearch/rails/ms_job.rb
+- lib/meilisearch/rails/pagination.rb
+- lib/meilisearch/rails/pagination/kaminari.rb
+- lib/meilisearch/rails/pagination/will_paginate.rb
+- lib/meilisearch/rails/railtie.rb
+- lib/meilisearch/rails/tasks/meilisearch.rake
+- lib/meilisearch/rails/utilities.rb
+- lib/meilisearch/rails/version.rb
 - meilisearch-rails.gemspec
-homepage: http://github.com/meilisearch/meilisearch-rails
+homepage: https://github.com/meilisearch/meilisearch-rails
 licenses:
 - MIT
 metadata: {}
@@ -85,5 +71,5 @@ requirements: []
 rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
-summary: MeiliSearch integration for Ruby on Rails.
+summary: Meilisearch integration for Ruby on Rails.
 test_files: []

data/lib/meilisearch/configuration.rb

@@ -1,21 +0,0 @@
-module MeiliSearch
-  module Configuration
-    def configuration
-      raise NotConfigured if @_config.blank?
-
-      @_config
-    end
-
-    def configuration=(configuration)
-      @_config = configuration
-    end
-
-    def client
-      ::MeiliSearch::Client.new(
-        configuration[:meilisearch_host] || 'http://localhost:7700',
-        configuration[:meilisearch_api_key],
-        configuration.slice(:timeout, :max_retries)
-      )
-    end
-  end
-end

data/lib/meilisearch/errors.rb

@@ -1,12 +0,0 @@
-module MeiliSearch
-  class NoBlockGiven < StandardError; end
-
-  class BadConfiguration < StandardError; end
-
-  class NotConfigured < StandardError
-    def message
-      'Please configure MeiliSearch. Set MeiliSearch.configuration = ' \
-        "{meilisearch_host: 'YOUR_MEILISEARCH_HOST', meilisearch_api_key: 'YOUR_API_KEY'}"
-    end
-  end
-end

data/lib/meilisearch/ms_job.rb

@@ -1,9 +0,0 @@
-module MeiliSearch
-  class MSJob < ::ActiveJob::Base
-    queue_as :meilisearch
-
-    def perform(record, method)
-      record.send(method)
-    end
-  end
-end

data/lib/meilisearch/pagination/kaminari.rb

@@ -1,46 +0,0 @@
-unless defined? Kaminari
-  raise(MeiliSearch::BadConfiguration,
-        "MeiliSearch: Please add 'kaminari' to your Gemfile to use kaminari pagination backend")
-end
-
-require 'kaminari/models/array_extension'
-
-module MeiliSearch
-  module Pagination
-    class Kaminari < ::Kaminari::PaginatableArray
-      def initialize(array, options)
-        if RUBY_VERSION >= '3'
-          super(array, **options)
-        else
-          super(array, options)
-        end
-      end
-
-      def limit(_num)
-        # noop
-        self
-      end
-
-      def offset(_num)
-        # noop
-        self
-      end
-
-      class << self
-        def create(results, total_hits, options = {})
-          offset = ((options[:page] - 1) * options[:per_page])
-          array = new results, limit: options[:per_page], offset: offset, total_count: total_hits
-
-          if array.empty? && !results.empty?
-            # since Kaminari 0.16.0, you need to pad the results with nil values so it matches the offset param
-            # otherwise you'll get an empty array: https://github.com/amatsuda/kaminari/commit/29fdcfa8865f2021f710adaedb41b7a7b081e34d
-            results = ([nil] * offset) + results
-            array = new results, offset: offset, limit: options[:per_page], total_count: total_hits
-          end
-
-          array
-        end
-      end
-    end
-  end
-end

data/lib/meilisearch/pagination/will_paginate.rb

@@ -1,20 +0,0 @@
-begin
-  require 'will_paginate/collection'
-rescue LoadError
-  raise(MeiliSearch::BadConfiguration,
-        "MeiliSearch: Please add 'will_paginate' to your Gemfile to use will_paginate pagination backend")
-end
-
-module MeiliSearch
-  module Pagination
-    class WillPaginate
-      def self.create(results, total_hits, options = {})
-        ::WillPaginate::Collection.create(options[:page], options[:per_page], total_hits) do |pager|
-          start = (options[:page] - 1) * options[:per_page]
-          paginated_results = results[start, options[:per_page]]
-          pager.replace paginated_results
-        end
-      end
-    end
-  end
-end

data/lib/meilisearch/pagination.rb

@@ -1,18 +0,0 @@
-module MeiliSearch
-  module Pagination
-    autoload :WillPaginate, 'meilisearch/pagination/will_paginate'
-    autoload :Kaminari, 'meilisearch/pagination/kaminari'
-
-    def self.create(results, total_hits, options = {})
-      return results if MeiliSearch.configuration[:pagination_backend].nil?
-
-      begin
-        backend = MeiliSearch.configuration[:pagination_backend].to_s.classify
-
-        ::MeiliSearch::Pagination.const_get(backend).create(results, total_hits, options)
-      rescue NameError
-        raise(BadConfiguration, 'Unknown pagination backend')
-      end
-    end
-  end
-end

data/lib/meilisearch/railtie.rb

@@ -1,12 +0,0 @@
-require 'rails'
-
-module MeiliSearch
-  class Railtie < Rails::Railtie
-    rake_tasks do
-      load 'meilisearch/tasks/meilisearch.rake'
-    end
-  end
-
-  class Engine < Rails::Engine
-  end
-end

data/lib/meilisearch/tasks/meilisearch.rake

@@ -1,17 +0,0 @@
-namespace :meilisearch do
-  desc 'Reindex all models'
-  task reindex: :environment do
-    MeiliSearch::Utilities.reindex_all_models
-  end
-
-  desc 'Set settings to all indexes'
-  task set_all_settings: :environment do
-    MeiliSearch::Utilities.set_settings_all_models
-  end
-
-  desc 'Clear all indexes'
-  task clear_indexes: :environment do
-    puts 'clearing all indexes'
-    MeiliSearch::Utilities.clear_all_indexes
-  end
-end

data/lib/meilisearch/utilities.rb

@@ -1,44 +0,0 @@
-module MeiliSearch
-  module Utilities
-    class << self
-      def get_model_classes
-        if Rails.application && defined?(Rails.autoloaders) && Rails.autoloaders.zeitwerk_enabled?
-          Zeitwerk::Loader.eager_load_all
-        elsif Rails.application
-          Rails.application.eager_load!
-        end
-        klasses = MeiliSearch.instance_variable_get(:@included_in)
-        (klasses + klasses.map(&:descendants).flatten).uniq
-      end
-
-      def clear_all_indexes
-        get_model_classes.each(&:clear_index!)
-      end
-
-      def reindex_all_models
-        klasses = get_model_classes
-
-        Rails.logger.info "\n\nReindexing #{klasses.count} models: #{klasses.to_sentence}.\n"
-
-        klasses.each do |klass|
-          Rails.logger.info klass
-          Rails.logger.info "Reindexing #{klass.count} records..."
-
-          klass.ms_reindex!
-        end
-      end
-
-      def set_settings_all_models
-        klasses = get_model_classes
-
-        Rails.logger.info "\n\nPushing settings for #{klasses.count} models: #{klasses.to_sentence}.\n"
-
-        klasses.each do |klass|
-          Rails.logger.info "Pushing #{klass} settings..."
-
-          klass.ms_set_settings
-        end
-      end
-    end
-  end
-end