faalis 2.0.8 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 865303e83168a89d500b98d74a174f9ecf3abec6
-  data.tar.gz: deaf44db028b0542758c9a93ba94af49ec0f8dbd
+  metadata.gz: ba34f964b080c021b7c947386f4e863acadf0ed3
+  data.tar.gz: c4784d91fc1af62b216e58853126d8b19707b91a
 SHA512:
-  metadata.gz: 6a0bd019f37aeee86328d4e30ac3d0f94503c9a92fbbaca3e8687926c0c50008c092600fd963ca7baf9e56a980d2590c1f635dcab9d81c75c7f015e3bc906f9d
-  data.tar.gz: dc64b7490dcbb50087842e1e1b36e926925fe619ebcaa85e88e8c930e024d6896d3b4c4536817ad64de8a5a414c39f702273baffe54f4032446f0c14f6cd90c5
+  metadata.gz: d2f6592ce15675664e07c4d0f296afc5e04c0d792e5e6337a368a8bbed25343d44b046cd62bfa3c6d65391f84f535571a3f4bf4e917822d620b0725679fd8c60
+  data.tar.gz: f370fafc1f81eee23335a932648837ba56fb6fbe7873b375317a20bda1f177d11590bc7f350c11ce6fe4c08d144e4bab04beceef3668802f9464aa0d9551dfd2

checksums.yaml.gz.sig

