rademade_admin 0.1.3 → 0.1.4

data/lib/rademade_admin/model/adapter/data/active_record.rb

@@ -30,11 +30,17 @@ module RademadeAdmin
               name = name.to_sym
               type = relation_info.macro
               if name != :translations
+                to_class = relation_info.polymorphic? ? nil : RademadeAdmin::LoaderService.const_get(relation_info.class_name)
                 is_sortable = relation_info.respond_to?(:sortable?) ? relation_info.sortable? : false
-                relations[name] = ::RademadeAdmin::Model::Info::Relation.new({
+                if !to_class.nil? && to_class.ancestors.include?(RademadeAdmin::Gallery)
+                  relation_class_name = ::RademadeAdmin::Model::Info::Relation::Gallery
+                else
+                  relation_class_name = ::RademadeAdmin::Model::Info::Relation
+                end
+                relations[name] = relation_class_name.new({
                   :name => name,
                   :from => @model,
-                  :to => relation_info.polymorphic? ? nil : RademadeAdmin::LoaderService.const_get(relation_info.class_name),
+                  :to => to_class,
                   :getter => name,
                   :setter => :"#{name}=",
                   :type => type,
@@ -90,6 +96,10 @@ module RademadeAdmin
             super.merge(@model.translation_class.uploaders)
           end
 
+          def _model_fields
+            @model.column_types.keys.map(&:to_sym)
+          end
+
           private
 
           def extract_column_data(field_data)

data/lib/rademade_admin/model/adapter/data/mongoid.rb

@@ -44,10 +44,16 @@ module RademadeAdmin
               name = name.to_sym
               type = relation_info.relation.macro
               is_sortable = relation_info.sortable?
-              relations[name] = ::RademadeAdmin::Model::Info::Relation.new({
+              to_class = RademadeAdmin::LoaderService.const_get(relation_info.class_name) rescue nil
+              if !to_class.nil? && to_class.ancestors.include?(RademadeAdmin::Gallery)
+                relation_class_name = ::RademadeAdmin::Model::Info::Relation::Gallery
+              else
+                relation_class_name = ::RademadeAdmin::Model::Info::Relation
+              end
+              relations[name] = relation_class_name.new({
                 :name => name,
                 :from => @model,
-                :to => to_class(relation_info),
+                :to => to_class,
                 :getter => name.to_s,
                 :setter => relation_info.setter,
                 :type => type,
@@ -61,12 +67,8 @@ module RademadeAdmin
             relations
           end
 
-          private
-
-          def to_class(relation_info)
-            RademadeAdmin::LoaderService.const_get(relation_info.class_name)
-          rescue
-            nil
+          def _model_fields
+            @model.fields.keys.map(&:to_sym)
           end
 
         end

data/lib/rademade_admin/model/adapter/query/active_record.rb

@@ -32,10 +32,15 @@ module RademadeAdmin
               if part.is_a? RademadeAdmin::Search::Part::Where
                 condition += "(#{collect_where_conditions(part)})"
               else
-                if part[:value].is_a? Array
-                  condition += "#{part[:field]} IN (?)"
+                field = "`#{part[:field]}`"
+                if part[:value].is_a? Regexp
+                  # hack temporary fix
+                  condition += "#{field} REGEXP ?"
+                  part[:value] = part[:value].source
+                elsif part[:value].is_a? Array
+                  condition += "#{field} IN (?)"
                 else
-                  condition += "#{part[:field]} = ?"
+                  condition += "#{field} = ?"
                 end
                 @values << part[:value]
               end

data/lib/rademade_admin/model/configuration.rb

@@ -3,11 +3,10 @@ module RademadeAdmin
   module Model
     class Configuration
 
-      attr_reader :controller, :parent_menu_item, :model_name, :display_in_menu
+      attr_reader :controller, :parent_menu_item, :model_name, :menu_count_block, :preview_url_block
 
       def initialize(controller)
         @controller = controller
-        @display_in_menu = true
       end
 
       def item_name
@@ -54,19 +53,22 @@ module RademadeAdmin
         @model_name = model_name
       end
 
+      def menu_count(&block)
+        @menu_count_block = block
+      end
+
+      def preview_url(&block)
+        @preview_url_block = block
+      end
+
       private
 
       def name(item_name)
         @item_name = item_name
       end
 
-      def remove_from_menu
-        @display_in_menu = false
-      end
-
       def parent_menu(parent_model)
-        model = parent_model.is_a?(String) ? RademadeAdmin::LoaderService.const_get(parent_model) : parent_model
-        @parent_menu_item = model
+        @parent_menu_item = parent_model.is_a?(String) ? RademadeAdmin::LoaderService.const_get(parent_model) : parent_model
       end
 
       def labels(*field_options, &block)

data/lib/rademade_admin/model/info.rb

@@ -41,12 +41,23 @@ module RademadeAdmin
         @nested
       end
 
+      def hideable?
+        @is_hideable ||= model_reflection.hideable?
+      end
+
       def parent_model
         @model_configuration.parent_menu_item
       end
 
-      def display_in_menu?
-        @model_configuration.display_in_menu
+      def menu_count
+        @model_configuration.menu_count_block.try(:call)
+      end
+
+      def preview_url(item)
+        unless @model_configuration.preview_url_block.nil?
+          # calls within url helpers context
+          Rails.application.routes.url_helpers.instance_exec(item, &@model_configuration.preview_url_block)
+        end
       end
 
       def data_items

data/lib/rademade_admin/model/info/data_item.rb

@@ -10,7 +10,8 @@ module RademadeAdmin
                       :label,
                       :form_position,
                       :list_position,
-                      :has_uploader
+                      :has_uploader,
+                      :order_column
 
         attr_writer :in_form,
                     :form_params,
@@ -23,16 +24,16 @@ module RademadeAdmin
         # @param relation [RademadeAdmin::Model::Info::Relation]
         # @param has_uploader [Boolean]
         #
-        def initialize(name, field = nil, relation = nil, has_uploader = false)
+        def initialize(name, field = nil, relation = nil, has_uploader = false, order_column = nil)
           @name = name
           @field = field
           @relation = relation
           @has_uploader = has_uploader
+          @order_column = order_column
           @in_list = false
           @in_form = false
           @form_params = nil
           @preview_accessor = nil
-          #rm_todo pry.binding if not has_relation? and @field.nil? create custom notification
         end
 
         def has_name?(name)
@@ -55,6 +56,10 @@ module RademadeAdmin
           @relation.sortable?
         end
 
+        def gallery_relation?
+          @relation.is_a? RademadeAdmin::Model::Info::Relation::Gallery
+        end
+
         def localizable?(localizable = true)
           if not @form_params.nil? and @form_params.has_key? :localize
             @form_params[:localize] == localizable

data/lib/rademade_admin/model/info/fields.rb

@@ -57,8 +57,18 @@ module RademadeAdmin
         end
 
         def init_data_item(field, relation)
-          name = relation.nil? ? field.name : relation.name
-          data_item = RademadeAdmin::Model::Info::DataItem.new(name, field, relation, @uploaders.has_uploader?(name))
+          if relation.nil?
+            name = field.name
+            order_column = name
+          else
+            name = relation.name
+            order_column = relation.foreign_key
+          end
+          data_item = RademadeAdmin::Model::Info::DataItem.new(
+            name, field, relation,
+            @uploaders.has_uploader?(name),
+            @data_adapter.columns.include?(order_column) ? order_column : nil
+          )
           add_configuration_data(data_item, name)
           data_item
         end

data/lib/rademade_admin/model/info/relation.rb

@@ -18,6 +18,10 @@ module RademadeAdmin
           @sortable
         end
 
+        def gallery?
+          @is_gallery
+        end
+
         def related_entities(ids)
           RademadeAdmin::Model::Graph.instance.model_info(to).query_adapter.find(ids)
         end
@@ -41,6 +45,7 @@ module RademadeAdmin
           @foreign_key = opt[:foreign_key]
           @sortable = opt[:sortable]
           @sortable_field = opt[:sortable_field]
+          @is_gallery = opt[:is_gallery]
         end
 
       end

data/lib/rademade_admin/model/info/relation/gallery.rb

@@ -0,0 +1,12 @@
+# -*- encoding : utf-8 -*-
+module RademadeAdmin
+  module Model
+    class Info
+      class Relation
+        class Gallery < Relation
+
+        end
+      end
+    end
+  end
+end

data/lib/rademade_admin/model/reflection.rb

@@ -26,6 +26,10 @@ module RademadeAdmin
         @query_adapter ||= "RademadeAdmin::Model::Adapter::Query::#{orm_type}".constantize.new(@model)
       end
 
+      def hideable?
+        _model_ancestors.include? RademadeAdmin::Hideable.name
+      end
+
       protected
 
       def _model_ancestors

data/lib/rademade_admin/routing/mapper.rb

@@ -15,7 +15,7 @@ module RademadeAdmin
             parent_resource_actions = @scope[:scope_level_resource].actions
 
             collection do
-              get :autocomplete
+              get :autocomplete if parent_resource_actions.include? :autocomplete
               patch :sort
             end
 

data/lib/rademade_admin/routing/resource.rb

@@ -2,6 +2,10 @@
 module RademadeAdmin
   module Routing
     class Resource < ActionDispatch::Routing::Mapper::Resources::Resource
+
+      def default_actions
+        super + [:autocomplete]
+      end
     end
   end
 end

data/lib/rademade_admin/uploader/crop_photo.rb

@@ -6,8 +6,9 @@ module RademadeAdmin
     module CropPhoto
       include ::RademadeAdmin::Uploader::Photo
 
-      def crop_image(image_path, params)
-        crop( full_image_path(image_path), params[:x], params[:y], params[:w], params[:h] )
+      def crop_image(params, image_path = nil)
+        crop_path = image_path ? full_image_path(image_path) : path
+        crop(crop_path, params[:x], params[:y], params[:w], params[:h])
       end
 
       def original_dimensions

data/lib/rademade_admin/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module RademadeAdmin
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rademade_admin
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Vladislav Melanitskiy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-13 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -19,6 +19,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,6 +29,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +100,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.2
+- !ruby/object:Gem::Dependency
+  name: select2-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sprockets-sass
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +128,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: sprockets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.11.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +162,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -192,20 +226,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: mini_magick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cells
   requirement: !ruby/object:Gem::Requirement
@@ -365,12 +413,19 @@ files:
 - app/assets/javascripts/rademade_admin/app/common/pagination.coffee
 - app/assets/javascripts/rademade_admin/app/common/related-index.coffee
 - app/assets/javascripts/rademade_admin/app/common/sort-list.coffee
+- app/assets/javascripts/rademade_admin/app/common/status-toggler.coffee
+- app/assets/javascripts/rademade_admin/app/common/turboform.coffee
 - app/assets/javascripts/rademade_admin/app/common/uploader.coffee
 - app/assets/javascripts/rademade_admin/app/form-popup/initializer.coffee
 - app/assets/javascripts/rademade_admin/app/form-popup/view.coffee
 - app/assets/javascripts/rademade_admin/app/forms/insert.coffee
 - app/assets/javascripts/rademade_admin/app/forms/login.coffee
 - app/assets/javascripts/rademade_admin/app/forms/remove.coffee
+- app/assets/javascripts/rademade_admin/app/gallery/image/collection-view.coffee
+- app/assets/javascripts/rademade_admin/app/gallery/image/collection.coffee
+- app/assets/javascripts/rademade_admin/app/gallery/image/model.coffee
+- app/assets/javascripts/rademade_admin/app/gallery/image/view.coffee
+- app/assets/javascripts/rademade_admin/app/gallery/view.coffee
 - app/assets/javascripts/rademade_admin/app/notifier/initialize.js
 - app/assets/javascripts/rademade_admin/app/select2/model.coffee
 - app/assets/javascripts/rademade_admin/app/select2/related/collection-view.coffee
@@ -400,6 +455,7 @@ files:
 - app/assets/stylesheets/rademade_admin/blocks/form/select2.sass
 - app/assets/stylesheets/rademade_admin/blocks/form/table.sass
 - app/assets/stylesheets/rademade_admin/blocks/form/texarea.sass
+- app/assets/stylesheets/rademade_admin/blocks/gallery/_main.sass
 - app/assets/stylesheets/rademade_admin/blocks/header/_logo.sass
 - app/assets/stylesheets/rademade_admin/blocks/header/_menu.sass
 - app/assets/stylesheets/rademade_admin/blocks/header/_search.sass
@@ -438,18 +494,22 @@ files:
 - app/controllers/rademade_admin/application_controller.rb
 - app/controllers/rademade_admin/dashboard_controller.rb
 - app/controllers/rademade_admin/file_controller.rb
+- app/controllers/rademade_admin/gallery_controller.rb
 - app/controllers/rademade_admin/model_controller.rb
 - app/controllers/rademade_admin/sessions_controller.rb
+- app/controllers/rademade_admin/status_controller.rb
 - app/helpers/rademade_admin/field_helper.rb
 - app/helpers/rademade_admin/form_helper.rb
 - app/helpers/rademade_admin/uri_helper.rb
 - app/inputs/rademade_admin/date_time_input.rb
 - app/inputs/rademade_admin/file_input.rb
+- app/inputs/rademade_admin/gallery_input.rb
 - app/inputs/rademade_admin/location_input.rb
 - app/inputs/rademade_admin/related_select_input.rb
 - app/models/rademade_admin/ability.rb
 - app/serializers/autocomplete/base_serializer.rb
 - app/serializers/autocomplete/link_serializer.rb
+- app/services/gallery/manager.rb
 - app/services/linker.rb
 - app/services/loader_service.rb
 - app/services/login.rb
@@ -470,23 +530,35 @@ files:
 - app/services/search/part/abstract.rb
 - app/services/search/part/order.rb
 - app/services/search/part/where.rb
+- app/services/search/where.rb
 - app/services/sortable_service.rb
+- app/services/status/toggler.rb
 - app/services/template_service.rb
+- app/services/upload/gallery_preview_service.rb
 - app/services/upload/preview_service.rb
 - app/services/video_service.rb
 - app/views/layouts/rademade_admin.html.erb
+- app/views/rademade_admin/_blocks/_form.html.erb
 - app/views/rademade_admin/_blocks/_header.html.erb
 - app/views/rademade_admin/_blocks/_menu.html.erb
 - app/views/rademade_admin/_blocks/_on_page_select.html.erb
 - app/views/rademade_admin/_blocks/_pagination.html.erb
+- app/views/rademade_admin/_blocks/_search.html.erb
+- app/views/rademade_admin/_blocks/_sort_reset.html.erb
+- app/views/rademade_admin/_blocks/button/_cancel.html.erb
+- app/views/rademade_admin/_blocks/button/_destroy.html.erb
 - app/views/rademade_admin/_blocks/button/_edit.html.erb
+- app/views/rademade_admin/_blocks/button/_hide.html.erb
+- app/views/rademade_admin/_blocks/button/_preview.html.erb
 - app/views/rademade_admin/_blocks/form/_control.html.erb
 - app/views/rademade_admin/_blocks/form/_lang_panel.html.erb
+- app/views/rademade_admin/_blocks/form/_separator.html.erb
 - app/views/rademade_admin/_blocks/table/_head.html.erb
 - app/views/rademade_admin/_layouts/inner.html.erb
 - app/views/rademade_admin/_layouts/inner/form.html.erb
 - app/views/rademade_admin/_layouts/inner/index_table.html.erb
 - app/views/rademade_admin/_layouts/inner/related_index_table.html.erb
+- app/views/rademade_admin/_layouts/main.html.erb
 - app/views/rademade_admin/abstract/_form.html.erb
 - app/views/rademade_admin/abstract/edit.html.erb
 - app/views/rademade_admin/abstract/form.html.erb
@@ -514,6 +586,8 @@ files:
 - lib/rademade_admin/configuration.rb
 - lib/rademade_admin/engine.rb
 - lib/rademade_admin/file_info_formatter.rb
+- lib/rademade_admin/gallery.rb
+- lib/rademade_admin/hideable.rb
 - lib/rademade_admin/hrml_buffer.rb
 - lib/rademade_admin/input/related_select_input/model_data.rb
 - lib/rademade_admin/input/related_select_input/related_list.rb
@@ -538,6 +612,7 @@ files:
 - lib/rademade_admin/model/info/field.rb
 - lib/rademade_admin/model/info/fields.rb
 - lib/rademade_admin/model/info/relation.rb
+- lib/rademade_admin/model/info/relation/gallery.rb
 - lib/rademade_admin/model/info/relations.rb
 - lib/rademade_admin/model/info/uploader.rb
 - lib/rademade_admin/model/info/uploaders.rb