faalis 2.0.5 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20d4b118e1da29b8834ccedee9cc1d1fb1190792
-  data.tar.gz: 5b528576a0774a70e3fa2b2e4b702a2e47b30abd
+  metadata.gz: 7e67dad743a6caeac4a9fb8b3dd3a84c0535a580
+  data.tar.gz: 7bdbf46c6e8413407556431b272fc42138246c78
 SHA512:
-  metadata.gz: ab54e163b30605dfc66cc9d39a47f1f2b914d2c949d0caafc9a6002bb009a40fefa88be7f11c18a8efa078a1534367beead995aba796c47fb8f3a1703b7555a9
-  data.tar.gz: ccf0422c9f191f93ec9805e8ec35c56470a98587735a49baa08ad92a126b483f5fca5b055c44bc2d867281b3b1c1d9a54b13acdfcd6f5ba997d9e2df4250c707
+  metadata.gz: c9fc0216db22840d7a89b000720ab32b32b47f3215f5afbd662bc41eaf5f2bf4e7dd775bbf490b11596f3525176f5d1ead489a670effeef7386ed4951410a3ac
+  data.tar.gz: 0d63d84d4a9a3e837cd9ef781743c09295fade9d383473a9ae5a121a3a12151999595e31e5043539b350939d973626db0e59250a66f004138bab4e4b68fbc719

data/app/assets/stylesheets/faalis/dashboard/ltr/application.css

@@ -19,3 +19,18 @@
 .dropdown.user.user-menu {
   width: auto;
 }
+
+.delete {
+  padding-left: 8px;
+}
+
+.btn-group {
+  padding-top: 10px;
+  width: 120px;
+
+}
+
+.pull-left.link.btn.btn-xs {
+  margin: 2px;
+
+}

data/app/assets/stylesheets/faalis/dashboard/rtl/application.css

@@ -3,34 +3,5 @@
 //= require nprogress
 //= require nprogress-bootstrap
 //= require faalis/dashboard/share
+//= require faalis/dashboard/rtl/base
 //= require_self
-.fa {
-   padding-left: 0.4em;
-}
-
-.user-image {
-  display: inline !important;
-}
-.user-name-span {
-  width: 100%;
-  display: inline !important;
-}
-.dropdown.user.user-menu {
-  width: auto;
-}
-
-.pagination li:first-child a {
-  border-bottom-left-radius: 0;
-  border-top-left-radius: 0;
-  border-bottom-right-radius: 4px;
-  border-top-right-radius: 4px;
-
-}
-
-.pagination li:last-child a {
-  border-bottom-left-radius: 4px;
-  border-top-left-radius: 4px;
-  border-bottom-right-radius: 0;
-  border-top-right-radius: 0;
-
-}

data/app/assets/stylesheets/faalis/dashboard/share.scss

@@ -40,3 +40,12 @@
   margin-left: 0.5em;
   margin-right: 0.5em;
 }
+
+.action-bar {
+  .tool {
+    opacity: 0.5;
+    &:hover {
+      opacity: 1;
+    }
+  }
+}

data/app/assets/stylesheets/faalis/dashboard/variables.scss

@@ -2,3 +2,8 @@
 
 $loading-indicators-color:  #FD7D00;
 $loading-indicators-shadow:  #4FF0A6;
+$red: #DD4B39;
+$dark_blue: #3C8DBC;
+$blue: #00C0EF;
+$green: #00A65A;
+$orange: #F39C12;

data/app/controllers/faalis/application_controller.rb

@@ -20,7 +20,7 @@ class Faalis::ApplicationController < ActionController::Base
 
   include Pundit
 
-  before_filter :set_locale
+  before_action :set_locale
 
  def set_locale
    if I18n.available_locales.length > 1

data/app/controllers/faalis/dashboard/application_controller.rb

@@ -31,6 +31,8 @@ module Faalis
         end
 
         def redirect_to_404(e)
+          logger.warn "Catch and ActiveRecord::RecordNotFoundL: '#{e}'"
+
           respond_to do |f|
             f.html { redirect_to faalis.dashboard_not_found_url }
             f.js { render 'faalis/dashboard/not_found' }

data/app/controllers/faalis/dashboard_controller.rb

