faalis 2.0.0.rc5 → 2.0.0.rc6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0abe60919182ff4fa22468fc7866314a4cc3bc75
-  data.tar.gz: fee9b4f57923792137bc48bd778d811b8025dfa6
+  metadata.gz: 54fc2bddb9547f9ff69fb6946ac9318210ee907c
+  data.tar.gz: 0a9105a8da26665726635a5f85b3dfd6f03f4b07
 SHA512:
-  metadata.gz: f397d766876bf46ae0bbca83e9bee94e1def95f164e1f86c16444c348b45e61ca538911451669a5696dd9fe86e11c2d0b76486659fb13317e3e0cb365f643bc4
-  data.tar.gz: 86559cfaec13f532a17791cc44ce5acf691891ba8244c37389320f8f623a325afab9be54108dbcfd46a5ffc65342167a6143e245209cd6902e9e04d79b5fffdb
+  metadata.gz: a6e3d0f4413c13713465c71747e6eb5d86f4fe9510dcec500c9a4b0bf1902c1912458babc838c64350e3f46a8f08534c4bf1b8e0147656bcb19d0c2dbc2d9a8b
+  data.tar.gz: 439987e49ba6b5b029fa9c58df240f1ad0ebfe33ee791594571a4faa3dc2ef3dc29982e0837639715e6ba6404f7895f53017c7741c76b29accf05cde42859a77

data/Rakefile

@@ -17,6 +17,26 @@ 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
+
+  system('bundle exec yardoc')
+
+  system("cp -r #{pwd}/docs/ruby /tmp/ruby")
+  Dir.chdir '/tmp/ruby' do
+    system('git init')
+    system('git remote add origin git@github.com:Yellowen/faalis_apidoc.git')
+    system('git checkout -b gh-pages')
+    system('echo "api.faalis.io" > CNAME')
+    system('git add .')
+    system('git commit -a -m "new release"')
+    system('git push origin gh-pages -f')
+  end
+
+  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

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

@@ -3,6 +3,10 @@ module Faalis::Dashboard::Sections
 
     extend ActiveSupport::Concern
 
+    included do |base|
+      base.before_action :setup_named_routes
+    end
+
     def _resource_title
       t(controller_name.humanize)
     end

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

@@ -9,7 +9,6 @@ module Faalis::Dashboard::Sections
     # The actual action method of a dashboard controller
     def new
       authorize model, :create?
-      setup_named_routes
 
       collect_model_fields_for_form
 
@@ -18,6 +17,7 @@ module Faalis::Dashboard::Sections
       @_fields_properties = form_properties._field_details
       @multipart          = has_attachment?
 
+      new_hook(resource)
       return if _override_views.include? :new
       render 'faalis/dashboard/resource/new'
     end
@@ -27,13 +27,14 @@ module Faalis::Dashboard::Sections
       @resource = model.find(params[:id])
       authorize @resource, :update?
 
-      setup_named_routes
       collect_model_fields_for_form
 
       @resource_title     = _resource_title.singularize
       @_fields_properties = form_properties._field_details
       @multipart          = has_attachment?
 
+      edit_hook(@resource)
+
       return if _override_views.include? :edit
       render 'faalis/dashboard/resource/edit'
     end
@@ -43,10 +44,12 @@ module Faalis::Dashboard::Sections
       @resource = model.find(params[:id])
       authorize @resource
 
-      setup_named_routes
       new_params = creation_params
       new_params.merge(reflections_hash) if reflections_hash
 
+      # Customize update behaviour
+      before_update_hook(@resource)
+
       # TODO: Move this method to a suitable place instead of controller
       #       itself
       new_params = symbolify_keys(new_params)
@@ -63,13 +66,14 @@ module Faalis::Dashboard::Sections
     # The actual action method for creating new resource.
     def create
       authorize model
-      setup_named_routes
 
       @resource = model.new(creation_params)
 
       @resource.assign_attributes(**reflections_hash) unless reflections_hash.nil?
 
+      # Customize the create behaviour
       before_create_hook(@resource)
+
       # TODO: Handle M2M relations in here
 
       if @resource.save
@@ -117,9 +121,26 @@ module Faalis::Dashboard::Sections
 
     private
 
+      # You can override this method to change the behaviour of `create`
+      # action
       def before_create_hook(resource)
       end
 
+      # You can override this method to change the behaviour of `update`
+      # action
+      def before_update_hook(resource)
+      end
+
+      # You can override this method to change the behaviour of `new`
+      # action
+      def new_hook(resource)
+      end
+
+      # You can override this method to change the behaviour of `edit`
+      # action
+      def edit_hook(resource)
+      end
+
       def all_valid_columns_for_form
         return @all_valid_columns_for_form unless @all_valid_columns_for_form.nil?
         columns   = model.columns_hash.dup

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

@@ -7,12 +7,21 @@ module Faalis::Dashboard::Sections
     def destroy
       @resource = model.find(params[:id])
       authorize @resource
-      setup_named_routes
+
       @resource_title = _resource_title.singularize
+
+      before_destroy_hook(@resource)
       @resource.destroy
 
       return if _override_views.include? :destroy
       render 'faalis/dashboard/resource/destroy'
     end
+
+    private
+
+      # You can override this method to change the behaviour of `destroy`
+      # action
+      def before_destroy_hook(resource)
+      end
   end
 end

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

@@ -10,11 +10,12 @@ module Faalis::Dashboard::Sections
       @resource = model.find(params[:id])
       authorize @resource
 
-      setup_named_routes
       collect_model_fields_for_show
 
       @resource_title = _resource_title.singularize
 
+      show_hook(@resource)
+
       return if _override_views.include? :show
       render 'faalis/dashboard/resource/show'
     end
@@ -46,11 +47,15 @@ module Faalis::Dashboard::Sections
 
       #   @all_valid_columns_for_show = columns
       # end
-
       def _show_fields
         all_valid_columns_for_show.keys.map(&:to_sym)
       end
 
+      # You can override this method to change the behaviour of `show`
+      # action
+      def show_hook(resource)
+      end
+
     # The actual DSL for index ages
     module ClassMethods
       # To specify any property and action for `show` section

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

@@ -10,10 +10,11 @@ module Faalis::Dashboard::Sections
       authorize model
 
       fetch_and_set_all
-      setup_named_routes
       action_buttons(index_properties)
       @_tools_buttons = index_properties.tool_buttons || {}
 
+      index_hook(@resources)
+
       return if _override_views.include? :index
       render 'faalis/dashboard/resource/index'
     end
@@ -63,7 +64,11 @@ module Faalis::Dashboard::Sections
         @resources    = result
       end
 
+      # You can override this method to change the behaviour of `index`
+      # action
+      def index_hook(resources)
 
+      end
     # The actual DSL for index ages
     module ClassMethods
 

data/lib/faalis/version.rb

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

data/lib/generators/faalis/install_generator.rb

@@ -37,12 +37,17 @@ module Faalis
       def copy_init_files
         template 'devise.rb', 'config/initializers/devise.rb'
         template 'faalis.rb', 'config/initializers/faalis.rb'
-        template 'seeds.rb', 'db/seeds.rb'
         template 'api_controller.rb', 'app/controllers/api_controller.rb'
         template 'dashboard_controller.rb', 'app/controllers/dashboard/application_controller.rb'
         template 'policy/application_policy.rb', 'app/policies/application_policy.rb'
       end
 
+      def patch_seed
+        prepend_to_file 'db/seeds.rb' do
+          "Faalis::Engine.load_seed\n"
+        end
+      end
+
       def copy_js_manifest
         empty_directory 'app/assets/javascripts/dashboard'
         directory 'javascripts', 'app/assets/javascripts/dashboard'

data/lib/generators/faalis/views_generator.rb

@@ -1,43 +1,57 @@
-# -----------------------------------------------------------------------------
-#    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
     class ViewsGenerator < Rails::Generators::Base
       source_root File.expand_path('../../../../app/', __FILE__)
 
-      desc "Copy all templates and assets to main application"
+      desc "Copy given views of a resource to the main application"
+      argument :resource_name , type: :string, required: true
+      argument :views_to_copy , type: :array, default: []
 
