tybo 0.0.12 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff316ce32e05b03bd95e99c31631d2c3b8254ec8dce7b592c2860558aaa1d1ff
-  data.tar.gz: 955dea95c34aaa8ca1eedcdc63fadc91cdbf962ce3c83f6ea99947c5f2b4e563
+  metadata.gz: f3e1659738fc5081c5c1f749ee9f5319bda7d3a6c14e00057f6bda6c637080fc
+  data.tar.gz: b1c45b98c8a241ee91fa5b3a8a6d8b0be15d5f7fae59c7678b7f2f42480af442
 SHA512:
-  metadata.gz: 98f3f107ddb3ad5cd000170ddb9f2ab049a6f2d1cd816467815f99c4c8ba507148e824f4a81d0aede83eae04fa7e24f81a3a5e7a98c630439d35eae8bd5076be
-  data.tar.gz: 6124736a64b0f9f92f6510e942552c4e72912dcc0297ea367b531ba0cd4bbcf152b7078a6885e4fe05035fa573cde8b1eab66b4a3210830257a997208538e108
+  metadata.gz: 40755097ff8fc2b01d7f49e189645c548cea5c3d32bc12df6e3d4f6b498649e0a541f4a4dcbc0dd54e748539b1acb013fab0aa6cfe2b24471ae53f5a28637739
+  data.tar.gz: 62597ee9ddf4815d0029e5be88ec1c515c4d8de5959b51e3f7392acfc35d49c8c3203422fbe6e9a5ee1326d53ab212a6b8ab0b96fc688624bf0617b4be3c28fa

data/README.md

