faalis 1.0.0.alpha1 → 1.0.0.alpha2

data/lib/generators/faalis/install_generator.rb

@@ -57,8 +57,10 @@ module Faalis
       end
 
       def install_routes
-        route 'mount Faalis::Engine => "/"'
-        route 'Faalis::Routes.define_api_routes'
+        route 'end'
+        route '  # Define your API routes here . . .'
+        route 'Faalis::Routes.define_api_routes do'
+        route "mount Faalis::Engine => '/'"
       end
 
       def patch_application_controller

data/lib/generators/faalis/js/list_view_generator.rb

@@ -1,22 +1,3 @@
-# -----------------------------------------------------------------------------
-#    Faalis - Basic website skel engine
-#    Copyright (C) 2012-2013 Yellowen
-#
-#    This program is free software; you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation; either version 2 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License along
-#    with this program; if not, write to the Free Software Foundation, Inc.,
-#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-# -----------------------------------------------------------------------------
-
 module Faalis
   module Generators
     module Js
@@ -44,11 +25,11 @@ module Faalis
         def create_template
           unless options[:only_controller]
             unless options[:only_specs]
-              template "js/list_view/index.html.erb", "app/views/angularjs_templates/#{resource.underscore}/index.html"
+              template "js/list_view/index.html.erb", "app/views/angular/#{resource.underscore}/index.html"
               unless options[:no_new_template]
-                template "js/list_view/new.html.erb", "app/views/angularjs_templates/#{resource.underscore}/new.html"
+                template "js/list_view/new.html.erb", "app/views/angular/#{resource.underscore}/new.html"
               end
-              template "js/list_view/details.html.erb", "app/views/angularjs_templates/#{resource.underscore}/details.html"
+              template "js/list_view/details.html.erb", "app/views/angular/#{resource.underscore}/details.html"
             end
           end
 

data/lib/generators/faalis/scaffold_generator.rb

@@ -24,7 +24,7 @@ module Faalis
       include Faalis::Generators::Concerns::RequireFields
       include Faalis::Generators::Concerns::Parent
       include Faalis::Generators::Concerns::Child
-      include Faalis::Generators::Concerns::JsonInput
+      include Faalis::Generators::Concerns::InputFile
       include Faalis::Generators::Concerns::ResourceName
       include Faalis::Generators::Concerns::ResourceFields
       include Faalis::Generators::Concerns::Globalize
@@ -75,21 +75,20 @@ module Faalis
         result = []
         all_fields = []
         relations = "\n"
-
         fields.each do |name, type, to|
           case type
           when 'belongs_to'
             type_ = 'integer'
             if to.singularize != name
               relations << "  belongs_to :#{name.singularize},
-              :class_name => \"#{to.singularize.capitalize}\"\n"
+              :class_name => \"#{to.singularize.camelize}\"\n"
             else
               relations << "  belongs_to :#{to.singularize}\n"
             end
             name_ = "#{name.singularize}_id"
             result << [name_, type_]
 
-          when 'text', 'integer', 'string', 'boolean', 'datetime', 'date', 'float'
+          when 'text', 'integer', 'string', 'boolean', 'datetime', 'time', 'date', 'float'
             result << [name, type]
 
           when 'image'
@@ -97,7 +96,7 @@ module Faalis
             relations << "  has_attached_file :#{name}\n"
             relations << "  validates_attachment_content_type :#{name},
      content_type: %w(image/jpeg image/jpg image/png),
-     less_than:  1.megabytes]\n"
+     less_than:  1.megabytes\n"
             # TODO: Run this generator just once for all images
             `rails generate paperclip #{resource_data['name']} #{name}`
           when 'tag'
@@ -108,11 +107,10 @@ module Faalis
           when 'in'
             result << [name, 'string']
 
-          when 'has_many'
-            relations << "  has_and_belongs_to_many :#{to}\n"
+          when 'has_and_belongs_to_many'
+            relations << "  has_and_belongs_to_many :#{to.pluralize}\n"
             say_status 'warn', "There is a many to many relation between #{resource_data['name']} and #{to},
  You should create it manually in model files"
-
           end
         end
 
@@ -161,8 +159,7 @@ module Faalis
 
       #Invoke Faalis list view generator
       def create_list_view
-        invoke 'faalis:js:list_view', [jsonfile]
-
+          invoke 'faalis:js:list_view', [input_file]
       end
 
       def create_globalize_migration

data/lib/generators/faalis/templates/README

@@ -32,10 +32,3 @@ Steps to finish up installation:
 
   6. Make sure you take a look and configured conf/initializer/fast_gettext.rb
   7. Make sure you take a look and configured conf/initializer/formtastic.rb
