effective_resources 1.1.3 → 1.1.4

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: e14f7c83d7a643249e87588a22d4f53cca940de2
4
- data.tar.gz: e93845d47bbd5edf230481ceba29d8c88d6582e9
3
+ metadata.gz: 5ab1ae6d875b4d44d12ad48411249e0bc2744a5e
4
+ data.tar.gz: 48384edd3edd7435616fd59f520ea689089ab068
5
5
  SHA512:
6
- metadata.gz: 8a21d5b413d009156de7d4c24da2b1607ddbfac8e5c4dc566264c053e5ff07cb9c4f1ad5a67f326af3537244bca2bf654059230706416dde3a7430b2e7229900
7
- data.tar.gz: 82a0760f7d0893323317029defb3afd409d05cc66b07501bccfeebcad4bea644e48598c1ba6c309cb983b69048a20a409090974ce31eeb441d3cfbe99e581eda
6
+ metadata.gz: 781652d7755d506ab553c08a8b49861e9614397d7cf630b5ac8a66e9665f6cbd91272aa65f34140fb5f563ff4861a2eff1fb5b0197e07557b2b6c6329afe6e62
7
+ data.tar.gz: d31e264878ee6c03d647c8eb2b4849281b7526b01d2ba4de0de81adc1fb635990e75841d993b3b404eae462cfd18133743c4914da81f614a5382b5fcb41d7df9
@@ -96,7 +96,7 @@ module Effective
96
96
  end
97
97
 
98
98
  unless relation.kind_of?(ActiveRecord::Relation) || effective_resource.active_model?
99
- raise("unable to build resource_scope for #{effective_resource.klass || 'unknown klass'}.")
99
+ raise("unable to build resource_scope for #{effective_resource.klass || 'unknown klass'}. Please name your controller to match an existing model, or manually define a resource_scope.")
100
100
  end
101
101
 
102
102
  relation
@@ -125,7 +125,7 @@ module Effective
125
125
  end
126
126
 
127
127
  def resource_params_method_name
128
- ["#{resource_name}_params", "#{resource_plural_name}_params", 'permitted_params', 'effective_resource_permitted_params'].find { |name| respond_to?(name, true) } || 'params'
128
+ ["#{resource_name}_params", "#{resource_plural_name}_params", 'permitted_params', 'effective_resource_permitted_params', ('resource_permitted_params' if effective_resource.model.present?)].compact.find { |name| respond_to?(name, true) } || 'params'
129
129
  end
130
130
 
131
131
  end
@@ -26,11 +26,11 @@ module Effective
26
26
  end
27
27
 
28
28
  def active_record?
29
- klass.ancestors.include?(ActiveRecord::Base)
29
+ klass && klass.ancestors.include?(ActiveRecord::Base)
30
30
  end
31
31
 
32
32
  def active_model?
33
- klass.ancestors.include?(ActiveModel::Model)
33
+ klass && klass.ancestors.include?(ActiveModel::Model)
34
34
  end
35
35
 
36
36
  end
@@ -1,3 +1,3 @@
1
1
  module EffectiveResources
2
- VERSION = '1.1.3'.freeze
2
+ VERSION = '1.1.4'.freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: effective_resources
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.3
4
+ version: 1.1.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Code and Effect
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-01-09 00:00:00.000000000 Z
11
+ date: 2019-01-11 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails