carload 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec9e29e90114250f401edc897cd90caae9c0d1c0
-  data.tar.gz: fe00e32e35074658bbfaca1724e9ecb282226ec0
+  metadata.gz: a049222076a6d7c860613fca9fdcb808f9d3a1fd
+  data.tar.gz: 027d10be270a76dce7187702c936139d6bec61ea
 SHA512:
-  metadata.gz: a766a69e3c4f93b543861ada5ddd505a66476e8a231174b443affa73140e9f1dda0515cf415f06b6445d79ac9c14f47f2cf0843f71626f80010aaf10bdecb9a4
-  data.tar.gz: c6294ff23b3be3049fce81ff4c405b73a75beab1ad545de23e9684c6ac40ccad491009914894ad2c592c1f269804aaf98a7e1962e07f49504b755ef1c5db24de
+  metadata.gz: eceb767f554ce9e7cc34b543764485beb0dcc925a70aae2eea3ebdf2d17688e3518a1f2c0083d3dbdc827b370d113314ce47bb78e7a10846cafeadcd6b6615b4
+  data.tar.gz: 2421d62bdd80071fb5bd7f41e13829b125d286f4c4315c54f8db465293e82cb614b67e24647cca9d582dfb27277ab86a83edc282474c7dd378972e0b8ebef63b

data/app/controllers/carload/dashboard_controller.rb

@@ -17,7 +17,12 @@ module Carload
       authorize :carload_dashboard, :index? unless Carload.auth_solution == :none
       if params[:search].present?
         @query = params[:search][:query]
-        @objects = @model_class.search(params[:search][:query]).page(params[:page])
+        case Carload.search_engine
+        when :elasticsearch
+          @objects = @model_class.search(params[:search][:query]).records.page(params[:page])
+        when :pg_search
+          @objects = @model_class.search(params[:search][:query]).page(params[:page])
+        end
       else
         @objects = @model_class.page(params[:page])
       end

data/app/views/layouts/carload/dashboard.html.erb

@@ -12,7 +12,7 @@
   <div id='main-container'>
     <div id='top-nav-buttons' class='center'>
       <div class='btn-group' role='group'>
-        <%= link_to t('carload.action.back_to_root'), main_app.root_path, class: 'btn btn-default' %>
+        <%= link_to t('carload.action.back_to_root'), (main_app.root_path rescue root_path), class: 'btn btn-default' %>
         <% Dashboard.models.keys.each do |model| %>
           <%= link_to t("activerecord.models.#{model}"), dashboard_index_path(model),
             class: "#{@model_name == model ? 'active' : ''} btn btn-default" %>

data/lib/carload/engine.rb

@@ -18,41 +18,57 @@ module Carload
         end
       end
       # Reopen model classes to add pg text search.
-      Dictionaries = {
-        en: 'english',
-        :'zh-CN' => 'zhparser'
-      }.freeze
-      Dashboard.models.each do |name, spec|
-        # NOTE: Only direct columns are included.
-        attributes = spec.index_page.searches.attributes.select { |x| x[:name].class == Symbol }.map { |x| x[:name] }
-        spec.klass.class_eval do
-          include PgSearch
-          pg_search_scope :search,
-            against: attributes,
-            using: {
-              tsearch: {
-                prefix: true,
-                negation: true,
-                dictionary: Dictionaries[I18n.locale]
-              }
-            }
-        end
-      end
-      # Reopen model classes to handle polymorphic association.
-      Dashboard.models.each do |name, spec|
-        spec.associated_models.values.select { |x| x[:polymorphic] == true }.each do |associated_model|
-          polymorphic_objects = []
-          associated_model[:instance_models].each do |instance_model|
-            Dashboard.model(instance_model).klass.all.each do |object|
-              polymorphic_objects << ["#{object.class} - #{object.send(associated_model[:choose_by])}", "#{object.id},#{object.class}"]
-            end
+      case Carload.search_engine
+      when :elasticsearch
+        Dashboard.models.each do |name, spec|
+          spec.klass.class_eval do
+            include Elasticsearch::Model
+            include Elasticsearch::Model::Callbacks
+
+            self.__elasticsearch__.client.indices.delete index: self.index_name rescue nil
+            self.__elasticsearch__.client.indices.create \
+              index: self.index_name,
+              body: { settings: self.settings.to_hash, mappings: self.mappings.to_hash }
           end
