effective_resources 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d2f4f585bbb5859066bf26049f670a026ad0df2
-  data.tar.gz: e10b256b516418051208158bc06a8dc76b46f1e6
+  metadata.gz: 3603bb31768aaa66451280ed995ff7ffb0267317
+  data.tar.gz: cefdd8ab23fb2caf9cea8a8072a5924a98bf2ed7
 SHA512:
-  metadata.gz: 33229026829624749822b3d54d0188b1979faf226d425b88f97dee7fe9618309d7f0630c7402ae36de704aabe5c9370af76e98f112de9b46583c240242f85835
-  data.tar.gz: 54286cafb8da006ef388c2d0a2ac0cf95c0b582e2f2bdb0f591188289bb05c32350f8452d11efd9ef23f3095ec3ada32a8a2fba7717bb85d3ccc0ffe8db94f01
+  metadata.gz: 6a0ee609b5828105deafbfcb6998582b9b41f96cfccfd4225ab3b725e1c73e9d487172d34fd574618f3938b3bb5b059fecf249b3b3a279df812fd84a95ac96a8
+  data.tar.gz: 1b0f62769e126fd7d32eb3c66b955cff2e2137d66bebae0e0fd1054721652b09882886e9923a994e94b993dd343d57ed901d189bf7ba1158f4ba55c6029e57cc

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

@@ -14,44 +14,29 @@ module Effective
 
           EffectiveResources.authorized?(self, action, resource)
 
-          if (request.post? || request.patch? || request.put?)
-            raise "expected @#{resource_name} to respond to #{action}!" unless resource.respond_to?("#{action}!")
-
-            begin
-              resource.send("#{action}!") || raise('exception')
-
-              flash[:success] = "Successfully #{action}#{action.to_s.end_with?('e') ? 'd' : 'ed'} #{resource_human_name}"
-              redirect_back fallback_location: resource_redirect_path
-            rescue => e
-              flash.now[:danger] = "Unable to #{action} #{resource_human_name}: #{resource.errors.full_messages.to_sentence.presence || e.message}"
-
-              referer = request.referer.to_s
-
-              edit_path = send(effective_resource.edit_path, resource) if respond_to?(effective_resource.edit_path)
-              new_path = effective_resource.new_path if respond_to?(effective_resource.new_path)
-              show_path = effective_resource.show_path if respond_to?(effective_resource.show_path)
-
-              if edit_path && referer.end_with?(edit_path)
-                @page_title ||= "Edit #{resource}"
-                render :edit
-              elsif new_path && referer.end_with?(new_path)
-                @page_title ||= "New #{resource_name.titleize}"
-                render :new
-              elsif show_path && referer.end_with?(show_path)
-                @page_title ||= resource_name.titleize
-                render :show
-              else
-                @page_title ||= resource.to_s
-                flash[:danger] = flash.now[:danger]
-
-                if referer.present? && (Rails.application.routes.recognize_path(URI(referer).path) rescue false)
-                  redirect_back fallback_location: resource_redirect_path
-                else
-                  redirect_to(resource_redirect_path)
-                end
-              end
-            end
+          @page_title ||= "#{action.to_s.titleize} #{resource}"
+
+          member_post_action(action) unless request.get?
+        end
+      end
+
+      def collection_action(action)
+        define_method(action) do
+          if params[:ids].present?
+            self.resources ||= resource_class.where(id: params[:ids])
+          end
+
+          if effective_resource.scope?(action)
+            self.resources ||= resource_class.send(action)
           end
+
+          self.resources ||= resource_class.all
+
+          EffectiveResources.authorized?(self, action, resource_class)
+
+          @page_title ||= "#{action.to_s.titleize} #{resource_plural_name.titleize}"
+
+          collection_post_action(action) unless request.get?
         end
       end
 
@@ -66,7 +51,7 @@ module Effective
 
     def index
       @page_title ||= resource_plural_name.titleize
-      EffectiveResources.authorized?(self, :index, resource_class.new)
+      EffectiveResources.authorized?(self, :index, resource_class)
 
       self.resources ||= resource_class.all
 
@@ -149,7 +134,67 @@ module Effective
       else
         redirect_to(send(resource_index_path))
       end
