wice_grid 3.6.0.pre2 → 3.6.0.pre3

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c5a6198777c04e4a7e84dd1001b45153e7f698be
4
- data.tar.gz: 86c0e94d25fe56352b025dee328b2f4ac6a30810
3
+ metadata.gz: 5936c2e90c4c4cd00e4ad4a623940ec625deda5f
4
+ data.tar.gz: dc2a80945a98aa315dd4dda9c58a45d40b093539
5
5
  SHA512:
6
- metadata.gz: f0cb441071b5824f8b5ac04b4985ae2b8c12476daf243175fcb42e0dda0bc2f02c54cedb1baac134c4134de012d5ce52e018ffdc443f66fdd5fe98da6fdcbe6a
7
- data.tar.gz: 90683cf991b2f109be612ed02e80562a712ae17f5fc645d1cba4f90c6ca924d98206dec08fed28eb0bc46717d58bbc787e36c073f929c5bbefb57ae2aaab2e7b
6
+ metadata.gz: 43f3f8b93e70324e8b6b7ffd536cbff5eba87e0a406dca3828dab8335c7ca7f95737a5b4c01ccae229efc252a879a6d1c8bfb5e5242c493ec901a940675ca7be
7
+ data.tar.gz: fdfac052949ebe4af5e34031b3adb614a8349916b63154bace94acbb6ce8ec3593235ac9623c980f4038396eeef0a86cebf38d6059a48eea1a414471ee8044a5
data/README.md CHANGED
@@ -8,7 +8,7 @@
8
8
  -->
9
9
 
10
10
  * Yuri Leikind, yuri.leikind at gmail dot com
11
- * Version 3.6.0.pre1
11
+ * Version 3.6.0.pre3
12
12
  * This tutorial is accompanied by a sample application with WiceGrid examples which you can browse online:
13
13
  http://wicegrid.herokuapp.com, or just view the code: https://github.com/leikind/wice_grid_testbed.
14
14
 
@@ -94,7 +94,8 @@ WARNING: Since 3.2.pre2 WiceGrid is not compatible with `will_paginate` because
94
94
  Add the following to your Gemfile:
95
95
 
96
96
  ```
97
- gem "wice_grid", '3.6.0.pre1'
97
+ gem 'font-awesome-sass', '~> 4.3.0'
98
+ gem "wice_grid", '3.6.0.pre2'
98
99
  ```
99
100
 
100
101
  and run the `bundle` command.
@@ -34,7 +34,7 @@ module Wice
34
34
 
35
35
  class ConditionsGeneratorColumnRailsDateHelper < ConditionsGeneratorColumn #:nodoc:
36
36
 
37
- include Wice::Columns::CommonJsDateDatetimeConditionsGeneratorMixin
37
+ include Wice::Columns::CommonRailsDateDatetimeConditionsGeneratorMixin
38
38
 
39
39
  end
40
40
  end
@@ -33,7 +33,7 @@ module Wice
33
33
 
34
34
  class ConditionsGeneratorColumnRailsDatetimeHelper < ConditionsGeneratorColumn #:nodoc:
35
35
 
36
- include Wice::Columns::CommonJsDateDatetimeConditionsGeneratorMixin
36
+ include Wice::Columns::CommonRailsDateDatetimeConditionsGeneratorMixin
37
37
 
38
38
  end
39
39
  end
@@ -1,7 +1,7 @@
1
1
  # encoding: utf-8
2
2
  module Wice
3
3
  module Columns #:nodoc:
4
- module CommonJsDateDatetimeConditionsGeneratorMixin #:nodoc:
4
+ module CommonRailsDateDatetimeConditionsGeneratorMixin #:nodoc:
5
5
 
6
6
  def generate_conditions(table_alias, opts) #:nodoc:
7
7
  conditions = [[]]
data/lib/wice_grid.rb CHANGED
@@ -23,10 +23,10 @@ require 'wice/columns/common_js_date_datetime_conditions_generator_mixin.rb'
23
23
  require 'wice/columns/common_rails_date_datetime_conditions_generator_mixin.rb'
24
24
  require 'kaminari.rb'
25
25
 
26
- unless Kernel.const_defined?(:FontAwesome)
27
- gem 'font-awesome-sass'
28
- require 'font-awesome-sass.rb'
29
- end
26
+ # unless Kernel.const_defined?(:FontAwesome)
27
+ # gem 'font-awesome-sass'
28
+ # require 'font-awesome-sass.rb'
29
+ # end
30
30
 
31
31
  ActionController::Base.send(:helper_method, :wice_grid_custom_filter_params)
32
32
 
data/wice_grid.gemspec CHANGED
@@ -1,7 +1,7 @@
1
1
  # encoding: utf-8
2
2
  Gem::Specification.new do |s|
3
3
  s.name = 'wice_grid'
4
- s.version = '3.6.0.pre2'
4
+ s.version = '3.6.0.pre3'
5
5
  s.authors = ['Yuri Leikind']
6
6
  s.email = ['yuri.leikind@gmail.com']
7
7
  s.homepage = 'https://github.com/leikind/wice_grid'
@@ -14,12 +14,15 @@ Gem::Specification.new do |s|
14
14
  s.files = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
15
15
  s.license = 'MIT'
16
16
  s.require_paths = ['lib']
17
- s.date = '2015-08-28'
17
+ s.date = '2015-08-30'
18
18
 
19
19
  s.add_dependency 'activerecord', ['> 3.2']
20
20
  s.add_dependency 'kaminari', ['~> 0.16']
21
21
  s.add_dependency 'coffee-rails', ['> 3.2']
22
- s.add_dependency 'font-awesome-sass', ['~> 4.3']
22
+
23
+ # s.add_dependency 'font-awesome-sass', ['~> 4.3']
24
+ # s.add_runtime_dependency 'sass', '~> 3.2'
25
+ # s.add_development_dependency 'sass-rails'
23
26
 
24
27
  s.add_development_dependency('rake', '~> 10.1')
25
28
  s.add_development_dependency('rspec', '~> 3.2.0')
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: wice_grid
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.6.0.pre2
4
+ version: 3.6.0.pre3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Yuri Leikind
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-08-28 00:00:00.000000000 Z
11
+ date: 2015-08-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activerecord
@@ -52,20 +52,6 @@ dependencies:
52
52
  - - ">"
53
53
  - !ruby/object:Gem::Version
54
54
  version: '3.2'
55
- - !ruby/object:Gem::Dependency
56
- name: font-awesome-sass
57
- requirement: !ruby/object:Gem::Requirement
58
- requirements:
59
- - - "~>"
60
- - !ruby/object:Gem::Version
61
- version: '4.3'
62
- type: :runtime
63
- prerelease: false
64
- version_requirements: !ruby/object:Gem::Requirement
65
- requirements:
66
- - - "~>"
67
- - !ruby/object:Gem::Version
68
- version: '4.3'
69
55
  - !ruby/object:Gem::Dependency
70
56
  name: rake
71
57
  requirement: !ruby/object:Gem::Requirement