+          spec.klass.import
+        end
+      when :pg_search
+        Dictionaries = {
+          en: 'english',
+          :'zh-CN' => 'zhparser'
+        }.freeze
+        Dashboard.models.each do |name, spec|
+          # NOTE: Only direct columns are included.
+          attributes = spec.index_page.searches.attributes.select { |x| x[:name].class == Symbol }.map { |x| x[:name] }
           spec.klass.class_eval do
-            class_eval <<-RUBY
-              def self.#{associated_model[:name].to_s.pluralize}
-                #{polymorphic_objects}
+            include PgSearch
+            pg_search_scope :search,
+              against: attributes,
+              using: {
+                tsearch: {
+                  prefix: true,
+                  negation: true,
+                  dictionary: Dictionaries[I18n.locale]
+                }
+              }
+          end
+        end
+        # Reopen model classes to handle polymorphic association.
+        Dashboard.models.each do |name, spec|
+          spec.associated_models.values.select { |x| x[:polymorphic] == true }.each do |associated_model|
+            polymorphic_objects = []
+            associated_model[:instance_models].each do |instance_model|
+              Dashboard.model(instance_model).klass.all.each do |object|
+                polymorphic_objects << ["#{object.class} - #{object.send(associated_model[:choose_by])}", "#{object.id},#{object.class}"]
               end
-            RUBY
+            end
+            spec.klass.class_eval do
+              class_eval <<-RUBY
+                def self.#{associated_model[:name].to_s.pluralize}
+                  #{polymorphic_objects}
+                end
+              RUBY
+            end
           end
         end
       end

data/lib/carload/exceptions.rb

@@ -14,4 +14,10 @@ module Carload
       @message = "Carload does not support #{data} currently."
     end
   end
+
+  class InvalidError < Error
+    def initialize data
+      @message = data
+    end
+  end
 end

data/lib/carload/version.rb

@@ -1,3 +1,3 @@
 module Carload
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

data/lib/carload.rb

@@ -1,6 +1,11 @@
 # Require all dependencies (Rails does not do this for us in default).
 Gem.loaded_specs['carload'].dependencies.each do |dependency|
-  require dependency.name
+  begin
+    require dependency.name
+  rescue LoadError
+    # For elasticsearch-model and elasticsearch-rails
+    require dependency.name.gsub('-', '/')
+  end
 end
 
 require 'carload/extended_hash'
@@ -24,6 +29,10 @@ module Carload
     if not [:carrierwave].include? @@config[:upload_solution]
       raise UnsupportedError.new("upload solution #{@@config[:upload_solution]}")
     end
+    @@config[:search_engine] ||= :elasticsearch
+    if not [:elasticsearch, :pg_search].include? @@config[:search_engine]
+      raise UnsupportedError.new("search engine #{@@config[:search_engine]}")
+    end
     # Define configuation helpers.
     @@config.each do |key, value|
       define_singleton_method key do

data/lib/generators/carload/install_generator.rb

@@ -29,10 +29,16 @@ require 'carload'
 
     def copy_migration_files
       # Copy migrations if necessary.
-      case I18n.locale
-      when :'zh-CN'
-        ['20161030074822_carload_enable_zhparser_extension.rb'].each do |file|
-          copy_file "#{Carload::Engine.root}/db/migrate/#{file}", "db/migrate/#{file}"
+      if Carload.search_engine == :pg_search
+        adapter = ActiveRecord::Base.connection.instance_values["config"][:adapter]
+        if adapter != 'postgresql'
+          raise InvalidError.new("Database adapter #{adapter} cannot work with pg_search!")
+        end
+        case I18n.locale
+        when :'zh-CN'
+          ['20161030074822_carload_enable_zhparser_extension.rb'].each do |file|
+            copy_file "#{Carload::Engine.root}/db/migrate/#{file}", "db/migrate/#{file}"
+          end
         end
       end
     end

data/lib/generators/carload/templates/carload.rb

@@ -17,6 +17,9 @@ Carload.setup do |config|
   # Set which file upload solution is used. Currently, we only support Carrierwave.
   config.upload_solution = :carrierwave
 
+  # Set which search engine to use (elasticsearch or pg_search).
+  config.search_engine = :elasticsearch
+
   # Set the actions used to discern user's permission to access dashboard.
   #
   #   config.dashboard.permits_user.<method> = '...'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carload
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Li Dong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-06 00:00:00.000000000 Z
+date: 2016-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -142,6 +142,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: elasticsearch-model
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: elasticsearch-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement