faalis 2.1.1 → 2.2.0.pre.rc1

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

@@ -8,7 +8,6 @@ module Faalis::Dashboard::Sections
     # The actual action method of a dashboard controller
     def index
       authorize model
-
       fetch_and_set_all
       action_buttons(index_properties)
 
@@ -27,10 +26,11 @@ module Faalis::Dashboard::Sections
       # The important thing here is that by using `scope`
       # DSL this method will chain the resulted scope
       # with other scopes like `page` and `policy_scope`
-      def fetch_index_objects
-        scope = index_properties.default_scope
+    def fetch_index_objects
+      scope = index_properties.default_scope
 
         if !scope.nil?
+
           # If user provided an scope for `index` section.
 
           if scope.respond_to? :call
@@ -44,10 +44,12 @@ module Faalis::Dashboard::Sections
 
         else
           scope = model.all
+          #scope = ApplicationPolicy::Scope.new(current_user, model.all).resolve
         end
 
         scope = scope.order('created_at DESC').page(params[:page])
         policy_scope(scope)
+
       end
 
       def index_properties

data/lib/faalis/engine.rb

@@ -45,9 +45,15 @@ module Faalis
       g.helper              false
     end
 
+    # The actual setup method which is responsible for configuring
+    # `Faalis` environment. This method simply yield the current
+    # class and allows developers to change the configuration via
+    # the class methods defined in `Faalis::Configuration` ( which is
+    # extended in this class ).
     def self.setup
       yield self
 
+      # Load the dependencies needed by each particular feature.
       load_dependencies_based_on_configuration
     end
 

data/lib/faalis/i18n.rb

@@ -60,7 +60,8 @@ module ::ActionView
           raise e if raise_error
 
           keys = I18n.normalize_keys(e.locale, e.key, e.options[:scope])
-          title = "translation missing: #{keys.join('.')}"
+          title = keys.last.to_s.humanize
+          title = "#{keys.join('.')}" if Faalis::Engine.i18n_debug
 
           interpolations = options.except(:default, :scope)
           if interpolations.any?

data/lib/faalis/liquid.rb

@@ -0,0 +1,7 @@
+module Faalis
+  module Liquid
+    autoload :Tag,       'faalis/liquid/tag'
+    autoload :Block,     'faalis/liquid/block'
+    autoload :RenderTag, 'faalis/liquid/render_tag'
+  end
+end

data/lib/faalis/liquid/block.rb

@@ -0,0 +1,14 @@
+module Faalis
+  module Liquid
+    class Block < ::Liquid::Block
+
+      def self.block_name(name)
+        @@name = name
+      end
+
+      def self.name
+        @@name
+      end
+    end
+  end
+end

data/lib/faalis/liquid/render_tag.rb

@@ -0,0 +1,50 @@
+module Faalis
+  module Liquid
+    # In order to use this class make sure to override the `before_render`
+    # and implement you logic there, Don't bother to override the `render`
+    # method
+    class RenderTag < Tag
+
+      class << self
+        def view(value)
+          define_method(:_view) do
+            value
+          end
+        end
+      end
+
+      def before_render(context)
+      end
+
+      def render(context)
+        before_render(context)
+        render_template(context)
+      end
+
+      private
+
+      def render_template(context)
+
+        controller = context.registers[:controller]
+        view_paths = controller.view_paths
+        request    = context.registers[:view].request
+        controller = controller.class
+
+        controller.view_paths = view_paths
+
+        patched_request = assignments.merge(request.env)
+        renderer = controller.renderer.new(patched_request)
+
+        renderer.render _view, layout: nil
+      end
+
+      def assignments
+        tmp = instance_variable_names.map do |x|
+          [x[1..-1], instance_variable_get(x)]
+        end
+
+        { assigns: Hash[tmp] }
+      end
+    end
+  end
+end

data/lib/faalis/liquid/tag.rb

@@ -0,0 +1,51 @@
+module Faalis
+  module Liquid
+    class Tag < ::Liquid::Tag
+
+      attr_reader :arguments, :params
+
+      # This method produce the `tag_name` DSL which is mandatory for
+      # each tag and defines the tag name that the tag class should be
+      # registered with
+      def self.tag_name(name)
+        @@name = name
+      end
+
+      def self.name
+        @@name
+      end
+
+      def self.argument(options)
+        raise ArgumentError.new "'name' is mandatory for argument in '#{self.class.name}'" if options[:name].nil?
+
+        @arguments ||= []
+        @arguments << options
+      end
+
+      def initialize(name, args, options)
+        super
+
+        if !arguments.empty? && (args.nil? || args.empty?)
+            count = arguments.length
+            raise ArgumentError.new "'#{count}' argument(s) is/are needed for '#{self.class.name}' tag."
+        end
+
+        @direction   = ::Faalis::I18n.direction(::I18n.locale)
+
+        @args = args.split(',').map do |x|
+          x.strip.tr('""', '').tr("''", '')
+        end
+
+        @params = {}
+
+        arguments.each_with_index do |arg, index|
+          @params[arg[:name]] = @args.fetch(index, arg[:default])
+        end
+      end
+
+      def arguments
+        @arguments ||= []
+      end
+    end
+  end
+end

data/lib/faalis/orm.rb

@@ -20,6 +20,7 @@ module Faalis
     # It will be used in models to specify which class to inherit
     # from, based on current ORM
     def self.proper_base_class
+      #TODO: fix this for rails 5 which has a new parent for each model
       return ::ActiveRecord::Base if active_record?
       return ::Object if mongoid?
       ::Faalis::Engine.orm = 'active_record'

data/lib/faalis/{route.rb → routes.rb}

@@ -12,8 +12,8 @@ module Faalis
     def localized_scope
       langs = ::I18n.available_locales.join('|')
       scope '(:locale)', locale: Regexp.new(langs) do
-          yield
-        end
+        yield
+      end
     end
 
     # This method allow user to define his routes in api
@@ -21,12 +21,12 @@ module Faalis
     def api_routes(version: :v1)
       # TODO: Add a dynamic solution for formats
       namespace :api, defaults: { format: :json } do
-          namespace version do
-            # Call user given block to define user routes
-            # inside this namespace
-            yield if block_given?
-          end
+        namespace version do
+          # Call user given block to define user routes
+          # inside this namespace
+          yield if block_given?
         end
+      end
 
       scope 'module'.to_sym => 'faalis' do
         #dashboard = Faalis::Engine.dashboard_namespace
@@ -37,21 +37,43 @@ module Faalis
 
       # TODO: Add a dynamic solution for formats
       namespace :api, defaults: { format: :json } do
-          namespace version do
-            get 'permissions',      to: 'permissions#index'
-            get 'permissions/user', to: 'permissions#user_permissions'
-            resources :groups,      except: [:new]
-            resources :users,       except: [:new]
-            resource :profile,      except: [:new, :destroy]
-
-            get 'logs', to: 'logs#index'
-          end
+        namespace version do
+          get 'permissions',      to: 'permissions#index'
+          get 'permissions/user', to: 'permissions#user_permissions'
+          resources :groups,      except: [:new]
+          resources :users,       except: [:new]
+          resource :profile,      except: [:new, :destroy]
+
+          get 'logs', to: 'logs#index'
         end
+      end
     end
+  end
+
 
-    class Routes
+  class Routes
+
+    class << self
+
+      attr_accessor :engine
+
+      def faalis(&block)
+        Faalis::Engine.routes.draw(&block)
+      end
+
+      def plugin(&block)
+        self.engine.routes.draw(&block)
+      end
+
+      def draw(engine, &block)
+        self.engine = engine
+
+        raise ArgumentError.new 'block is needed' unless block_given?
+
+        self.class_eval(&block)
+      end
 
-      def self.localized_scop(router: Rails.application.routes)
+      def localized_scop(router: Rails.application.routes)
         puts '[Warning]: This method is depricated please just use "localized_scope" in your router.'
         langs = ::I18n.available_locales.join('|')
         router.scope '(:locale)', locale: Regexp.new(langs)
@@ -59,8 +81,8 @@ module Faalis
 
       # This class method will add `Faalis` routes to host application
       # Router
-      def self.define_api_routes(routes: Rails.application.routes,
-                                 version: :v1)
+      def define_api_routes(routes: Rails.application.routes,
+        version: :v1)
         puts '[Warning]: This method is depricated. Please use "api_routes" directly in your router.'
         routes.draw do
           # TODO: Add a dynamic solution for formats

data/lib/faalis/version.rb

@@ -18,5 +18,5 @@
 # -----------------------------------------------------------------------------
 
 module Faalis
-  VERSION = '2.1.1'
+  VERSION = '2.2.0-rc1'
 end