+    end
+
+    def member_post_action(action)
+      raise 'expected post, patch or put http action' unless (request.post? || request.patch? || request.put?)
+      raise "expected @#{resource_name} to respond to #{action}!" unless resource.respond_to?("#{action}!")
+
+      begin
+        resource.public_send("#{action}!") || raise("failed to #{action} #{resource}")
+
+        flash[:success] = "Successfully #{action_verb(action)} #{resource_human_name}"
+        redirect_back(fallback_location: resource_redirect_path)
+      rescue => e
+        flash.now[:danger] = "Unable to #{action} #{resource_human_name}: #{resource.errors.full_messages.to_sentence.presence || e.message}"
+
+        referer = request.referer.to_s
+
+        edit_path = send(effective_resource.edit_path, resource) if respond_to?(effective_resource.edit_path)
+        new_path = effective_resource.new_path if respond_to?(effective_resource.new_path)
+        show_path = effective_resource.show_path if respond_to?(effective_resource.show_path)
+
+        if edit_path && referer.end_with?(edit_path)
+          @page_title ||= "Edit #{resource}"
+          render :edit
+        elsif new_path && referer.end_with?(new_path)
+          @page_title ||= "New #{resource_name.titleize}"
+          render :new
+        elsif show_path && referer.end_with?(show_path)
+          @page_title ||= resource_name.titleize
+          render :show
+        else
+          @page_title ||= resource.to_s
+          flash[:danger] = flash.now[:danger]
+
+          if referer.present? && (Rails.application.routes.recognize_path(URI(referer).path) rescue false)
+            redirect_back fallback_location: resource_redirect_path
+          else
+            redirect_to(resource_redirect_path)
+          end
+        end
+      end
+    end
+
+    def collection_post_action(action)
+      action = action.to_s.gsub('bulk_', '').to_sym
+
+      raise 'expected post, patch or put http action' unless (request.post? || request.patch? || request.put?)
+      raise "expected #{resource_name} to respond to #{action}!" if resources.to_a.present? && !resources.first.respond_to?("#{action}!")
+
+      successes = 0
+
+      resource_class.transaction do
+        successes = resources.select do |resource|
+          begin
+            resource.public_send("#{action}!") if EffectiveResources.authorized?(self, action, resource)
+          rescue => e
+            false
+          end
+        end.length
+      end
 
+      render json: { status: 200, message: "Successfully #{action_verb(action)} #{successes} / #{resources.length} selected #{resource_plural_name}" }
     end
 
     protected
@@ -200,6 +245,10 @@ module Effective
       effective_resource.plural_name
     end
 
+    def action_verb(action)
+      (action.to_s + (action.to_s.end_with?('e') ? 'd' : 'ed'))
+    end
+
     # Scoped to resource_scope_method_name
     def resource_class # Thing
       @resource_class ||= (

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

@@ -78,6 +78,23 @@ module Effective
         nested_resources.find { |ass| ass.name == name }
       end
 
+      def scope?(name)
+        return false unless klass.respond_to?(name)
+
+        is_scope = false
+
+        ActiveRecord::Base.transaction do
+          begin
+            relation = klass.public_send(name).kind_of?(ActiveRecord::Relation)
+          rescue => e
+          end
+
+          raise ActiveRecord::Rollback
+        end
+
+        is_scope
+      end
+
     end
   end
 end

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

@@ -38,9 +38,9 @@ module Effective
           name = name.to_s
 
           # If the method is named :status, and there is a Class::STATUSES
-          if (klass || NilClass).const_defined?(name.pluralize.upcase)
+          if ((klass || NilClass).const_defined?(name.pluralize.upcase) rescue false)
             { as: :select, collection: klass.const_get(name.pluralize.upcase) }
-          elsif (klass || NilClass).const_defined?(name.singularize.upcase)
+          elsif ((klass || NilClass).const_defined?(name.singularize.upcase) rescue false)
             { as: :select, collection: klass.const_get(name.singularize.upcase) }
           else
             { as: :string }

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '0.4.5'.freeze
+  VERSION = '0.4.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-11 00:00:00.000000000 Z
+date: 2017-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails