effective_resources 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47f2e4bf5eab9a622f1ab0e66ab3878cf52de399
-  data.tar.gz: 6f2d1de27bafd3c352aa84f226025c641ab2a75d
+  metadata.gz: 835582267c27e57dd956b47f7f4ee16611761471
+  data.tar.gz: 6502e8942e9c05ed2f8fa9b4b253540ee6961255
 SHA512:
-  metadata.gz: d3783949d96cb00d070b53cedd220129fd2b0609437410d973c6d21802cb9479e5bf4d5e8bc46cfe046e5cdcab28bdec3a9468488a193f8769930340998502f2
-  data.tar.gz: 46fbb4de8b02aba9553b1c7d5f051cd55d519d54a85d41ab67352a636723fc0cdaaf6f80ad9a768edd240d9090f94d03e732a2907eacfd499f338ba61f4f8454
+  metadata.gz: be0a71e0ee416a1c91c8b42e0b9a5194cf469ecde22d73155ba42ff9fb978f63f54ff0ca9c981b87650e2bafe921137963e351b639256fc11b2e48902dcc58e7
+  data.tar.gz: c6f43d75ad754c5403ceed17ccf91b07234d7fe82c87a34e8f7c2c8d2ea22b36169d202b49669ee69229eae73e1ab35d30017c43ddfa9ca81086c142190d6e37

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

@@ -3,12 +3,47 @@ module Effective
     extend ActiveSupport::Concern
 
     included do
+      class << self
+        def member_actions
+          @_effective_member_actions ||= {
+            'Save' => { action: :save, data: { disable_with: 'Saving...' }}
+          }
+        end
+      end
     end
 
     module ClassMethods
       # Add the following to your controller for a simple member action
       # member_action :print
-      def member_action(action)
+      #
+      # Add to your permissions:  can :print, Thing
+      #
+      # If you want to POST and do an action based on this:
+      # Make sure your model responds to approve!
+      # member_action :approve
+      # If you want it to automatically show up in your forms
+      # member_action :approve, 'Save and Approve', if: -> { approved? }
+      # member_action :approve, 'Save and Approve', unless: -> { !approved? }, redirect: :show
+
+      def member_action(action, commit = nil, args = {})
+        if commit.present?
+          raise 'expected args to be a Hash or false' unless args.kind_of?(Hash) || args == false
+
+          if args == false
+            member_actions.delete(commit); return
+          end
+
+          if args.key?(:if) && args[:if].respond_to?(:call) == false
+            raise "expected if: to be callable. Try member_action :approve, 'Save and Approve', if: -> { submitted? }"
+          end
+
+          if args.key?(:unless) && args[:unless].respond_to?(:call) == false
+            raise "expected unless: to be callable. Try member_action :approve, 'Save and Approve', unless: -> { declined? }"
+          end
+
+          member_actions[commit] = (args || {}).merge(action: action)
+        end
+
         define_method(action) do
           self.resource ||= resource_scope.find(params[:id])
 
@@ -93,18 +128,19 @@ module Effective
     end
 
     def create
-      self.resource ||= resource_scope.new(send(resource_params_method_name))
+      self.resource ||= resource_scope.new
 
       @page_title ||= "New #{resource_name.titleize}"
       EffectiveResources.authorized?(self, :create, resource)
 
-      resource.created_by ||= current_user if resource.respond_to?(:created_by=)
+      action = resource_commit_action[:action]
+      EffectiveResources.authorized?(self, action, resource) unless action == :save
 
-      if resource.save
-        flash[:success] = flash_success(resource)
+      if save_resource(resource, action)
+        flash[:success] ||= flash_success(resource, action)
         redirect_to(resource_redirect_path)
       else
-        flash.now[:danger] = flash_danger(resource)
+        flash.now[:danger] ||= flash_danger(resource, action)
         render :new
       end
     end
@@ -129,11 +165,14 @@ module Effective
       @page_title = "Edit #{resource}"
       EffectiveResources.authorized?(self, :update, resource)
 
-      if resource.update_attributes(send(resource_params_method_name))
-        flash[:success] = flash_success(resource)
+      action = resource_commit_action[:action]
+      EffectiveResources.authorized?(self, action, resource) unless action == :save
+
+      if save_resource(resource, action)
+        flash[:success] ||= flash_success(resource, action)
         redirect_to(resource_redirect_path)
       else
-        flash.now[:danger] = flash_danger(resource)
+        flash.now[:danger] ||= flash_danger(resource, action)
         render :edit
       end
     end
@@ -145,13 +184,13 @@ module Effective
       EffectiveResources.authorized?(self, :destroy, resource)
 
       if resource.destroy
-        flash[:success] = flash_success(resource, :delete)
+        flash[:success] ||= flash_success(resource, :delete)
       else
-        flash[:danger] = flash_danger(resource, :delete)
+        flash[:danger] ||= flash_danger(resource, :delete)
       end
 
-      if request.referer.present? && !request.referer.include?(effective_resource.show_path)
-        redirect_to(request.referer)
+      if referer_redirect_path && !request.referer.include?(resource_show_path)
+        redirect_to(referer_redirect_path)
       else
         redirect_to(resource_index_path)
       end
@@ -159,36 +198,26 @@ module Effective
 
     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] = flash_success(resource, action)
-        redirect_back(fallback_location: resource_redirect_path)
-      rescue => e
-        flash.now[:danger] = flash_danger(resource, action, e: e)
-
-        referer = request.referer.to_s
+      if save_resource(resource, action)
+        flash[:success] ||= flash_success(resource, action)
+        redirect_to(referer_redirect_path || resource_redirect_path)
+      else
+        flash.now[:danger] ||= flash_danger(resource, action)
 
-        if resource_edit_path && referer.end_with?(resource_edit_path)
+        if resource_edit_path && (referer_redirect_path || '').end_with?(resource_edit_path)
           @page_title ||= "Edit #{resource}"
           render :edit
-        elsif resource_new_path && referer.end_with?(resource_new_path)
+        elsif resource_new_path && (referer_redirect_path || '').end_with?(resource_new_path)
           @page_title ||= "New #{resource_name.titleize}"
           render :new