-      def copy_views_file
-        directory "views/faalis", "app/views/faalis"
-        directory "views/layouts/faalis", "app/views/layouts/faalis"
-        directory "views/angular", "app/views/layouts/faalis"
+      def copy_views
+        if views_to_copy.empty?
+          views = ['index', 'show', 'new', 'edit', 'create', 'update', 'destroy']
+        else
+          views = views_to_copy
+        end
 
-      end
+        empty_directory "app/views/#{resources}"
+
+        if views.include? 'index'
+          copy_file 'views/faalis/dashboard/resource/index.html.slim', "app/views/#{resources}/index.html.slim"
+        end
+
+        if views.include? 'show'
+          copy_file 'views/faalis/dashboard/resource/show.html.slim', "app/views/#{resources}/show.html.slim"
+        end
+
+        if views.include? 'new'
+          copy_file 'views/faalis/dashboard/resource/new.html.slim', "app/views/#{resources}/new.html.slim"
+          copy_file 'views/faalis/dashboard/resource/_form.html.slim', "app/views/#{resources}/_form.html.slim"
+        end
 
-      def copy_assets_file
-        directory "assets/javascripts/faalis", "app/assets/javascripts/faalis"
-        directory "assets/stylesheets/faalis", "app/assets/stylesheets/faalis"
-        directory "assets/images/faalis", "app/assets/images/faalis"
+        if views.include? 'edit'
+          copy_file 'views/faalis/dashboard/resource/edit.html.slim', "app/views/#{resources}/edit.html.slim"
+          copy_file 'views/faalis/dashboard/resource/_form.html.slim', "app/views/#{resources}/_form.html.slim"
+        end
 
+        if views.include? 'create'
+          copy_file 'views/faalis/dashboard/resource/create.js.erb', "app/views/#{resources}/create.js.erb"
+        end
+
+        if views.include? 'update'
+          copy_file 'views/faalis/dashboard/resource/update.js.erb', "app/views/#{resources}/update.js.erb"
+        end
+
+        if views.include? 'destroy'
+          copy_file 'views/faalis/dashboard/resource/destroy.js.erb', "app/views/#{resources}/destroy.js.erb"
+        end
       end
 
+      private
+
+      def resources
+        resource_name.underscore.pluralize
+      end
     end
   end
 end

data/spec/generators/install_spec.rb

@@ -25,11 +25,13 @@ describe Faalis::Generators::InstallGenerator, type: :generator do
 
     FileUtils.mkdir_p("#{path}/config/initializers")
     FileUtils.mkdir_p("#{path}/app/controllers")
+    FileUtils.mkdir_p("#{path}/db")
 
     FileUtils.touch("#{path}/config/routes.rb")
     FileUtils.touch("#{path}/Gemfile")
     FileUtils.touch("#{path}/config/initializers/assets.rb")
     FileUtils.touch("#{path}/config/initializers/formtastic.rb")
+    FileUtils.touch("#{path}/db/seeds.rb")
 
 
     FileUtils.touch("#{path}/app/controllers/application_controller.rb")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faalis
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc5
+  version: 2.0.0.rc6
 platform: ruby
 authors:
 - Sameer Rahmani
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-10 00:00:00.000000000 Z
+date: 2015-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -754,15 +754,10 @@ files:
 - lib/faalis_application.rb
 - lib/faalis_plugin.rb
 - lib/generators/faalis/USAGE
-- lib/generators/faalis/angularjs_resource_generator.rb
 - lib/generators/faalis/install_all_generator.rb
 - lib/generators/faalis/install_generator.rb
-- lib/generators/faalis/install_specs_generator.rb
-- lib/generators/faalis/js/install_i18n_generator.rb
-- lib/generators/faalis/js/list_view_generator.rb
 - lib/generators/faalis/resource_generator.rb
 - lib/generators/faalis/resources_generator.rb
-- lib/generators/faalis/scaffold_generator.rb
 - lib/generators/faalis/templates/README
 - lib/generators/faalis/templates/SPECS
 - lib/generators/faalis/templates/api/controller.rb.erb