data/test/controllers/faalis/dashboard/resource_test.rb

@@ -0,0 +1,118 @@
+require "test_helper"
+
+# Testing dashboard controller routes of a Faalis plugin ----------------------
+
+module Faalis
+  module Dashboard
+    module SomeEngine
+      class PostsController < Faalis::Dashboard::ApplicationController
+        engine 'Faalis::Engine'
+        route_namespace 'some_engine'
+
+      end
+    end
+  end
+end
+
+
+class TestPluginDashboardControllers < ActionController::TestCase
+
+  tests Faalis::Dashboard::SomeEngine::PostsController
+
+
+  def setup
+    #@routes = Faalis::Engine.routes
+    @routes.draw do
+      namespace :faalis do
+        namespace :dashboard do
+          namespace :some_engine do
+            resource :posts
+          end
+        end
+      end
+    end
+  end
+
+  test 'guess the right `new` route based on controller' do
+    get :new
+    route = @controller.send(:_new_route)
+
+    assert_equal 'new_dashboard_some_engine_post_path', route
+  end
+
+  test 'guess the right `index` route based on controller' do
+    get :index
+    route = @controller.send(:_index_route)
+
+    assert_equal 'dashboard_some_engine_posts_path', route
+  end
+
+  test 'guess the right `show` route based on controller' do
+    route = @controller.send(:_show_route)
+
+    assert_equal 'dashboard_some_engine_post_path', route
+  end
+end
+
+# Testing dashboard controller routes of a normal controller ------------------
+
+module Dashboard
+  class PostController < Faalis::Dashboard::ApplicationController
+  end
+end
+
+class TestDashboardControllers < ActionController::TestCase
+
+  tests Dashboard::PostController
+
+  test 'guess the right `new` route based on controller' do
+    route = @controller.send(:_new_route)
+
+    assert_equal 'new_dashboard_post_path', route
+  end
+
+  test 'guess the right `index` route based on controller' do
+    route = @controller.send(:_index_route)
+
+    assert_equal 'dashboard_posts_path', route
+  end
+
+  test 'guess the right `show` route based on controller' do
+    route = @controller.send(:_show_route)
+
+    assert_equal 'dashboard_post_path', route
+  end
+end
+
+
+# Testing dashboard controller routes of a namespaced controller --------------
+
+module Dashboard
+  module SomeModule
+    class PostController < Faalis::Dashboard::ApplicationController
+    end
+  end
+end
+
+class TestDashboardNestedControllers < ActionController::TestCase
+
+  tests Dashboard::SomeModule::PostController
+
+  test 'guess the right `new` route based on controller' do
+    route = @controller.send(:_new_route)
+
+    assert_equal 'new_dashboard_some_module_post_path', route
+  end
+
+  test 'guess the right `index` route based on controller' do
+    route = @controller.send(:_index_route)
+
+    assert_equal 'dashboard_some_module_posts_path', route
+  end
+
+  test 'guess the right `show` route based on controller' do
+    route = @controller.send(:_show_route)
+
+    assert_equal 'dashboard_some_module_post_path', route
+  end
+end

data/test/dummy/config/boot.rb

@@ -1,5 +1,5 @@
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
 
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
 $LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)

metadata

