adminos 1.0.0.pre.rc.2 → 1.0.0.pre.rc.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1dd7956b8e247ace0302f2da00df9bd1a437de8b0ed52bc1e5bb575fe4889fcc
-  data.tar.gz: 2980ad30232cc36f622c1059c6c77e0273500a6ba53cd9513e4c66e10aedd012
+  metadata.gz: 8b5e4c3f3ca3f62630cea3a1f944cdbfc825974f295b1e056ad9e27fc571b59f
+  data.tar.gz: 58829a898a9194f9d3836e5743716f581e0be4cd61c7425da5942b3ffa94d461
 SHA512:
-  metadata.gz: 7271cb01c26fc3fc4471fffa46ee1250934f85872b2438eb7d590d13334585ca78a1347968254913e0a00383e9ee0a90041b46e33b046149f326c75b509750cc
-  data.tar.gz: 50b733a689694add1c82c11b26eadb3fc8abf3a7212fe1bca1dc22ffa8395d9335b7c4feb073a5c380748dd4db6782113c9d1091d1383b4bf2ca3a23c6fc5ec2
+  metadata.gz: c2fbcdb16cc34d96aa89f42e1b8bc8d15bebacfcbdbd88821560317f6682f694baa360597f3b1f3858b277d2e5b2c59415aa33722fc9e6218ff7dce3d10fc728
+  data.tar.gz: c7b3733876ea14ee809f01b64d94781c8f239830f4261ea3cc83d096f5e0ca7eefd84ca6ea1a43fd04eeb9ff4d4d60fa039141954cd44141ad8d3cfb148a6a17

data/Gemfile

@@ -18,8 +18,7 @@ group :development do
 end
 
 gem 'guard-minitest', '~> 2.4'
-gem 'globalize'
 gem 'friendly_id'
 gem 'activerecord-nulldb-adapter', git: 'git://github.com/nulldb/nulldb.git'
-gem 'sqlite3'
-gem 'database_cleaner'
+gem 'sqlite3', '~> 1.3.6'
+gem 'database_cleaner'

data/README.md

@@ -51,6 +51,32 @@ If no need in SEO fields, switch it off using `--no-seo`.
     $ rails g adminos Model --no-seo
 
 ## Features
