effective_resources 0.9.5 → 0.10.0

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

@@ -7,7 +7,7 @@ module Effective
       end
 
       def datatable_klass
-        @datatable_klass ||= if defined?(EffectiveDatatables)
+        if defined?(EffectiveDatatables)
           "#{namespaced_class_name.pluralize}Datatable".safe_constantize ||
           "#{class_name.pluralize.camelize}Datatable".safe_constantize ||
           "#{name.pluralize.camelize}Datatable".safe_constantize ||
@@ -18,13 +18,11 @@ module Effective
       end
 
       def controller_klass
-        @controller_klass ||= (
-          "#{namespaced_class_name.pluralize}Controller".safe_constantize ||
-          "#{class_name.pluralize.classify}Controller".safe_constantize ||
-          "#{name.pluralize.classify}Controller".safe_constantize ||
-          "#{initialized_name.to_s.classify.pluralize}Controller".safe_constantize ||
-          "#{initialized_name.to_s.classify}Controller".safe_constantize
-        )
+        "#{namespaced_class_name.pluralize}Controller".safe_constantize ||
+        "#{class_name.pluralize.classify}Controller".safe_constantize ||
+        "#{name.pluralize.classify}Controller".safe_constantize ||
+        "#{initialized_name.to_s.classify.pluralize}Controller".safe_constantize ||
+        "#{initialized_name.to_s.classify}Controller".safe_constantize
       end
 
       def active_record?

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

@@ -0,0 +1,23 @@
+module Effective
+  module Resources
+    module Model
+      attr_accessor :model  # As defined by effective_resource do block in a model file
+
+      def _initialize_model(&block)
+        @model = ModelReader.new(&block)
+
+        # If effective_developer is in live mode, this will cause it to refresh the class
+        ActiveSupport.run_load_hooks(:effective_resource, klass)
+      end
+
+      def model
+        @model || (klass.effective_resource.model if klass.respond_to?(:effective_resource) && klass.effective_resource)
+      end
+
+    end
+  end
+end
+
+
+
+

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

@@ -4,7 +4,7 @@ module Effective
       SPLIT = /\/|::/  # / or ::
 
       def name # 'post'
-        @name ||= (klass.try(:name).to_s.split(SPLIT).last || '').singularize.underscore
+        @name ||= ((klass.present? ? klass.name : initialized_name).to_s.split(SPLIT).last || '').singularize.underscore
       end
 
       def plural_name # 'posts'
@@ -16,7 +16,7 @@ module Effective
       end
 
       def class_name # 'Effective::Post'
-        @model_klass.try(:name).to_s
+        @model_klass ? @model_klass.name : name.classify
       end
 
       def class_path # 'effective'
@@ -32,13 +32,17 @@ module Effective
       end
 
       def namespaces # ['admin', 'things']
-        @namespaces
+        @namespaces || []
       end
 
       def human_name
         class_name.gsub('::', ' ').underscore.gsub('_', ' ')
       end
 
+      def human_plural_name
+        class_name.pluralize.gsub('::', ' ').underscore.gsub('_', ' ')
+      end
+
     end
   end
 end

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

@@ -2,69 +2,6 @@ module Effective
   module Resources
     module Paths
 
-      #
-      # TODO: Delete these. Once effective_developer is updated
-      #
-      # # Controller REST helper paths
-      # def index_path(check: false)
-      #   path = [namespace, plural_name, 'path'].compact * '_'
-      #   path if (!check || path_exists?(path))
-      # end
-
-      # def new_path(check: false)
-      #   path = ['new', namespace, name, 'path'].compact * '_'
-      #   path if (!check || path_exists?(path))
-      # end
-
-      # def show_path(check: false)
-      #   path = [namespace, name, 'path'].compact * '_'
-      #   path if (!check || path_exists?(path, 1))
-      # end
-
-      # def destroy_path(check: false)
-      #   path = [namespace, name, 'path'].compact * '_'
-      #   path if (!check || path_exists?(path, 1, :delete))
-      # end
-
-      # def edit_path(check: false)
-      #   path = ['edit', namespace, name, 'path'].compact * '_'
-      #   path if (!check || path_exists?(path, 1))
-      # end
-
-      # def action_path(action, check: false)
-      #   path = [action, namespace, name, 'path'].compact * '_'
-      #   path if (!check || path_exists?(path, 1, :any))
-      # end
-
-      # def action_post_path(action, check: false)
-      #   path = [action, namespace, name, 'path'].compact * '_'
-      #   path if (!check || path_exists?(path, 1, :post) || path_exists?(path, 1, :put) || path_exists?(path, 1, :patch))
-      # end
-
-      # def path_exists?(path, param = nil, verb = :get)
-      #   routes = Rails.application.routes
-
-      #   return false unless routes.url_helpers.respond_to?(path)
-      #   (routes.recognize_path(routes.url_helpers.send(path, param), method: verb).present? rescue false)
-      # end
-
-      # # _helper methods also put in the (@thing)
-      # alias_method :index_path_helper, :index_path
-      # alias_method :new_path_helper, :new_path
-
-      # def show_path_helper(at: true)
-      #   show_path + '(' + (at ? '@' : '') + name + ')'
-      # end
-
-      # def edit_path_helper(at: true)
-      #   edit_path + '(' + (at ? '@' : '') + name + ')'
-      # end
-
-      # def action_path_helper(action, at: true)
-      #   action_path(action) + '(' + (at ? '@' : '') + name + ')'
-      # end
-
-      # Default file paths
       def model_file
         File.join('app/models', class_path.to_s, "#{name}.rb")
       end
@@ -81,6 +18,10 @@ module Effective
         File.join('app/views', namespace.to_s, (namespace.present? ? '' : class_path), plural_name, "#{'_' if partial}#{action}.html.haml")
       end
 
+      def flat_view_file(action = :index, partial: false)
+        File.join('app/views', plural_name, "#{'_' if partial}#{action}.html.haml")
+      end
+
     end
   end
 end

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

@@ -1,7 +1,10 @@
 module Effective
   module Resources
     module Relation
-      attr_reader :relation
+
+      def relation
+        @relation ||= klass.where(nil)
+      end
 
       # When Effective::Resource is initialized with an ActiveRecord relation, the following
       # methods will be available to operate on that relation, and be chainable and such

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

@@ -32,7 +32,7 @@ module Effective
       end
 
       def sql_direction(name)
-        name.to_s.downcase == 'desc' ? 'DESC' : 'ASC'
+        name.to_s.downcase == 'desc' ? 'DESC'.freeze : 'ASC'.freeze
       end
 
       # This is for EffectiveDatatables (col as:)

data/app/views/application/create.js.erb

@@ -1,5 +1,5 @@
 <% resource = (@_effective_resource || Effective::Resource.new(controller_path)) %>
 <% @resource = instance_variable_get('@' + resource.name) if resource.name %>
 
-EffectiveForm.remote_form_payload = "<%= j render_resource_form(resource) %>";
+EffectiveForm.remote_form_payload = "<%= j render_resource_form(@resource) %>";
 EffectiveForm.remote_form_flash = <%= raw flash.to_json %>;

data/app/views/application/edit.html.haml

@@ -6,6 +6,6 @@
     .col-8
       %h1= @page_title
     .col-4.text-right
-      = render_resource_actions(resource, @resource, edit: false)
+      = render_resource_buttons(@resource, edit: false)
 
-  = render_resource_form(resource)
+  = render_resource_form(@resource)

data/app/views/application/index.html.haml

@@ -4,7 +4,7 @@
   .col-8
     %h1= @page_title
   .col-4.text-right
-    = render_resource_actions(resource)
+    = render_resource_actions(resource.klass, index: false)
 
 - if @datatable
   = render_datatable(@datatable)

data/app/views/application/member_action.js.erb

@@ -1,5 +1,5 @@
 <% resource = (@_effective_resource || Effective::Resource.new(controller_path)) %>
 <% @resource = instance_variable_get('@' + resource.name) if resource.name %>
 
-EffectiveForm.remote_form_payload = "<%= j render_resource_form(resource, action: action) %>";
+EffectiveForm.remote_form_payload = "<%= j render_resource_form(@resource, action: action) %>";
 EffectiveForm.remote_form_flash = <%= raw flash.to_json %>;

data/app/views/application/new.html.haml

@@ -5,5 +5,7 @@
   .row
     .col-8
       %h1= @page_title
+    .col-4.text-right
+      = render_resource_buttons(@resource)
 
-  = render_resource_form(resource)
+  = render_resource_form(@resource)

data/app/views/application/show.html.haml

