dynamic_controller 0.0.5 → 0.0.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. data/dynamic_controller.gemspec +1 -1
  2. data/lib/dynamic_controller/instance_methods.rb +9 -1
  3. data/lib/dynamic_controller/version.rb +1 -1
  4. metadata +16 -16
data/dynamic_controller.gemspec CHANGED
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
18
18
 
19
19
  s.add_dependency 'ransack'
20
20
  s.add_dependency 'kaminari'
21
- s.add_dependency 'nql', '0.0.2'
21
+ s.add_dependency 'nql', '0.0.3'
22
22
 
23
23
  s.add_development_dependency 'rails'
24
24
  s.add_development_dependency 'sqlite3'
data/lib/dynamic_controller/instance_methods.rb CHANGED
@@ -6,13 +6,21 @@ module DynamicController
6
6
 
7
7
  if base.include_action?(:index)
8
8
  base.send :define_method, :index do
9
- query = params[:q].is_a?(String) ? NQL.to_ransack(params[:q]) : params[:q]
9
+ begin
10
+ query = params[:q].is_a?(String) ? NQL.to_ransack(params[:q]) : params[:q]
11
+ valid_query = true
12
+ rescue NQL::InvalidExpressionError => ex
13
+ Rails.logger.debug "Invalid search expression: #{params[:q]} | Error: #{ex.message}"
14
+ query = nil
15
+ valid_query = false
16
+ end
10
17
  if parent_model
11
18
  @search = parent_model.send(controller_name).search(query)
12
19
  else
13
20
  @search = resource_class.search(query)
14
21
  end
15
22
  self.collection = @search.result(distinct: true).page(params[:page])
23
+ self.collection = self.collection.where('1=2') unless valid_query
16
24
 
17
25
  Responder.new(self).index
18
26
  end
data/lib/dynamic_controller/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module DynamicController
2
- VERSION = '0.0.5'
2
+ VERSION = '0.0.6'
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dynamic_controller
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.5
4
+ version: 0.0.6
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2012-11-09 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: ransack
16
- requirement: &28300260 !ruby/object:Gem::Requirement
16
+ requirement: &29261412 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *28300260
24
+ version_requirements: *29261412
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: kaminari
27
- requirement: &28300008 !ruby/object:Gem::Requirement
27
+ requirement: &29261148 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,21 +32,21 @@ dependencies:
32
32
  version: '0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *28300008
35
+ version_requirements: *29261148
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: nql
38
- requirement: &28299696 !ruby/object:Gem::Requirement
38
+ requirement: &29260836 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - =
42
42
  - !ruby/object:Gem::Version
43
- version: 0.0.2
43
+ version: 0.0.3
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *28299696
46
+ version_requirements: *29260836
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: rails
49
- requirement: &28299444 !ruby/object:Gem::Requirement
49
+ requirement: &29260572 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *28299444
57
+ version_requirements: *29260572
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: sqlite3
60
- requirement: &28282440 !ruby/object:Gem::Requirement
60
+ requirement: &29260272 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '0'
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *28282440
68
+ version_requirements: *29260272
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: rspec-rails
71
- requirement: &28281540 !ruby/object:Gem::Requirement
71
+ requirement: &29259996 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '0'
77
77
  type: :development
78
78
  prerelease: false
79
- version_requirements: *28281540
79
+ version_requirements: *29259996
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: factory_girl_rails
82
- requirement: &28280292 !ruby/object:Gem::Requirement
82
+ requirement: &29259720 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
87
87
  version: '0'
88
88
  type: :development
89
89
  prerelease: false
90
- version_requirements: *28280292
90
+ version_requirements: *29259720
91
91
  description: Simple way to add CRUD actions into Rails controllers
92
92
  email:
93
93
  - gabynaiman@gmail.com