rademade_admin 0.1.5 → 0.1.6

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

@@ -61,7 +61,7 @@ module RademadeAdmin
                 :has_many => has_many_relations.include?(type),
                 :sortable => is_sortable,
                 :sortable_field => is_sortable ? relation_info.sortable_field : nil,
-                :foreign_key => relation_info.foreign_key.to_sym
+                :foreign_key => relation_info.foreign_key ? relation_info.foreign_key.to_sym : nil
               })
             end
             relations

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

@@ -35,7 +35,7 @@ module RademadeAdmin
                 field = "`#{part[:field]}`"
                 if part[:value].is_a? Regexp
                   # hack temporary fix
-                  condition += "#{field} REGEXP ?"
+                  condition += "LOWER(#{field}) REGEXP ?"
                   part[:value] = part[:value].source
                 elsif part[:value].is_a? Array
                   condition += "#{field} IN (?)"

data/lib/rademade_admin/model/configuration.rb

@@ -29,6 +29,14 @@ module RademadeAdmin
         @list_fields ||= RademadeAdmin::Model::Configuration::ListFields.new
       end
 
+      # Return configured csv info
+      #
+      # @return [RademadeAdmin::Model::Configuration::CsvFields]
+      #
+      def csv_fields
+        @csv_fields ||= RademadeAdmin::Model::Configuration::CsvFields.new
+      end
+
       # Return configured fields info
       #
       # @return [RademadeAdmin::Model::Configuration::FormFields]
@@ -46,7 +54,11 @@ module RademadeAdmin
       end
 
       def all_field_names
-        @all_field_names ||= Set.new(list_fields.all.map(&:name) + form_fields.all.map(&:name))
+        @all_field_names ||= Set.new([
+          list_fields.all.map(&:name),
+          form_fields.all.map(&:name),
+          csv_fields.all.map(&:name)
+        ].flatten(1))
       end
 
       def model(model_name)
@@ -79,6 +91,10 @@ module RademadeAdmin
         list_fields.configure(*field_options, &block)
       end
 
+      def csv(*field_options, &block)
+        csv_fields.configure(*field_options, &block)
+      end
+
       def form(*field_options, &block)
         form_fields.configure(*field_options, &block)
       end

data/lib/rademade_admin/model/configuration/csv_fields.rb

@@ -0,0 +1,12 @@
+# -*- encoding : utf-8 -*-
+require 'rademade_admin/model/configuration/list_fields'
+
+module RademadeAdmin
+  module Model
+    class Configuration
+      class CsvFields < ListFields
+
+      end
+    end
+  end
+end

data/lib/rademade_admin/model/configuration/list_field.rb

@@ -12,7 +12,11 @@ module RademadeAdmin
         end
 
         def preview_accessor
-          @opts.has_key?(:method) ? @opts[:method] : nil
+          @opts[:method]
+        end
+
+        def preview_handler
+          @opts[:handler]
         end
 
       end

data/lib/rademade_admin/model/info.rb

@@ -57,17 +57,25 @@ module RademadeAdmin
         @model_configuration.menu_count_block.try(:call)
       end
 
+      # TODO it's not Model::Info logic. Move method
       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
+      rescue
+        nil
       end
 
       def data_items
         fields.data_items
       end
 
+      # TODO it's not Model::Info logic. Move method
+      def has_csv?
+        not data_items.csv_fields.empty?
+      end
+
       # Fields data class
       #
       # @return [RademadeAdmin::Model::Info::Fields]
@@ -95,6 +103,8 @@ module RademadeAdmin
         model_reflection.data_adapter
       end
 
+      # TODO add galleries component
+
       # @return [RademadeAdmin::Model::Info::Relations]
       def relations
         @model_relations ||= RademadeAdmin::Model::Info::Relations.new(_data_adapter)
@@ -104,7 +114,6 @@ module RademadeAdmin
       def uploaders
         @model_uploaders ||= RademadeAdmin::Model::Info::Uploaders.new(_data_adapter)
       end
-
     end
   end
 end

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

@@ -4,36 +4,44 @@ module RademadeAdmin
     class Info
       class DataItem
 
+        # TODO extract sub classes
+
         attr_accessor :name,
                       :field,
                       :relation,
                       :label,
+                      :has_uploader,
+                      :order_column,
+                      :form_params,
+
                       :form_position,
                       :list_position,
-                      :has_uploader,
-                      :order_column
+                      :csv_position,
+
+                      :in_form,
+                      :in_list,
+                      :in_csv,
 
-        attr_writer :in_form,
-                    :form_params,
-                    :in_list,
-                    :preview_accessor
+                      :list_preview_accessor,
+                      :list_preview_handler,
+                      :csv_preview_accessor,
+                      :csv_preview_handler
 
         #
         # @param name [Symbol]
         # @param field [RademadeAdmin::Model::Info::Field]
         # @param relation [RademadeAdmin::Model::Info::Relation]