-        elsif resource_show_path && referer.end_with?(resource_show_path)
+        elsif resource_show_path && (referer_redirect_path || '').end_with?(resource_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
+          redirect_to(referer_redirect_path || resource_redirect_path)
         end
       end
     end
@@ -214,9 +243,57 @@ module Effective
       render json: { status: 200, message: "Successfully #{action_verb(action)} #{successes} / #{resources.length} selected #{resource_plural_name}" }
     end
 
+    # 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...'}}
+    def member_actions_for(obj)
+      self.class.member_actions.select do |commit, args|
+        (args.key?(:if) ? obj.instance_exec(&args[:if]) : true) &&
+        (args.key?(:unless) ? !obj.instance_exec(&args[:unless]) : true)
+      end.inject({}) { |h, (commit, args)| h[commit] = args.except(:action, :if, :unless, :redirect); h }
+    end
+
+    # 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
+        begin
+          resource.public_send("#{action}!") || raise("failed to #{action} #{resource}")
+          return true
+        rescue => e
+          flash.delete(:success)
+          flash.now[:danger] = flash_danger(resource, action, e: e)
+          raise ActiveRecord::Rollback
+        end
+      end
+
+      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
+        when :edit  ; resource_edit_path
+        when :show  ; resource_show_path
+        when :back  ; referer_redirect_path
+        when nil    ; nil
+        else        ; resource_member_action_path(resource_commit_action[:action])
+      end
+
+      return commit_action_redirect if commit_action_redirect.present?
+
       case params[:commit].to_s
       when 'Save'
         [resource_edit_path, resource_show_path, resource_index_path].compact.first
@@ -224,10 +301,14 @@ module Effective
         [resource_new_path, resource_index_path].compact.first
       when 'Save and Continue'
         resource_index_path
-      when 'Save and Return'
-        request.referer.present? ? request.referer : resource_index_path
       else
-        [resource_edit_path, resource_show_path, resource_index_path].compact.first
+        [referer_redirect_path, resource_index_path].compact.first
+      end
+    end
+
+    def referer_redirect_path
+      if request.referer.present? && (Rails.application.routes.recognize_path(URI(request.referer.to_s).path) rescue false)
+        request.referer.to_s
       end
     end
 
@@ -251,6 +332,10 @@ module Effective
       send(effective_resource.destroy_path, resource) if effective_resource.destroy_path(check: true)
     end
 
+    def resource_member_action_path(action)
+      send(effective_resource.action_path(action), resource) if effective_resource.action_path(action, check: true)
+    end
+
     def resource # @thing
       instance_variable_get("@#{resource_name}")
     end

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

@@ -9,7 +9,7 @@ module Effective
       action ||= :save
       name ||= resource.class.model_name.human
 
-      "#{name.to_s.titleize} was successfully #{action}#{(action.to_s.end_with?('e') ? 'd' : 'ed')}"
+      "#{name.to_s.titleize} was successfully #{action}#{(action.to_s == 'submit' ? 't' : '')}#{(action.to_s.end_with?('e') ? 'd' : 'ed')}"
     end
 
     # flash.now[:danger] = flash_danger(@post)

data/app/helpers/effective_resources_helper.rb

@@ -3,13 +3,18 @@ module EffectiveResourcesHelper
   def simple_form_submit(form, options = {class: 'form-actions'}, &block)
     resource = (@_effective_resource || Effective::Resource.new(controller_path))
 
+    actions = if controller.respond_to?(:member_actions_for)
+      controller.member_actions_for(form.object)
+    else
+      {}.tap do |actions|
+        actions['Save'] = { data: { disable_with: 'Saving...' }}
+        actions['Save and Continue'] = { data: { disable_with: 'Saving...' }} if resource.index_path(check: true)
+        actions['Save and Add New'] = { data: { disable_with: 'Saving...' }} if resource.new_path(check: true)
+      end
+    end
+
     content_tag(:div, class: options[:class]) do
-      [
-        form.button(:submit, 'Save', data: { disable_with: 'Saving...' }),
-        (form.button(:submit, 'Save and Continue', data: { disable_with: 'Saving...' }) if resource.index_path(check: true)),
-        (form.button(:submit, 'Save and Add New', data: { disable_with: 'Saving...' }) if resource.new_path(check: true)),
-        (capture(&block) if block_given?)
-      ].compact.join(' ').html_safe
+      (actions.map { |action| form.button(:submit, *action.to_a) } + [(capture(&block) if block_given?)]).compact.join(' ').html_safe
     end
   end
 

data/app/models/effective/attribute.rb

@@ -41,6 +41,7 @@ module Effective
         when :resource    ; :resource
         when :string      ; :string
         when :text        ; :text
+        when :time        ; :time
         when FalseClass   ; :boolean
         when Fixnum       ; :integer
         when Float        ; :decimal
@@ -73,6 +74,11 @@ module Effective
           date = Time.zone.local(*digits)
           name.to_s.start_with?('end_') ? date.end_of_day : date
         end
+      when :time
+        if (digits = value.to_s.scan(/(\d+)/).flatten).present?
+          now = Time.zone.now
+          Time.zone.local(now.year, now.month, now.day, *digits)
+        end
       when :decimal, :currency
         (value.kind_of?(String) ? value.gsub(/[^0-9|\-|\.]/, '') : value).to_f
       when :duration

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

@@ -32,6 +32,8 @@ module Effective
           { as: :number }
         when :text
           { as: :text }
+        when :time
+          { as: :time }
         when ActiveRecord::Base
           { as: :select }.merge(Effective::Resource.new(type).search_form_field_collection)
         else

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

@@ -41,6 +41,9 @@ module Effective
         when :string, :text
           relation
             .order(("ISNULL(#{sql_column}), " if mysql?).to_s + "#{sql_column}='' ASC, #{sql_column} #{sql_direction}" + (" NULLS LAST" if postgres?).to_s)
+          when :time
+            relation
+              .order(("ISNULL(#{sql_column}), " if mysql?).to_s + "EXTRACT(hour from #{sql_column}) #{sql_direction}, EXTRACT(minute from #{sql_column}) #{sql_direction}" + (" NULLS LAST" if postgres?).to_s)
         else
           relation
             .order(("ISNULL(#{sql_column}), " if mysql?).to_s + "#{sql_column} #{sql_direction}" + (" NULLS LAST" if postgres?).to_s)
@@ -101,6 +104,10 @@ module Effective
             end
           )
           relation.where("#{sql_column} >= ? AND #{sql_column} <= ?", term, end_at)
+        when :time
+          timed = relation.where("EXTRACT(hour from #{sql_column}) = ?", term.utc.hour)
+          timed = timed.where("EXTRACT(minute from #{sql_column}) = ?", term.utc.min) if term.min > 0
+          timed
         when :decimal, :currency
           if fuzzy && (term.round(0) == term) && value.to_s.include?('.') == false
             if term < 0

data/lib/effective_resources/version.rb

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

metadata

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