express_admin 1.6.4 → 1.6.7

data/app/assets/javascripts/express_admin.js

@@ -5,6 +5,8 @@
 //= require tinymce-jquery
 //= require select2
 //= require dropzone
+//= require jquery.validate
+//= require jquery.validate.additional-methods
 //= require ace/ace
 //= require ace/worker-html
 //= require ace/mode-ruby

data/app/assets/javascripts/express_admin/admin.js.coffee

@@ -5,6 +5,9 @@ class AceInput
     @session  = @editor.getSession()
     @renderer = @editor.renderer
     @textarea = $("##{$(editor).data('target')}")
+    @selectedMode = $(editor).data('mode')
+    if @selectedMode == "et"
+      @selectedMode = "ruby"
     @setOptions()
     @updateMode()
     @updateTheme()
@@ -20,7 +23,7 @@ class AceInput
     @session.setFoldStyle "markbeginend"
 
   updateMode: =>
-    mode = require("ace/mode/ruby").Mode
+    mode = require("ace/mode/#{@selectedMode}").Mode
     @session.setMode new mode()
 
   updateTheme: =>
@@ -53,8 +56,11 @@ $(document).ready ->
     e.preventDefault()
     $('a.close-reveal-modal').trigger 'click'
     return
+
+  editor = []
   $('.ace-input').each (index)->
-    editor = new AceInput(this)
+    editor.push(new AceInput(this))
+    window.editor = editor
 
 String::repeat = (num) ->
   new Array(num + 1).join this

data/app/assets/javascripts/express_admin/form_validation.js.coffee

@@ -0,0 +1,24 @@
+$ ->
+  $('form').validate
+    debug: true
+    errorElement: 'span'
+
+  email = $('[name$="[email]"]')
+
+  if email.size() > 0
+    email.rules 'add',
+      required:   true
+      email:      true
+
+  password = $('[name$="[password]"]')
+
+  if password.size() > 0
+    password.rules 'add',
+      required:   true
+      minlength:  8
+
+  password_confirmation = $('[name$="[password_confirmation]"]')
+
+  if password_confirmation.size() > 0
+    password_confirmation.rules 'add',
+      equalTo: $('[name$="[password]"]')

data/app/assets/stylesheets/express_admin/shared/_forms.sass

@@ -9,9 +9,18 @@
     height: 6rem
 
   .error
-    border: none
-    input, select, textarea, .select2-container
-      border: 1px solid $red
+    border: 1px solid $red
+    margin-bottom: 0
+
+  span.error
+    display: block
+    border: 0
+    background-color: #f04124
+    color: $light
+    padding: 0.33333rem 0.5rem 0.5rem
+    font:
+      size: 0.85rem
+    margin-bottom: 1rem
 
   .help
     font:

data/app/assets/stylesheets/express_admin/shared/_tables.sass

@@ -36,3 +36,44 @@
   tbody
     td
       padding: 0.5rem
+
+.smart-table
+  .ion-checkmark-round
+    color: #1fa67a
+
+  table + nav
+    margin-top: 50px
+    text-align: center
+
+  nav.pagination
+    span
+      transition: background-color 300ms ease-out
+      display: inline-block
+      height: 1.33333rem
+      margin-left: 0.27778rem
+      line-height: 20px
+      font:
+        weight: normal
+        size: 0.77778rem
+
+      &.gap:hover
+        background: inherit
+        border-radius: none
+      &:hover
+        background: #e6e6e6
+        border-radius: 3px
+      a
+        color: #999
+        display: block
+        padding: 0.05556rem 0.55556rem 0.05556rem
+
+
+    .current
+      font-weight: bold
+      background: #008cba
+      border-radius: 3px
+      color: #fff
+      padding: 0.05556rem 0.55556rem 0.05556rem
+      &:hover
+        background: #008cba
+

data/app/components/express_admin/code_editor.rb

@@ -0,0 +1,44 @@
+module ExpressAdmin
+  class CodeEditor < ExpressTemplates::Components::Forms::FormComponent
+
+    has_option :mode, "Language of the editor", type: :string
+    has_option :rows, "Define the number of rows", type: :int, default: 10
+
+    contains -> {
+      base_styles = "position: relative; height: 300px;"
+      text_area_tag object, object.send(field), field_helper_options.merge( id: field_id, name: field_name ) #field_name_attribute, field_helper_options
+      content_tag(:div, '', id: "ace_#{field_name}",
+                  class: "ace-input", style: base_styles,
+                  data: { target: field_id, mode: config[:mode] })
+    }
+
+    def field_helper_options
+      {rows: rows, class: "hide", hidden: true}.merge(super)
+    end
+
+    def object
+      self.send resource_name
+    end
+
+    def field
+      config[:id]
+    end
+
+    def rows
+      config[:rows]
+    end
+
+    def field_name
+      "#{object_type}[#{field}]"
+    end
+
+    def field_id
+      "#{object_type}_#{field}_#{object.id}"
+    end
+
+    def object_type
+      object.class.to_s.demodulize.underscore
+    end
+  end
+end
+