@@ -4,7 +4,7 @@ require_dependency 'faalis/dashboard/application_controller'
 module Faalis
   class DashboardController < ::Dashboard::ApplicationController
 
-    before_filter :authenticate_user!, :only => [:modules, :index]
+    before_action :authenticate_user!, :only => [:modules, :index]
 
     def index
       redirect_to dashboard_path if params.include? :signin

data/app/helpers/faalis/dashboard_helper.rb

@@ -1,5 +1,12 @@
+require_dependency 'faalis/dashboard/helpers/box_helpers'
+
 module Faalis
   module DashboardHelper
+    include Faalis::Dashboard::Helpers::BoxHelpers
+
+    def form_label(resource, name)
+      ::I18n.t("forms.#{@resource.class.name.underscore.to_s.gsub('/', '.')}.#{name}")
+    end
 
     def localized_time(time)
       # Fixme: Setup and use Rails l10n

data/app/views/faalis/dashboard/resource/_form.html.slim

@@ -12,7 +12,7 @@
             .col-sm-12.col-lg-6.col-md-6
               .form-group data-name=(name)
                 - hash = @_fields_properties[name.to_sym] || {}
-                - hash[:label] = I18n.t("forms.#{@resource.class.name.underscore.to_s}.#{name}") unless hash.include?(:label)
+                - hash[:label] = form_label(@resource, name) unless hash.include?(:label)
                 = f.send(:input, name, hash)
             - if index % 2 != 0
              | </div>

data/app/views/faalis/dashboard/resource/index.html.slim

@@ -42,17 +42,18 @@
                   td
                     = resource.try(field.to_s).to_s || '-'
                 td.btn-user.text-center.hidden-print
-                  .btn-group
-                    a.pull-left.link.btn.btn-xs.btn-default href=(get_url(@show_route, resource.id, @engine))
-                      i.fa.fa-eye
-                    a.warning.link.pull-left.btn.btn-xs.btn-default href=(get_url(@edit_route, resource.id, @engine))
-                      i.fa.fa-edit
-                    a.link.pull-left.btn.btn-xs.btn-default href=(get_url(@show_route, resource.id, @engine)) data-remote="true" data-method="delete"
-                      i.fa.fa-remove.btn-remove
+                  .btn-group.action-bar
+                    a.pull-left.link.btn.btn-xs.btn.show.tool href=(get_url(@show_route, resource.id, @engine)) data-toggle="tooltip" data-placement="top" title=(t("faalis.dashboard.index_section.show"))
+                      i.fa.fa-eye.fa-lg
+                    a.warning.link.pull-left.btn.btn-xs.btn.edit.tool href=(get_url(@edit_route, resource.id, @engine)) data-toggle="tooltip" data-placement="top" title=(t("faalis.dashboard.index_section.edit"))
+                      i.fa.fa-edit.fa-lg
+                    a.link.pull-left.btn.btn-xs.delete.tool href=(get_url(@show_route, resource.id, @engine)) data-remote="true" data-method="delete" data-toggle="tooltip" data-placement="top" title=(t("faalis.dashboard.index_section.delete")) data-confirm=(t('faalis.dashboard.index_section.delete_msg'))
+                      i.fa.fa-remove.fa-lg.btn-remove
 
                     - @_tools_buttons.each do |btn_name, btn|
                       a id=("tool_button_#{btn_name}") class=("link pull-left btn btn-xs #{btn[:class] || 'btn-default'}") href=(btn[:block].call(resource)) data-remote=("#{btn[:remote]}")
                         i class=("fa #{btn[:icon_class]}")
+                        = btn_name
       .box-footer.hidden-print
         .row
           .col-xs-12.col-sm-12

data/config/locales/faalis.en.yml

@@ -77,6 +77,10 @@ en:
 
       index_section:
         add_button: "New %{resource}"
+        edit: Edit
+        show: Show
+        delete: Delete
+        delete_msg: Are you sure want to delete?
 
       buttons:
         back: Back

data/config/locales/faalis.fa.yml

@@ -49,6 +49,10 @@ fa:
         search: جستجو
       index_section:
         add_button: "%{resource} جدید"
+        edit: ویرایش
+        show: نمایش
+        delete: حذف
+        delete_msg: آیا مطمئن هستید که می خواهید حذف کنید؟
       buttons:
         back: برگشت
     permissions:

data/lib/faalis/dashboard.rb

@@ -4,6 +4,9 @@ module Faalis::Dashboard
   module DSL
   end
 
+  module Helpers
+  end
+
   module Sections
   end
 end

data/lib/faalis/dashboard/helpers/box_helpers.rb

@@ -0,0 +1,129 @@
+module Faalis::Dashboard
+  module Helpers
+    module BoxHelpers
+
+      class Box
+        def footer(&block)
+          return @footer = nil unless block_given?
+          @footer = block
+        end
+
+        def body(&block)
+          @body = block
+        end
+
+        def footer_content
+          @footer
+        end
+
+        def body_content
+          @body
+        end
+      end
+
+      class Tabs
+
+        class Tab
+          attr_reader :title, :title_icon
+          attr_accessor :content, :id
+
+          def initialize(title, **options)
+            @title      = title
+            @active     = false
+            @active     = true if options[:active] == true
+            @title_icon = options[:title_icon]
+          end
+
+          def active?
+            @active
+          end
+        end
+
+        attr_reader :title_icon
+
+        def initialize(**options)
+          @tabs       = []
+          @title_icon = options[:title_icon]
+        end
+
+
+        def tab(title, **options, &block)
+          id  = @tabs.length
+          tab = Tab.new(title, **options)
+          tab.content = block
+          tab.id = id
+          @tabs << tab
+        end
+
+        def tabs
+          @tabs
+        end
+      end
+
+      def box(title = nil, **options)
+        content = Box.new
+
+        yield content
+
+        result = "<div class='box #{options[:box_class] || 'box-default'}'>" +
+          "<div class='box-header with-border'>" +
+          "<h3 class='box-title'>" +
+          title +
+          '</h3>'
+
+        unless options[:show_tools].nil?
+          result += "<div class='box-tools pull-right'>" +
+            "<button class='btn btn-box-tool' data-widget='collapse'>" +
+            "<i class='fa fa-minus'></i></button>" +
+            "</div><!-- /.box-tools -->"
+        end
+
+        result += "</div><!-- /.box-header -->" +
+          "<div class='box-body'>" +
+          capture(&content.body_content) +
+          "</div><!-- /.box-body -->"
+
+        unless content.footer_content.nil?
+          result += '<div class="box-footer">' +
+            content.footer_content +
+            "</div><!-- /.box-footer-->"
+        end
+
+        result += "</div><!-- /.box -->"
+
+        result.html_safe
+      end
+
+
+      def tabbed_box(title = nil, **options)
+        content = Tabs.new
+
+        yield content
+
+        result = "<div class='nav-tabs-custom'>" +
+          "<ul class='nav nav-tabs pull-right'>"
+
+        content.tabs.each do |tab|
+          active = nil
+          active = "class='active'" if tab.active?
+
+          result += "<li #{active}><a href='#tab_#{tab.id}-#{tab.id}' data-toggle='tab'>" +
+            "<i class='fa #{tab.title_icon}'></i> #{tab.title}</a></li>"
+        end
+
+        result += "<li class='pull-left header'><i class='fa #{options[:title_icon]}'></i>#{title}</li>" +
+          "</ul>" +
+          "<div class='tab-content'>"
+
+        content.tabs.each do |tab|
+          result += "<div class='tab-pane #{'active' if tab.active?}' id='tab_#{tab.id}-#{tab.id}'>" +
+            capture(&tab.content) +
+            "</div><!-- /.tab-pane -->"
+        end
+
+        result += "</div><!-- /.tab-content --></div>"
+        result.html_safe
+      end
+    end
+  end
+end

data/lib/faalis/dashboard/sections/resource.rb

@@ -36,6 +36,7 @@ module Faalis::Dashboard::Sections
       def namespace
         pieces = controller_path.gsub('dashboard/', '').split('/')
         return '' if pieces.length == 1
+
         pieces.pop
         pieces.join('/')
       end
@@ -44,7 +45,13 @@ module Faalis::Dashboard::Sections
         if namespace.empty?
           Rails.application
         else