@@ -6,7 +6,7 @@
     .col-8
       %h1= @page_title
     .col-4.text-right
-      = render_resource_actions(resource, @resource, show: false)
+      = render_resource_buttons(@resource, show: false)
 
   = render @resource
 

data/app/views/application/update.js.erb

@@ -1,5 +1,5 @@
 <% resource = (@_effective_resource || Effective::Resource.new(controller_path)) %>
 <% @resource = instance_variable_get('@' + resource.name) if resource.name %>
 
-EffectiveForm.remote_form_payload = "<%= j render_resource_form(resource) %>";
+EffectiveForm.remote_form_payload = "<%= j render_resource_form(@resource) %>";
 EffectiveForm.remote_form_flash = <%= raw flash.to_json %>;

data/app/views/effective/resource/_actions.html.haml

@@ -1,34 +1,5 @@
-- if actions.index(:new)
-  - if EffectiveResources.authorized?(controller, :new, effective_resource.klass)
-    - name = effective_resource.human_name.titleize
-    = link_to "New #{name}", effective_resource.action_path(:new), title: "New #{name}", class: 'btn btn-primary'
-
-- if actions.index(:edit)
-  - if EffectiveResources.authorized?(controller, :edit, resource)
-    = link_to 'Edit', effective_resource.action_path(:edit, resource), title: "Edit #{resource}", class: 'btn btn-secondary'
-
-- if actions.index(:show)
-  - if EffectiveResources.authorized?(controller, :show, resource)
-    = link_to 'View', effective_resource.action_path(:show, resource), title: resource.to_s, class: 'btn btn-secondary'
-
-- (actions - effective_resource.crud_actions).each do |action|
-  - if effective_resource.member_post_actions.include?(action)
-    - if EffectiveResources.authorized?(controller, action, resource)
-      = link_to action.to_s.titleize, effective_resource.action_path(action, resource), class: 'btn btn-secondary',
-        title: "#{action} #{resource}", data: { method: :post, confirm: "#{action.to_s.titleize} #{resource}?"}
-
-  - elsif effective_resource.member_get_actions.include?(action)
-    - if EffectiveResources.authorized?(controller, action, resource)
-      = link_to action.to_s.titleize, effective_resource.action_path(action, resource), class: 'btn btn-secondary',
-        title: "#{action.to_s.titleize} #{resource}"
-  - else
-    - if EffectiveResources.authorized?(controller, action, effective_resource.klass)
-      = link_to action.to_s.titleize, effective_resource.action_path(action), class: 'btn btn-secondary',
-        title: action.to_s.titleize
+- permitted_resource_actions(resource, actions, effective_resource).each do |label, opts|
+  = link_to(label, (effective_resource.action_path(opts[:action], resource) || '#'), opts.except(:action))
 
+= instance_exec(resource, &format_block) if local_assigns[:format_block]
 = yield if block_given?
-
-- if actions.index(:destroy)
-  - if EffectiveResources.authorized?(controller, :destroy, resource)
-    = link_to 'Delete', effective_resource.action_path(:destroy, resource), class: 'btn btn-danger',
-      title: "Delete #{resource}", data: { method: :delete, confirm: "Delete #{resource}?" }

data/app/views/effective/resource/_actions_dropleft.html.haml

@@ -1,28 +1,6 @@
 = dropdown(variation: :dropleft) do
-  - if actions.index(:edit)
-    - if EffectiveResources.authorized?(controller, :edit, resource)
-      = dropdown_link_to 'Edit', effective_resource.action_path(:edit, resource), title: "Edit #{resource}"
+  - permitted_resource_actions(resource, actions, effective_resource).each do |label, opts|
+    = dropdown_link_to(label, (effective_resource.action_path(opts[:action], resource) || '#'), opts.except(:action, :class))
 
