collate 0.1.6 → 0.1.7

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 (9) hide show
  1. checksums.yaml +4 -4
  2. data/Rakefile +1 -0
  3. data/collate.gemspec +4 -2
  4. data/lib/collate/active_record_extension.rb +6 -5
  5. data/lib/collate/engine.rb +1 -0
  6. data/lib/collate/filter.rb +2 -2
  7. data/lib/collate/sorter.rb +2 -2
  8. data/lib/collate/version.rb +1 -1
  9. metadata +31 -9
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 2a5e40360240e63880d47ee7855eeccff87256b0
4
- data.tar.gz: 47709623c8d53fbc7f50d5762c2d52822b451e75
3
+ metadata.gz: b11c6ff3f5f062350ceae03e8e29232d9413bb28
4
+ data.tar.gz: 0a07b0e9ef5b3d668c77dc510eb8aa6d323ca0bd
5
5
  SHA512:
6
- metadata.gz: 39f23205845ec996f4183ec9abd304fc8bb6d2449b264948b5f2ff682ad0d87d9bc2b34dda4c05a3d0235f5ce0c5df2d08d211a0a9dfd5e325c51f526cff9a9e
7
- data.tar.gz: 78230df30c91fdcc562ab0263c6339d59cf0c48f9d201195bfba882def24fcceb131422b96cd3ba39a520dc68c8ef0c93a1cb53ea4321dc517a15fe3783d210d
6
+ metadata.gz: 66c60138f6a581fd841dbc903cc3c34d32d19837b79add298c5f8e2daf51c1b1a69932aba13a6eae0ba7d7d2b44712fd16bd431c729ffa9e74c72fe47cf4818f
7
+ data.tar.gz: 153872bc3fe4c3e6ee6ad71e87c8f4a80984e979ad602455190e3cdfbe3515281bd519a8ef79d3e42ad119dd2a1ad98be32302cf23789c8d31de1ef69599ac3f
data/Rakefile CHANGED
@@ -1,5 +1,6 @@
1
1
  require "bundler/gem_tasks"
2
2
  require "rake/testtask"
3
+ require 'single_test/tasks'
3
4
 
4
5
  Rake::TestTask.new(:test) do |t|
5
6
  t.libs << "test"
data/collate.gemspec CHANGED
@@ -29,8 +29,10 @@ Gem::Specification.new do |spec|
29
29
  spec.require_paths = ["lib"]
30
30
 
31
31
  spec.add_development_dependency "bundler", "~> 1.14"
32
- spec.add_development_dependency "rake", "~> 10.0"
33
- spec.add_development_dependency "rails", "~> 4.2", ">= 4.2.6"
32
+ spec.add_development_dependency "rake", "~> 11.2.2" #"~> 10.0"
33
+ spec.add_development_dependency "rails", "~> 5.0.1" #"~> 4.2", ">= 4.2.6"
34
+ spec.add_development_dependency "single_test"
35
+ spec.add_development_dependency "rails-controller-testing"
34
36
  spec.add_development_dependency "pg", "~> 0.18.4"
35
37
  spec.add_development_dependency "minitest", "~> 5.0"
36
38
  spec.add_development_dependency "pry-rescue", "~> 1.4", ">= 1.4.2"
data/lib/collate/active_record_extension.rb CHANGED
@@ -60,15 +60,16 @@ module Collate
60
60
  private
61
61
 
62
62
  def initialize_collate
63
- if !self.method_defined? :collate_filters
63
+ if !self.respond_to? :collate_filters
64
64
  class << self
65
65
  attr_accessor :collate_filters, :collate_sorters, :default_group, :group_options
66
66
  end
67
+
68
+ self.collate_filters ||= {}
69
+ self.collate_sorters ||= []
70
+ self.default_group ||= :main
71
+ self.group_options ||= {}
67
72
  end
68
- self.collate_filters ||= {}
69
- self.collate_sorters ||= []
70
- self.default_group ||= :main
71
- self.group_options ||= {}
72
73
  end
73
74
 
74
75
  def apply_sorter ar_rel, sorter, param_value, sorting_method = 'reorder'
data/lib/collate/engine.rb CHANGED
@@ -1,6 +1,7 @@
1
1
  require_relative 'active_record_extension'
2
2
  require_relative 'action_view_extension'
3
3
  require 'rails'
4
+ require 'active_support/core_ext/string/filters'
4
5
 
5
6
  module Collate
6
7
  class Engine < ::Rails::Engine
data/lib/collate/filter.rb CHANGED
@@ -11,8 +11,8 @@ module Collate
11
11
  :joins_prefix, :not, :or
12
12
 
13
13
  def initialize(field, opt={})
14
- opt.each do |field, value|
15
- self.send("#{field}=", value)
14
+ opt.each do |f, value|
15
+ self.send("#{f}=", value)
16
16
  end
17
17
 
18
18
  self.component ||= {}
data/lib/collate/sorter.rb CHANGED
@@ -4,8 +4,8 @@ module Collate
4
4
  :field_select, :joins, :default, :nulls_last, :nulls_first
5
5
 
6
6
  def initialize(field, opt={})
7
- opt.each do |field, value|
8
- self.send("#{field}=", value)
7
+ opt.each do |f, value|
8
+ self.send("#{f}=", value)
9
9
  end
10
10
 
11
11
  self.field = field
data/lib/collate/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Collate
2
- VERSION = "0.1.6"
2
+ VERSION = "0.1.7"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: collate
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.6
4
+ version: 0.1.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Nicholas Page
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: exe
11
11
  cert_chain: []
12
- date: 2017-02-08 00:00:00.000000000 Z
12
+ date: 2017-02-16 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: bundler
@@ -31,34 +31,56 @@ dependencies:
31
31
  requirements:
32
32
  - - "~>"
33
33
  - !ruby/object:Gem::Version
34
- version: '10.0'
34
+ version: 11.2.2
35
35
  type: :development
36
36
  prerelease: false
37
37
  version_requirements: !ruby/object:Gem::Requirement
38
38
  requirements:
39
39
  - - "~>"
40
40
  - !ruby/object:Gem::Version
41
- version: '10.0'
41
+ version: 11.2.2
42
42
  - !ruby/object:Gem::Dependency
43
43
  name: rails
44
44
  requirement: !ruby/object:Gem::Requirement
45
45
  requirements:
46
46
  - - "~>"
47
47
  - !ruby/object:Gem::Version
48
- version: '4.2'
48
+ version: 5.0.1
49
+ type: :development
50
+ prerelease: false
51
+ version_requirements: !ruby/object:Gem::Requirement
52
+ requirements:
53
+ - - "~>"
54
+ - !ruby/object:Gem::Version
55
+ version: 5.0.1
56
+ - !ruby/object:Gem::Dependency
57
+ name: single_test
58
+ requirement: !ruby/object:Gem::Requirement
59
+ requirements:
49
60
  - - ">="
50
61
  - !ruby/object:Gem::Version
51
- version: 4.2.6
62
+ version: '0'
52
63
  type: :development
53
64
  prerelease: false
54
65
  version_requirements: !ruby/object:Gem::Requirement
55
66
  requirements:
56
- - - "~>"
67
+ - - ">="
68
+ - !ruby/object:Gem::Version
69
+ version: '0'
70
+ - !ruby/object:Gem::Dependency
71
+ name: rails-controller-testing
72
+ requirement: !ruby/object:Gem::Requirement
73
+ requirements:
74
+ - - ">="
57
75
  - !ruby/object:Gem::Version
58
- version: '4.2'
76
+ version: '0'
77
+ type: :development
78
+ prerelease: false
79
+ version_requirements: !ruby/object:Gem::Requirement
80
+ requirements:
59
81
  - - ">="
60
82
  - !ruby/object:Gem::Version
61
- version: 4.2.6
83
+ version: '0'
62
84
  - !ruby/object:Gem::Dependency
63
85
  name: pg
64
86
  requirement: !ruby/object:Gem::Requirement