faalis 2.0.0.rc3 → 2.0.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd58b9524184740f7a662d95ca49bc9df56827ff
-  data.tar.gz: ccaf174612ab7631d73e16f27d2739fbe3e17aa0
+  metadata.gz: 05e2a22db21f97b31c2ed97aaeb0a7a917870298
+  data.tar.gz: 14d1abfe0fa0a8a1dd75e665182e173306f04a8b
 SHA512:
-  metadata.gz: b38d695d939323551bea7fe78455d7b2afce32e71a68982f4c9a6c6fbf94de078bc845e688f81aba66a1effae0cbd4b1b7a48f02ddd67c2d5270cc4dcebd403c
-  data.tar.gz: f8e8ca706a2a7603d2666b5956134364f97bebd10c353845757713c9149bfe67dfcc76d9c04fedff04d7834e266f95efe9187c57ff77e9b7e875c20a2f375382
+  metadata.gz: 693ad6a858db7c4726cff47c1c9407f4d717a93583a80445bcb4c6ae34b2d6013e32af9062924ce72f7f82d09001701df523b3b03cb28916968f5f6a49d1a161
+  data.tar.gz: df7b4f2748e5c3161591d99f68a9a89c5fbdb330981215b20fe5e6aa48cd8debdef77285af1676487c35da1bf5f6d49b1dc8eae6f0490417d28d65c8f516f287

data/README.md

@@ -15,7 +15,17 @@ cool stuff.
 Simply add `faalis` to your gem file with following command:
 
 ```ruby
-gem "faalis"
+source 'http://rails-assets.org' do
+  gem 'rails-assets-sugar'
+  gem 'rails-assets-bootstrap-rtl'
+  gem 'rails-assets-jquery-knob'
+  gem 'rails-assets-bootstrap-daterangepicker'
+  gem 'rails-assets-jquery-sparkline'
+  gem 'rails-assets-jquery-icheck'
+  gem 'rails-assets-admin-lte'
+end
+
+gem "faalis", github: 'Yellowen/Faalis'
 ```
 
 Then install your project dependencies using `bundle` command:

data/app/assets/javascripts/faalis/dashboard/lib/ujs_patches.js.coffee

@@ -0,0 +1,28 @@
+# Patching the jquery UJS to add a class to disabled
+# element
+$.rails.disableElement = (element) ->
+  replacement = element.data('disable-with')
+  classes     = element.data('disable-class')
+
+  element.data('ujs:enable-with', element.html())
+  if replacement != undefined
+    element.html(replacement)
+
+  if classes != undefined
+    element.addClass(classes);
+
+  element.bind 'click.railsDisable', (e) ->
+    return rails.stopEverything(e)
+
+
+$.rails.enableElement = (element) ->
+  classes = element.data('disable-class');
+
+  if element.data('ujs:enable-with') != undefined
+    element.html(element.data('ujs:enable-with'))
+    element.removeData('ujs:enable-with')
+
+  if classes != undefined
+    element.removeClass(classes);
+
+  element.unbind('click.railsDisable')

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

@@ -1,11 +1,17 @@
+@import "variables";
 
-.skin-blue {
+.skin-blue, .skin-blue-light{
   #nprogress .bar {
-  background: #058;
+  background: $loading-indicators-color;
   }
 
 
   #nprogress .peg {
-    box-shadow: 0 0 10px #058, 0 0 5px #058;
+    box-shadow: 5px 2px 2px  $loading-indicators-shadow, 0 0 10px red;
   }
 }
+
+
+.skin-yellow, .skin-yellow-light{
+
+}

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

@@ -0,0 +1,4 @@
+/* Variables of the hole Faalis project */
+
+$loading-indicators-color:  #FD7D00;
+$loading-indicators-shadow:  #4FF0A6;

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

@@ -19,6 +19,7 @@ module Faalis
 
         def setup_header
           @dashboard_section_title = t(controller_name.underscore)
+          @dashboard_resource_name = t(controller_name.underscore.singularize)
           @dashboard_section_slug  = t(action_name)
         end
 

data/app/helpers/faalis/dashboard_helper.rb

@@ -6,6 +6,49 @@ module Faalis
       time.strftime("%Y-%m-%d %H:%M")
     end
 
+    def link_button(title, **options)
+      classes    = "btn pull-right btn-sm #{options.fetch(:classes, '')}"
+      icon_class = options[:icon_class]
+      href       = options.fetch(:href, '#')
+      remote     = options.fetch(:remote, false).to_s
+
+      button = "<a class='#{classes}' href='#{href}'" +
+               "data-disable-with='#{title} . . .' data-remote='#{remote}'" +
+               "data-disable-class='disabled'>"
+
+      if icon_class
+        button += "<i class='fa fa-#{icon_class}'></i>"
+      end
+
+      button += title + '</a>'
+
+      button.html_safe
+    end
+
+    def action_buttons(buttons)
+      buttons_html = ''
+
+      buttons.each do |button|
+        href    = button.fetch(:href, '#')
+        klass   = button.fetch(:class, 'btn-success')
+        remote  = button.fetch(:remote, false).to_s
+        icons   = button.fetch(:icon_class, "")
+        label   = button.fetch(:label, '')
+        model   = button.fetch(:model, nil)
+        action  = button.fetch(:policy, nil)
+
+        with_policy(model, action) do
+          buttons_html += "<a class='action-button btn pull-right " +
+                          "#{klass}' href='#{href}' data-remote='#{remote}'"+
+                          "data-disable-with='#{spinner} #{label}'>\n" +
+                          "<i class='fa fa-#{icons}'></i>" +
+                          label +
+                          '</a>'
+        end
+      end
+      buttons_html.html_safe
+    end
+
     # Translate route name to url dynamically
     def get_url(route_name, id = nil, engine = Rails.application)
       return engine.routes.url_helpers.send(route_name, id.to_s) unless id.nil?
@@ -38,5 +81,21 @@ module Faalis
         result += '</ul>'
       end
     end
+
+    private
+
+    def spinner
+      h "<i class='fa fa-cog fa-lg fa-spin'></i>"
+    end
+
+    def with_policy(model, action, &block)
+      if model && action
+        if policy(model).send("#{action}?")
+          block.call
+        end
+      else
+        block.call
+      end
+    end
   end
 end

data/app/models/faalis/concerns/user/permission.rb

@@ -9,7 +9,7 @@ module Faalis
       @group_ids.include? group.id
     end
 
-    def have_permission? action, obj
+    def has_permission? action, obj
       perm = self.groups.includes(:permissions)
         .where(faalis_permissions: { model: obj, permission_type: action })
         .count
@@ -17,10 +17,24 @@ module Faalis
     end
 
     def can_not? action, obj
-      !have_permission? action, obj
+      !has_permission? action, obj
     end
 
-    alias_method :can?, :have_permission?
+    alias_method :can?, :has_permission?
+
+    def owned?(record)
+      if has_permission? :ownership, record.class.to_s
+        if record.respond_to? :user
+          return true if record.user == self
+          return false
+        end
+
+        if record.respond_to? :__owned_by
+          return true if record.__owned_by == self
+        end
+      end
+      false
+    end
 
     def permissions
       groups.includes(:permissions).map(&:permissions).flatten.uniq

data/app/models/faalis/group.rb

@@ -44,6 +44,9 @@ module Faalis
       end
     end
 
+    def to_s
+      name
+    end
     private
 
     def permission_ids

data/app/models/faalis/permission.rb

@@ -38,5 +38,6 @@ module Faalis
     def model_name
       model.underscore.humanize
     end
+
   end
 end

data/app/models/faalis/user.rb

@@ -56,7 +56,7 @@ module Faalis
       #acts_as_messageable
     end
 
-    has_and_belongs_to_many :groups, class_name: 'Faalis::Group'
+    has_and_belongs_to_many :groups, class_name: 'Faalis::Group', uniq: true
 
     # Validations
     validates :password, presence: true, length: { minimum: 5, maximum: 120 }, on: :create
@@ -79,5 +79,9 @@ module Faalis
       Faalis::UserPolicy
     end
 
+    def to_s
+      full_name || email
+    end
+
   end
 end

data/app/policies/faalis/application_policy.rb

@@ -12,7 +12,15 @@ class Faalis::ApplicationPolicy
     return false if @user.nil?
     return true if @user.admin?
 
-    @user.have_permission? action, @record.class.to_s
+    # Check for ownership of the reocrd
+    record_class = @record.class
+
+    unless [Class, String, Symbol].include?(record_class)
+      return false if !@user.owned? @record
+      @record = @record.class
+    end
+
+    user.can? action, @record.to_s
   end
 
   def method_missing(m, *args, &block_given)