-        # @param has_uploader [Boolean]
+        # @param order_column [String]
         #
-        def initialize(name, field = nil, relation = nil, has_uploader = false, order_column = nil)
+        def initialize(name, field = nil, relation = nil, order_column = nil)
           @name = name
           @field = field
           @relation = relation
-          @has_uploader = has_uploader
           @order_column = order_column
+          @has_uploader = false
           @in_list = false
           @in_form = false
-          @form_params = nil
-          @preview_accessor = nil
+          @in_csv = false
         end
 
         def has_name?(name)
@@ -81,14 +89,24 @@ module RademadeAdmin
           @setter ||= :"#{getter}="
         end
 
-        def preview_accessor
-          @preview_accessor.nil? ? getter : @preview_accessor
+        def list_preview_accessor
+          return @list_preview_accessor if @list_preview_accessor
+          getter
+        end
+
+        def csv_preview_accessor
+          return @csv_preview_accessor if @csv_preview_accessor
+          getter
         end
 
         def in_list?
           @in_list
         end
 
+        def in_csv?
+          @in_csv
+        end
+
         def in_form?
           @in_form
         end

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

@@ -0,0 +1,37 @@
+# -*- encoding : utf-8 -*-
+module RademadeAdmin
+  module Model
+    class Info
+      class DataItem
+        class Initializer
+
+          def auto
+            return from_relation if @relation
+            return form_field if @field
+            raise 'No relation and field given for DateItem initialization' # TODO custom exception
+          end
+
+          def from_relation
+            build(@relation.name, @relation.foreign_key)
+          end
+
+          def form_field
+            name = @field.name
+            build(name, name)
+          end
+
+          def build(name, order_column)
+            RademadeAdmin::Model::Info::DataItem.new(name, @field, @relation, order_column)
+          end
+
+          protected
+
+          def initialize(field, relation)
+            @field, @relation = field, relation
+          end
+
+        end
+      end
+    end
+  end
+end

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

@@ -4,6 +4,7 @@ module RademadeAdmin
     class Info
       class DataItems
         include ::Enumerable
+
         # rm_todo extract mixins
 
         UNINFORMATIVE_FIELDS = [:_id, :deleted_at, :position]
@@ -17,7 +18,7 @@ module RademadeAdmin
         end
 
         def each(&block)
-          items.each(&block)
+          items.values.each(&block)
         end
 
         # @param data_item [RademadeAdmin::Model::Info::DataItem]
@@ -57,6 +58,10 @@ module RademadeAdmin
           @list_fields ||= collect_list_fields
         end
 
+        def csv_fields
+          @csv_fields ||= collect_csv_fields
+        end
+
         def filter_fields
           @autocomplete_fields ||= collect_field_names { |data_item| data_item.string_field? }
         end
@@ -95,6 +100,11 @@ module RademadeAdmin
           fields.empty? ? _default_fields.values : fields.values.sort_by(&:list_position)
         end
 
+        def collect_csv_fields
+          fields = items.select { |_, data_item| data_item.in_csv? }
+          fields.empty? ? [] : fields.values.sort_by(&:csv_position)
+        end
+
         def collect_form_fields
           fields = items.select { |_, data_item| data_item.in_form? }
           fields.empty? ? _default_fields : fields

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

@@ -24,56 +24,59 @@ module RademadeAdmin
         end
 
         def data_items
-          @data_items ||= init_data_items
+          @data_items ||= build_items
         end
 
-        private
+        protected
 
-        def init_data_items
+        def item_initializer
+          RademadeAdmin::Model::Info::DataItem::Initializer
+        end
+
+        def build_items
           data_items = RademadeAdmin::Model::Info::DataItems.new
           used_relations = []
 
+          # TODO extract sub - methods
           @data_adapter.fields.each do |_, field|
             relation = field.relation_name.nil? ? nil : @data_adapter.relation(field.relation_name)
             used_relations << field.relation_name if relation
-            data_items.add_data_item(init_data_item(field, relation))
+            data_item = item_initializer.new(field, relation).auto
+            data_items.add_data_item( data_item )
           end
 
           @data_adapter.relations.each do |_, relation|
             unless used_relations.include? relation.name
-              data_items.add_data_item(init_data_item(nil, relation))
+              data_items.add_data_item( item_initializer.new(nil, relation).from_relation )
             end
           end
 
           @model_configuration.all_field_names.each do |field_name|
             unless data_items.has_field?(field_name)
-              data_item = RademadeAdmin::Model::Info::DataItem.new(field_name)
-              add_configuration_data(data_item, field_name)
-              data_items.add_data_item(data_item)
+              data_items.add_data_item( item_initializer.new(nil, nil).build(field_name, nil) )
             end
           end
 
+          configure_items(data_items)
+
           data_items
         end
 
-        def init_data_item(field, relation)
-          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
+        def configure_items(data_items)
+          data_items.each { |item| configure_item(item) }
+
         end
 