-          "#{namespace.split('/')[0]}::Engine".classify.constantize
+          engine = "#{namespace.split('/')[0]}::Engine".classify
+          if Object.const_defined? engine
+            engine.constantize
+          else
+            logger.info 'You are using locale modules please define route_engine in your controller'
+            Rails.application
+          end
         end
       end
 
@@ -54,6 +61,10 @@ module Faalis::Dashboard::Sections
         @_action_buttons = property_object.action_buttons || []
       end
 
+      def _engine
+        nil
+      end
+
     private
 
       def _route_name
@@ -74,6 +85,8 @@ module Faalis::Dashboard::Sections
 
       def guess_index_route(scope  = 'dashboard')
         scope_ = "#{scope}_"
+        scope_ = "#{scope_}#{namespace}_" if !namespace.blank? && _engine.nil?
+
         name   = controller_name
         if name.singularize == name.pluralize
           "#{scope_}#{name}_index_path"
@@ -84,30 +97,38 @@ module Faalis::Dashboard::Sections
 
       def guess_show_route(scope  = 'dashboard')
         scope_        = "#{scope}_"
+        scope_ = "#{scope_}#{namespace}_" if !namespace.blank? && _engine.nil?
+
         resource_name = controller_name.singularize.underscore
-        "#{scope_}#{resource_name}_path"
+        "#{scope_}#{resource_name}_path".gsub('/', '_')
       end
 
       def guess_edit_route(scope  = 'dashboard')
         scope_        = "#{scope}_"
+        scope_ = "#{scope_}#{namespace}_" if !namespace.blank? && _engine.nil?
+
         resource_name = controller_name.singularize.underscore
-        "edit_#{scope_}#{resource_name}_path"
+        "edit_#{scope_}#{resource_name}_path".gsub('/', '_')
       end
 
       def guess_new_route(scope  = 'dashboard')
         scope_        = "#{scope}_"
+        scope_ = "#{scope_}#{namespace}_" if !namespace.blank? && _engine.nil?
+
         resource_name = controller_name.singularize.underscore
-        "new_#{scope_}#{resource_name}_path"
+        "new_#{scope_}#{resource_name}_path".gsub('/', '_')
       end
 
       def guess_edit_route(scope  = 'dashboard')
         scope_        = "#{scope}_"
+        scope_ = "#{scope_}#{namespace}_" if !namespace.blank? && _engine.nil?
+
         resource_name = controller_name.singularize.underscore
-        "edit_#{scope_}#{resource_name}_path"
+        "edit_#{scope_}#{resource_name}_path".gsub('/', '_')
       end
 
       def setup_named_routes
-        @engine        = _route_engine
+        @engine        = _engine || _route_engine
         @index_route   = guess_index_route
         @new_route     = guess_new_route
         @show_route    = guess_show_route
@@ -165,10 +186,11 @@ module Faalis::Dashboard::Sections
       # Via this method user can specify the engine or application name
       # which current resource is defined under. Default value is:
       # Rails.application
-      def route_engine(name, &block)
+      def route_engine(name = nil, &block)
         define_method(:_route_engine) do
           return block.call if block_given?
-          name
+          return name unless name.nil?
+          fail 'You have to provide a name or a block'
         end
       end
 
@@ -180,6 +202,15 @@ module Faalis::Dashboard::Sections
           name
         end
       end
+
+      # Set the engine name of current controller. It's necessary to provide and
+      # engine name if the controller belongs to an engine other than Faalis or
+      # Rails.application.
+      def engine(name)
+        define_method(:_engine) do
+          name.constantize
+        end
+      end
     end
 
   end

data/lib/faalis/dashboard/sections/resource_create.rb

@@ -201,7 +201,9 @@ module Faalis::Dashboard::Sections
       #     end
       #   end
       def in_form(&block)
