effective_resources 0.10.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 297715acf66f40c204bce59ebb58873f0499afaa
-  data.tar.gz: b9a0766cc92594a8f6f0cae06bfecd6aefdb24b5
+  metadata.gz: 3ef79c2ff4b11e7b6fc7c81007b82f1ecb0fa8a0
+  data.tar.gz: 98158d2296aac5e0290d515a1bf82e3a4ace8138
 SHA512:
-  metadata.gz: baa1604c9325e9b8f0259ad4657dd209bc89e9a1dc9dfccdf106a1030f066d77a043896da6c430b19971c15d005bfba401d591c48b4f3057b552c9b83c7ae3d5
-  data.tar.gz: 68077fb078d34ad68d0a5122bcdc56fcddf567969d7a0bb432e8ac95cca6fde7aa56bd70f882c99456ddbe5e70106c9837e417fd0f1797f10ac5504efccce4b4
+  metadata.gz: 1d49fb28d6eafa486291070b6e3aca1c2f8381f02598d5ef9d0a33f1bf449e701a8f8ecf6e76ae82bf463fc1b002f4e84e8d540eef1f64db2365ecbecffe91ed
+  data.tar.gz: fdb49fb1b934cbf11428eaab0ee6906e813fa782f0b6dee6bfb936705b7edfa24a05d7f211b6370f67d0585a7e08b984c7d3e97c3f5538d6f297566ede2dc845

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

@@ -44,6 +44,11 @@ module Effective
         @page_title ||= "New #{resource_name.titleize}"
 
         run_callbacks(:resource_render)
+
+        respond_to do |format|
+          format.html { }
+          format.js { render('new.js') }
+        end
       end
 
       def create
@@ -63,17 +68,17 @@ module Effective
             request.format = :html if specific_redirect_path?
 
             format.html do
-              flash[:success] ||= resource_flash(:success, resource, action)
+              flash[:success] ||= resource_flash(:success, resource, (action == :save ? :create : action))
               redirect_to(resource_redirect_path)
             end
 
             format.js do
-              flash.now[:success] ||= resource_flash(:success, resource, action)
+              flash.now[:success] ||= resource_flash(:success, resource, (action == :save ? :create : action))
               reload_resource # create.js.erb
             end
           else
             flash.delete(:success)
-            flash.now[:danger] ||= resource_flash(:danger, resource, action)
+            flash.now[:danger] ||= resource_flash(:danger, resource, (action == :save ? :create : action))
 
             run_callbacks(:resource_render)
 
@@ -103,6 +108,12 @@ module Effective
         @page_title ||= "Edit #{resource}"
 
         run_callbacks(:resource_render)
+
+        respond_to do |format|
+          format.html { }
+          format.js { render('edit.js') }
+        end
+
       end
 
       def update
@@ -145,6 +156,10 @@ module Effective
       def destroy
         Rails.logger.info 'Processed by Effective::CrudController#destroy'
 
+        if params[:ids].present?
+          return collection_action(:destroy)
+        end
+
         self.resource = resource_scope.find(params[:id])
         action = :destroy
 

data/app/helpers/effective_resources_helper.rb

@@ -65,11 +65,13 @@ module EffectiveResourcesHelper
     spacer_template = locals.delete(:spacer_template)
 
     effective_resource = (atts.delete(:effective_resource) || find_effective_resource)
-    actions = atts.delete(:actions) || effective_resource.resource_actions
     namespace = atts.delete(:namespace) || (effective_resource.namespace.to_sym if effective_resource.namespace)
 
+    actions = atts.delete(:actions)
+    actions ||= (resource.kind_of?(Class) ? effective_resource.resource_klass_actions : effective_resource.resource_actions)
+
     # Filter Actions
-    action_keys = actions.map { |_, v| v[:action] }
+    action_keys = effective_resource.actions #actions.map { |_, v| v[:action] }
     raise "unknown action for #{effective_resource.name}: #{(atts.keys - action_keys).join(' ')}." if (atts.keys - action_keys).present?
     actions = actions.select { |_, v| atts[v[:action]].respond_to?(:call) ? instance_exec(&atts[v[:action]]) : (atts[v[:action]] != false) }
 

data/app/helpers/effective_resources_private_helper.rb

@@ -22,18 +22,9 @@ module EffectiveResourcesPrivateHelper
         data.each { |k, v| opts["data-#{k}"] ||= v }
       end
 
-      # Assign data method and confirm
-      if effective_resource.member_post_actions.include?(action)
-        opts['data-method'] ||= :post
-        opts['data-confirm'] ||= "Really #{action} @resource?"
-      elsif effective_resource.member_delete_actions.include?(action)
-        opts['data-method'] ||= :delete
-        opts['data-confirm'] ||= "Really #{action == :destroy ? 'delete' : action.to_s.titleize} @resource?"
-      end
-
       # Assign class
       opts[:class] ||= (
-        if opts['data-method'] == :delete
+        if opts['data-method'].to_s == 'delete'
           'btn btn-danger'
         elsif index == 0
           'btn btn-primary'

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

@@ -44,15 +44,15 @@ module Effective
       def belongs_to(name)
         if name.kind_of?(String) || name.kind_of?(Symbol)
           name = (name.to_s.end_with?('_id') ? name.to_s[0...-3] : name).to_sym
-          belong_tos.find { |ass| ass.name == name && !ass.options[:polymorphic] }
+          belong_tos.find { |ass| !ass.options[:polymorphic] && ass.name == name }
         else
-          belong_tos.find { |ass| ass.klass == name.class && !ass.options[:polymorphic] }
+          belong_tos.find { |ass| !ass.options[:polymorphic] && ass.klass == name.class }
         end
       end
 
       def belongs_to_polymorphic(name)
         name = (name.to_s.end_with?('_id') ? name.to_s[0...-3] : name).to_sym
-        belong_tos.find { |ass| ass.name == name && ass.options[:polymorphic] }
+        belong_tos.find { |ass| ass.options[:polymorphic] && ass.name == name }
       end
 
       def has_and_belongs_to_many(name)

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

@@ -29,11 +29,15 @@ module Effective
           end
 
           (member_post_actions - crud_actions).each do |action| # default true means it will be overwritten by dsl methods
-            buttons[action.to_s.titleize] = { action: action, default: true }
+            buttons[action.to_s.titleize] = { action: action, default: true, 'data-method' => :post, 'data-confirm' => "Really #{action} @reource?"}
           end
 
           member_delete_actions.each do |action|
-            buttons[action == :destroy ? 'Delete' : action.to_s.titleize] = { action: action, default: true }
+            if action == :destroy
+              buttons['Delete'] = { action: action, default: true, 'data-method' => :delete, 'data-confirm' => "Really delete @resource?" }
+            else
+              buttons[action.to_s.titleize] = { action: action, default: true, 'data-method' => :delete, 'data-confirm' => "Really #{action} @resource?" }
+            end
           end
 
           if collection_get_actions.find { |a| a == :index }
@@ -63,11 +67,33 @@ module Effective
           end
 
           (member_post_actions - crud_actions).each do |action|
-            actions[action.to_s.titleize] = { action: action, default: true }
+            actions[action.to_s.titleize] = { action: action, default: true, 'data-method' => :post, 'data-confirm' => "Really #{action} @resource?" }
           end
 
           member_delete_actions.each do |action|
-            actions[action == :destroy ? 'Delete' : action.to_s.titleize] = { action: action, default: true }
+            if action == :destroy
+              actions['Delete'] = { action: action, default: true, 'data-method' => :delete, 'data-confirm' => "Really delete @resource?" }
+            else
+              actions[action.to_s.titleize] = { action: action, default: true, 'data-method' => :delete, 'data-confirm' => "Really #{action} @resource?" }
+            end
+          end
+        end
+      end
+
+      # This is the fallback for render_resource_actions when no actions are specified, but a class is given
+      # Used by Datatables new
+      def resource_klass_actions
+        {}.tap do |buttons|
+          if collection_get_actions.find { |a| a == :index }
+            buttons["All #{human_plural_name}".titleize] = { action: :index, default: true }
+          end
+
+          if collection_get_actions.find { |a| a == :new }
+            buttons["New #{human_name}".titleize] = { action: :new, default: true }
+          end
+
+          (collection_get_actions - crud_actions).each do |action|
+            buttons[action.to_s.titleize] = { action: action, default: true }
           end
         end
       end

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

@@ -236,7 +236,7 @@ module Effective
         # Order the target model for its matching records / keys
         sort_column = (sort unless sort == true) || resource.sort_column
 
-        relation = resource.order(sort_column, direction, limit: limit, reorder: true).limit([limit, 1000].compact.min)
+        relation = resource.order(sort_column, direction, limit: limit, reorder: true).limit(1500)
 
         if association.options[:as] # polymorphic
           relation = relation.where(association.type => klass.name)

data/app/views/application/edit.js.erb

@@ -0,0 +1,5 @@
+<% resource = (@_effective_resource || Effective::Resource.new(controller_path)) %>
+<% @resource = instance_variable_get('@' + resource.name) if resource.name %>
+
+EffectiveForm.remote_form_payload = "<%= j render_resource_form(@resource) %>";
+EffectiveForm.remote_form_flash = <%= raw flash.to_json %>;

data/app/views/application/new.js.erb

@@ -0,0 +1,5 @@
+<% resource = (@_effective_resource || Effective::Resource.new(controller_path)) %>
+<% @resource = instance_variable_get('@' + resource.name) if resource.name %>
+
+EffectiveForm.remote_form_payload = "<%= j render_resource_form(@resource) %>";
+EffectiveForm.remote_form_flash = <%= raw flash.to_json %>;

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '0.10.1'.freeze
+  VERSION = '1.0.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-03 00:00:00.000000000 Z
+date: 2018-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -70,9 +70,11 @@ files:
 - app/views/application/create.js.erb
 - app/views/application/destroy.js.erb
 - app/views/application/edit.html.haml
+- app/views/application/edit.js.erb
 - app/views/application/index.html.haml
 - app/views/application/member_action.js.erb
 - app/views/application/new.html.haml
+- app/views/application/new.js.erb
 - app/views/application/show.html.haml
 - app/views/application/update.js.erb
 - app/views/effective/resource/_actions.html.haml
@@ -103,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Make any controller an effective resource controller.