@@ -838,38 +833,11 @@ files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
-- spec/dummy/db/migrate/20151210221051_devise_create_faalis_users.faalis.rb
-- spec/dummy/db/migrate/20151210221052_create_faalis_groups.faalis.rb
-- spec/dummy/db/migrate/20151210221053_create_faalis_permissions.faalis.rb
-- spec/dummy/db/migrate/20151210221054_add_permissions_groups_table.faalis.rb
-- spec/dummy/db/migrate/20151210221055_add_users_groups_table.faalis.rb
-- spec/dummy/db/migrate/20151210221056_add_uniqueness_index_to_users_groups.faalis.rb
-- spec/dummy/db/migrate/20151210221057_create_application_models.model_discovery_engine.rb
-- spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
 - spec/dummy/lib/templates/slim/scaffold/_form.html.slim
-- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
-- spec/dummy/tmp/Gemfile
-- spec/dummy/tmp/app/assets/javascripts/dashboard/application.js
-- spec/dummy/tmp/app/assets/stylesheets/dashboard/ltr/application.css
-- spec/dummy/tmp/app/assets/stylesheets/dashboard/rtl/application.css
-- spec/dummy/tmp/app/assets/stylesheets/ltr/application.css
-- spec/dummy/tmp/app/assets/stylesheets/rtl/application.css
-- spec/dummy/tmp/app/controllers/api_controller.rb
-- spec/dummy/tmp/app/controllers/application_controller.rb
-- spec/dummy/tmp/app/controllers/dashboard/application_controller.rb
-- spec/dummy/tmp/app/policies/application_policy.rb
-- spec/dummy/tmp/config/initializers/assets.rb
-- spec/dummy/tmp/config/initializers/devise.rb
-- spec/dummy/tmp/config/initializers/faalis.rb
-- spec/dummy/tmp/config/initializers/faalis_assets.rb
-- spec/dummy/tmp/config/initializers/formtastic.rb
-- spec/dummy/tmp/config/routes.rb
-- spec/dummy/tmp/db/seeds.rb
 - spec/factories/faalis/groups.rb
 - spec/factories/faalis/permissions.rb
 - spec/factories/faalis/users.rb
@@ -910,91 +878,64 @@ specification_version: 4
 summary: Faalis is a ruby on rails engine which provides a platform to easily build
   a web application
 test_files:
+- spec/policies/faalis/admin_only_policy_spec.rb
+- spec/policies/faalis/application_policy_spec.rb
 - spec/support/factory_girl.rb
-- spec/spec_helper.rb
-- spec/models/faalis/group_spec.rb
-- spec/models/faalis/permission_spec.rb
+- spec/generators/install_spec.rb
 - spec/models/faalis/user_spec.rb
-- spec/factories/faalis/permissions.rb
-- spec/factories/faalis/users.rb
-- spec/factories/faalis/groups.rb
-- spec/features/sign_in_spec.rb
-- spec/features/dashboard_spec.rb
-- spec/features/record_not_found_spec.rb
-- spec/dummy/tmp/Gemfile
-- spec/dummy/tmp/db/seeds.rb
-- spec/dummy/tmp/app/assets/javascripts/dashboard/application.js
-- spec/dummy/tmp/app/assets/stylesheets/ltr/application.css
-- spec/dummy/tmp/app/assets/stylesheets/dashboard/ltr/application.css
-- spec/dummy/tmp/app/assets/stylesheets/dashboard/rtl/application.css
-- spec/dummy/tmp/app/assets/stylesheets/rtl/application.css
-- spec/dummy/tmp/app/controllers/api_controller.rb
-- spec/dummy/tmp/app/controllers/application_controller.rb
-- spec/dummy/tmp/app/controllers/dashboard/application_controller.rb
-- spec/dummy/tmp/app/policies/application_policy.rb
-- spec/dummy/tmp/config/routes.rb
-- spec/dummy/tmp/config/initializers/assets.rb
-- spec/dummy/tmp/config/initializers/faalis_assets.rb
-- spec/dummy/tmp/config/initializers/formtastic.rb
-- spec/dummy/tmp/config/initializers/devise.rb
-- spec/dummy/tmp/config/initializers/faalis.rb
-- spec/dummy/log/test.log
+- spec/models/faalis/permission_spec.rb
+- spec/models/faalis/group_spec.rb
+- spec/spec_helper.rb
+- spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/404.html
-- spec/dummy/public/422.html
 - spec/dummy/public/favicon.ico
