itsf_backend 3.0.7 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71eed6cfcc268ef5f460a907df0b286818fec094
-  data.tar.gz: df4a8a6d20297456495afb0073ee8da1897d6971
+  metadata.gz: 7dba7df55da3a16d726325289495274aaaa991f6
+  data.tar.gz: cd5b43538b9080d8b761df1a3959ccb8437501b2
 SHA512:
-  metadata.gz: ee2b2f614bea5f33d04f5e760f063b4b6d08500c339a420cfb2d8ea3af53ec64c74cc3120860be2ead7cf7bde58b154e109318f5c6d00d5a0206ecc23f60e2fb
-  data.tar.gz: b467607742f446bd68692d33cddfb7f9c3f0e60ffb180ba5894d4c4b98f0ec309717d09945e3d0efcbfe3583ad4d03ab675b68758f758c362cab9d8ea81072fa
+  metadata.gz: b24be68819b940e891f24b8b13fc629c4bf87aeea222121216274a03d5744bc5d74c78ce8f752756c40315abaefcecaf25e0aae28ebfad2b46b6670a95cd814a
+  data.tar.gz: 85f12a5f32d79b7528629f6185a50e95d72f2cb2b9be2dca096f2105dea607604f0f85b5a2f825da8fbe50a426fae735cbc275aa64b3d722478d8721576b299c

data/app/controllers/concerns/controller/friendly_id_concern.rb

@@ -0,0 +1,11 @@
+module Controller
+  module FriendlyIdConcern
+    extend ActiveSupport::Concern
+
+    private
+
+    def load_scope
+      resource_class.friendly
+    end
+  end
+end

data/app/controllers/concerns/controller/rest_actions_concern_with_pundit.rb

@@ -62,7 +62,7 @@ module Controller
     private
 
     def after_create_location
-      collection_path
+      @resource
     end
 
     def after_destroy_location
@@ -70,7 +70,7 @@ module Controller
     end
 
     def after_update_location
-      collection_path
+      @resource
     end
 
     def authorize_action
@@ -91,21 +91,49 @@ module Controller
       final_scope
     end
 
-    def collection_scope
+    def search_scopes
+      return [] unless params.key?(:q) && params[:q].key?(:scopes)
+      params[:q][:scopes].keys - ['unscoped']
+    end
+
+    def base_scope
       resource_class
     end
 
+    def after_create_location
+      collection_path
+    end
+
+    def after_destroy_location
+      collection_path
+    end
+
+    def after_update_location
+      collection_path
+    end
+
+    def collection_scope
+      base_scope
+    end
+
+    def initialize_scope
+      base_scope
+    end
+
     def initialize_resource
-      resource_class.new
+      initialize_scope.new
     end
 
-    def load_resource
-      resource_class.find(params[:id])
+    def load_collection
+      collection_scope.all
     end
 
-    def search_scopes
-      return [] unless params.key?(:q) && params[:q].key?(:scopes)
-      params[:q][:scopes].keys - ['unscoped']
+    def load_scope
+      base_scope
+    end
+
+    def load_resource
+      load_scope.find(params[:id])
     end
   end
 end

data/app/controllers/itsf/backend/resource/base_controller.rb

@@ -47,13 +47,13 @@ module Itsf::Backend
     def after_create_location
       return edit_resource_path(@resource) if params.has_key?(:commit_and_continue_with_edit)
       return new_resource_path if params.has_key?(:commit_and_continue_with_new)
-      collection_path  
+      @resource
     end
 
     def after_update_location
       return edit_resource_path(@resource) if params.has_key?(:commit_and_continue_with_edit)
       return new_resource_path if params.has_key?(:commit_and_continue_with_new)
-      collection_path  
+      @resource
     end
   end
 end

data/lib/itsf/backend/version.rb

@@ -1,5 +1,5 @@
 module Itsf
   module Backend
-    VERSION = '3.0.7'
+    VERSION = '3.1.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itsf_backend
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.1.0
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-03 00:00:00.000000000 Z
+date: 2017-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -506,6 +506,7 @@ files:
 - app/controllers/concerns/controller/awesome_nested_set_concern.rb
 - app/controllers/concerns/controller/collection_links_concern.rb
 - app/controllers/concerns/controller/feature_flags_concern.rb
+- app/controllers/concerns/controller/friendly_id_concern.rb
 - app/controllers/concerns/controller/pagination_concern.rb
 - app/controllers/concerns/controller/pundit_authorization_failure_handling_concern.rb
 - app/controllers/concerns/controller/pundit_namespaced_authorize_concern.rb