@@ -1,37 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: faalis
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0.pre.rc1
 platform: ruby
 authors:
 - Sameer Rahmani
 - Behnam Ahmad Khan Beigi
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDaDCCAlCgAwIBAgIBATANBgkqhkiG9w0BAQUFADA9MREwDwYDVQQDDAhseHNh
-  bWVlcjETMBEGCgmSJomT8ixkARkWA2dudTETMBEGCgmSJomT8ixkARkWA29yZzAe
-  Fw0xNjA0MDkwOTU2NTlaFw0xNzA0MDkwOTU2NTlaMD0xETAPBgNVBAMMCGx4c2Ft
-  ZWVyMRMwEQYKCZImiZPyLGQBGRYDZ251MRMwEQYKCZImiZPyLGQBGRYDb3JnMIIB
-  IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoynu3mQH6Frf1qQnqEFzmBfj
-  u+6oRNs55zVQi5S3YJ0bXUSOhtAfBQ4i8BOcFKBULyVBvbJervFP+9t7H33miaev
-  KQgR/QU2Gvgi5TTA48t38n/SlNLzCMKdFHqhJcZ33kf0J/ZnvNGewevDSXRQFWxz
-  vFbHzbzZPT2Bv8SoDpollAfkjx3CTSbreKIsEwA3kYKyeKOnJAso+fMDoXZBnKWm
-  ICfBXzcWrnCRob7bOIHMKqH9dilP3I6pLPDl6v4HD2iLbdeHJXtWa+f0PC/iwyqI
-  p1uGsiNwRT33tfXAD9CHnF1tkKVOegf1iZlRQjkxX1wrKldCMXRJsDgBSP8yLQID
-  AQABo3MwcTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUFQiOeeK9
-  LHfZgFmrXcC1Vk70IFkwGwYDVR0RBBQwEoEQbHhzYW1lZXJAZ251Lm9yZzAbBgNV
-  HRIEFDASgRBseHNhbWVlckBnbnUub3JnMA0GCSqGSIb3DQEBBQUAA4IBAQBPzlyO
-  ydG7m2tjP9DkZl/Jw8Paeqi4OQL2tPudgN+nVyx0yb6/6ow11xtc+Q+cI42ecbqJ
-  8DNP1M9JuYbNiYb1ZNteyMNavAMyd+Ts+XCtbwe5Cdn7yINFAhdv/CQ3d3pMk76J
-  lgMRZV+lB5qpfPxIOzoTlRfsNAnmOKq4hloZp4RFQV0n+s9OvSBBjICptu5RkilM
-  kPaeTjT5a10PduReeTaQZtQybKkCPsdWBPKy3gNrEEQ+DIUi26lhYOhgvbu8wWRk
-  ge9CIZowYamI/vvfSApoebxfKQrV8RTkuhxfkna/XvPQS0Qej6X3vjJ8z5bS5vLo
-  +4LSCtONiaAAc/sP
-  -----END CERTIFICATE-----
-date: 2016-04-24 00:00:00.000000000 Z
+cert_chain: []
+date: 2017-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -632,6 +610,7 @@ files:
 - app/assets/javascripts/faalis/dashboard/lib/misc.js
 - app/assets/javascripts/faalis/dashboard/lib/string.js
 - app/assets/javascripts/faalis/dashboard/lib/ujs_patches.js.coffee
+- app/assets/javascripts/faalis/dashboard/manifest.js
 - app/assets/javascripts/faalis/dashboard/variables.js.erb
 - app/assets/javascripts/faalis/groups.js
 - app/assets/javascripts/faalis/home.js
@@ -677,7 +656,6 @@ files:
 - app/models/faalis/concerns/user/user_roles.rb
 - app/models/faalis/group.rb
 - app/models/faalis/permission.rb
-- app/models/faalis/permissions/auth.rb
 - app/models/faalis/user.rb
 - app/models/faalis/user_message.rb
 - app/policies/faalis/admin_only_policy.rb
@@ -853,7 +831,9 @@ files:
 - lib/faalis/dashboard/dsl/show.rb
 - lib/faalis/dashboard/dsl/update.rb
 - lib/faalis/dashboard/helpers/box_helpers.rb
+- lib/faalis/dashboard/models.rb
 - lib/faalis/dashboard/models/sidebar.rb
+- lib/faalis/dashboard/sections.rb
 - lib/faalis/dashboard/sections/resource.rb
 - lib/faalis/dashboard/sections/resource_create.rb
 - lib/faalis/dashboard/sections/resource_destroy.rb
@@ -869,12 +849,16 @@ files:
 - lib/faalis/fake_assets.rb
 - lib/faalis/i18n.rb
 - lib/faalis/initialize.rb
+- lib/faalis/liquid.rb
+- lib/faalis/liquid/block.rb
+- lib/faalis/liquid/render_tag.rb
+- lib/faalis/liquid/tag.rb
 - lib/faalis/middlewares.rb
 - lib/faalis/middlewares/locale.rb
 - lib/faalis/omniauth.rb
 - lib/faalis/omniauth/callbacks.rb
 - lib/faalis/orm.rb
-- lib/faalis/route.rb
+- lib/faalis/routes.rb
 - lib/faalis/version.rb
 - lib/generators/faalis/USAGE
 - lib/generators/faalis/install_all_generator.rb
@@ -915,6 +899,7 @@ files:
 - lib/tasks/docs.rake
 - lib/tasks/faalis_tasks.rake
 - lib/tasks/sync.rake