@@ -0,0 +1,2 @@
+MS5������&��%/�8[,��[�`������8�B�6q9c�P��k�Y+�&��
+�hC;����1t�Y�PC����?�_8߶��ap��o^-o�O��{�6��C-O�-�|u7�E'[�r� NBt��eS%��
���B'��� /_�����6 L��D[_@�à45�(�,�U��=����1o�S;cPq��#?�� �D��s��meyi>�:�!T�A�֨��#�SR}�ћ��y��J��7

data/Rakefile

@@ -1,4 +1,3 @@
-require 'rubygems'
 import 'docs/guides/Rakefile'
 
 begin
@@ -7,16 +6,16 @@ rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
-#Bundler.setup(ENV['RAILS_ENV'] || :default)
+Bundler.setup(ENV['RAILS_ENV'] || :default)
 
-APP_RAKEFILE = File.expand_path('../spec/dummy/Rakefile', __FILE__)
+APP_RAKEFILE = File.expand_path('../test/dummy/Rakefile', __FILE__)
+
+#load 'rails/tasks/engine.rake'
 load 'rails/tasks/engine.rake'
+load 'rails/tasks/statistics.rake'
 
 Bundler::GemHelper.install_tasks
 
-require 'rspec/core'
-require 'rspec/core/rake_task'
-
 desc "Generate and deploy all docs"
 task docs: ['guides:generate', 'guides:deploy'] do
   pwd = Dir.pwd
@@ -37,6 +36,13 @@ task docs: ['guides:generate', 'guides:deploy'] do
   system("rm -rf /tmp/ruby ")
 end
 
-desc 'Run all specs in spec directory (excluding plugin specs)'
-RSpec::Core::RakeTask.new(spec: 'app:db:test:prepare')
-task default: :spec
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
+end
+
+task default: :test

data/app/assets/javascripts/faalis/dashboard/application.js.erb

@@ -14,6 +14,7 @@
 //= require jquery
 //= require jquery.turbolinks
 //= require jquery_ujs
+//= require turbolinks
 
 // Misc ---------------------------
 //= require sugar/sugar-full.development
@@ -22,8 +23,8 @@
 //= require admin_lte/admin_lte
 //= require nprogress
 //= require nprogress-turbolinks
-
-
+// <% if Faalis::Engine.enabled?(:amd) && defined?(AMD) %>
+//= require amd/amd
+//<% end %>
 //= require_tree ./lib/
 //= require faalis/dashboard/init
-//= require turbolinks

data/app/assets/javascripts/faalis/dashboard/init.js.coffee

@@ -26,7 +26,7 @@ setup_controls = ->
   setup_datepicker()
   setup_loadindicator()
 
-$(document).on "page:load", ->
+$(document).on "page:changed", ->
   setup_controls()
 
 

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

@@ -49,3 +49,8 @@
     }
   }
 }
+
+.icheckbox_flat {
+  margin-left: 5px;
+  margin-right: 5px;
+}

data/app/controllers/faalis/assets_controller.rb

@@ -0,0 +1,6 @@
+class Faalis::AssetsController < ApplicationController
+
+  include ::AMD::ControllerHelper
+  before_action :authenticate_user!
+
+end

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

@@ -0,0 +1,27 @@
+module Faalis::Dashboard
+  class UserMessagesController < ::Dashboard::ApplicationController
+
+    engine 'Faalis::Engine'
+
+    override_views :show, :new
+
+    def sent
+      authorize model
+
+      fetch_and_set_all
+      action_buttons(index_properties)
+
+      @_tools_buttons = index_properties.tool_buttons || {}
+      @resources = @resources.where(sender: current_user)
+
+      return if _override_views.include? :index
+      render 'faalis/dashboard/resource/index'
+    end
+
+    private
+
+    def index_hook(resource)
+      resource = resource.where(reciver: current_user)
+    end
+  end
+end

data/app/models/application_record.rb

@@ -0,0 +1,3 @@
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end

data/app/models/faalis/group.rb

@@ -11,13 +11,13 @@
 
 module Faalis
   # **Group** model for **Faalis** platform
-  class Group < Faalis::ORM.proper_base_class
+  class Group < ORM.proper_base_class
 
     # Make this model authorizable
-    include Faalis::Concerns::Authorizable
+    include Concerns::Authorizable
 
     # Define **Group** fields if current ORM was **Mongoid**
-    if Faalis::ORM.mongoid?
+    if ORM.mongoid?
       include Mongoid::Document
       include Mongoid::Timestamps
 
@@ -47,6 +47,7 @@ module Faalis
     def to_s
       name
     end
+
     private
 
     def permission_ids

data/app/models/faalis/permission.rb

@@ -10,9 +10,9 @@
 #
 
 module Faalis
-  class Permission < Faalis::ORM.proper_base_class
+  class Permission < ORM.proper_base_class
 
-    if Faalis::ORM.mongoid?
+    if ::Faalis::ORM.mongoid?
       include Mongoid::Document
       include Mongoid::Timestamps
 

data/app/models/faalis/user.rb

@@ -25,7 +25,7 @@
 
 module Faalis
   # **User** model for **Faalis** platform
-  class User < Faalis::ORM.proper_base_class
+  class User < ORM.proper_base_class
 
     # Define **User** fields if current ORM was Mongoid -----------------------
     if Faalis::ORM.mongoid?
@@ -50,12 +50,6 @@ module Faalis
     # Make this model authorizable
     include Faalis::Concerns::Authorizable
 
-    # Define **User** fields if current ORM was ActiveRecord-------------------
-    if Faalis::ORM.active_record?
-      # acts as messageable for mailboxer
-      #acts_as_messageable
-    end
-
     has_and_belongs_to_many :groups, class_name: 'Faalis::Group', uniq: true
 
     # Validations

data/app/models/faalis/user_message.rb

@@ -0,0 +1,6 @@
+module Faalis
+  class UserMessage < ActiveRecord::Base
+    belongs_to :sender, class_name: 'Faalis::User'
+    belongs_to :reciever, class_name: 'Faalis::User'
+  end
+end

data/app/policies/faalis/user_message_policy.rb

@@ -0,0 +1,9 @@
+module Faalis
+  class UserMessagePolicy < ApplicationPolicy
+    class Scope < Scope
+      def resolve
+        scope
+      end
+    end
+  end
+end

data/app/policies/faalis/user_policy.rb

@@ -1,5 +1,5 @@
 module Faalis
-  class UserPolicy < Faalis::ApplicationPolicy
+  class UserPolicy < ApplicationPolicy
     class Scope < Scope
       def resolve
         scope

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

@@ -1,3 +1,3 @@
 - form_target = get_url(@show_route, @resource.id, @engine)
-- index       = get_url(@index_route, @engine)
+- index       = get_url(@index_route, nil, @engine)
 = render partial: 'faalis/dashboard/resource/form', locals: { index: index, form_target: form_target}

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

@@ -16,8 +16,7 @@
 
       .box-footer.hidden-print
           .row
-
             .col-sm-2.pull-right
-              a.btn.btn-warning.btn-block href=(get_url(@index_route, @engine))
+              a.btn.btn-warning.btn-block href=(get_url(@index_route, nil, @engine))
                 i class=("fa fa-chevron-#{Faalis::I18n.direction(I18n.locale) == 'ltr' ? 'left' : 'right'}")
                 = t('faalis.back')

data/app/views/faalis/dashboard/shared/_header.html.erb

@@ -13,7 +13,7 @@
       <ul class="nav navbar-nav">
         <!-- Messages: style can be found in dropdown.less-->
         <li class="dropdown messages-menu">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+          <a href="<%= Faalis::Engine.routes.url_helpers.dashboard_user_messages_path %>" class="dropdown-toggle" data-toggle="dropdown">
             <i class="fa fa-envelope-o"></i>
             <!-- <span class="label label-success">4</span>-->
           </a>
@@ -80,7 +80,7 @@
             <!-- Menu Footer-->
             <li class="user-footer">
               <div class="pull-left">
-                <a href="#" class="btn btn-default btn-flat">Profile</a>
+                <a href="#" class="btn btn-primary btn-flat">Profile</a>
               </div>
               <div class="pull-right">
                 <a href="<%= faalis.destroy_user_session_path %>" data-method="delete" class="btn btn-default btn-flat"><%= t('sign_out') %></a>

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

@@ -0,0 +1,72 @@
+/! Content Wrapper. Contains page content
+.content-wrapper
+  /! Content Header (Page header)
+  section.content-header
+    h1
+      | Inbox
+      small 13 new messages
+
+  /! Main content
+  section.content
+    .row
+      .col-md-3.header
+        .box.box-solid
+          .box-header.with-border
+            h3.box-title Labels
+            .box-tools
+              button.btn.btn-box-tool data-widget="collapse" type="button"
+                i.fa.fa-minus
+          /! /.box-header
+          .box-body.no-padding
+            ul.nav.nav-pills.nav-stacked
+              li
+                a href="#"
+                  i.fa.fa-circle-o.text-red
+                  | Important
+              li
+                a href="#"
+                  i.fa.fa-circle-o.text-yellow
+                  | Promotions
+              li
+                a href="#"
+                  i.fa.fa-circle-o.text-light-blue
+                  | Social
+          /! /.box-body
+        /! /.box
+      /! /.col
+      .col-md-9
+        .box.box-primary
+          .box-header.with-border
+            h3.box-title Compose New Message
+          /! /.box-header
+          .box-body
+            .form-group
+              input.form-control placeholder="To:" /
+            .form-group
+              input.form-control placeholder="Subject:" /
+            .form-group
+              textarea#compose-textarea.form-control style=("height: 300px")
+              .form-group
+              .btn.btn-default.btn-file
+                i.fa.fa-paperclip
+                | Attachment
+                input name="attachment" type="file" /
+              p.help-block Max. 32MB
+          /! /.box-body
+          .box-footer
+            .pull-right
+              button.btn.bg-navy type="button"
+                i.fa.fa-pencil
+                | Draft
+              button.btn.btn-success style=("margin-left: 5px") type="submit"
+                i.fa.fa-envelope-o
+                | Send
+            button.btn.btn-danger type="reset"
+              i.fa.fa-times
+              | Discard
+          /! /.box-footer
+        /! /. box
+      /! /.col
+    /! /.row
+  /! /.content
+/! /.content-wrapper

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

@@ -7,6 +7,7 @@
 
     <%= stylesheet_link_tag   "dashboard/" + Faalis::I18n.direction(I18n.locale) + "/application", media: "all" %>
     <%= javascript_include_tag :modernizr %>
+
     <%= javascript_include_tag Faalis::Engine.dashboard_js_manifest %>
 
     <%= csrf_meta_tags %>
@@ -17,7 +18,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 sidebar-collapse">
+  <body class="skin-blue sidebar-mini sidebar-collapse" data-action="<%= AMD::Engine.amd_module(self) %>">
     <div class="wrapper">
       <%= render 'faalis/dashboard/shared/header' %>
       <%= render 'faalis/dashboard/shared/sidebar' %>

data/config/locales/faalis.en.yml

@@ -58,7 +58,7 @@ en:
 
     permission:
       permissions: Permissions
-
+      
     dashboard:
       users: Users
       groups: Groups
@@ -68,6 +68,7 @@ en:
       updated_successfully: "%{resource} updated successfully."
       removed_successfully: "%{resource} removed successfully."
       saved_successfully:  "%{resource} saved successfully."
+      user_messages: User Messages
 
       new_resource_title: "New %{resource}"
       edit_resource_title: "Edit %{resource}"

data/config/routes.rb

@@ -26,6 +26,11 @@ Faalis::Engine.routes.draw do
           end
         end
       end
+      resources :user_messages do
+        collection do
+          get 'sent', to: 'user_messages#sent', as: :sent
+        end
+      end
       get '', to: '/faalis/dashboard#index', as: 'index'
       get '/404', to: '/faalis/dashboard#not_found', as: 'not_found'
     end
@@ -34,25 +39,5 @@ Faalis::Engine.routes.draw do
     devise_for :users, devise_config
   end
 
-  #scope '(:locale)', locale: Regexp.new(::I18n.available_locales.join('|')) do
-  #  scope Faalis::Engine.dashboard_namespace.to_sym do
-      #get '' => 'dashboard#index', :as => 'dashboard'
-  #    get 'modules' => 'dashboard#modules'
-  #  end
-
-  #devise_for :users, devise_config
-  #end
-
-  # match('/users/auth/:provider',
-  #       constraints: { provider: /#{Devise.omniauth_configs.keys.join("|")}/ },
-  #       controller: "devise/omniauth_callbacks#passthru",
-  #       as: :user_omniauth_authorize,
-  #       via: [:get, :post])
-
-  # match('/users/auth/:action/callback',
-  #       constraints: { action: /#{Devise.omniauth_configs.keys.join("|")}/ },
-  #       controller: 'devise/omniauth_callbacks',
-  #       as: :user_omniauth_callback,
-  #       via: [:get, :post])
-
+  get '/amd/*asset', to: 'assets#finder'
 end

data/db/migrate/20160310105736_create_faalis_user_messages.rb

@@ -0,0 +1,16 @@
+class CreateFaalisUserMessages < ActiveRecord::Migration
+  def change
+    create_table :faalis_user_messages do |t|
+      t.integer :sender_id
+      t.integer :reciver_id
+      t.boolean :read_only
+      t.text :content
+      t.text :raw_content
+
+      t.timestamps
+    end
+
+    add_index :faalis_user_messages, :sender_id
+    add_index :faalis_user_messages, :reciver_id
+  end
+end

data/lib/faalis.rb

@@ -7,13 +7,13 @@ require 'pundit'
 require 'slim-rails'
 require 'formtastic'
 require 'kaminari'
+require 'amd'
 
 # Faalis Module
 module Faalis
 
 end
 
-require 'faalis/configuration'
 require 'faalis/engine'
 require 'faalis/orm'
 require 'faalis/concerns'