-        model = controller_name.classify.constantize
+        name  = controller_name
+        path  = controller_path.gsub(name, '').gsub(/dashboard\//, '')
+        model = "#{path}#{name}".classify.constantize
         form_props = Faalis::Dashboard::DSL::Create.new(model)
 
         unless block_given?

data/lib/faalis/dashboard/sections/resource_show.rb

@@ -72,7 +72,9 @@ module Faalis::Dashboard::Sections
       # ```
       #
       def in_show(&block)
-        model = controller_name.classify.constantize
+        name  = controller_name
+        path  = controller_path.gsub(name, '').gsub(/dashboard\//, '')
+        model = "#{path}#{name}".classify.constantize
         show_props = Faalis::Dashboard::DSL::Show.new(model)
 
         unless block_given?

data/lib/faalis/dashboard/sections/resources_index.rb

@@ -11,8 +11,8 @@ module Faalis::Dashboard::Sections
 
       fetch_and_set_all
       action_buttons(index_properties)
-      @_tools_buttons = index_properties.tool_buttons || {}
 
+      @_tools_buttons = index_properties.tool_buttons || {}
       index_hook(@resources)
 
       return if _override_views.include? :index
@@ -86,7 +86,10 @@ module Faalis::Dashboard::Sections
       # ```
       #
       def in_index(&block)
-        model = controller_name.classify.constantize
+        name  = controller_name
+        path  = controller_path.gsub(name, '').gsub(/dashboard\//, '')
+        model = "#{path}#{name}".classify.constantize
+
         index_props = Faalis::Dashboard::DSL::Index.new(model)
 
         unless block_given?

data/lib/faalis/version.rb

@@ -18,5 +18,5 @@
 # -----------------------------------------------------------------------------
 
 module Faalis
-  VERSION = '2.0.5'
+  VERSION = '2.0.7'
 end

data/lib/generators/faalis/resource_generator.rb

@@ -9,12 +9,12 @@ module Faalis
       source_root File.expand_path('../templates', __FILE__)
 
       def create_pundit_file
-        generate 'pundit:policy', resource
+        generate 'pundit:policy', resource_name
       end
 
       def create_controller
         template('dashboard/controller.rb.erb',
-                 "app/controllers/#{module_path}dashboard/#{resources}_controller.rb")
+                 "app/controllers/dashboard/#{module_path}#{resources}_controller.rb")
       end
 
       def inject_routes
@@ -32,7 +32,7 @@ module Faalis
           puts "            `School::Student`, then you should have your route like this:"
           puts ""
           puts "            in_dashboard do"
-          puts "               scope :school do"
+          puts "               namespace :school do"
           puts "                  resources students"
           puts "               end"
           puts "            end"
@@ -54,7 +54,7 @@ module Faalis
       end
 
       def controller_module
-        path = module_path + 'dashboard/'
+        path = 'dashboard/' + module_path
         path.classify
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faalis
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.7
 platform: ruby
 authors:
 - Sameer Rahmani
@@ -9,15 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-16 00:00:00.000000000 Z
+date: 2016-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
@@ -25,9 +22,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
@@ -49,22 +43,16 @@ dependencies:
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '3.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.5'
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: admin_lte-rails
   requirement: !ruby/object:Gem::Requirement
@@ -337,14 +325,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.8
 - !ruby/object:Gem::Dependency
   name: orm_adapter
   requirement: !ruby/object:Gem::Requirement
@@ -505,7 +493,9 @@ files:
 - app/assets/locale/templates.pot
 - app/assets/stylesheets/faalis/dashboard/loadindicator.scss
 - app/assets/stylesheets/faalis/dashboard/ltr/application.css
+- app/assets/stylesheets/faalis/dashboard/ltr/base.css.scss
 - app/assets/stylesheets/faalis/dashboard/rtl/application.css
+- app/assets/stylesheets/faalis/dashboard/rtl/base.css.scss
 - app/assets/stylesheets/faalis/dashboard/share.scss
 - app/assets/stylesheets/faalis/dashboard/variables.scss
 - app/assets/stylesheets/faalis/ltr/application.css
@@ -709,6 +699,7 @@ files:
 - lib/faalis/dashboard/dsl/index.rb
 - lib/faalis/dashboard/dsl/show.rb
 - lib/faalis/dashboard/dsl/update.rb
+- lib/faalis/dashboard/helpers/box_helpers.rb
 - lib/faalis/dashboard/models/sidebar.rb
 - lib/faalis/dashboard/sections/resource.rb
 - lib/faalis/dashboard/sections/resource_create.rb