-  8. Add your resources to routes.rb like this:
-
-       namespace :api, :defaults => {:format => :json} do
-           namespace :v1 do
-              resources :resource
-           end
-       end

data/lib/generators/faalis/templates/angularjs/module.js.erb

@@ -100,7 +100,8 @@ var <%= resource.pluralize %> = angular.module("<%= resource %>", ["ListView", "
             },
             route: "#<% if parent? %>/<%= options[:parent] %>/" + <%= options[:parent] %>_id + "<% end %>/<%= resource_url %>/new"
 
-         },<% unless options[:no_bulk] %>
+         },
+            <% unless options[:no_bulk] %>
         {
             title: gettext("Bulk Edit"),
             icon: "fa fa-edit",
@@ -114,6 +115,7 @@ var <%= resource.pluralize %> = angular.module("<%= resource %>", ["ListView", "
             },
 
         },<% end %>
+            <% unless options[:no_duplicate] %>
         {
             title: gettext("Duplicate"),
             icon: "fa fa-files-o",
@@ -135,6 +137,7 @@ var <%= resource.pluralize %> = angular.module("<%= resource %>", ["ListView", "
                 }
             }
         }
+        <% end %>
 
     ];<% unless options[:no_bulk] %>
 

data/lib/generators/faalis/templates/api/controller.rb.erb

@@ -1,20 +1,18 @@
 class API::V1::<%= resource.pluralize %>Controller < APIController
-  <% if allowed_fields_provided? %>allow_query_on <%= allowed_fields %><% end %>
-  before_filter :build_resource, :only => :create
-  <% if parent? %><% all_parents = parents %><% prev = all_parents.shift %>
-  load_and_authorize_resource :<%= prev.singularize %>, :except => [:destroy]
-  <% all_parents.each do |p| %>load_and_authorize_resource :<%= p.singularize %>, :through => :<%= prev.singularize %>, :except => [:destory]<% prev = p %>
-  <% end %>load_and_authorize_resource :through => :<%= prev.singularize %>, :except => [:destory]<% if model_specified? %>, :class => "<%= model %>"<% end %>
-  <% else %>
-  load_and_authorize_resource :except => [:destory]<% if model_specified? %>, :class => "<%= model %>"<% end %>
-  <% end %>
-  # GET /api/v1/<%= resource.pluralize.underscore %>
+<% if allowed_fields_provided? %>allow_query_on <%= allowed_fields %><% end %>
+after_action :verify_authorized, :except => :index
+
+# GET /api/v1/<%= resource.pluralize.underscore %>
   def index
+    @<%= resource.pluralize.underscore %> = <%= resource.camelize %>.all
+    authorize @<%= resource.pluralize.underscore %>
     respond_with(@<%= resource.pluralize.underscore %>)
   end
 
   def create
-    <% fields.each do |name, type| %><% if type == "has_many" %>
+    authorize <%= resource.camelize %>, :create?
+    @<%= resource.underscore %> = <%= resource.camelize %>.new(resource_params)
+<% fields.each do |name, type| %><% if type == "has_many" %>
     <%= name.underscore %> = <%= name.singularize.camelize %>.where({:id => params[:<%= resource.underscore %>][:<%= name %>]})
     @<%= resource.underscore %>.<%= name.underscore %> = <%= name.underscore %><% end %><% end %>
     if @<%= resource.underscore %>.save
@@ -27,11 +25,15 @@ class API::V1::<%= resource.pluralize %>Controller < APIController
   end
 
   def show
+    @<%= resource.underscore %> = <%= resource.camelize %>.find(params[:id])
+    authorize @<%= resource.underscore %>
     respond_with(@<%= resource.underscore %>)
   end
 
   def update
-    <% fields.each do |name, type| %><% if type == "has_many" %>
+    @<%= resource.underscore %> = <%= resource.camelize %>.find(params[:id])
+    authorize @<%= resource.underscore %>, :update?
+  <% fields.each do |name, type| %><% if type == "has_many" %>
     <%= name.underscore %> = <%= name.singularize.camelize %>.where({:id => params[:<%= resource.underscore %>][:<%= name %>]})
     @<%= resource.underscore %>.<%= name.underscore %> = <%= name.underscore %><% end %><% end %>
 
@@ -39,25 +41,20 @@ class API::V1::<%= resource.pluralize %>Controller < APIController
       respond_with(@<%= resource.underscore %>)
     else
       respond_to do |format|
-        format.json { render :json => {:fields => @<%= resource.underscore %>.errors}, :status => :unprocessable_entity }
+         format.json { render :json => {:fields => @<%= resource.underscore %>.errors}, :status => :unprocessable_entity }
       end
     end
   end
 
   def destroy
     ids = params[:id].split(",")
-    @<%= resource.pluralize.underscore %> = <% if model_specified? %><%= model %><% else %>::<%= resource %><% end %>.where(:id => ids)
-    authorize! :destroy, @<%= resource.pluralize.underscore %>
-    @<%= resource.pluralize.underscore %>.destroy_all
-  end
+    @<%= resource.pluralize.underscore %> = <%= resource.camelize%>.where(:id => ids)
 
-  def build_resource
-    @<%= resource.underscore %> = <% if model_specified? %><%= model %><% else %>::<%= resource %><% end %>.new(resource_params)
-    <% if parent? %>@<%= resource.underscore %>.<%= parents.last.singularize %> = <%= parents.last.singularize.camelize %>.find(params[:<%= parents.last.singularize %>_id])<% end %>
+    authorize @<%= resource.pluralize.underscore %>
+    @<%= resource.pluralize.underscore %>.destroy_all
   end
 
   def resource_params
     params.require(:<%= resource.underscore %>).permit(:id<%= fields_as_params(:relations => true) %>)
   end
-
 end

data/lib/generators/faalis/templates/application.js

@@ -10,6 +10,19 @@
 // Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
 // about supported directives.
 //
+/// From Faalis -----------------------------
 //= require faalis/angular-manifest
-//= require faalis/dashboard/application
+
+
+/// From Dashstrap
+//= require jquery-ui
+///= require jquery-ui/tooltip
+//= require ui-bootstrap
+//= require dashstrap/application
+
+//= require AdminLTE/app
+//= require AdminLTE/dashboard
+
+/// Faalis dashboard main application --------
 //= require_tree ./modules
+//= require faalis/dashboard/application

data/lib/generators/faalis/templates/faalis.rb

@@ -3,8 +3,10 @@ Faalis::Engine.setup do |config|
   # Default value is the rails logger
   # config.logger = Logger.new(STDOUT)
 
+  config.orm = 'active_record'
+
   # Add your models which want to manage their permissions
-  config.models_with_permission = []
+  config.models_with_permission = ['Faalis::Permissions::Auth']
 
   # Url prefix for dashboard section. default is '/dashboard'
   # config.dashboard_namespace = :dashboard

data/lib/generators/faalis/templates/i18n/Gruntfile.js.erb

