action_admin 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a9012703a5f2b71c90cf819ea615adc7a01b4962
-  data.tar.gz: 04d2c416ffd490f115d0a2355c4ca992dd4c7868
+SHA256:
+  metadata.gz: c77406bd753e915216a297463d96665a366cc77a3b11fa90062fee7effeea727
+  data.tar.gz: b5f009f61c75d7c09306116c785e36d2cf063868f00949499290e9c01a18af03
 SHA512:
-  metadata.gz: 4a2515331cca4dc5faddff423557a13ccffc09270efb4b88422c27747091d1676727cca40c89a11161a9e930885f3759ef54b64864ddc87b4a828d497c54144b
-  data.tar.gz: f8e510880908c0c62abd7a73e5416dc8b268d5ecda0dbc051498406f96817ef011c5fff8b4ce5f15ca3f66c55be0c53ad3098c5bc4956db9da05841410b121be
+  metadata.gz: 4eb6f0321c070337c08ac66251e9ad6a0a315218a06098bd7224c16450579b45b1b77744d8b1bd253722699a291825900ba59a4531c97fdbfacb78a68d6b9606
+  data.tar.gz: b9cc52e4b2941a03044d13482fa7b495f0bca6bde4a9c85e9419ca8289a46b8e4870c3ce1a411e3b81eff4e5ea2d6c235fe8e50409c072c63c46fd41674c5361

data/app/controllers/action_admin/shortcodes_controller.rb

@@ -13,7 +13,8 @@ module ActionAdmin
     end
 
     def form
-      @shortcode = params[:id]
+      @presenter = helpers.admin_shortcode_present(params[:id])
+      @shortcode = ActionAdmin::Shortcode.new(params, @presenter.fields)
     end
 
     def preview

data/app/helpers/action_admin/markup_helper.rb

@@ -29,7 +29,7 @@ module ActionAdmin
 
     def admin_settings_menu(records, label_method=:id)
       options = {
-        menu_class:    'menu horizontal',
+        menu_class:    'vertical menu icons icon-left',
         active_class:  'active',
         keep_defaults: false
       }
@@ -38,7 +38,7 @@ module ActionAdmin
         label = record.send(label_method)
         url   = edit_record_url(record)
 
-        [:"#{label.downcase.underscore}", { label: label, url: url, html: { class: 'padding-1' } }]
+        [:"#{label.downcase.underscore}", { label: label, url: url }]
       end
 
       smart_navigation_for Hash[items], options

data/app/inputs/action_admin/attachment_input.rb

@@ -43,7 +43,20 @@ module ActionAdmin
     end
 
     def attachment_url
-      object.try(attribute_name).try(:file_url, :preview)
+      medium = nil
+
+      if object.is_a? ::ActiveRecord::Base
+        medium = object.try(attribute_name)
+      elsif options[:model_name]
+        media_model = "#{options[:model_name]}".safe_constantize
+
+        if media_model.present?
+          attval = object.send(attribute_name) rescue nil
+          medium = media_model.find_by_id(attval)
+        end
+      end
+
+      medium.try(:file_url, :preview)
     end
 
     def attachment(image_url=nil)

data/app/inputs/action_admin/attachments_input.rb

@@ -30,13 +30,13 @@ module ActionAdmin
       @builder.hidden_field(final_attribute_name, value: '', id: nil, multiple: true)
     end
 
-    def hidden_input
+    def hidden_input(image_id=nil)
       input_options = input_html_options
 
       input_options[:data]        ||= {}
       input_options[:data][:value]  = :id
 
-      @builder.hidden_field(final_attribute_name, input_options.merge(multiple: true))
+      @builder.hidden_field(final_attribute_name, input_options.merge(multiple: true, value: image_id))
     end
 
     def input_html_id
@@ -44,20 +44,33 @@ module ActionAdmin
     end
 
     def attachment_urls
-      Array(object.try(attribute_name)).map { |a| a.try(:file_url, :small) }
+      media = nil
+
+      if object.is_a? ::ActiveRecord::Base
+        media = object.try(attribute_name)
+      elsif options[:model_name]
+        media_model = "#{options[:model_name]}".safe_constantize
+
+        if media_model.present?
+          attval = object.send(attribute_name) rescue nil
+          media = media_model.where(id: attval)
+        end
+      end
+
+      Array(media).map { |a| [a.try(:id), a.try(:file_url, :small), a.try(:name)] }
     end
 
     def attachments(urls=[])
-      urls.map { |u| attachment(u) }.join.html_safe
+      urls.map { |u| attachment(*u) }.join.html_safe
     end
 
-    def attachment(image_url=nil)
+    def attachment(image_id=nil, image_url=nil, image_name=nil)
       image    = content_tag :img, nil, src: image_url, class: 'width-100 margin-bottom-1', data: { src: 'file.small.url', url: "#{template.root_url.chomp('/')}[src]" }
-      filename = content_tag :span, nil, class: 'filename', data: { text: 'name' }
+      filename = content_tag :span, image_name, class: 'filename', data: { text: 'name' }
       remove   = content_tag :span, nil, class: 'remove-button mdi mdi-close', data: { remove: '' }
       thumb    = content_tag :div, image + filename + remove, class: 'thumbnail'
 
