filter_form 0.8.1 → 0.8.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. checksums.yaml +5 -5
  2. data/lib/assets/javascripts/filter_form.js.coffee +5 -3
  3. data/lib/filter_form/input_options/base.rb +2 -2
  4. data/lib/filter_form/version.rb +1 -1
  5. metadata +21 -21
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: 0bdd28148acf26ef60072eae5ad45e275b4c2299
4
- data.tar.gz: 3ba9fe6625752961a0dfd497c9e3d70474d44e34
2
+ !binary "U0hBMQ==":
3
+ metadata.gz: 46c6a58b11f78f33bf95db4070aeebdc01d1461e
4
+ data.tar.gz: 098c3ec61496b73b4a54bf41b4d34182ceda52ec
5
5
  SHA512:
6
- metadata.gz: be205121e2fb7611e75a85bedfdfb216870fd7c733cb42621a8a9d624d5be7c1a818a529f371c04aeb6c02cc5640fbda692c59841920024d747e47ee8c304b48
7
- data.tar.gz: 451d19c190406e4f9ef48ede4ed448ca8b41e6caea2795d05195cc8857e8432199438cf8fd389701a2303a2b7ecbbb4dcaffdd460efec6c0f83a70eeaa11e88e
6
+ metadata.gz: 9d941db09900aaa526c33d9e63f71e38351551c13ab457fc8e4190da3995224690069ad5d28f612049f1eef5a3c6c368067e4895f804434f7ccf86f73c6f7e3d
7
+ data.tar.gz: b033d09304ba27afe144216b3d46d1d4bb54320dace72c929e0196e1646e603c7730fb2f61e7cccbe44923bc4c5b7a6fd51126b570075ac7fdc9fc0c03123260
data/lib/assets/javascripts/filter_form.js.coffee CHANGED
@@ -48,7 +48,9 @@ $ ->
48
48
  for element in $("[#{ PredicateSelector.element_for_attribute() }]")
49
49
  new PredicateSelector(element)
50
50
 
51
- $('.filter_form_select2').select2()
51
+ if $('.filter_form_select2').select2
52
+ $('.filter_form_select2').select2()
52
53
 
53
- $('.filter_form_date').datepicker
54
- dateFormat: 'yy-mm-dd'
54
+ if $('.filter_form_date').datepicker
55
+ $('.filter_form_date').datepicker
56
+ dateFormat: 'yy-mm-dd'
data/lib/filter_form/input_options/base.rb CHANGED
@@ -43,11 +43,11 @@ module FilterForm
43
43
  end
44
44
 
45
45
  if options[:predicate_selector]
46
- result.merge!(data: { predicate_selector: options[:predicate_selector] })
46
+ result.deep_merge!(data: { predicate_selector: options[:predicate_selector] })
47
47
  end
48
48
 
49
49
  if current_predicate
50
- result.merge!(data: { current_predicate: current_predicate })
50
+ result.deep_merge!(data: { current_predicate: current_predicate })
51
51
  end
52
52
 
53
53
  result
data/lib/filter_form/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module FilterForm
2
- VERSION = '0.8.1'
2
+ VERSION = '0.8.2'
3
3
  end
metadata CHANGED
@@ -1,125 +1,125 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: filter_form
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.8.1
4
+ version: 0.8.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Evgeny Li
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-09-19 00:00:00.000000000 Z
11
+ date: 2014-10-31 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: simple_form
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ">="
17
+ - - ! '>='
18
18
  - !ruby/object:Gem::Version
19
19
  version: '0'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - ">="
24
+ - - ! '>='
25
25
  - !ruby/object:Gem::Version
26
26
  version: '0'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: ransack
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - ">="
31
+ - - ! '>='
32
32
  - !ruby/object:Gem::Version
33
33
  version: '0'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - ">="
38
+ - - ! '>='
39
39
  - !ruby/object:Gem::Version
40
40
  version: '0'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: jquery-rails
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - ">="
45
+ - - ! '>='
46
46
  - !ruby/object:Gem::Version
47
47
  version: '0'
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - ">="
52
+ - - ! '>='
53
53
  - !ruby/object:Gem::Version
54
54
  version: '0'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: select2-rails
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - ">="
59
+ - - ! '>='
60
60
  - !ruby/object:Gem::Version
61
61
  version: '0'
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - ">="
66
+ - - ! '>='
67
67
  - !ruby/object:Gem::Version
68
68
  version: '0'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: bundler
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - "~>"
73
+ - - ~>
74
74
  - !ruby/object:Gem::Version
75
75
  version: '1.3'
76
76
  type: :development
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - "~>"
80
+ - - ~>
81
81
  - !ruby/object:Gem::Version
82
82
  version: '1.3'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: rake
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - ">="
87
+ - - ! '>='
88
88
  - !ruby/object:Gem::Version
89
89
  version: '0'
90
90
  type: :development
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - ">="
94
+ - - ! '>='
95
95
  - !ruby/object:Gem::Version
96
96
  version: '0'
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: rspec
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - "~>"
101
+ - - ~>
102
102
  - !ruby/object:Gem::Version
103
103
  version: 3.0.0
104
104
  type: :development
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
- - - "~>"
108
+ - - ~>
109
109
  - !ruby/object:Gem::Version
110
110
  version: 3.0.0
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: sqlite3
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
- - - ">="
115
+ - - ! '>='
116
116
  - !ruby/object:Gem::Version
117
117
  version: '0'
118
118
  type: :development
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
- - - ">="
122
+ - - ! '>='
123
123
  - !ruby/object:Gem::Version
124
124
  version: '0'
125
125
  description: Build filter forms easily
@@ -129,7 +129,7 @@ executables: []
129
129
  extensions: []
130
130
  extra_rdoc_files: []
131
131
  files:
132
- - ".travis.yml"
132
+ - .travis.yml
133
133
  - Gemfile
134
134
  - LICENSE.txt
135
135
  - README.md
@@ -169,12 +169,12 @@ require_paths:
169
169
  - lib
170
170
  required_ruby_version: !ruby/object:Gem::Requirement
171
171
  requirements:
172
- - - ">="
172
+ - - ! '>='
173
173
  - !ruby/object:Gem::Version
174
174
  version: '0'
175
175
  required_rubygems_version: !ruby/object:Gem::Requirement
176
176
  requirements:
177
- - - ">="
177
+ - - ! '>='
178
178
  - !ruby/object:Gem::Version
179
179
  version: '0'
180
180
  requirements: []