effective_resources 1.5.3 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e01b50384fc2d41b95913769c539276b592257b4f36109917a02afe5a74a8584
-  data.tar.gz: 005a5676dca6e1d0e14a19ad96f31d834a85fdec527514bc75b86d040b3ed2f0
+  metadata.gz: 6aedd8615011c317ab13eb87dd39e859f2c96b2566e968eaa395ef6851bed01c
+  data.tar.gz: 86428262c78668050c311979f0fad5002f5d28e73fe1b890053ad6fc70412ed4
 SHA512:
-  metadata.gz: 0d135e3a5f848c0ee8f40d89e5412a4576fdd4e25068cd5df6ee3d01d3901db36f10c034376dc9bc253cc0f7aebbdce242cebca9c988e8a2bb315621aee80f80
-  data.tar.gz: c7808cfa20c0b8c7b256a0dc5d46ba0b39bf6c638d1200820cd93c50228b8c456b77f9adbe34039825c6e0a00dc5312b6da4ab51a464769ac8b11f91393dcd78
+  metadata.gz: b07ef7750880fdc92771cd51faae6d1a41d0165fc18490889663fde1d82cf2c9de09d03d6b98e50e351bfe8977571bd61fb47ae3a4c183ab81811ae5f05d25fc
+  data.tar.gz: f552fb107e746829a69c589f11d9eced9b8e1e33db07d25d9ea38557f4c6032372d01ff7877518f8d64a207312603c2a095a0995a1e044b672466dbdb81ab3c0

data/README.md

@@ -1,7 +1,7 @@
 # Effective Resources
 
 This gem looks at the current `routes.rb`, authorization `ability.rb`, `current_user` and controller context
-to metaprogram an effective CRUD website. 
+to metaprogram an effective CRUD website.
 
 It automates linking to resource edit, show, delete pages, as well as member and collection actions.
 
@@ -256,6 +256,14 @@ end
 
 and include Effective::CrudController in your resource controller.
 