-      content_tag :div, hidden_input + thumb, class: 'attachment', data: { list_item: '' }
+      content_tag :div, hidden_input(image_id) + thumb, class: 'attachment', data: { list_item: '' }
     end
 
     def input_template

data/app/inputs/action_admin/textarea_input.rb

@@ -0,0 +1,13 @@
+module ActionAdmin
+  class TextareaInput < SimpleForm::Inputs::TextInput
+    def input(wrapper_options)
+      input_html_options[:data] ||= {}
+      input_html_options[:data].merge!({
+        textarea: '',
+        resize_icon: 'mce-ico mce-i-resize'
+      })
+
+      super
+    end
+  end
+end

data/app/views/action_admin/shortcodes/form.html.slim

@@ -1,2 +1,2 @@
-= admin_form_for(:"#{@shortcode}", url: root_url, method: :get) do |f|
-  = admin_shortcode_present(@shortcode).render_fields(f)
+= admin_form_for(@shortcode, url: root_url, method: :get) do |f|
+  = @presenter.render_fields(f)

data/app/views/admin/templates/_settings.html.slim

@@ -1,22 +1,10 @@
 = admin_form_for([:admin, current_record]) do |f|
-  = f.error_notification
 
-  / .page-content
-  /   .sidebar
-  /     .panel
-  /       .panel-header.border
-  /         = 'Menu'
-  /
-  /       .panel-content
-  /         = admin_settings_menu collection, label_method
-  /
-  /   .content
-  /     = admin_present(current_record).render_panels(form: f)
-  /     = f.button :submit
-
-  .panel
-    .panel-content.padding-0
+  .page-content
+    .sidebar
       = admin_settings_menu collection, label_method
 
-  = admin_present(current_record).render_panels(form: f)
-  = f.button :submit
+    .content
+      = f.error_notification
+      = admin_present(current_record).render_panels(form: f)
+      = f.button :submit

data/lib/action_admin.rb

@@ -16,6 +16,7 @@ module ActionAdmin
   autoload :Form
   autoload :Header
   autoload :Table
+  autoload :Shortcode
 
   # Set attr accessors
   mattr_accessor :config

data/lib/action_admin/shortcode.rb

@@ -0,0 +1,53 @@
+module ActionAdmin
+  class Shortcode
+    # Initializes the decorator
+    def initialize(params, attribs={})
+      attribs = Hash[attribs.map { |k, _v| [k, nil] }].symbolize_keys
+      string  = URI.decode(params[:shortcode])
+
+      @field  = params[:id]
+      @object = parse_shortcode_attr(string, attribs)
+    end
+
+    # Sets the model name
+    def model_name
+      ActiveModel::Name.new(self.class, nil, @field)
+    end
+
+    # Delegates to the wrapped object
+    def method_missing(method, *args, &block)
+      if @object.key? method
+        @object[method]
+      elsif @object.respond_to? method
+        @object.send(method, *args, &block)
+      end
+    end
+
+    # Check if attribute exists
+    def has_attribute?(attribute)
+      @object.key? attribute
+    end
+
+    private
+
+      # Checks if shortcode string is valid
+      def valid_shortcode?(string)
+        "#{string}".strip.match(/^\[(\w+) (.+?)\]$/).present? and
+        parse_shortcode_field(string) == "#{@field}"
+      end
+
+      # Parses shortcode string and returns field name
+      def parse_shortcode_field(string)
+        "#{string}".match(/^\[(\w+) /).captures.first
+      end
+
+      # Parses shortcode string and returns attributes
+      def parse_shortcode_attr(string, attribs)
+        found = Hash["#{string}".scan(/(\w+)="([^"]+)"/)].symbolize_keys
+        valid = found.select { |k, _v| k.in? attribs.keys }
+        valid = Hash[valid.map { |k, v| k == :ids ? [k, v.split(',').map(&:strip)] : [k, v] }]
+
+        valid_shortcode?(string) ? attribs.merge(valid) : attribs
+      end
+  end
+end

data/lib/action_admin/version.rb

@@ -1,3 +1,3 @@
 module ActionAdmin
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: action_admin
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Jonian Guveli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-28 00:00:00.000000000 Z
+date: 2018-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -204,6 +204,7 @@ files:
 - app/inputs/action_admin/seo_analysis_input.rb
 - app/inputs/action_admin/slug_input.rb
 - app/inputs/action_admin/tag_list_input.rb
+- app/inputs/action_admin/textarea_input.rb
 - app/inputs/action_admin/tinymce_input.rb
 - app/inputs/action_admin/title_input.rb
 - app/inputs/action_admin/toggle_input.rb
@@ -263,6 +264,7 @@ files:
 - lib/action_admin/form/minimal_builder.rb
 - lib/action_admin/header.rb
 - lib/action_admin/routes.rb
+- lib/action_admin/shortcode.rb
 - lib/action_admin/table.rb
 - lib/action_admin/version.rb
 - lib/tasks/action_admin_tasks.rake
@@ -286,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Ruby on Rails mountable engine to create admin interfaces