data/{vendor/gems/express_templates/lib/express_templates/components/forms → app/components/express_admin}/country_select.rb

@@ -1,5 +1,5 @@
 require 'countries'
-require_relative 'select'
+require 'express_templates/components/forms/select'
 
 module ExpressTemplates
   module Components

data/app/components/express_admin/smart_form.rb

@@ -38,7 +38,6 @@ module ExpressAdmin
           submit(class: 'button')
         }
 
-
         def form_field_for(attrib)
           field_type_substitutions = {'text_area'       => 'textarea',
                                       'datetime_select' => 'datetime',
@@ -46,19 +45,11 @@ module ExpressAdmin
           field_type = attrib.field_type.to_s.sub(/_field$/,'')
           field_type = "password" if attrib.name.match(/password/)
           if relation = attrib.name.match(/(\w+)_id$/).try(:[], 1)
-              # TODO: should allow select2 override
-              select(attrib.name.to_sym, options: config["#{relation}_collection".to_sym], select2: true)
+            # TODO: should allow select2 override
+            select(attrib.name.to_sym, options: config["#{relation}_collection".to_sym], select2: true)
           else
             if field_type == 'text_area'
-              if attrib.name == 'definition'
-                # TODO allow other fields aside from layout.definition
-                base_styles = "position: relative; height: 300px;"
-                target = [attributes[:class].to_a.last, attrib.name].join("_")
-                textarea attrib.name.to_sym, rows: 10, class: "hide", hidden: true
-                content_tag(:div, '', id: "ace_#{attrib.name}", class: "ace-input", style: base_styles, data: { target: target })
-              else
-                textarea attrib.name.to_sym, rows: 10
-              end
+              textarea attrib.name.to_sym, rows: 10
             else
               self.send((field_type_substitutions[field_type] || field_type), attrib.name.to_sym)
             end
@@ -118,8 +109,8 @@ module ExpressAdmin
               attribs
             end.reject {|attrib| (excluded_attributes).map(&:to_s).include? attrib.name }
           end
-
       end
     end
   end
-end
+end
+

data/app/components/express_admin/smart_table.rb

@@ -4,9 +4,10 @@ module ExpressAdmin
       class SmartTable < ExpressTemplates::Components::Configurable
         include ExpressTemplates::Components::Capabilities::Resourceful
 
-        tag :table
+        tag :div
 
         MAX_COLS_TO_SHOW_IDX = 5
+        MAX_ROWS_TO_SHOW_IDX = 10
 
         attr :columns
 
@@ -32,44 +33,70 @@ module ExpressAdmin
                                end
                                options = options + resource_class.instance_methods.grep(/_count$/).map(&:to_s)
                              }
