effective_resources 0.3.13 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eab2acea54c68e25f1d066485fb00763295982e8
-  data.tar.gz: beebb25a6052cbd33d9bfcb67bea42c8124c6a6e
+  metadata.gz: 710060a4d1418f907cd8ffb119036b6b641e58f5
+  data.tar.gz: 4c702a563c7bede6b1f415fd94f73e8eebf290c0
 SHA512:
-  metadata.gz: 173ea246c8e6dca6f05a31d0d0a715f9273682b04ce2d779a9e50c5aef12b6549193eda7cc36c0198642d68a5b3e6a66f86134fc4ae4d62df94cc0ae88fdb5e7
-  data.tar.gz: d987ab50595f08fc4465af85dfabdbf0f5cd971cf029b403a4792995c7625c4d179991404b613b0b54b8fbe18ef5439f40204f02bc33250e6cfda34606dfda1d
+  metadata.gz: e58b4be5357a4f631ff7ef3c7a599fa16c5da4c7a990e5bf6ccfd7531af9f95d772a35b7115fda179215d3cff8133976f1b866f09c138de05009ec43b5d33a29
+  data.tar.gz: 2b3bd0c219550a21fefc27cbe3f2c4d1b25226b5f34c0bc2335d4ef99084d5b0643d66eb7945130b193e8a94b532f1a9e6b4ac57c75d1fa8b7d8fb6b2af3ffd9

data/app/models/effective/resource.rb

@@ -1,5 +1,6 @@
 module Effective
   class Resource
+    include Effective::Resources::Actions
     include Effective::Resources::Associations
     include Effective::Resources::Attributes
     include Effective::Resources::Init

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

@@ -0,0 +1,55 @@
+module Effective
+  module Resources
+    module Actions
+
+      # This was written for the Edit actions fallback templates
+
+      def controller_routes
+        @controller_routes ||= (
+          path = controller_path
+
+          Rails.application.routes.routes.select do |route|
+            (route.defaults[:controller] == path) && route.defaults[:action].present?
+          end
+        )
+      end
+
+      def controller_actions
+        controller_routes.map { |route| route.defaults[:action] }
+      end
+
+      # GET actions
+      def member_actions
+        controller_routes.map { |route| route.defaults[:action] if is_get_member?(route) }.compact - crud_actions
+      end
+
+      # GET actions
+      def member_post_actions
+        controller_routes.map { |route| route.defaults[:action] if is_post_member?(route) }.compact - crud_actions
+      end
+
+      # Same as controller_path in the view
+      def controller_path
+        [namespace, plural_name].compact * '/'
+      end
+
+      private
+
+      def crud_actions
+        %w(index new create show edit update destroy)
+      end
+
+      def is_get_member?(route)
+        route.verb.to_s.include?('GET') && route.path.required_names == ['id']
+      end
+
+      def is_post_member?(route)
+        ['POST', 'PUT', 'PATCH'].any? { |verb| route.verb == verb } && route.path.required_names == ['id']
+      end
+
+    end
+  end
+end
+
+
+

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

@@ -30,7 +30,12 @@ module Effective
 
       def action_path(action, check: false)
         path = [action, namespace, name, 'path'].compact * '_'
-        path if (!check || path_exists?(path, 1))
+        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)

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

@@ -111,7 +111,7 @@ module Effective
             relation.where("#{sql_column} = ?", term)
           end
         when :duration
-          if fuzzy && (term % 60) == 0 && value.to_s.include?('m') == false
+          if fuzzy && (term % 60 == 0) && value.to_s.include?('m') == false
             if term < 0
               relation.where("#{sql_column} <= ? AND #{sql_column} > ?", term, term-60)
             else

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

@@ -0,0 +1,20 @@
+- resource = (@_effective_resource || Effective::Resource.new(controller_path))
+- @resource = instance_variable_get('@' + resource.name)
+
+.row
+  .col-sm-6
+    %h1= @page_title
+  .col-sm-6
+    %p.text-right
+      - resource.member_post_actions.each do |action|
+        - if EffectiveResources.authorized?(controller, action.to_sym, @resource)
+          - if resource.action_post_path(action, check: true).present?
+            = link_to action.titleize, send(resource.action_post_path(action), @resource), class: 'btn btn-primary',
+              data: { confirm: "Really #{action} #{@resource}?", method: :post }
+
+      - if EffectiveResources.authorized?(controller, :destroy, @resource)
+        - if resource.destroy_path(check: true).present?
+          = link_to 'Delete', send(resource.destroy_path, @resource), class: 'btn btn-danger',
+            data: { confirm: "Really delete #{@resource}?", method: :delete }
+
+= render 'form', resource.name.to_sym => @resource

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

@@ -0,0 +1,23 @@
+- resource = (@_effective_resource || Effective::Resource.new(controller_path))
+
+.row
+  .col-sm-6
+    %h1= @page_title
+  .col-sm-6
+    %p.text-right
+      - if can?(:new, resource.klass) && resource.new_path(check: true).present?
+        = link_to "New #{resource.human_name.titleize}", send(resource.new_path), class: 'btn btn-primary'
+
+- if @datatable
+  = render_datatable(@datatable)
+
+- elsif instance_variable_get('@' + resource.plural_name)
+  = render instance_variable_get('@' + resource.plural_name)
+
+- elsif instance_variable_get('@' + resource.name)
+  = render instance_variable_get('@' + resource.name)
+
+- elsif Rails.env.development?
+  %p effective_resources index view is not sure what to render.
+  %p Define an @datatable, @#{resource.plural_name}, or @#{resource.name}.
+  %p or include Effective::CrudController in your controller

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

@@ -0,0 +1,5 @@
+- resource = (@_effective_resource || Effective::Resource.new(controller_path))
+
+%h1= @page_title
+
+= render 'form', resource.name.to_sym => instance_variable_get('@' + resource.name)

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

@@ -0,0 +1,20 @@
+- resource = (@_effective_resource || Effective::Resource.new(controller_path))
+- @resource = instance_variable_get('@' + resource.name)
+
+.row
+  .col-sm-6
+    %h1= @page_title
+  .col-sm-6
+    %p.text-right
+      - resource.member_post_actions.each do |action|
+        - if EffectiveResources.authorized?(controller, action.to_sym, @resource)
+          - if resource.action_post_path(action, check: true).present?
+            = link_to action.titleize, send(resource.action_post_path(action), @resource), class: 'btn btn-primary',
+              data: { confirm: "Really #{action} #{@resource}?", method: :post }
+
+      - if EffectiveResources.authorized?(controller, :destroy, @resource)
+        - if resource.destroy_path(check: true).present?
+          = link_to 'Delete', send(resource.destroy_path, @resource), class: 'btn btn-danger',
+            data: { confirm: "Really delete #{@resource}?", method: :delete }
+
+= render @resource

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '0.3.13'.freeze
+  VERSION = '0.4.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 0.3.13
+  version: 0.4.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-18 00:00:00.000000000 Z
+date: 2017-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -41,6 +41,7 @@ files:
 - app/models/effective/attribute.rb
 - app/models/effective/code_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/forms.rb
@@ -51,6 +52,10 @@ files:
 - app/models/effective/resources/paths.rb
 - app/models/effective/resources/relation.rb
 - app/models/effective/resources/sql.rb
+- app/views/application/edit.html.haml
+- app/views/application/index.html.haml
+- app/views/application/new.html.haml
+- app/views/application/show.html.haml
 - config/effective_resources.rb
 - lib/effective_resources.rb
 - lib/effective_resources/engine.rb