faalis 2.0.0.rc6 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54fc2bddb9547f9ff69fb6946ac9318210ee907c
-  data.tar.gz: 0a9105a8da26665726635a5f85b3dfd6f03f4b07
+  metadata.gz: a8393f4cff680393d20bfd24d04b72150399c6c2
+  data.tar.gz: 876bfdae7c8febd26278835eb059a32adb69a685
 SHA512:
-  metadata.gz: a6e3d0f4413c13713465c71747e6eb5d86f4fe9510dcec500c9a4b0bf1902c1912458babc838c64350e3f46a8f08534c4bf1b8e0147656bcb19d0c2dbc2d9a8b
-  data.tar.gz: 439987e49ba6b5b029fa9c58df240f1ad0ebfe33ee791594571a4faa3dc2ef3dc29982e0837639715e6ba6404f7895f53017c7741c76b29accf05cde42859a77
+  metadata.gz: a18545deef8a4ee2da81af606712d374005eec662dbb3f11613499774166efa9bafeeebabefb246b3994c2b2b985080070d1642c9a6aa641bc5890c566f243cc
+  data.tar.gz: ebe48d5747a4b2471d0c1dec8803fb427fc681c8fffd1d39735109d81600751ca37d6680034c57349d00f82c086c0b971ba42e564d0a1007f03edb645aa25506

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

@@ -18,3 +18,19 @@
 .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/controllers/faalis/dashboard/application_controller.rb

@@ -32,7 +32,7 @@ module Faalis
 
         def redirect_to_404(e)
           respond_to do |f|
-            f.html { redirect_to dashboard_not_found_url }
+            f.html { redirect_to faalis.dashboard_not_found_url }
             f.js { render 'faalis/dashboard/not_found' }
           end
         end

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

@@ -42,16 +42,18 @@ module Faalis::Dashboard
     end
 
     def update
-      puts "---", user_params
       parameters = user_params
-      #groups     = parameters.delete(:groups)
-      group_ids  = parameters.delete(:groups).map(&:to_i)
+      groups     = parameters.delete(:groups)
+
 
       @user = Faalis::User.find(params[:id])
       authorize @user
 
-      @user.groups = Faalis::Group.where(id: group_ids)
-      @user.save
+      unless groups.nil?
+        group_ids    = groups.map(&:to_i)
+        @user.groups = Faalis::Group.where(id: group_ids)
+        @user.save
+      end
 
       respond_to do |f|
         if @user.update_without_password(parameters)

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