@@ -34,6 +34,18 @@ $ bundle exec rails g tybo_install
 
 ```
 
+## Policy
+add your policy logic in ApplicationController eg:
+```
+  rescue_from ActionPolicy::Unauthorized, with: :not_authorized
+
+
+  def not_authorized
+    flash[:alert] = I18n.t('bo.unauthorized')
+    redirect_to(request.referrer || root_path)
+  end
+```
+
 ## Customize
 
 **Update images**: change `logo_url` and `cover_url` in `config/initializer/tybo.rb`

data/app/controllers/tybo/application_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tybo
   class ApplicationController < ActionController::Base
   end

data/app/controllers/tybo/login_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Tybo::LoginController < ::ApplicationController
   layout 'devise_admin'
   def home

data/lib/generators/bo/bo_generator.rb

@@ -19,6 +19,10 @@ class BoGenerator < Rails::Generators::NamedBase
     template '_search_bar.html.erb', File.join("app/views/#{options[:namespace]}", "#{plural_name}/_search_bar.html.erb")
     template 'show.html.erb', File.join("app/views/#{options[:namespace]}", "#{plural_name}/show.html.erb")
     template 'controller.rb', File.join("app/controllers/#{options[:namespace]}", "#{plural_name}_controller.rb")
+    template 'policy.rb', File.join("app/policies/bo/#{options[:namespace]}", "#{file_name.underscore}_policy.rb")
+    unless File.exists?("app/policies/bo/#{options[:namespace]}.rb")
+      template 'namespace_policy.rb', "app/policies/bo/#{options[:namespace]}_policy.rb"
+    end
     create_translations
   end
 
@@ -65,7 +69,7 @@ class BoGenerator < Rails::Generators::NamedBase
 
   def permited_params
     params = {}
-    action_text_columns= has_one_assoc&.select {|a| a.name == :rich_text_content}
+    action_text_columns = has_one_assoc&.select { |a| a.options[:class_name] == 'ActionText::RichText' }
     model_columns&.map do |col|
       params["#{col}".to_sym] = nil
     end
@@ -76,8 +80,10 @@ class BoGenerator < Rails::Generators::NamedBase
        params["#{association.name.to_s.singularize}_ids".to_sym] = []
     end
     has_one_assoc&.map do |association|
-       attributes = association.klass.column_names.map(&:to_sym).delete_if {|attr| excluded_columns.include?(attr)}
-       params["#{association.name.to_s.singularize}_attributes".to_sym] = attributes
+      next if association.options[:class_name] == 'ActionText::RichText'
+
+      attributes = association.klass.column_names.map(&:to_sym).delete_if { |attr| excluded_columns.include?(attr) }
+      params["#{association.name.to_s.singularize}_attributes".to_sym] = attributes
     end
     params
   end

data/lib/generators/bo/templates/_form.html.erb

@@ -2,7 +2,7 @@
   <!-- Model columns --> 
   <%- bo_model.column_names.each do |column| -%>
   <%- next if excluded_columns.include?(column.to_sym) || bo_model.reflect_on_all_associations.map(&:foreign_key).include?(column) -%>
-  <%%= f.input :<%= column %> %>
+  <%%= f.input :<%= column %>,label: I18n.t('bo.<%= class_name.underscore %>.attributes.<%= column %>')  %>
   <%- end -%>
   <!-- belongs_to Associations -->
   <%- belongs_to_assoc.each do |association| -%>
@@ -11,7 +11,10 @@
   <!-- has_one Associations -->
   <%- has_one_assoc.each do |association| -%>
   <%- if association.options[:class_name] == "ActionText::RichText" -%>
-  <%%= f.rich_text_area :<%= association.name.to_s.singularize.to_s.remove('rich_text_' )%> %>
+  <label class="block my-5 block text-sm font-medium text-gray-700 string optional text-sm font-medium text-gray-600">
+    <%%= I18n.t('bo.<%= class_name.underscore %>.attributes.<%=- association.name.to_s.singularize.to_s.remove('rich_text_') -%>') %>
+  </label>
+  <%%= f.rich_text_area :<%= association.name.to_s.singularize.to_s.remove('rich_text_')%> %>
   <%- else -%>
   <%%= render(Forms::HasOneFormComponent.new(title: I18n.t('bo.<%= association.name %>.one') )) do %>
     <%%= f.simple_fields_for :<%= association.name.to_s %> do |<%= association.name.to_s %>_form| %>

data/lib/generators/bo/templates/controller.rb

@@ -5,11 +5,15 @@ module <%= options[:namespace].camelize %>
     before_action :set_<%= class_name.underscore %>, only: %i[show edit destroy update]
 
     def index
-      @q = <%=class_name%>.ransack(params[:q])
+      @q = authorized_scope(
+        <%=class_name%>.all,
+        with: Bo::<%= options[:namespace].camelize %>::<%= class_name %>Policy
+      ).ransack(params[:q])
       @pagy, @<%= class_name.pluralize.underscore %> = pagy(@q.result(distinct: true))
     end
 
     def show
+      authorize! @<%= class_name.underscore %>, to: :show?, namespace:, strict_namespace: true
     <%- has_one_assoc.each do |association| -%>
     <%- next if association.options[:class_name] == "ActionText::RichText" -%>
       @<%= class_name.underscore %>.build_<%= association.name %> if @<%= class_name.underscore %>.<%= association.name %>.nil?
@@ -18,16 +22,20 @@ module <%= options[:namespace].camelize %>
 
     def new
       @<%= class_name.underscore %> = <%= class_name %>.new
+      authorize! @<%= class_name.underscore %>, to: :new?, namespace:, strict_namespace: true
       <%- has_one_assoc.each do |association| -%>
       <%- next if association.options[:class_name] == "ActionText::RichText" -%>
       @<%= class_name.underscore %>.build_<%= association.name %>
       <%- end -%>
     end
 
-    def edit; end
+    def edit
+      authorize! @<%= class_name.underscore %>, to: :edit?, namespace:, strict_namespace: true
+    end
 
     def create
       @<%= class_name.underscore %> = <%= class_name %>.new(<%= class_name.underscore %>_params)
+      authorize! @<%= class_name.underscore %>, to: :create?, namespace:, strict_namespace: true
 
       if @<%= class_name.underscore %>.save
         flash[:success] = t('bo.record.created')
@@ -38,6 +46,8 @@ module <%= options[:namespace].camelize %>
     end
 
     def update
+      authorize! @<%= class_name.underscore %>, to: :update?, namespace:, strict_namespace: true
+
       if @<%= class_name.underscore %>.update(<%= class_name.underscore %>_params)
         flash[:success] = t('bo.record.updated')
         redirect_to <%="#{options[:namespace]}_#{class_name.underscore}_path"%>
@@ -47,6 +57,8 @@ module <%= options[:namespace].camelize %>
     end
 
     def destroy
+      authorize! @<%= class_name.underscore %>, to: :destroy?, namespace:, strict_namespace: true
+
       @<%= class_name.underscore %>.destroy
       flash[:success] = t('bo.record.destroyed')
 
@@ -70,5 +82,9 @@ module <%= options[:namespace].camelize %>
         <%- end -%>
       )
     end
+
+    def namespace
+      @namespace ||= Bo::<%= options[:namespace].camelize %>
+    end
   end
 end

data/lib/generators/bo/templates/namespace_policy.rb

@@ -0,0 +1,29 @@
+module Bo
+  class <%= options[:namespace].camelize %>Policy < ActionPolicy::Base
+    def show?
+      raise "Add custom policy scope in #{__FILE__}"
+    end
+
+    def new?
+      raise "Add custom policy scope in #{__FILE__}"
+    end
+
+    def edit?
+      raise "Add custom policy scope in #{__FILE__}"
+    end
+
+    def create?
+      raise "Add custom policy scope in #{__FILE__}"
+    end
+
+    def update?
+      raise "Add custom policy scope in #{__FILE__}"
+    end
+
+    def destroy?
+      raise "Add custom policy scope in #{__FILE__}"
+    end
+
+    relation_scope(&:all)
+  end
+end

data/lib/generators/bo/templates/policy.rb

@@ -0,0 +1,6 @@
+module Bo
+  module <%= options[:namespace].camelize %>
+    class <%= class_name %>Policy < Bo::<%= options[:namespace].camelize %>Policy
+    end
+  end
+end

data/lib/generators/bo_namespace/bo_namespace_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class BoNamespaceGenerator < Rails::Generators::NamedBase
   source_root File.expand_path("templates", __dir__)
   

data/lib/generators/bo_namespace/templates/admin_controller.rb

@@ -4,4 +4,5 @@ class <%= class_name %>Controller < ApplicationController
   include Pagy::Backend
   layout '<%= class_name.underscore %>'
   before_action :authenticate_<%= class_name.underscore %>!
+  authorize :user, through: :current_<%= class_name.underscore %>
 end

data/lib/generators/bo_namespace/templates/policy.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module Bo
+  class <%= class_name %>Policy < ActionPolicy::Base
+  end
+end

data/lib/generators/tybo_install/templates/tybo_config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Tybo.configure do |config|
   # customise logo and cover url
   # should be an external url or image should be present in (app/assets/images)

data/lib/generators/tybo_install/tybo_install_generator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class TyboInstallGenerator < Rails::Generators::Base
   source_root File.expand_path("templates", __dir__)

data/lib/tybo/version.rb

@@ -1,3 +1,3 @@
 module Tybo
-  VERSION = '0.0.12'
+  VERSION = '0.0.14'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tybo
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.14
 platform: ruby
 authors:
 - Michel Delpierre
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-13 00:00:00.000000000 Z
+date: 2023-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -241,7 +241,9 @@ files:
 - lib/generators/bo/templates/controller.rb
 - lib/generators/bo/templates/index.html.erb
 - lib/generators/bo/templates/item.html.erb
+- lib/generators/bo/templates/namespace_policy.rb
 - lib/generators/bo/templates/new.html.erb
+- lib/generators/bo/templates/policy.rb
 - lib/generators/bo/templates/show.html.erb
 - lib/generators/bo/utils/files/fr.json
 - lib/generators/bo/utils/translations.rb
@@ -249,6 +251,7 @@ files:
 - lib/generators/bo_namespace/bo_namespace_generator.rb
 - lib/generators/bo_namespace/templates/admin.html.erb
 - lib/generators/bo_namespace/templates/admin_controller.rb
+- lib/generators/bo_namespace/templates/policy.rb
 - lib/generators/bo_namespace/templates/seeds.rb
 - lib/generators/bo_namespace/templates/side_bar.html.erb
 - lib/generators/tybo_install/templates/application.tailwind.css