effective_resources 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 835582267c27e57dd956b47f7f4ee16611761471
-  data.tar.gz: 6502e8942e9c05ed2f8fa9b4b253540ee6961255
+  metadata.gz: a656240359f56e13c1bfb238df45835f1c52be5f
+  data.tar.gz: 2bf2cd4ee1efb59ad3645098f42eb37811bd589f
 SHA512:
-  metadata.gz: be0a71e0ee416a1c91c8b42e0b9a5194cf469ecde22d73155ba42ff9fb978f63f54ff0ca9c981b87650e2bafe921137963e351b639256fc11b2e48902dcc58e7
-  data.tar.gz: c6f43d75ad754c5403ceed17ccf91b07234d7fe82c87a34e8f7c2c8d2ea22b36169d202b49669ee69229eae73e1ab35d30017c43ddfa9ca81086c142190d6e37
+  metadata.gz: b1e02bd43eac4a53a4bb4d5895254ff86a9ce7b211803e70bcf749a4403afaa1f5ef5bcbb3176b3225864a22d16663f314ce6049023396c023c706576baeb959
+  data.tar.gz: 2cf16278075484bdeeda965a38eb00812552b7973bfe7cfb051f10e15db555f3d989c32dab967ba7bbb2955ae06757568903a4c3dfd2cceac633c3d65e5fb1c6

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

@@ -136,6 +136,9 @@ module Effective
       action = resource_commit_action[:action]
       EffectiveResources.authorized?(self, action, resource) unless action == :save
 
+      resource.assign_attributes(send(resource_params_method_name))
+      resource.created_by ||= current_user if resource.respond_to?(:created_by=)
+
       if save_resource(resource, action)
         flash[:success] ||= flash_success(resource, action)
         redirect_to(resource_redirect_path)
@@ -168,6 +171,8 @@ module Effective
       action = resource_commit_action[:action]
       EffectiveResources.authorized?(self, action, resource) unless action == :save
 
+      resource.assign_attributes(send(resource_params_method_name))
+
       if save_resource(resource, action)
         flash[:success] ||= flash_success(resource, action)
         redirect_to(resource_redirect_path)
@@ -196,6 +201,7 @@ module Effective
       end
     end
 
+    # No attributes are assigned or saved. We purely call action! on the resource.
     def member_post_action(action)
       raise 'expected post, patch or put http action' unless (request.post? || request.patch? || request.put?)
 
@@ -222,6 +228,7 @@ module Effective
       end
     end
 
+    # No attributes are assigned or saved. We purely call action! on the resource
     def collection_post_action(action)
       action = action.to_s.gsub('bulk_', '').to_sym
 
@@ -245,7 +252,7 @@ module Effective
 
     # Here we look at all available (class level) member actions, see which ones apply to the current resource
     # This feeds into the helper simple_form_submit(f)
-    # Returns a Hash of {'Save': {data-disable-with: 'Saving...'}, 'Save and Continue': {data-disable-with: 'Saving...'}}
+    # Returns a Hash of {'Save': {data-disable-with: 'Saving...'}, 'Approve': {data-disable-with: 'Approve'}}
     def member_actions_for(obj)
       self.class.member_actions.select do |commit, args|
         (args.key?(:if) ? obj.instance_exec(&args[:if]) : true) &&
@@ -253,13 +260,12 @@ module Effective
       end.inject({}) { |h, (commit, args)| h[commit] = args.except(:action, :if, :unless, :redirect); h }
     end
 
+    protected
+
     # This calls the appropriate member action, probably save!, on the resource.
     def save_resource(resource, action = :save)
       raise "expected @#{resource_name} to respond to #{action}!" unless resource.respond_to?("#{action}!")
 
-      resource.assign_attributes(send(resource_params_method_name))
-
-      resource.created_by ||= current_user if resource.respond_to?(:created_by=)
       resource.current_user ||= current_user if resource.respond_to?(:current_user=)
 
       resource_klass.transaction do
@@ -276,12 +282,6 @@ module Effective
       false
     end
 
-    protected
-
-    def resource_commit_action
-      self.class.member_actions[params[:commit].to_s] || self.class.member_actions['Save'] || raise("expected member_actions['Save'] to be present")
-    end
-
     def resource_redirect_path
       commit_action_redirect = case resource_commit_action[:redirect]
         when :index ; resource_index_path
@@ -303,7 +303,7 @@ module Effective
         resource_index_path
       else
         [referer_redirect_path, resource_index_path].compact.first
-      end
+      end.presence || root_path
     end
 
     def referer_redirect_path
@@ -378,6 +378,10 @@ module Effective
       (action.to_s + (action.to_s.end_with?('e') ? 'd' : 'ed'))
     end
 
+    def resource_commit_action
+      self.class.member_actions[params[:commit].to_s] || self.class.member_actions['Save'] || raise("expected member_actions['Save'] to be present")
+    end
+
     # Returns an ActiveRecord relation based on the computed value of `resource_scope` dsl method
     def resource_scope # Thing
       @_effective_resource_relation ||= (

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '0.6.0'.freeze
+  VERSION = '0.6.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Code and Effect