@@ -37,4 +45,5 @@ class Faalis::ApplicationPolicy
       scope
     end
   end
+
 end

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

@@ -11,7 +11,7 @@ div
               .col-sm-12.col-lg-6
                 .form-group data-name="role"
                   label for="group_name"
-                    = ('faalis.group.group_name')
+                    = t('faalis.group.group_name')
 
                   input#group_name.form-control[name="group[name]" type="text" required value=(@group.name)]
 
@@ -48,11 +48,11 @@ div
                             - actions.each do |action|
                               span.col-sm-3
                                 - if @group.include_permission? action[1]
-                                  input[type="checkbox" checked name=("group[permissions][#{action[1]}]") label=(t(action[0].humanize()))]
-                                    = " #{action[0].humanize()}"
+                                  input[type="checkbox" checked name=("group[permissions][#{action[1]}]") label=(t("faalis.permissions.#{action[0]}"))]
+                                    = t("faalis.permissions.#{action[0]}")
                                 - else
-                                  input[type="checkbox" name=("group[permissions][#{action[1]}]") label=(t(action[0].humanize()))]
-                                    = " #{action[0].humanize()}"
+                                  input[type="checkbox" name=("group[permissions][#{action[1]}]") label=(t("faalis.permissions.#{action[0]}"))]
+                                    = t("faalis.permissions.#{action[0]}")
 
     .row
       .col-sm-2

data/app/views/faalis/dashboard/groups/edit.html.slim

@@ -1,3 +1,3 @@
-- form_target = dashboard_auth_group_path(@group.id)
-- index = dashboard_auth_groups_path
+- form_target = faalis.dashboard_auth_group_path(id: @group.id)
+- index = faalis.dashboard_auth_groups_path
 = render partial: 'form', locals: { form_target: form_target, method: :put, index: index }

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

@@ -5,7 +5,7 @@
         h3.box-title
           = t('faalis.group.groups')
         .box-tools
-          - new_group = new_dashboard_auth_group_path
+          - new_group = faalis.new_dashboard_auth_group_path
           a.btn.btn-success.pull-right.btn-sm href=(new_group)
             i.fa.fa-plus
             = t('faalis.dashboard.index_section.add_button', resource: t('faalis.group.group'))
@@ -26,9 +26,9 @@
                 = t('faalis.dashboard.actions')
 
             - @groups.each do |group|
-              - edit_target = edit_dashboard_auth_group_path(id: group.id)
-              - destroy_target = dashboard_auth_groups_path
-              - show_target = dashboard_auth_group_path(id: group.id)
+              - edit_target    = faalis.edit_dashboard_auth_group_path(id: group.id)
+              - destroy_target = faalis.dashboard_auth_groups_path
+              - show_target    = faalis.dashboard_auth_group_path(id: group.id)
               tr id=("group_#{group.id}")
 
                 td

data/app/views/faalis/dashboard/groups/new.html.slim

@@ -1,2 +1,2 @@
-- form_target = dashboard_auth_groups_path
+- form_target = faalis.dashboard_auth_groups_path
 = render partial: 'form', locals: { form_target: form_target, method: :post, index: form_target }

data/app/views/faalis/dashboard/groups/update.js.erb

@@ -1,3 +1,3 @@
 success_message('<%= t("faalis.dashboard.updated_successfully", resource: t("faalis.group.group")) %>');
-var target = '<%= Rails.application.routes.url_helpers.send("#{Faalis::Engine.dashboard_namespace}_auth_groups_path".to_sym) %>';
+var target = '<%= dashboard_auth_groups_path %>';
 redirect_to(target);

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

@@ -12,6 +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)
                 = f.send(:input, name, hash)
             - if index % 2 != 0
              | </div>

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

@@ -19,14 +19,10 @@
         h3.box-title
           |
         .box-tools
-          a.btn.btn-success.action-button.pull-right.btn-sm href=(get_url(@new_route, nil, @engine))
-            i.fa.fa-plus
-            = t("faalis.dashboard.index_view.new_button", title: @dashboard_section_title)
+          - if policy(@resources.model).create?
+            = link_button(t("faalis.dashboard.index_view.new_button", title: t("resources.#{@resources.model.name.underscore}")), remote: false, href: get_url(@new_route, nil, @engine), classes: 'btn-success', icon_class: 'plus')
 
-          - @_action_buttons.each do |action|
-            a class=("action-button btn pull-right btn-sm #{action.fetch(:class, 'btn-success')}") href=(action.fetch(:href, '#')) data-remote=(action.fetch(:remote, true).to_s)
-              i class=("fa fa-#{action.fetch(:icon_class, "")}")
-              = action.fetch(:label, '')
+          = action_buttons(@_action_buttons)
 
       .box-body.no-padding
         table.table.table-striped.dataTable
@@ -54,8 +50,8 @@
                     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
 
-                    - @_tools_buttons.each do |btn|
-                      a class=("link pull-left btn btn-xs #{btn[:class] || 'btn-default'}") href=(btn[:block].call(resource)) data-remote=("#{btn[:remote]}")
+                    - @_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]}")
       .box-footer
         .row

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

@@ -6,12 +6,12 @@
           / TODO: add a DSL to provide a message for this section
       .box-body
         ul.resource.details.col-sm-12.col-lg-6.col-md-6
-          - @_fields.keys.each_with_index do |name, index|
+          - @_fields.each_with_index do |name, index|
             li
               h5.header
-                = t(name.to_s.titleize) + ':'
+                = t("#{@resource.class.name.underscore}.show.#{name.to_s.underscore}") + ':'
               h4.result
-                = @resource.send(name.to_sym) || "-"
+                = @resource.send(name.to_sym).to_s || "-"
 
 
       .box-footer

data/app/views/faalis/dashboard/users/edit.html.slim

@@ -1,3 +1,3 @@
-- form_target = dashboard_auth_user_path(id: @user.id)
-- index =  dashboard_auth_users_path
+- form_target = faalis.dashboard_auth_user_path(id: @user.id)
+- index =  faalis.dashboard_auth_users_path
 = render partial: 'form', locals: { method: :put, form_target: form_target, index: index }

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

@@ -5,7 +5,7 @@
         h3.box-title
           = t('faalis.users')
         .box-tools
-          - new_user = new_dashboard_auth_user_path
+          - new_user = faalis.new_dashboard_auth_user_path
           a.btn.btn-success.pull-right.btn-sm href=(new_user)
             i.fa.fa-plus
             = t('faalis.dashboard.index_section.add_button' , resource:  'user')
@@ -30,8 +30,8 @@
                 = t('faalis.dashboard.actions')
 
             - @users.each do |user|
-              - edit_target = edit_dashboard_auth_user_path(id: user.id)
-              - show_target = dashboard_auth_user_path(id: user.id)
+              - edit_target = faalis.edit_dashboard_auth_user_path(id: user.id)
+              - show_target = faalis.dashboard_auth_user_path(id: user.id)
               tr id=("user_#{user.id}")
 
                 td

data/app/views/faalis/dashboard/users/new.html.slim

@@ -1,2 +1,2 @@
-- form_target = dashboard_auth_users_path
+- form_target = faalis.dashboard_auth_users_path
 = render partial: 'form', locals: { method: :post, form_target: form_target, index: form_target}

data/config/locales/devise.fa.yml

@@ -19,6 +19,8 @@ fa:
       invalid_token: 'کلمه رمز نامعتبر.'
       timeout: 'نشست شما منقضی شده است. برای ادامه دوباره وارد شوید.'
       inactive: 'حساب شما هنوز فعال نشده است.'
+      user:
+        not_found_in_database: 'کاربری با این مشخصات پیدا نشد'
     sessions:
       signed_in: 'ورود موفق.'
       signed_out: 'خروج موفق.'

data/config/locales/faalis.en.yml

@@ -6,6 +6,7 @@ en:
     didnt_receive_confirmation_instructions: "Didn't receive confirmation instructions"
     didnt_receive_unlock_instructions: "Didn't receive unlock instructions"
 
+
     faalis_version: Faalis Version
     copyright_html: |
       &copy; 2013-2015 <a href="http://yellowen.com">Yellowen</a>.
@@ -75,4 +76,14 @@ en:
         search: Search
 
       index_section:
-        add_button: "New %{resource}"
+        add_button: "New %{resource}"
+
+
+    permissions:
+      read: Read
+      update: Update
+      create: Create
+      destroy: Destroy
+      index: Index
+      show: Show
+      ownershio: ownership