admin_it 1.1.0 → 1.2.0

data/lib/admin_it/context/single_context.rb

@@ -7,6 +7,7 @@ module AdminIt
     extend ExtendIt::Base
     include ExtendIt::Dsl
     include Renderable
+    include Iconed
 
     attr_reader :name, :display_name, :fields
 
@@ -53,12 +54,12 @@ module AdminIt
 
     def identity; end
 
-    protected
-
-    def context_param
+    def to_link
       identity.nil? ? super : "#{super}(#{identity})"
     end
 
+    protected
+
     #
     module ClassMethods
     end
@@ -127,12 +128,17 @@ module AdminIt
 
     def section=(value)
       value = value.ensure_symbol(downcase: true) || return
-      if sections.empty?
-        return if section != :none
-      else
-        return unless sections.map(&:name).include?(value)
-      end
-      @section = section
+#      if s.empty?
+#        return if section != :none
+#      else
+#        return unless s.map(&:name).include?(value.to_s)
+#      end
+      @section = value
+    end
+
+    def url_params(**params)
+      params[:section] = section unless params.key?(:section)
+      super(**params)
     end
 
     protected
@@ -219,6 +225,10 @@ module AdminIt
       AdminIt::Engine.routes.url_helpers.send("new_#{resource.name}_path")
     end
 
+    def path(_entity: nil)
+      self.class.path
+    end
+
     def self.save_action
       :create
     end

data/lib/admin_it/controller.rb

@@ -24,7 +24,11 @@ module AdminIt
     end
 
     def redirect_to_default
-      redirect_to(resource[resource.default_context].path)
+      if context.child?
+        redirect_to(context.parent.class.url(context.parent, section: context.section))
+      else
+        redirect_to(resource[resource.default_context].url)
+      end
     end
 
     private
@@ -37,6 +41,7 @@ module AdminIt
         if layout == 'admin_it' && !request.query_parameters.empty?
           redirect_to request.path
         else
+          Request.get(request).process!
           render template: "admin_it/#{context.name}", layout: layout
         end
       end

data/lib/admin_it/data/active_record/field.rb

@@ -57,6 +57,13 @@ module AdminIt
       end
 
       def write_value(entity, value)
+        if type == :relation
+          if assoc.collection?
+            value.map! { |x| assoc.klass.find(x) }
+          else
+            value = assoc.klass.find(value)
+          end
+        end
         entity.send("#{name}=", value)
       end
     end

data/lib/admin_it/data/active_record/single_context.rb

@@ -36,7 +36,6 @@ module AdminIt
         fields(scope: :writable).each do |field|
           next unless params.key?(field.name)
           next unless field.writable?
-          next if field.type == :relation
           field.write(entity, params[field.name])
         end
         controller.redirect_to_default if entity.save

data/lib/admin_it/engine.rb

@@ -19,6 +19,8 @@ module AdminIt
         prepend_view_path 'lib/views'
       end
     end
+
+    config.app_middleware.insert_after(Rack::ETag, Middleware)
   end
 
   def self.config

data/lib/admin_it/field/field.rb

@@ -19,17 +19,17 @@ module AdminIt
     include ExtendIt::Callbacks
 
     TYPES = %i(unknown integer float string date datetime time relation enum
-               array hash range regexp symbol binary)
+               array hash range regexp symbol binary image)
+    EDITORS = %i(text combo radio image hidden)
 
     define_callbacks :initialize
 
     dsl do
       dsl_accessor :type, default: TYPES[0]
-
       dsl_accessor :placeholder
-
-      dsl_boolean :readable, :writable, :visible, :sortable
-
+      dsl_accessor :partial
+      dsl_accessor :editor, default: EDITORS[0]
+      dsl_boolean :readable, :writable, :visible, :sortable, :show_label
       dsl_block :read, :write, :render, :display
 
       def hide
@@ -42,7 +42,7 @@ module AdminIt
     end
 
     class << self
-      attr_reader :read, :write, :render, :display, :type
+      attr_reader :read, :write, :render, :display, :type, :partial
 
       protected
 
@@ -67,6 +67,10 @@ module AdminIt
       @sortable.nil? ? @sortable = true : @sortable == true
     end
 
+    def self.show_label?
+      @show_label.nil? ? @show_label = true : @show_label == true
+    end
+
     inherited_class_reader :field_name, :entity_class
 
     def self.create(name, _entity_class, **opts)