+## Testing
+
+Run tests by:
+
+```ruby
+rails test
+```
+
 ## License
 
 MIT License.  Copyright [Code and Effect Inc.](http://www.codeandeffect.com/)
@@ -268,4 +276,3 @@ MIT License.  Copyright [Code and Effect Inc.](http://www.codeandeffect.com/)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Bonus points for test coverage
 6. Create new Pull Request
-

data/app/controllers/concerns/effective/crud_controller.rb

@@ -118,7 +118,9 @@ module Effective
 
       return unless datatable_klass.present?
 
-      datatable_klass.new(resource_datatable_attributes)
+      datatable = datatable_klass.new(resource_datatable_attributes)
+      datatable.effective_resource = effective_resource if datatable.respond_to?(:effective_resource=)
+      datatable
     end
 
     def resource_params_method_name

data/app/controllers/concerns/effective/crud_controller/dsl.rb

@@ -80,7 +80,7 @@ module Effective
         raise 'expected a proc or block' unless (obj.respond_to?(:call) || block_given?)
 
         instance_exec do
-          prepend_before_action(opts) { @_effective_resource_scope ||= instance_exec(&(block_given? ? block : obj)) }
+          before_action(opts) { @_effective_resource_scope ||= instance_exec(&(block_given? ? block : obj)) }
         end
       end
 

data/app/controllers/concerns/effective/crud_controller/permitted_params.rb

@@ -5,7 +5,7 @@ module Effective
 
       # This is only available to models that use the effective_resource do ... end attributes block
       # It will be called last, and only for those resources
-      # params.require(effective_resource.name).permit!
+      # params.require(effective_resource.resource_name).permit!
       def resource_permitted_params
         raise 'expected resource class to have effective_resource do .. end' if effective_resource.model.blank?
 
@@ -13,10 +13,10 @@ module Effective
 
         if Rails.env.development?
           Rails.logger.info "Effective::CrudController#resource_permitted_params:"
-          Rails.logger.info "params.require(:#{effective_resource.name}).permit(#{permitted_params.to_s[1...-1]})"
+          Rails.logger.info "params.require(:#{effective_resource.resource_name}).permit(#{permitted_params.to_s[1...-1]})"
         end
 
-        params.require(effective_resource.name).permit(*permitted_params)
+        params.require(effective_resource.resource_name).permit(*permitted_params)
       end
 
       # If the resource is ActiveModel, just permit all
@@ -24,13 +24,13 @@ module Effective
       def resource_active_model_permitted_params
         if Rails.env.development?
           Rails.logger.info "Effective::CrudController#resource_permitted_params:"
-          Rails.logger.info "params.require(:#{effective_resource.name}).permit!"
+          Rails.logger.info "params.require(:#{effective_resource.resource_name}).permit!"
         end
 
-        if params[effective_resource.name].present?
-          params.require(effective_resource.name).permit!
+        if params[effective_resource.resource_name].present?
+          params.require(effective_resource.resource_name).permit!
         else
-          params.require((effective_resource.namespaces + [effective_resource.name]).join('_')).permit!
+          params.require((effective_resource.namespaces + [effective_resource.resource_name]).join('_')).permit!
         end
       end
 
@@ -96,7 +96,7 @@ module Effective
 
           if (nested_params = permitted_params_for(nested.klass, namespaces)).present?
             nested_params.insert(nested_params.rindex { |obj| !obj.kind_of?(Hash)} + 1, :_destroy)
-            permitted_params << { "#{nested.name}_attributes".to_sym => nested_params }
+            permitted_params << { "#{nested.resource_name}_attributes".to_sym => nested_params }
           end
         end
 

data/app/controllers/concerns/effective/crud_controller/respond.rb

@@ -64,10 +64,14 @@ module Effective
           else
             if template_present?(action)
               format.html { render(action, locals: { action: action }) }
+            elsif request.referer.to_s.end_with?('/edit')
+              format.html { render :edit }
+            elsif request.referer.to_s.end_with?('/new')
+              format.html { render :new }
             else
               format.html do
                 redirect_flash
-                redirect_to(from_path.presence || resource_redirect_path(action))
+                redirect_to(resource_redirect_path(action))
               end
             end
           end

data/app/models/effective/resources/actions.rb

@@ -11,24 +11,36 @@ module Effective
       # Effective::Resource.new('admin/posts').routes[:index]
       def routes
         @routes ||= (
-          matches = [[namespace, plural_name].compact.join('/'), [namespace, name].compact.join('/')]
+          matches = [
+            [namespace, plural_name].compact.join('/'),
+            [namespace, name].compact.join('/')
+          ]
+
+          # Check main Rails app
+          routes = Rails.application.routes.routes.select do |route|
+            (matches & [route.defaults[:controller]]).present? && !route.name.to_s.end_with?('root')
+          end
+
+          # Check engine routes
+          if routes.blank?
+            matches = [
+              [namespace, plural_name].compact.join('/'),
+              [namespace, name].compact.join('/'),
+              ['effective', namespace, plural_name].compact.join('/'),
+              ['effective', namespace, name].compact.join('/')
+            ]
+
+            (Rails::Engine.subclasses.reverse + [Rails.application]).each do |engine|
+              routes = engine.routes.routes.select do |route|
+                (matches & [route.defaults[:controller]]).present? && !route.name.to_s.end_with?('root')
+              end
 
-          routes_engine.routes.routes.select do |route|
-            matches.any? { |match| match == route.defaults[:controller] } && !route.name.to_s.end_with?('root')
-          end.inject({}) do |h, route|
-            h[route.defaults[:action].to_sym] = route; h
+              break if routes.present?
+            end
           end
-        )
-      end
 
-      # Effective::Resource.new('effective/order', namespace: :admin)
-      def routes_engine
-        case class_name
-        when 'Effective::Order'
-          EffectiveOrders::Engine
-        else
-          Rails.application
-        end
+          Array(routes).inject({}) { |h, route| h[route.defaults[:action].to_sym] = route; h }
+        )
       end
 
       # Effective::Resource.new('admin/posts').action_path_helper(:edit) => 'edit_admin_posts_path'
@@ -73,13 +85,15 @@ module Effective
                 h[part] = target.public_send(part)
               end
             end
-          else
+          elsif target.respond_to?(:to_param) || target.respond_to?(:id)
             target
+          else
+            {id: target}
           end
         end
 
         # Generate the path
-        path = routes[action].format(formattable || EMPTY_HASH)
+        path = (routes[action].format(formattable || EMPTY_HASH) rescue nil)
 
         if path.present? && opts.present?
           uri = URI.parse(path)

data/app/models/effective/resources/controller.rb

@@ -31,22 +31,26 @@ module Effective
           end
 
           (member_post_actions - crud_actions).each do |action| # default true means it will be overwritten by dsl methods
-            buttons[action.to_s.titleize] = case action
+            action_name = action.to_s.titleize
+
+            buttons[action_name] = case action
             when :archive
-              { action: action, default: true, if: -> { !resource.archived? }, class: 'btn btn-danger', 'data-method' => :post, 'data-confirm' => "Really #{action} @resource?"}
+              { action: action, default: true, if: -> { !resource.archived? }, class: 'btn btn-danger', 'data-method' => :post, 'data-confirm' => "Really #{action_name} @resource?"}
             when :unarchive
-              { action: action, default: true, if: -> { resource.archived? }, 'data-method' => :post, 'data-confirm' => "Really #{action} @resource?" }
+              { action: action, default: true, if: -> { resource.archived? }, 'data-method' => :post, 'data-confirm' => "Really #{action_name} @resource?" }
             else
-              { action: action, default: true, 'data-method' => :post, 'data-confirm' => "Really #{action} @resource?"}
+              { action: action, default: true, 'data-method' => :post, 'data-confirm' => "Really #{action_name} @resource?"}
             end
           end
 
           member_delete_actions.each do |action|
+            action_name = action.to_s.titleize
+
             if action == :destroy
               next if buttons.values.find { |v| v[:action] == :archive }.present?
               buttons['Delete'] = { action: action, default: true, 'data-method' => :delete, 'data-confirm' => "Really delete @resource?" }
             else
-              buttons[action.to_s.titleize] = { action: action, default: true, 'data-method' => :delete, 'data-confirm' => "Really #{action} @resource?" }
+              buttons[action_name] = { action: action, default: true, 'data-method' => :delete, 'data-confirm' => "Really #{action_name} @resource?" }
             end
           end
 
@@ -81,24 +85,26 @@ module Effective
           member_post_actions.each do |action|
             next if crud_actions.include?(action)
 
-            actions[action.to_s.titleize] = { action: action, default: true, 'data-method' => :post, 'data-confirm' => "Really #{action} @resource?" }
+            action_name = action.to_s.titleize
 
-            actions[action.to_s.titleize] = case action
+            actions[action_name] = case action
             when :archive
-              { action: action, default: true, if: -> { !resource.archived? }, class: 'btn btn-danger', 'data-method' => :post, 'data-confirm' => "Really #{action} @resource?"}
+              { action: action, default: true, if: -> { !resource.archived? }, class: 'btn btn-danger', 'data-method' => :post, 'data-confirm' => "Really #{action_name} @resource?"}
             when :unarchive
-              { action: action, default: true, if: -> { resource.archived? }, 'data-method' => :post, 'data-confirm' => "Really #{action} @resource?" }
+              { action: action, default: true, if: -> { resource.archived? }, 'data-method' => :post, 'data-confirm' => "Really #{action_name} @resource?" }
             else
-              { action: action, default: true, 'data-method' => :post, 'data-confirm' => "Really #{action} @resource?" }
+              { action: action, default: true, 'data-method' => :post, 'data-confirm' => "Really #{action_name} @resource?" }
             end
           end
 
           member_delete_actions.each do |action|
+            action_name = action.to_s.titleize
+
             if action == :destroy
               next if actions.find { |_, v| v[:action] == :archive }.present?
               actions['Delete'] = { action: action, default: true, 'data-method' => :delete, 'data-confirm' => "Really delete @resource?" }
             else
-              actions[action.to_s.titleize] = { action: action, default: true, 'data-method' => :delete, 'data-confirm' => "Really #{action} @resource?" }
+              actions[action_name] = { action: action, default: true, 'data-method' => :delete, 'data-confirm' => "Really #{action_name} @resource?" }
             end
           end
         end

data/app/models/effective/resources/init.rb

@@ -6,8 +6,40 @@ module Effective
 
       def _initialize_input(input, namespace: nil)
         @initialized_name = input
+        @model_klass = _klass_by_input(input)
 
-        @model_klass = case input
+        # Consider namespaces
+        if namespace
+          @namespaces = (namespace.kind_of?(String) ? namespace.split('/') : Array(namespace))
+        end
+
+        if input.kind_of?(Array) && @namespaces.blank?
+          @namespaces = input[0...-1].map { |input| input.to_s.presence }.compact
+        end
+
+        # Consider relation
+        if input.kind_of?(ActiveRecord::Relation)
+          @relation ||= input
+        end
+
+        if input.kind_of?(ActiveRecord::Reflection::MacroReflection) && input.scope
+          @relation ||= klass.where(nil).merge(input.scope)
+        end
+
+        # Consider instance
+        if klass && input.instance_of?(klass)
+          @instance ||= input
+        end
+
+        if klass && input.kind_of?(Array) && input.last.instance_of?(klass)
+          @instance ||= input.last
+        end
+      end
+
+      def _klass_by_input(input)
+        case input
+        when Array
+          _klass_by_input(input.last)
         when String, Symbol
           _klass_by_name(input)
         when Class
@@ -24,22 +56,6 @@ module Effective
         when nil    ; raise 'expected a string or class'
         else        ; _klass_by_name(input.class.name)
         end
-
-        if namespace
-          @namespaces = (namespace.kind_of?(String) ? namespace.split('/') : Array(namespace))
-        end
-
-        if input.kind_of?(ActiveRecord::Relation)
-          @relation = input
-        end
-
-        if input.kind_of?(ActiveRecord::Reflection::MacroReflection) && input.scope
-          @relation = klass.where(nil).merge(input.scope)
-        end
-
-        if klass && input.instance_of?(klass)
-          @instance = input
-        end
       end
 
       def _klass_by_name(input)
@@ -48,6 +64,7 @@ module Effective
 
         names = input.split('/')
 
+        # Crazy classify
         0.upto(names.length-1) do |index|
           class_name = names[index..-1].map { |name| name.classify } * '::'
           klass = class_name.safe_constantize
@@ -64,35 +81,19 @@ module Effective
           end
         end
 
-        nil
-      end
-
-      # Lazy initialized
-      def _initialize_written
-        @written_attributes = []
-        @written_belong_tos = []
-        @written_scopes = []
-
-        return unless File.exists?(model_file)
-
-        Effective::CodeReader.new(model_file) do |reader|
-          first = reader.index { |line| line == '# Attributes' }
-          last = reader.index(from: first) { |line| line.start_with?('#') == false && line.length > 0 } if first
-
-          if first && last
-            @written_attributes = reader.select(from: first+1, to: last-1).map do |line|
-              Effective::Attribute.parse_written(line).presence
-            end.compact
-          end
-
-          @written_belong_tos = reader.select { |line| line.start_with?('belongs_to ') }.map do |line|
-            line.scan(/belongs_to\s+:(\w+)/).flatten.first
-          end
+        # Crazy engine
+        if names[0] == 'admin'
+          class_name = (['effective'] + names[1..-1]).map { |name| name.classify } * '::'
+          klass = class_name.safe_constantize
 
-          @written_scopes = reader.select { |line| line.start_with?('scope ') }.map do |line|
-            line.scan(/scope\s+:(\w+)/).flatten.first
+          if klass.present?
+            @namespaces ||= names[0...-1]
+            @model_klass = klass
+            return klass
           end
         end
+
+        nil
       end
 
     end

data/app/models/effective/resources/klass.rb

@@ -9,8 +9,12 @@ module Effective
       def datatable_klass
         if defined?(EffectiveDatatables)
           "#{namespaced_class_name.pluralize}Datatable".safe_constantize ||
+          "#{namespaced_module_name.pluralize}Datatable".safe_constantize ||
+          "#{namespaced_class_name.pluralize.gsub('::', '')}Datatable".safe_constantize ||
           "#{class_name.pluralize.camelize}Datatable".safe_constantize ||
+          "#{class_name.pluralize.camelize.gsub('::', '')}Datatable".safe_constantize ||
           "#{name.pluralize.camelize}Datatable".safe_constantize ||
+          "#{name.pluralize.camelize.gsub('::', '')}Datatable".safe_constantize ||
           "Effective::Datatables::#{namespaced_class_name.pluralize}".safe_constantize ||
           "Effective::Datatables::#{class_name.pluralize.camelize}".safe_constantize ||
           "Effective::Datatables::#{name.pluralize.camelize}".safe_constantize

data/app/models/effective/resources/naming.rb

@@ -11,6 +11,10 @@ module Effective
         name.pluralize
       end
 
+      def resource_name # 'effective_post' used by permitted params
+        @resource_name ||= ((klass.present? ? klass.name : initialized_name).to_s.split(SPLIT).join('_') || '').singularize.underscore
+      end
+
       def initialized_name
         @initialized_name
       end
@@ -27,6 +31,10 @@ module Effective
         (Array(namespaces).map { |name| name.to_s.classify } + [class_name]) * '::'
       end
 
+      def namespaced_module_name # 'Admin::EffectivePosts'
+        Array(namespaces).map { |name| name.to_s.classify }.join('::') + '::' + class_name.gsub('::', '')
+      end
+
       def namespace # 'admin/things'
         (namespaces.join('/') if namespaces.present?)
       end

data/lib/effective_resources.rb

@@ -1,4 +1,5 @@
 require 'effective_resources/engine'
+require 'effective_resources/version'
 
 module EffectiveResources
 

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.5.3'.freeze
+  VERSION = '1.6.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.6.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-18 00:00:00.000000000 Z
+date: 2020-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,6 +24,76 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: effective_bootstrap
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: effective_datatables
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Make any controller an effective resource controller.
 email:
 - info@codeandeffect.com
@@ -113,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Make any controller an effective resource controller.