-- spec/dummy/config.ru
-- spec/dummy/README.rdoc
-- spec/dummy/db/schema.rb
-- spec/dummy/db/migrate/20151210221056_add_uniqueness_index_to_users_groups.faalis.rb
-- spec/dummy/db/migrate/20151210221054_add_permissions_groups_table.faalis.rb
-- spec/dummy/db/migrate/20151210221055_add_users_groups_table.faalis.rb
-- spec/dummy/db/migrate/20151210221053_create_faalis_permissions.faalis.rb
-- spec/dummy/db/migrate/20151210221057_create_application_models.model_discovery_engine.rb
-- spec/dummy/db/migrate/20151210221052_create_faalis_groups.faalis.rb
-- spec/dummy/db/migrate/20151210221051_devise_create_faalis_users.faalis.rb
-- spec/dummy/db/test.sqlite3
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/javascripts/dashboard/application.js
-- spec/dummy/app/assets/stylesheets/application.css
-- spec/dummy/app/assets/stylesheets/ltr/application.css
-- spec/dummy/app/assets/stylesheets/dashboard/ltr/application.css
-- spec/dummy/app/assets/stylesheets/dashboard/rtl/application.css
-- spec/dummy/app/assets/stylesheets/rtl/application.css
-- spec/dummy/app/controllers/api_controller.rb
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/controllers/dashboard/application_controller.rb
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/policies/application_policy.rb
 - spec/dummy/Rakefile
-- spec/dummy/lib/templates/slim/scaffold/_form.html.slim
-- spec/dummy/bin/rake
-- spec/dummy/bin/bundle
-- spec/dummy/bin/rails
+- spec/dummy/config.ru
 - spec/dummy/config/application.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/routes.rb
-- spec/dummy/config/environment.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/boot.rb
 - spec/dummy/config/initializers/session_store.rb
+- spec/dummy/config/initializers/faalis.rb
+- spec/dummy/config/initializers/devise.rb
 - spec/dummy/config/initializers/formstatic.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/initializers/faalis_assets.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/initializers/formtastic.rb
+- spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/devise.rb
 - spec/dummy/config/initializers/kaminari_config.rb
+- spec/dummy/config/initializers/formtastic.rb
 - spec/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/secret_token.rb
-- spec/dummy/config/initializers/faalis.rb
-- spec/generators/install_spec.rb
-- spec/policies/faalis/admin_only_policy_spec.rb
-- spec/policies/faalis/application_policy_spec.rb
+- spec/dummy/config/database.yml
+- spec/dummy/config/boot.rb
+- spec/dummy/config/environments/production.rb
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/environments/development.rb
+- spec/dummy/config/locales/en.yml
+- spec/dummy/config/routes.rb
+- spec/dummy/config/environment.rb
+- spec/dummy/app/assets/javascripts/dashboard/application.js
+- spec/dummy/app/assets/javascripts/application.js
+- spec/dummy/app/assets/stylesheets/rtl/application.css
+- spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/app/assets/stylesheets/ltr/application.css
+- spec/dummy/app/assets/stylesheets/dashboard/rtl/application.css
+- spec/dummy/app/assets/stylesheets/dashboard/ltr/application.css
+- spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/policies/application_policy.rb
+- spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/controllers/api_controller.rb
+- spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/controllers/dashboard/application_controller.rb
+- spec/dummy/bin/rails
+- spec/dummy/bin/rake
+- spec/dummy/bin/bundle
+- spec/dummy/lib/templates/slim/scaffold/_form.html.slim
+- spec/dummy/README.rdoc
+- spec/factories/faalis/users.rb
+- spec/factories/faalis/permissions.rb
+- spec/factories/faalis/groups.rb
+- spec/features/dashboard_spec.rb
+- spec/features/sign_in_spec.rb
+- spec/features/record_not_found_spec.rb
 has_rdoc: