effective_resources 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10c047350e78353e5509d24980209bc53916e39c
-  data.tar.gz: fd7eab9a51c6c9c2d2a634431a6ab9696079708d
+  metadata.gz: 4d2f4f585bbb5859066bf26049f670a026ad0df2
+  data.tar.gz: e10b256b516418051208158bc06a8dc76b46f1e6
 SHA512:
-  metadata.gz: ca9824a092e57a9c8e87546bf09fc21d9e20134038a9103d3c900ea87119606e88e63dc532a187b5de049f063be613b9cf9361f40ccfdb4fba3ac4d44db4c82e
-  data.tar.gz: 670074c014a952d6949c2e768845fdf54b7544910a10440c325bf7bda239d62cf078b70783b1d783b724ce2e90310a2ec24ff49d2103bad76a165e785c5172f6
+  metadata.gz: 33229026829624749822b3d54d0188b1979faf226d425b88f97dee7fe9618309d7f0630c7402ae36de704aabe5c9370af76e98f112de9b46583c240242f85835
+  data.tar.gz: 54286cafb8da006ef388c2d0a2ac0cf95c0b582e2f2bdb0f591188289bb05c32350f8452d11efd9ef23f3095ec3ada32a8a2fba7717bb85d3ccc0ffe8db94f01

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

@@ -27,12 +27,19 @@ module Effective
 
               referer = request.referer.to_s
 
-              if referer.end_with?(send(effective_resource.edit_path, resource))
+              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 referer.end_with?(send(effective_resource.new_path))
+              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]
@@ -48,6 +55,13 @@ module Effective
         end
       end
 
+      # page_title 'My Title', only: [:new]
+      def page_title(label, opts = {})
+        instance_eval do
+          before_action(opts) { @page_title = label }
+        end
+      end
+
     end
 
     def index
@@ -121,7 +135,7 @@ module Effective
     def destroy
       self.resource = resource_class.find(params[:id])
 
-      @page_title = "Destroy #{resource}"
+      @page_title ||= "Destroy #{resource}"
       EffectiveResources.authorized?(self, :destroy, resource)
 
       if resource.destroy
@@ -143,8 +157,8 @@ module Effective
     def resource_redirect_path
       case params[:commit].to_s
       when 'Save'               ; send(effective_resource.edit_path, resource)
-      when 'Save and Continue'  ; send(effective_resource.index_path)
       when 'Save and Add New'   ; send(effective_resource.new_path)
+      when 'Save and Continue'  ; send(resource_index_path)
       when 'Save and Return'
         request.referer.present? ? request.referer : send(resource_index_path)
       else
@@ -229,6 +243,7 @@ module Effective
       ["#{resource_name}_params", "#{resource_plural_name}_params", 'permitted_params'].find { |name| respond_to?(name, true) } || 'params'
     end
 
+    # Override this with Team.where(team: current_user.team) to build and create with team
     def resource_scope_method_name
       ["#{resource_name}_scope", "#{resource_plural_name}_scope", 'resource_scope', 'default_scope'].find { |name| respond_to?(name, true) }
     end

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

@@ -35,7 +35,16 @@ module Effective
         when ActiveRecord::Base
           { as: :select }.merge(Effective::Resource.new(type).search_form_field_collection)
         else
-          { as: :string }
+          name = name.to_s
+
+          # If the method is named :status, and there is a Class::STATUSES
+          if (klass || NilClass).const_defined?(name.pluralize.upcase)
+            { as: :select, collection: klass.const_get(name.pluralize.upcase) }
+          elsif (klass || NilClass).const_defined?(name.singularize.upcase)
+            { as: :select, collection: klass.const_get(name.singularize.upcase) }
+          else
+            { as: :string }
+          end
         end
       end
 

data/lib/effective_resources/version.rb

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

metadata

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