@@ -3,8 +3,8 @@ module.exports = function (grunt) {
         nggettext_extract: {
             pot: {
                 files: {
-                    'app/assets/locales/templates.pot': ['app/views/angularjs_templates/**/*.html',
-                                                        'app/views/angularjs_templates/**/*.html.erb',
+                    'app/assets/locales/templates.pot': ['app/views/angular/**/*.html',
+                                                        'app/views/angular/**/*.html.erb',
                                                         'app/assets/javascripts/**/*.js',
                                                         'app/assets/javascripts/**/*.js',
                                                         'app/assets/javascripts/**/*.coffee',

data/lib/generators/faalis/templates/js/list_view/partials/add_controller.js.erb

@@ -16,14 +16,14 @@
     <% fields.each do |name, type, to| %><% if ["belongs_to", "in", "has_many"].include? type %>
     $scope.<%= name %>_data = {
         type: '<%= type %>',<% if type == "in" %>
-        choices: _.sortBy([<% to.each do |choice| %>{name: "<%= choice.underscore %>", title: "<%= choice.humanize %>"},<% end %>]),
+        choices: [<% to.each do |choice| %>{name: "<%= choice.underscore %>", title: "<%= choice.humanize %>"},<% end %>].sortBy(),
   <% else %>
         to: '<%= type.to %>',<% end %>
         name: '<%= name %>'
     };<% end %><% end %>
-    <% fields.each do |name, type, to| %><% if type == "in" %>$scope.<%= name %>_choices = _.sortBy([<% to.each do |choice| %>
+    <% fields.each do |name, type, to| %><% if type == "in" %>$scope.<%= name %>_choices = [<% to.each do |choice| %>
         {name: "<%= choice.underscore %>", title: "<%= choice.humanize %>"},<% end %>
-    ], "title");<% end %><% end %>
+    ].sortBy(), "title");<% end %><% end %>
     if( "id" in $routeParams ){
         $scope.obj_id = $routeParams.id;
         $scope.editing = true;

data/lib/generators/faalis/views_generator.rb

@@ -27,7 +27,7 @@ module Faalis
       def copy_views_file
         directory "views/faalis", "app/views/faalis"
         directory "views/layouts/faalis", "app/views/layouts/faalis"
-        directory "views/angularjs_templates", "app/views/layouts/faalis"
+        directory "views/angular", "app/views/layouts/faalis"
 
       end
 

data/lib/tasks/docs.rake

@@ -0,0 +1,6 @@
+namespace :docs do
+  desc "Generate the annotated source code document."
+  task :annotated do
+    system 'groc **/*.rb **/*.js **/*.js.coffee README.md -o docs/annotated_source'
+  end
+end

data/lib/tasks/faalis_tasks.rake

@@ -1,3 +1,4 @@
+require 'faalis'
 namespace :js do
   namespace :i18n do
 

data/lib/tasks/grunt/Gruntfile.js

@@ -3,8 +3,8 @@ module.exports = function (grunt) {
         nggettext_extract: {
             pot: {
                 files: {
-                    'app/assets/locale/templates.pot': ['app/views/angularjs_templates/**/*.html',
-                                                               'app/views/angularjs_templates/**/*.html.erb',
+                    'app/assets/locales/templates.pot': ['app/views/angular/**/*.html',
+                                                               'app/views/angular/**/*.html.erb',
                                                                'app/assets/javascripts/**/*.js',
                                                                'app/assets/javascripts/**/*.js',
                                                                'app/assets/javascripts/**/*.coffee',
@@ -18,7 +18,7 @@ module.exports = function (grunt) {
                     module: "Dashboard"
                 },
                 files: {
-                    'app/assets/javascripts/faalis/locales/translations.fa.js': ['app/assets/locale/*.fa.pot']
+                    'app/assets/javascripts/faalis/locale/translations.fa.js': ['app/assets/locale/*.fa.pot']
                 }
             }
         }

data/spec/dummy/app/controllers/api_controller.rb

@@ -0,0 +1,5 @@
+class APIController < Faalis::APIController
+
+  # Including `Setting::Loader` cause a before_filter method
+  # executed on each request with will load the user settings data.
+end

data/spec/dummy/config/initializers/faalis.rb

@@ -4,9 +4,9 @@ Faalis::Engine.setup do |config|
   # config.logger = Logger.new(STDOUT)
 
   # Add your models which want to manage their permissions
-  config.models_with_permission = ["Permissions::Settings",
-                                   "Permissions::Theme",
-                                   "Faalis::Permissions::Auth"]
+  #config.models_with_permission = ["Permissions::Settings",
+  #                                 "Permissions::Theme",
+  #                                 "Faalis::Permissions::Auth"]
 
   # Url prefix for dashboard section. default is '/dashboard'
   # config.dashboard_namespace = :dashboard

data/spec/dummy/db/migrate/20150121060012_create_application_models.model_discovery_engine.rb

@@ -0,0 +1,10 @@
+# This migration comes from model_discovery_engine (originally 20140129104940)
+class CreateApplicationModels < ActiveRecord::Migration
+  def change
+    create_table :application_models do |t|
+      t.string :model
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/schema.rb

@@ -0,0 +1,71 @@
+# encoding: UTF-8
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended that you check this file into your version control system.
+
+ActiveRecord::Schema.define(version: 20150121060012) do
+
+  create_table "application_models", force: :cascade do |t|
+    t.string   "model"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "faalis_groups", force: :cascade do |t|
+    t.string   "name"
+    t.string   "role"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "faalis_groups_permissions", force: :cascade do |t|
+    t.integer "permission_id"
+    t.integer "group_id"
+  end
+
+  create_table "faalis_groups_users", force: :cascade do |t|
+    t.integer "user_id"
+    t.integer "group_id"
+  end
+
+  create_table "faalis_permissions", force: :cascade do |t|
+    t.string   "model"
+    t.string   "permission_type"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "faalis_users", force: :cascade do |t|
+    t.string   "email",                  default: "", null: false
+    t.string   "encrypted_password",     default: "", null: false
+    t.string   "reset_password_token"
+    t.datetime "reset_password_sent_at"
+    t.datetime "remember_created_at"
+    t.integer  "sign_in_count",          default: 0
+    t.datetime "current_sign_in_at"
+    t.datetime "last_sign_in_at"
+    t.string   "current_sign_in_ip"
+    t.string   "last_sign_in_ip"
+    t.string   "first_name"
+    t.string   "last_name"
+    t.integer  "group_id",               default: 2
+    t.integer  "failed_attempts",        default: 0
+    t.string   "unlock_token"
+    t.datetime "locked_at"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "faalis_users", ["email"], name: "index_faalis_users_on_email", unique: true
+  add_index "faalis_users", ["reset_password_token"], name: "index_faalis_users_on_reset_password_token", unique: true
+  add_index "faalis_users", ["unlock_token"], name: "index_faalis_users_on_unlock_token", unique: true
+
+end