Skip to content

Commit 222d3a4

Browse files
committed
Allow overriding id_param
1 parent 234383b commit 222d3a4

File tree

4 files changed

+17
-11
lines changed

4 files changed

+17
-11
lines changed

lib/typical_situation.rb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# frozen_string_literal: true
22

3-
require 'typical_situation/engine'
4-
require 'typical_situation/identity'
5-
require 'typical_situation/permissions'
6-
require 'typical_situation/flash_messages'
7-
require 'typical_situation/actions'
8-
require 'typical_situation/operations'
9-
require 'typical_situation/responses'
3+
require "typical_situation/engine"
4+
require "typical_situation/identity"
5+
require "typical_situation/permissions"
6+
require "typical_situation/flash_messages"
7+
require "typical_situation/actions"
8+
require "typical_situation/operations"
9+
require "typical_situation/responses"
1010

1111
module TypicalSituation
1212
class Error < StandardError; end

lib/typical_situation/engine.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require 'rails/engine'
1+
require "rails/engine"
22

33
module TypicalSituation
44
class Engine < Rails::Engine

lib/typical_situation/operations.rb

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ def pagination_params
2929
end
3030

3131
def get_resource
32-
if (@resource = find_resource(params[:id]))
32+
if (@resource = find_resource(id_param))
3333
set_single_instance
3434
@resource
3535
else
36-
raise ActiveRecord::RecordNotFound, "Could not find #{model_class}( id:#{params[:id].inspect} )"
36+
raise ActiveRecord::RecordNotFound, "Could not find #{model_class}( id:#{id_param.inspect} )"
3737
end
3838
end
3939

@@ -105,6 +105,12 @@ def set_collection_instance
105105
instance_variable_set(:"@#{model_type.to_s.gsub("/", "__").pluralize}", @resources)
106106
end
107107

108+
protected
109+
110+
def id_param
111+
params[:id]
112+
end
113+
108114
private
109115

110116
def apply_sorting(resources)

lib/typical_situation/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# frozen_string_literal: true
22

33
module TypicalSituation
4-
VERSION = "1.0.2"
4+
VERSION = "1.0.3"
55
end

0 commit comments

Comments
 (0)