@@ -78,7 +82,9 @@ module AdminIt
         @writable = opts[:writable].nil? ? true : opts[:writable] == true
         @visible = opts[:visible].nil? ? true : opts[:visible] == true
         @sortable = opts[:sortable].nil? ? true : opts[:sortable] == true
+        @show_label = opts[:show_label].nil? ? true : opts[:show_label] == true
         self.type = opts[:type]
+        self.editor = opts[:editor] unless opts[:editor].nil?
       end
     end
 
@@ -86,10 +92,18 @@ module AdminIt
       @type = value.ensure_symbol(values: TYPES, default: TYPES[0])
     end
 
+    def self.editor=(value)
+      @editor = value.ensure_symbol(values: EDITORS, default: EDITORS[0])
+    end
+
     def self.placeholder
       @placeholder ||= display_name
     end
 
+    def self.partial
+      @partial ||= nil
+    end
+
     def self.hide
       @visible = false
     end
@@ -98,15 +112,20 @@ module AdminIt
       @visible = true
     end
 
-    class_attr_reader :entity_class, :display_name, :type
+    def self.editor
+      @editor ||= EDITORS[0]
+    end
+
+    class_attr_reader :entity_class, :display_name, :type, :partial, :editor
     attr_writer :visible, :readable, :writable
 
-    def initialize(readable: nil, writable: nil, visible: nil, sortable: nil)
+    def initialize(readable: nil, writable: nil, visible: nil, sortable: nil, show_label: nil)
       run_callbacks :initialize do
         @readable = readable.nil? ? self.class.readable? : readable == true
         @writable = writable.nil? ? self.class.writable? : writable == true
         @visible = visible.nil? ? self.class.visible? : visible == true
         @sortable = sortable.nil? ? self.class.sortable? : sortable == true
+        @show_label = show_label.nil? ? self.class.show_label? : show_label == true
       end
     end
 
@@ -126,10 +145,18 @@ module AdminIt
       @visible == true
     end
 
+    def hidden?
+      @visible != true
+    end
+
     def sortable?
       @sortable == true
     end
 
+    def show_label?
+      @show_label == true
+    end
+
     def read(entity)
       unless readable?
         fail FieldReadError, "Attempt to read write-only field #{name}"
@@ -219,15 +246,23 @@ module AdminIt
     end
 
     def fields(scope: :visible)
+      values = @fields.values
+      if scope.is_a?(Hash)
+        if scope.key?(:editor)
+          return values.select { |f| f.editor == scope[:editor] }
+        end
+      end
       case scope
-      when nil, :all then @fields.values
-      when :visible then @fields.values.select { |f| f.visible? }
-      when :hidden then @fields.values.select { |f| !f.visible? }
-      when :readable then @fields.values.select { |f| f.readable? }
-      when :writable then @fields.values.select { |f| f.writable? }
-      when :sortable then @fields.values.select { |f| f.sortable? }
-      when Field::TYPES then @fields.values.select { |f| f.type == scope }
-      else @fields.values
+      when nil, :all then values
+      when :visible then values.select { |f| f.visible? }
+      when :hidden then values.select { |f| !f.visible? }
+      when :readable then values.select { |f| f.readable? }
+      when :writable then values.select { |f| f.writable? }
+      when :sortable then values.select { |f| f.sortable? }
+      when :with_labels then values.select { |f| f.show_label? }
+      when :without_labels then values.select { |f| !f.show_label? }
+      when Field::TYPES then values.select { |f| f.type == scope }
+      else values
       end
     end
 

data/lib/admin_it/helpers/toolbar.rb

@@ -3,10 +3,11 @@ module AdminIt
   module Helpers
     #
     class ToolbarItem < WrapIt::Link
-      attr_accessor :icon, :add_class, :add_data
+      attr_accessor :icon, :dialog, :add_class, :add_data
       option :icon
       option :add_class
       option :add_data
+      option :dialog
       section :icon
       place :icon, before: :body
 
@@ -15,7 +16,12 @@ module AdminIt
           self[:icon] << html_safe("<i class=\"fa fa-#{icon}\"></i> ")
         end
         html_class << add_class
-        html_data.merge!(add_data) if add_data.is_a?(Hash)
+        data = add_data.is_a?(Hash) ? add_data : {}
+        unless dialog.nil? || dialog.empty?
+          data[:toggle] = 'modal'
+          data[:target] = dialog
+        end
+        html_data.merge!(data)
 #        options = { tag: 'li' }
 #        options[:class] = 'active' if resource == @template.resource
 #        wrap(options)

data/lib/admin_it/locales/en.yml

@@ -19,3 +19,7 @@ en:
       destroy:
         header: 'You are going to delete following record:'
         text: 'Please, confirm deletion'
+    image:
+      select: 'Select'
+      upload: 'Upload'
+      cancel: 'Cancel'

data/lib/admin_it/locales/ru.yml

@@ -19,3 +19,7 @@ ru:
       destroy:
         header: 'Вы собираетесь удалить следующую запись:'
         text: 'Подтвердите удаление'
+    image:
+      select: 'Выбрать'
+      upload: 'Загрузить'
+      cancel: 'Отмена'

data/lib/admin_it/middleware.rb

@@ -0,0 +1,54 @@
+module AdminIt
+  # Middleware request
+  class Request < DelegateClass(Hash)
+    ENV_KEY = 'admin_it.request'
+
+    attr_reader :templates
+
+    def initialize(env)
+      @templates = {}
+      @collections = {}
+      @models = {}
+      @env = env
+      @process = false
+      super({})
+    end
+
+    def process?
+      @process == true
+    end
+
+    def process!
+      @process = true
+    end
+
+    def self.get(request)
+      return request if request.is_a?(self)
+      fail 'Wrong request' unless request.is_a?(Rack::Request)
+      request = request.env[ENV_KEY]
+      fail 'rails_script middleware is not mounted' if request.nil?
+      request
+    end
+  end
+
+  # AdminIt middleware
+  class Middleware
+    SUBST_REGEXP = /<!--\s*([a-zA-Z0-9_]+)\s*-->/
+
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      request = env[Request::ENV_KEY] = Request.new(env)
+      status, headers, body = @app.call(env)
+      if request.process?
+        body.each do |str|
+          # $1 not working here ???
+          str.gsub!(SUBST_REGEXP) { |s| request[SUBST_REGEXP.match(s)[1]] }
+        end
+      end
+      [status, headers, body]
+    end
+  end
+end

data/lib/admin_it/shared.rb

@@ -6,6 +6,10 @@ module AdminIt
 
     dsl { dsl_block :render }
 
+    def renderable?
+      !@render.nil?
+    end
+
     def render(entity, instance = nil, &block)
       return if @render.nil?
       # method used as event emmiter, call block in instance or caller
@@ -33,6 +37,10 @@ module AdminIt
       @icon ||= default_icon
     end
 
+    def icon?
+      !@icon.nil? && !icon.empty?
+    end
+
     protected
 
     def default_icon

data/lib/admin_it/version.rb

@@ -1,5 +1,5 @@
 #
 module AdminIt
   # Current gem version
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/lib/extend_it/dsl.rb

@@ -85,7 +85,7 @@ module ExtendIt
           define_method setter_name do |*args|
             obj =
               if setter.nil?
-                default || args.first
+                args.first || default
               else
                 dsl_receiver.instance_exec(*args, &setter)
               end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: admin_it
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Alexey Ovchinnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-22 00:00:00.000000000 Z
+date: 2014-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -222,11 +236,16 @@ files:
 - app/assets/stylesheets/admin_it/admin_it.css
 - app/assets/stylesheets/admin_it/bootstrap-theme.min.css
 - app/assets/stylesheets/admin_it/bootstrap.min.css
+- app/assets/stylesheets/admin_it/font-awesome-old.min.css.erb
 - app/assets/stylesheets/admin_it/font-awesome.min.css.erb
+- app/controllers/admin_it/signed_url_controller.rb
 - app/views/admin_it/context/_show.html.slim
 - app/views/admin_it/context/_table.html.slim
 - app/views/admin_it/context/_tiles.html.slim
 - app/views/admin_it/edit.html.slim
+- app/views/admin_it/editors/_hidden.html.slim
+- app/views/admin_it/editors/_image.html.slim
+- app/views/admin_it/editors/_text.html.slim
 - app/views/admin_it/new.html.slim
 - app/views/admin_it/shared/_child.html.slim
 - app/views/admin_it/shared/_fields.html.slim
@@ -286,6 +305,7 @@ files:
 - lib/admin_it/helpers/top_menu.rb
 - lib/admin_it/locales/en.yml
 - lib/admin_it/locales/ru.yml
+- lib/admin_it/middleware.rb
 - lib/admin_it/resource.rb
 - lib/admin_it/shared.rb
 - lib/admin_it/version.rb