-        def add_configuration_data(data_item, name)
+        # @param [RademadeAdmin::Model::Info::DataItem]
+        def configure_item(data_item)
+
+          # TODO extract sub methods
+
+          name = data_item.name
+
+          data_item.has_uploader = @uploaders.has_uploader?(name)
+          data_item.order_column = nil unless @data_adapter.columns.include?(data_item.order_column)
+
           @model_configuration.field_labels.find(name) do |label_data|
             data_item.label = label_data.label
           end
@@ -84,11 +87,21 @@ module RademadeAdmin
             data_item.form_position = index
           end
 
-          @model_configuration.list_fields.find_with_index(name) do |list_field_data, index|
+          @model_configuration.list_fields.find_with_index(name) do |data, index|
             data_item.in_list = true
-            data_item.preview_accessor = list_field_data.preview_accessor
+            data_item.list_preview_accessor = data.preview_accessor
+            data_item.list_preview_handler = data.preview_handler
             data_item.list_position = index
           end
+
+          @model_configuration.csv_fields.find_with_index(name) do |data, index|
+            data_item.in_csv = true
+            data_item.csv_preview_accessor = data.preview_accessor
+            data_item.csv_preview_handler = data.preview_handler
+            data_item.csv_position = index
+          end
+
+          data_item
         end
 
       end

data/lib/rademade_admin/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rademade_admin
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Vladislav Melanitskiy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-27 00:00:00.000000000 Z
+date: 2015-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -142,6 +142,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.11.0
+- !ruby/object:Gem::Dependency
+  name: sass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -408,6 +422,7 @@ files:
 - app/assets/javascripts/rademade_admin/app/common/datetime-picker.coffee
 - app/assets/javascripts/rademade_admin/app/common/dnd-sort.coffee
 - app/assets/javascripts/rademade_admin/app/common/droplist.coffee
+- app/assets/javascripts/rademade_admin/app/common/image-preview.coffee
 - app/assets/javascripts/rademade_admin/app/common/lang-panel.coffee
 - app/assets/javascripts/rademade_admin/app/common/location.coffee.erb
 - app/assets/javascripts/rademade_admin/app/common/pagination.coffee
@@ -434,13 +449,13 @@ files:
 - app/assets/javascripts/rademade_admin/app/select2/related/view.coffee
 - app/assets/javascripts/rademade_admin/app/select2/view.coffee
 - app/assets/javascripts/rademade_admin/app/templates/crop.jst.ejs
+- app/assets/javascripts/rademade_admin/app/templates/image-preview-popup.jst.ejs
 - app/assets/javascripts/rademade_admin/app/templates/related-item.jst.ejs
 - app/assets/javascripts/rademade_admin/form/form-ajax.coffee
 - app/assets/javascripts/rademade_admin/form/form-initializater.coffee
 - app/assets/javascripts/rademade_admin/form/form-validation.coffee
 - app/assets/javascripts/rademade_admin/form/form.coffee
 - app/assets/javascripts/rademade_admin/library/ckeditor/config.js
-- app/assets/javascripts/rademade_admin/library/jquery/jquery.tablednd.js
 - app/assets/javascripts/rademade_admin/library/notifier.custom.min.js
 - app/assets/javascripts/rademade_admin/settings/ajax-csrf.coffee
 - app/assets/stylesheets/edit.css
@@ -510,6 +525,7 @@ files:
 - app/models/rademade_admin/ability.rb
 - app/serializers/autocomplete/base_serializer.rb
 - app/serializers/autocomplete/link_serializer.rb
+- app/services/csv_service.rb
 - app/services/gallery/manager.rb
 - app/services/linker.rb
 - app/services/loader_service.rb
@@ -589,7 +605,7 @@ files:
 - 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/html_buffer.rb
 - lib/rademade_admin/input/related_select_input/model_data.rb
 - lib/rademade_admin/input/related_select_input/related_list.rb
 - lib/rademade_admin/model/adapter/data.rb
@@ -599,6 +615,7 @@ files:
 - lib/rademade_admin/model/adapter/query/active_record.rb
 - lib/rademade_admin/model/adapter/query/mongoid.rb
 - lib/rademade_admin/model/configuration.rb
+- lib/rademade_admin/model/configuration/csv_fields.rb
 - lib/rademade_admin/model/configuration/field_label.rb
 - lib/rademade_admin/model/configuration/fields.rb
 - lib/rademade_admin/model/configuration/fields_labels.rb
@@ -609,6 +626,7 @@ files:
 - lib/rademade_admin/model/graph.rb
 - lib/rademade_admin/model/info.rb
 - lib/rademade_admin/model/info/data_item.rb
+- lib/rademade_admin/model/info/data_item/initializer.rb
 - lib/rademade_admin/model/info/data_items.rb
 - lib/rademade_admin/model/info/field.rb
 - lib/rademade_admin/model/info/fields.rb