+  ### Filters
+
+  To add filtering by any attributes you need to add the required filters in the controller. Below is an example.
+
+  ```ruby
+    class Admin::ProductsController < Admin::BaseController
+      add_filter :name
+      add_filter :price
+      add_filter :published
+
+      #some code
+    end
+  ```
+  
+  ### Search
+
+  By default, search is enabled only on user models.
+  
+  To add a search, run the following generator.
+
+  ```
+  rails generate adminos:search ModelName
+  ```
+
+  You can use search engines such as ElasticSearch or PgSearch. By default, PgSearch is used if you did not specify the --search = elastic flag when installing adminos.
+
   ### Cropped 
   model
   ```ruby

data/adminos.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = 'adminos'
-  gem.version       = '1.0.0-rc.2'
+  gem.version       = '1.0.0-rc.3'
   gem.authors       = ['RavWar', 'milushov', 'abuhtoyarov', 'SiebenSieben']
   gem.email         = ['studio@molinos.ru']
   gem.homepage      = 'https://gitlab.molinos.ru/global/adminos'
@@ -22,11 +22,11 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'babosa'
   gem.add_dependency 'simple_form'
   gem.add_dependency 'kaminari'
-  gem.add_dependency 'russian'
   gem.add_dependency 'devise'
   gem.add_dependency 'cancancan'
   gem.add_dependency 'cocoon'
   gem.add_dependency 'awesome_nested_set'
+  gem.add_dependency 'ransack'
 
   gem.add_development_dependency 'bundler', '~> 1.3'
   gem.add_development_dependency 'm'

data/app/inputs/cropp_input.rb

@@ -23,13 +23,25 @@ class CroppInput < SimpleForm::Inputs::Base
 
     aspect_ratio = input_html_options.delete(:aspect_ratio) || '16/9'
     aspect_ratio = aspect_ratio.split('/').map(&:to_f)
-    aspect_ratio = aspect_ratio[0]/aspect_ratio[1]
+    aspect_ratio = aspect_ratio[0] / aspect_ratio[1]
 
     out << %{<div class="row"><div class="col-md-8"><div class="img-container">}
 
     out << template.image_tag(object.send(attribute_name), data: { aspect_ratio: aspect_ratio, preview: ".#{@version}_#{attribute_name}_preview", toggle: 'cropp', coord: @coord_attribute })
 
     out << %{</div></div><div class="col-md-4">}
+    out << %{<div class="cropper-dimensions">}
+    out << %{<div class="field">}
+    out << template.label_tag(:width, 'Ширина', class: 'control-label')
+    out << template.number_field_tag(:width, nil, class: 'form-control')
+    out << %{</div>}
+    out << %{<div class="field">}
+
+    out << template.label_tag(:height, 'Высота', class: 'control-label')
+    out << template.number_field_tag(:height, nil, class: 'form-control')
+    out << %{</div>}
+
+    out << %{</div>}
     out << %{<div class="docs-preview clearfix">}
     out << %{<div class="img-preview preview-lg #{@version}_#{attribute_name}_preview"></div>}
     out << cropped

data/app/inputs/filter_inputs/boolean_input.rb

@@ -0,0 +1,18 @@
+module FilterInputs
+  class BooleanInput < SimpleForm::Inputs::CollectionSelectInput
+    def input(wrapper_options = nil)
+      label_method, value_method = detect_collection_methods
+
+      merged_input_options = merge_wrapper_options(input_html_options, wrapper_options)
+
+      @builder.collection_select(
+        filter_attribute_name, collection, value_method, label_method,
+        input_options, merged_input_options
+      )
+    end
+
+    def filter_attribute_name
+      "#{attribute_name}_eq"
+    end
+  end
+end

data/app/inputs/filter_inputs/date_range_input.rb

@@ -0,0 +1,36 @@
+module FilterInputs
+  class DateRangeInput < SimpleForm::Inputs::StringInput
+    def input(wrapper_options = nil)
+      @wrapper_options = wrapper_options
+      out = []
+
+      out << input_html
+      out.join.html_safe
+    end
+
+    def input_html
+      merged_input_options = merge_wrapper_options(input_html_options, @wrapper_options)
+      [
+        @builder.text_field(gt_input_name, merged_input_options.merge(placeholder: gt_input_placeholder, class: 'date-picker form-control')),
+        @builder.text_field(lt_input_name, merged_input_options.merge(placeholder: lt_input_placeholder, class: 'date-picker form-control'))
+      ].join("\n").html_safe
+    end
+
+    def gt_input_name
+      "#{attribute_name}_gteq"
+    end
+    alias :input_name :gt_input_name
+
+    def lt_input_name
+      "#{attribute_name}_lteq"
+    end
+
+    def gt_input_placeholder
+      'От'
+    end
+
+    def lt_input_placeholder
+      'До'
+    end
+  end
+end

data/app/inputs/filter_inputs/numeric_input.rb

@@ -0,0 +1,40 @@
+module FilterInputs
+  class NumericInput < SimpleForm::Inputs::StringInput
+    def input(wrapper_options = nil)
+      @wrapper_options = wrapper_options
+      out = []
+      out << select_html
+      out << input_html
+      out.join.html_safe
+    end
+
+    def select_html
+      template.select_tag '', template.options_for_select(filter_options, current_filter), class: 'select_filter form-control'
+    end
+
+    def input_html
+      merged_input_options = merge_wrapper_options(input_html_options, @wrapper_options)
+      @builder.text_field current_filter, merged_input_options.merge(class: 'form-control')
+    end
+
+    def current_filter
+      @current_filter ||= begin
+        attributes = filters.map { |f| "#{attribute_name}_#{f}" }
+        attributes.detect { |m| object.public_send m } || attributes.first
+      end
+    end
+
+    def label_html
+    end
+
+    def filter_options
+      filters.map do |filter|
+        [filter, "#{attribute_name}_#{filter}"]
+      end
+    end
+
+    def filters
+      %w(eq gt lt)
+    end
+  end
+end

data/app/inputs/filter_inputs/string_input.rb

@@ -0,0 +1,40 @@
+module FilterInputs
+  class StringInput < SimpleForm::Inputs::StringInput
+    def input(wrapper_options = nil)
+      @wrapper_options = wrapper_options
+      out = []
+      out << select_html
+      out << input_html
+      out.join.html_safe
+    end
+
+    def select_html
+      template.select_tag '', template.options_for_select(filter_options, current_filter), class: 'select_filter form-control'
+    end
+
+    def input_html
+      merged_input_options = merge_wrapper_options(input_html_options, @wrapper_options)
+      @builder.text_field current_filter, merged_input_options.merge(class: 'form-control')
+    end
+
+    def current_filter
+      @current_filter ||= begin
+        attributes = filters.map { |f| "#{attribute_name}_#{f}" }
+        attributes.detect { |m| object.public_send m } || attributes.first
+      end
+    end
+
+    def label_html
+    end
+
+    def filter_options
+      filters.map do |filter|
+        [filter, "#{attribute_name}_#{filter}"]
+      end
+    end
+
+    def filters
+      %w(cont eq start end)
+    end
+  end
+end

data/lib/adminos.rb

@@ -3,17 +3,38 @@ require 'rails'
 require 'jquery-fileupload-rails'
 require 'dotenv-rails'
 require 'babosa'
-require 'russian'
 require 'devise'
 require 'cancancan'
+require 'ransack'
 require 'cocoon'
+require 'simple_form'
 
 module Adminos
+
+  autoload :FormBuilder,              'adminos/form_builder'
+
+  class << self
+    attr_writer :configuration
+  end
+
+  def self.configuration
+    @configuration ||= Configuration.new
+  end
+
+  def self.reset
+    @configuration = Configuration.new
+  end
+
+  def self.configure
+    yield(configuration)
+  end
+
   Helpers      = Module.new
   NestedSet    = Module.new
   Controllers  = Module.new
   StatefulLink = Module.new
 
+
   Path.require_tree 'adminos', except: %w[generators operations]
 
   class Engine < ::Rails::Engine
@@ -26,6 +47,7 @@ module Adminos
     initializer 'adminos.controller_helpers' do
       ActionController::Base.send :include, Controllers::Helpers
       ActionController::Base.send :include, Controllers::Resource
+      ActionController::Base.send :include, Controllers::Filters
     end
 
     initializer 'adminos.stateful_link' do
@@ -38,5 +60,3 @@ module Adminos
     end
   end
 end
-
-require 'adminos/extensions/nested_set'

data/lib/adminos/configuration.rb

@@ -0,0 +1,9 @@
+module Adminos
+  class Configuration
+    attr_accessor :search_engine
+
+    def initialize
+      @search_engine = Adminos::Search::PgSearch
+    end
+  end
+end

data/lib/adminos/controllers/filters.rb

@@ -0,0 +1,20 @@
+module Adminos::Controllers::Filters
+  extend ActiveSupport::Concern
+
+  included do
+    helper_method :filters
+  end
+
+  class_methods do
+    attr_reader :filters
+
+    def add_filter(attribute, *args)
+      options = args.extract_options!
+      (@filters ||= {})[attribute.to_sym] = options
+    end
+  end
+
+  def filters
+    self.class.filters
+  end
+end

data/lib/adminos/controllers/resource.rb

@@ -19,7 +19,7 @@ module Adminos::Controllers::Resource
         with_move_to = options.delete(:with_move_to)
         with_apply_sortable_order = options.delete(:with_apply_sortable_order)
 
-        helper_method :resource, :collection, :resource_class, :resource_params
+        helper_method :resource, :collection, :resource_class, :resource_params, :filter
         helper_method(:parent_resource) if with_parent_resource
 
         define_method :create do
@@ -80,11 +80,15 @@ module Adminos::Controllers::Resource
             if with_parent_resource
               parent_resource.send(self.resource_as_association)
             elsif filter_by_locale
-              resource_class.with_translations(I18n.locale)
+              Mobility.with_locale(I18n.locale) do
+                resource_class
+              end
             else
               resource_class
             end
 
+          collection = collection.search_by(params[:query]) if params[:query].present?
+
           @collection =
             if collection_scope.is_a?(Array)
               collection_scope.inject(collection) do |collection, method|
@@ -93,12 +97,19 @@ module Adminos::Controllers::Resource
             else
               collection.send(collection_scope)
             end
+
+          @collection = @collection.ransack(params[:q]).result if params[:q].present?
+          @collection
         end
 
         define_method :build_resource do
           self.resource_class_scope.new(parameters)
         end
 
+        define_method :filter do
+          @collection.ransack(params[:q])
+        end
+
         define_method :parameters do
           if action_name == ('create') || action_name == ('update')
             strong_params
@@ -121,17 +132,13 @@ module Adminos::Controllers::Resource
 
           _attribute_names = self.resource_class_scope.attribute_names + ids_attributes + rich_text_attributes
 
-          if params[resource_params][:translations_attributes]
-            _translated_attributes = resource_class.translated_attribute_names
-            attrs = _attribute_names + _translated_attributes
-            attrs.push(translations_attributes: _translated_attributes + [:id, :locale]) unless _translated_attributes.blank?
-
-            result = params.require(resource_params).permit(attrs)
-          else
-            result = params.require(resource_params).permit(*_attribute_names)
+          if resource_class.respond_to?(:translated_attribute_names)
+            _attribute_names += resource_class.translated_attribute_names.map do |attr|
+              I18n.available_locales.map { |locale| "#{attr}_#{Mobility.normalize_locale(locale)}" }
+            end.flatten
           end
 
-          result
+          params.require(resource_params).permit(*_attribute_names)
         end
 
         define_method :find_resource do

data/lib/adminos/extensions/simple_form.rb

@@ -0,0 +1,12 @@
+module Adminos
+  module SimpleFormExtraBase
+    # Find reflection name when available, otherwise use attribute
+    def reflection_or_attribute_name
+      @reflection_or_attribute_name ||= reflection ? reflection.name : attribute_name
+      @reflection_or_attribute_name.to_s.gsub(/_(#{I18n.available_locales.join('|')})/, '')
+    end
+  end
+end
+
+
+SimpleForm::Inputs::Base.prepend(Adminos::SimpleFormExtraBase)

data/lib/adminos/features/search/elastic.rb

@@ -0,0 +1,46 @@
+module Adminos
+  module Search
+    module Elastic
+      extend ActiveSupport::Concern
+
+      included do
+        searchkick **searchkick_options
+
+        def search_data
+          data = respond_to?(:to_hash) ? to_hash : serializable_hash
+          data.delete("id")
+          data.delete("_id")
+          data.delete("_type")
+          data.merge!(actiontext_attributes)
+
+          data
+        end
+
+        def actiontext_attributes
+          reflect_has_one = self.class.reflect_on_all_associations(:has_one)
+          rich_text_attributes = reflect_has_one.map(&:name).map { |name| name if name.to_s.include?('rich_text_') }.compact
+
+          rich_text_attributes.inject({}) do |memo, attr|
+            memo[attr] = public_send(attr).to_plain_text
+            memo
+          end
+        end
+      end
+
+      class_methods do
+        def search_by(q = nil, *args)
+          options = args.extract_options!
+          options.merge!(load: false)
+
+          result_ids = self.search(q, options).results.map(&:id)
+
+          where(id: result_ids)
+        end
+
+        def searchkick_options
+          {}
+        end
+      end
+    end
+  end
+end