-  - if actions.index(:show)
-    - if EffectiveResources.authorized?(controller, :show, resource)
-      = dropdown_link_to 'View', effective_resource.action_path(:show, resource), title: resource.to_s
-
-  - (actions - effective_resource.crud_actions).each do |action|
-    - if effective_resource.member_post_actions.include?(action)
-      - if EffectiveResources.authorized?(controller, action, resource)
-        = dropdown_link_to action.to_s.titleize, effective_resource.action_path(action, resource),
-          title: "#{action} #{resource}", data: { method: :post, confirm: "#{action.to_s.titleize} #{resource}?"}
-
-    - elsif effective_resource.member_get_actions.include?(action)
-      - if EffectiveResources.authorized?(controller, action, resource)
-        = dropdown_link_to action.to_s.titleize, effective_resource.action_path(action, resource), title: "#{action.to_s.titleize} #{resource}"
-    - else
-      - if EffectiveResources.authorized?(controller, action, effective_resource.klass)
-        = dropdown_link_to action.to_s.titleize, effective_resource.action_path(action), title: action.to_s.titleize
-
-  = yield if block_given?
-
-  - if actions.index(:destroy)
-    - if EffectiveResources.authorized?(controller, :destroy, resource)
-      = dropdown_link_to 'Delete', effective_resource.action_path(:destroy, resource),
-        title: "Delete #{resource}", data: { method: :delete, confirm: "Delete #{resource}?" }
+  = instance_exec(resource, &format_block) if local_assigns[:format_block]
+  = yield(resource) if block_given?

data/app/views/effective/resource/_actions_glyphicons.html.haml

@@ -1,11 +1,5 @@
-- if actions.index(:edit)
-  - if EffectiveResources.authorized?(controller, :edit, resource)
-    = edit_icon_to effective_resource.action_path(:edit, resource)
+- permitted_resource_actions(resource, actions, effective_resource).each do |label, opts|
+  = glyphicon_to(opts[:action], (effective_resource.action_path(opts[:action], resource) || '#'), opts.except(:action, :class))
 
-- if actions.index(:show)
-  - if EffectiveResources.authorized?(controller, :show, resource)
-    = show_icon_to effective_resource.action_path(:show, resource)
-
-- if actions.index(:destroy)
-  - if EffectiveResources.authorized?(controller, :destroy, resource)
-    = destroy_icon_to effective_resource.action_path(:destroy, resource), data: { method: :delete, confirm: "Really delete #{resource}?" }
+= instance_exec(resource, &format_block) if local_assigns[:format_block]
+= yield(resource) if block_given?

data/lib/effective_resources/engine.rb

@@ -21,6 +21,7 @@ module EffectiveResources
       ActiveSupport.on_load :active_record do
         ActiveRecord::Base.extend(ActsAsTokened::ActiveRecord)
         ActiveRecord::Base.extend(ActsAsSlugged::ActiveRecord)
+        ActiveRecord::Base.extend(EffectiveResource::ActiveRecord)
       end
     end
 

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '0.9.5'.freeze
+  VERSION = '0.10.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.10.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-13 00:00:00.000000000 Z
+date: 2018-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -36,21 +36,32 @@ files:
 - app/assets/javascripts/effective_resources.js
 - app/assets/javascripts/effective_resources/effective_ujs.js
 - app/controllers/concerns/effective/crud_controller.rb
+- app/controllers/concerns/effective/crud_controller/actions.rb
+- app/controllers/concerns/effective/crud_controller/dsl.rb
+- app/controllers/concerns/effective/crud_controller/paths.rb
+- app/controllers/concerns/effective/crud_controller/permitted_params.rb
+- app/controllers/concerns/effective/crud_controller/save.rb
+- app/controllers/concerns/effective/crud_controller/submits.rb
 - app/controllers/concerns/effective/flash_messages.rb
 - app/helpers/effective_resources_helper.rb
+- app/helpers/effective_resources_private_helper.rb
 - app/models/concerns/acts_as_slugged.rb
 - app/models/concerns/acts_as_tokened.rb
+- app/models/concerns/effective_resource.rb
 - app/models/effective/access_denied.rb
 - app/models/effective/attribute.rb
 - app/models/effective/code_reader.rb
+- app/models/effective/model_reader.rb
 - app/models/effective/resource.rb
 - app/models/effective/resources/actions.rb
 - app/models/effective/resources/associations.rb
 - app/models/effective/resources/attributes.rb
+- app/models/effective/resources/controller.rb
 - app/models/effective/resources/forms.rb
 - app/models/effective/resources/init.rb
 - app/models/effective/resources/instance.rb
 - app/models/effective/resources/klass.rb
+- app/models/effective/resources/model.rb
 - app/models/effective/resources/naming.rb
 - app/models/effective/resources/paths.rb
 - app/models/effective/resources/relation.rb
@@ -92,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Make any controller an effective resource controller.