+        has_option :rows, 'Specify the number of rows to show', type: :integer
+
+        has_option :pagination, 'Add pagination to the bottom of the table', type: :string, default: 'bottom'
 
         contains -> {
-          thead {
-            tr {
-              display_columns.each do |column|
-                th(class: column.name) {
-                  column.title
-                }
-              end
-              actions_header if should_show_actions?
-              hidden_columns_header_indicator if columns_hidden?
-            }
-          }
-          tbody {
-            stored_member_assigns = assigns[collection_member_name.to_sym]
-            collection.each do |item|
-              assigns[collection_member_name.to_sym] = item
-              tr(id: row_id(item), class: row_class(item)) {
+          pagination if config[:pagination] == 'top'
+          table(class: table_classes) {
+            thead {
+              tr {
                 display_columns.each do |column|
-                  td(class: column.name) {
-                    cell_value(item, column.accessor)
+                  th(class: column.name) {
+                    column.title
                   }
                 end
-                actions_column(item) if should_show_actions?
-                hidden_column_cell if columns_hidden?
+                actions_header if should_show_actions?
+                hidden_columns_header_indicator if columns_hidden?
               }
-              assigns[collection_member_name.to_sym] = stored_member_assigns
-            end ; nil
+            }
+            tbody {
+              stored_member_assigns = assigns[collection_member_name.to_sym]
+              collection.each do |item|
+                assigns[collection_member_name.to_sym] = item
+                tr(id: row_id(item), class: row_class(item)) {
+                  display_columns.each do |column|
+                    td(class: column.name) {
+                      cell_value(item, column.accessor)
+                    }
+                  end
+                  actions_column(item) if should_show_actions?
+                  hidden_column_cell if columns_hidden?
+                }
+                assigns[collection_member_name.to_sym] = stored_member_assigns
+              end; nil
+            }
           }
-
           scroll_table if !!config[:scrollable]
+          pagination if config[:pagination] == 'bottom'
         }
 
         before_build -> {
           _initialize_columns
-          add_class 'table striped'
         }
 
+        def pagination
+          paginate collection, :route_set => route_set
+        end
+
+        def table_classes
+          'table striped'
+        end
+
+        def route_set
+          namespace.nil? ? namespace : eval(namespace)
+        end
+
+        def collection
+          collections = super.kind_of?(Array) ? Kaminari.paginate_array(super) : super
+          collections.page(index_page).per(specified_rows)
+        end
+
+        def index_page
+          helpers.params[:page] || 1 # Default page is 1
+        end
+
         def scroll_table
           script {
             %Q($('\##{config[:id]}').scrollTableBody())
@@ -124,12 +151,14 @@ module ExpressAdmin
                   elsif attrib = accessor.to_s.match(/(\w+)_link$/).try(:[], 1)
                     # TODO: only works with non-namespaced routes
                     helpers.link_to item.send(attrib), resource_path(item)
+                  elsif attrib = accessor.to_s.match(/(\w+)_checkmark/).try(:[], 1)
+                    "<i class='ion-checkmark-round'></i>".html_safe if item.send(attrib)
                   elsif attrib = accessor.to_s.match(/(\w+)_in_words/).try(:[], 1)
                     if item.send(attrib)
                       if item.send(attrib) < DateTime.now
                         "#{helpers.time_ago_in_words(item.send(attrib))} ago"
                       else
-                        helpers.time_ago_in_words(item.send(attrib))
+                        "in #{helpers.time_ago_in_words(item.send(attrib))}"
                       end
                     else
                       'never'
@@ -184,6 +213,16 @@ module ExpressAdmin
           td(class: 'more-columns-indicator')
         end
 
+        def specified_rows
+          config[:rows] || MAX_ROWS_TO_SHOW_IDX
+        end
+
+        def hidden_columns_header_indicator
+          th(class: 'more-columns-indicator') {
+            "..."
+          }
+        end
+
         private
           def _initialize_columns
             @columns =

data/lib/express_admin/engine.rb

@@ -6,6 +6,7 @@ require 'jquery-rails'
 require 'jquery-ui-rails'
 require 'select2-rails'
 require 'dropzonejs-rails'
+require 'jquery-validation-rails'
 require 'foundation_apps_styles'
 require 'bourbon'
 require 'gravatar_image_tag'

data/lib/express_admin/version.rb

@@ -1,3 +1,3 @@
 module ExpressAdmin
-  VERSION = "1.6.4"
+  VERSION = "1.6.7"
 end

data/test/dummy/test/components/code_editor_test.rb

@@ -0,0 +1,53 @@
+require 'test_helper'
+
+class Foo
+  def self.columns; [] ; end
+end
+
+module Components
+
+  class CodeEditorTest < ActiveSupport::TestCase
+
+    def compiled_code_editor(*args)
+       arbre {
+        express_form(:foo){
+          code_editor :name, *args
+        }
+      }
+    end
+
+    def assigns
+      { foo: resource }
+    end
+
+    def helpers
+      mock_action_view do
+        def foos_path
+          '/foos'
+        end
+      end
+    end
+
+    test "renders the code editor" do
+      assert compiled_code_editor
+    end
+
+    test "div displays the ace editor" do
+      assert_match 'class="ace-input"', compiled_code_editor
+    end
+
+    test "text area is hidden" do
+      assert_match /textarea(.*?)class="hide" hidden="hidden"/, compiled_code_editor
+    end
+
+    test "rows can be changed" do
+      assert_match 'rows="15"', compiled_code_editor(rows: 15)
+    end
+
+    test "language mode can be changed" do
+      assert_match 'data-mode="html"', compiled_code_editor(mode: "html")
+      assert_match 'data-mode="et"', compiled_code_editor(mode: "et")
+    end
+
+  end
+end

data/test/dummy/test/components/country_select_test.rb

@@ -0,0 +1,36 @@
+require 'test_helper'
+require 'ostruct'
+class CountrySelectTest < ActiveSupport::TestCase
+
+  def resource_assigns
+    {example_engine: ExampleEngine::MockRouteProxy.new}
+  end
+
+  def helpers
+    view = mock_action_view
+    class << view
+      def widgets_path
+        "/widgets"
+      end
+      alias collection_path widgets_path
+    end
+    view
+  end
+
+  test "country_select renders without an error" do
+    assert arbre(widget: Widget.new) {
+      express_form(:widget) {
+        country_select :column6
+      }
+    }
+  end
+
+  test "can change label for country_select" do
+    html = arbre(widget: Widget.new) {
+      express_form(:widget) {
+        country_select :column6, label: "Country"
+      }
+    }
+    assert_match(/<label.*Country<\/label>/, html)
+  end
+end