@@ -1,3 +1,3 @@
 success_message('<%= t("faalis.dashboard.saved_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 = '<%= faalis.dashboard_auth_groups_path %>';
 redirect_to(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 = '<%= dashboard_auth_groups_path %>';
+var target = '<%= faalis.dashboard_auth_groups_path %>';
 redirect_to(target);

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

@@ -3,11 +3,6 @@
     .col-sm-12.col-lg-12
      .box.box-primary
         .box-header
-          .box-title
-            - if @user.new_record?
-              = t('faalis.dashboard.new_resource_title', resource: t('faalis.user.user'))
-            - else
-              = t('faalis.dashboard.edit_resource_title', resource: t('faalis.user.user'))
 
         .box-body
           .row
@@ -30,18 +25,19 @@
                   = t('faalis.user.user.email')
                 input#group_name.form-control[name="user[email]" type="text" required value=(@user.email)]
 
-          .row
-            .col-sm-12.col-lg-6
-              .form-group data-name="password"
-                label for="password"
-                  = t('password')
-                input#group_name.form-control[name="user[password]" type="password"]
+          - if @user.new_record?
+            .row
+              .col-sm-12.col-lg-6
+                .form-group data-name="password"
+                  label for="password"
+                    = t('password')
+                  input#group_name.form-control[name="user[password]" type="password"]
 
-            .col-sm-12.col-lg-6
-              .form-group data-name="password_confirmation"
-                label for="password_confirmation"
-                  = t('password_confirmation')
-                input#group_name.form-control[name="user[password_confirmation]" type="password"]
+              .col-sm-12.col-lg-6
+                .form-group data-name="password_confirmation"
+                  label for="password_confirmation"
+                    = t('password_confirmation')
+                  input#group_name.form-control[name="user[password_confirmation]" type="password"]
 
           .row
             .col-sm-12

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

@@ -1,5 +1,5 @@
-- form_target = Rails.application.routes.url_helpers.send("#{Faalis::Engine.dashboard_namespace}_auth_users_edit_password_path".to_sym, @user.id)
-- index = Rails.application.routes.url_helpers.send("#{Faalis::Engine.dashboard_namespace}_auth_users_path".to_sym)
+- form_target = faalis.auth_users_edit_password_dashboard_auth_user_path({id: @user.id})
+- index       = faalis.dashboard_auth_users_path
 = form_tag(form_target, remote: true, method: :patch) do
   .row
     .col-sm-12

data/app/views/faalis/dashboard/users/create.js.erb

@@ -1,3 +1,3 @@
 success_message('<%= t("faalis.dashboard.saved_successfully", resource: t('faalis.user.user')) %>');
-var target = '<%= dashboard_auth_users_path %>';
+var target = '<%= faalis.dashboard_auth_users_path %>';
 redirect_to(target);

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

@@ -8,7 +8,7 @@
           - 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')
+            = t('faalis.dashboard.index_section.add_button' , resource:  t('faalis.user.user'))
 
       .box-body.no-padding
         table.table.table-striped
@@ -59,7 +59,7 @@
                 td.btn-user
                   a.warning.link.pull-left href=(edit_target)
                     i.fa.fa-edit
-                  a.pass-change.link.pull-left href=()
+                  a.pass-change.link.pull-left href=(faalis.auth_users_edit_password_dashboard_auth_user_path({id: user.id}))
                     i.fa.fa-key.change-pass
                   a.link.pull-left href=(show_target) data-remote="true" data-method="delete"
                     i.fa.fa-remove.btn-remove

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

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

data/app/views/faalis/dashboard/users/update_password.js.erb

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

data/app/views/layouts/faalis/dashboard.html.erb

@@ -17,7 +17,7 @@
     <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
     <![endif]-->
   </head>
-  <body class="skin-blue sidebar-mini">
+  <body class="skin-blue sidebar-mini sidebar-collapse">
     <div class="wrapper">
       <%= render 'faalis/shared/header' %>
       <%= render 'faalis/shared/sidebar' %>

data/config/locales/faalis.fa.yml

@@ -23,6 +23,12 @@ fa:
     password: گذرواژه
     remember_me: مرا بخاطر بسپار
 
+    group:
+      group: گروه
+
+    user:
+      user: کاربر
+
     member_since: "عضو از %{date}"
     not_authorized: شما مجاز به انجام این فعالیت نیستید.
     engine_name: فالیس
@@ -41,7 +47,8 @@ fa:
       sidebar:
         online: آنلاین
         search: جستجو
-
+      index_section:
+        add_button: "%{resource} جدید"
     permissions:
       read: خواندن
       update: بروزرسانی

data/lib/faalis.rb

@@ -29,9 +29,10 @@ require 'kaminari'
 
 # Faalis Module
 module Faalis
-  autoload :Configuration, 'faalis/configuration'
+
 end
 
+require 'faalis/configuration'
 require 'faalis/engine'
 require 'faalis/orm'
 require 'faalis/concerns'
@@ -39,8 +40,6 @@ require 'faalis/dashboard'
 require 'faalis/extension'
 require 'faalis/omniauth'
 require 'faalis/i18n'
-require 'faalis/generators/concerns'
-require 'faalis/generators'
 require 'faalis/route'
 require 'faalis/action_dispatch'
 require 'faalis/discovery'

data/lib/faalis/configuration.rb

@@ -1,25 +1,53 @@
-module Faalis
-  class Configuration
+module Faalis::Configuration
 
-    class << self
-      attr_accessor :features, :enabled_features
+  # Configure logger
+  mattr_accessor :logger
+  @@logger = Logger.new(STDOUT)
 
-      def enabled_features
-        @enabled_features || []
-      end
+  # Dashboard url prefix
+  mattr_accessor :dashboard_namespace
+  @@dashboard_namespace = :dashboard
 
-      def features
-        [:colorize_output]
-      end
+  # ==> ORM configuration
+  # Load and configure the ORM. Supports :active_record (default) and
+  # :mongoid (bson_ext recommended) by default. Other ORMs may be
+  # available as additional gems.
+  # ORM name to use. either 'active_record' or 'mongoid'
+  mattr_accessor :orm
 
-      def enable(feature)
-        fail "No such feature: '#{feature}'" unless features.include? feature
-        features << featue unless enabled_features.include? feature
-      end
+  def self.orm=(orm_name)
+    @@orm = orm_name
+    require "devise/orm/#{orm_name}"
+  end
 
-      def disable
-        fail 'TODO: create a disable method'
-      end
+  # We have to move this method somewhere else
+  def collect_i18n_missing_keys=(value)
+    if value
+      ::I18n.exception_handler = Faalis::I18n::MissingKeyHandler.new
     end
   end
+
+  # Site Title
+  attr_accessor :site_title
+  @site_title = 'Faalis'
+
+  mattr_accessor :slug
+
+  # Dashboard default javascript manifest
+  mattr_accessor :dashboard_js_manifest
+  @@dashboard_js_manifest = 'dashboard/application.js'
+
+  # Devise options
+  # Include default devise modules. Others available are:
+  # :token_authenticatable, :confirmable,
+  # :lockable, :timeoutable and :omniauthable
+  mattr_accessor :devise_options
+  @@devise_options = [:database_authenticatable,
+                      :registerable,
+                      :recoverable,
+                      :rememberable,
+                      :trackable,
+                      :lockable,
+                      :timeoutable,
+                      :validatable]
 end

data/lib/faalis/engine.rb

@@ -19,12 +19,13 @@
 
 require_relative './middlewares/locale'
 
-
 module Faalis
 
   # `Engine` class of **Faalis**.
   class Engine < ::Rails::Engine
 
+    extend Faalis::Configuration
+
     # TODO: Break this class to modules
     # TODO: Add a facility to allow developers to select
     #       features of faalis
@@ -45,43 +46,11 @@ module Faalis
       g.helper              false
     end
 
-    # Configure logger
-    mattr_accessor :logger
-    @@logger = Logger.new(STDOUT)
-
-    # Dashboard url prefix
-    mattr_accessor :dashboard_namespace
-    @@dashboard_namespace = :dashboard
-
-    # ==> ORM configuration
-    # Load and configure the ORM. Supports :active_record (default) and
-    # :mongoid (bson_ext recommended) by default. Other ORMs may be
-    # available as additional gems.
-    # ORM name to use. either 'active_record' or 'mongoid'
-    mattr_accessor :orm
-
-    def self.orm=(orm_name)
-      @@orm = orm_name
-      require "devise/orm/#{orm_name}"
-      #require 'mailboxer'
-    end
 
     def self.setup
       yield self
     end
 
-    # We have to move this method somewhere else
-    def self.collect_i18n_missing_keys=(value)
-      if value
-        ::I18n.exception_handler = Faalis::I18n::MissingKeyHandler.new
-      end
-    end
-
-    # Site Title
-    mattr_accessor :site_title
-    @@site_title = 'Faalis'
-
-    mattr_accessor :slug
 
 
     # Override devise layout
@@ -92,25 +61,7 @@ module Faalis
       Devise::UnlocksController.layout 'faalis/application'
       Devise::PasswordsController.layout 'faalis/application'
     end
-    #Devise.omniauth_path_prefix = ["/en", "/fa"]
-
-    # Dashboard default javascript manifest
-    mattr_accessor :dashboard_js_manifest
-    @@dashboard_js_manifest = 'dashboard/application.js'
 
-    # Devise options
-    # Include default devise modules. Others available are:
-    # :token_authenticatable, :confirmable,
-    # :lockable, :timeoutable and :omniauthable
-    mattr_accessor :devise_options
-    @@devise_options = [:database_authenticatable,
-                        :registerable,
-                        :recoverable,
-                        :rememberable,
-                        :trackable,
-                        :lockable,
-                        :timeoutable,
-                        :validatable]
 
     middleware.use Faalis::Middlewares::Locale
 

data/lib/faalis/version.rb

@@ -18,5 +18,5 @@
 # -----------------------------------------------------------------------------
 
 module Faalis
-  VERSION = '2.0.0.rc6'
+  VERSION = '2.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faalis
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc6
+  version: 2.0.0
 platform: ruby
 authors:
 - Sameer Rahmani
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-13 00:00:00.000000000 Z
+date: 2015-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -720,28 +720,6 @@ files:
 - lib/faalis/extension.rb
 - lib/faalis/extension/base.rb
 - lib/faalis/fake_assets.rb
-- lib/faalis/generators.rb
-- lib/faalis/generators/concerns.rb
-- lib/faalis/generators/concerns/allow_query_on.rb
-- lib/faalis/generators/concerns/angular.rb
-- lib/faalis/generators/concerns/bulk.rb
-- lib/faalis/generators/concerns/child.rb
-- lib/faalis/generators/concerns/dependency.rb
-- lib/faalis/generators/concerns/fieldset.rb
-- lib/faalis/generators/concerns/globalize.rb
-- lib/faalis/generators/concerns/hstore.rb
-- lib/faalis/generators/concerns/input_file.rb
-- lib/faalis/generators/concerns/menu.rb
-- lib/faalis/generators/concerns/model.rb
-- lib/faalis/generators/concerns/parent.rb
-- lib/faalis/generators/concerns/render.rb
-- lib/faalis/generators/concerns/required.rb
-- lib/faalis/generators/concerns/resource_fields.rb
-- lib/faalis/generators/concerns/resource_name.rb
-- lib/faalis/generators/concerns/tabs.rb
-- lib/faalis/generators/concerns/where.rb
-- lib/faalis/generators/dashboard_scaffold.rb
-- lib/faalis/generators/fields/relation.rb
 - lib/faalis/i18n.rb
 - lib/faalis/initialize.rb
 - lib/faalis/middlewares.rb
@@ -867,9 +845,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5.1