+- test/controllers/faalis/dashboard/resource_test.rb
 - test/dummy/README.rdoc
 - test/dummy/Rakefile
 - test/dummy/app/assets/javascripts/application.js
@@ -956,9 +941,7 @@ files:
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
-- test/dummy/db/test.sqlite3
 - test/dummy/lib/templates/slim/scaffold/_form.html.slim
-- test/dummy/log/test.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
@@ -972,7 +955,7 @@ files:
 - test/test_helper.rb
 homepage: http://faalis.io
 licenses:
-- GPL-2
+- GPL-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -985,70 +968,68 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Faalis is a ruby on rails engine which provides a platform to easily build
   a web application
 test_files:
-- test/fabricators/faalis/users.rb
-- test/fabricators/faalis/permissions.rb
-- test/fabricators/faalis/groups.rb
-- test/integration/faalis/dashboard_test.rb
-- test/integration/faalis/authentication_test.rb
-- test/test_helper.rb
 - test/generators/install_generator_test.rb
-- test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/public/404.html
-- test/dummy/public/favicon.ico
-- test/dummy/Rakefile
+- test/integration/faalis/authentication_test.rb
+- test/integration/faalis/dashboard_test.rb
+- test/controllers/faalis/dashboard/resource_test.rb
+- test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/policies/application_policy.rb
+- test/dummy/app/views/layouts/application.html.erb
+- test/dummy/app/controllers/api_controller.rb
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/controllers/dashboard/application_controller.rb
+- test/dummy/app/assets/javascripts/application.js
+- test/dummy/app/assets/javascripts/dashboard/application.js
+- test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/assets/stylesheets/ltr/application.css
+- test/dummy/app/assets/stylesheets/rtl/application.css
+- test/dummy/app/assets/stylesheets/dashboard/ltr/application.css
+- test/dummy/app/assets/stylesheets/dashboard/rtl/application.css
+- test/dummy/bin/rails
+- test/dummy/bin/rake
+- test/dummy/bin/bundle
 - test/dummy/config.ru
+- test/dummy/config/environments/development.rb
+- test/dummy/config/environments/test.rb
+- test/dummy/config/environments/production.rb
+- test/dummy/config/routes.rb
+- test/dummy/config/boot.rb
 - test/dummy/config/application.rb
+- test/dummy/config/environment.rb
+- test/dummy/config/initializers/devise.rb
+- test/dummy/config/initializers/filter_parameter_logging.rb
+- test/dummy/config/initializers/faalis_assets.rb
+- test/dummy/config/initializers/kaminari_config.rb
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/faalis.rb
-- test/dummy/config/initializers/devise.rb
-- test/dummy/config/initializers/formstatic.rb
+- test/dummy/config/initializers/secret_token.rb
 - test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/initializers/faalis_assets.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/mime_types.rb
 - test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/kaminari_config.rb
 - test/dummy/config/initializers/formtastic.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/secret_token.rb
-- test/dummy/config/database.yml
-- test/dummy/config/boot.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/environments/development.rb
+- test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/formstatic.rb
 - test/dummy/config/locales/en.yml
-- test/dummy/config/routes.rb
-- test/dummy/config/environment.rb
-- test/dummy/app/assets/javascripts/dashboard/application.js
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/stylesheets/rtl/application.css
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/assets/stylesheets/ltr/application.css
-- test/dummy/app/assets/stylesheets/dashboard/rtl/application.css
-- test/dummy/app/assets/stylesheets/dashboard/ltr/application.css
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/policies/application_policy.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/controllers/api_controller.rb
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/controllers/dashboard/application_controller.rb
-- test/dummy/bin/rails
-- test/dummy/bin/rake
-- test/dummy/bin/bundle
-- test/dummy/db/test.sqlite3
-- test/dummy/lib/templates/slim/scaffold/_form.html.slim
-- test/dummy/log/test.log
+- test/dummy/config/database.yml
+- test/dummy/Rakefile
 - test/dummy/README.rdoc
-has_rdoc: 
+- test/dummy/public/404.html
+- test/dummy/public/500.html
+- test/dummy/public/422.html
+- test/dummy/public/favicon.ico
+- test/dummy/lib/templates/slim/scaffold/_form.html.slim
+- test/test_helper.rb
+- test/fabricators/faalis/users.rb
+- test/fabricators/faalis/groups.rb
+- test/fabricators/faalis/permissions.rb