collate 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a5e40360240e63880d47ee7855eeccff87256b0
-  data.tar.gz: 47709623c8d53fbc7f50d5762c2d52822b451e75
+  metadata.gz: b11c6ff3f5f062350ceae03e8e29232d9413bb28
+  data.tar.gz: 0a07b0e9ef5b3d668c77dc510eb8aa6d323ca0bd
 SHA512:
-  metadata.gz: 39f23205845ec996f4183ec9abd304fc8bb6d2449b264948b5f2ff682ad0d87d9bc2b34dda4c05a3d0235f5ce0c5df2d08d211a0a9dfd5e325c51f526cff9a9e
-  data.tar.gz: 78230df30c91fdcc562ab0263c6339d59cf0c48f9d201195bfba882def24fcceb131422b96cd3ba39a520dc68c8ef0c93a1cb53ea4321dc517a15fe3783d210d
+  metadata.gz: 66c60138f6a581fd841dbc903cc3c34d32d19837b79add298c5f8e2daf51c1b1a69932aba13a6eae0ba7d7d2b44712fd16bd431c729ffa9e74c72fe47cf4818f
+  data.tar.gz: 153872bc3fe4c3e6ee6ad71e87c8f4a80984e979ad602455190e3cdfbe3515281bd519a8ef79d3e42ad119dd2a1ad98be32302cf23789c8d31de1ef69599ac3f

data/Rakefile

@@ -1,5 +1,6 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
+require 'single_test/tasks'
 
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"

data/collate.gemspec

@@ -29,8 +29,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler",      "~> 1.14"
-  spec.add_development_dependency "rake",         "~> 10.0"
-  spec.add_development_dependency "rails",        "~> 4.2", ">= 4.2.6"
+  spec.add_development_dependency "rake",         "~> 11.2.2"           #"~> 10.0"
+  spec.add_development_dependency "rails",        "~> 5.0.1"            #"~> 4.2", ">= 4.2.6"
+  spec.add_development_dependency "single_test"
+  spec.add_development_dependency "rails-controller-testing"
   spec.add_development_dependency "pg",           "~> 0.18.4"
   spec.add_development_dependency "minitest",     "~> 5.0"
   spec.add_development_dependency "pry-rescue",   "~> 1.4", ">= 1.4.2"

data/lib/collate/active_record_extension.rb

@@ -60,15 +60,16 @@ module Collate
   private
 
     def initialize_collate
-      if !self.method_defined? :collate_filters
+      if !self.respond_to? :collate_filters
         class << self
           attr_accessor :collate_filters, :collate_sorters, :default_group, :group_options
         end
+
+        self.collate_filters ||= {}
+        self.collate_sorters ||= []
+        self.default_group ||= :main
+        self.group_options ||= {}
       end
-      self.collate_filters ||= {}
-      self.collate_sorters ||= []
-      self.default_group ||= :main
-      self.group_options ||= {}
     end
 
     def apply_sorter ar_rel, sorter, param_value, sorting_method = 'reorder'

data/lib/collate/engine.rb

@@ -1,6 +1,7 @@
 require_relative 'active_record_extension'
 require_relative 'action_view_extension'
 require 'rails'
+require 'active_support/core_ext/string/filters'
 
 module Collate
   class Engine < ::Rails::Engine

data/lib/collate/filter.rb

@@ -11,8 +11,8 @@ module Collate
                   :joins_prefix, :not, :or
 
     def initialize(field, opt={})
-      opt.each do |field, value|
-        self.send("#{field}=", value)
+      opt.each do |f, value|
+        self.send("#{f}=", value)
       end
 
       self.component ||= {}

data/lib/collate/sorter.rb

@@ -4,8 +4,8 @@ module Collate
                   :field_select, :joins, :default, :nulls_last, :nulls_first
 
     def initialize(field, opt={})
-      opt.each do |field, value|
-        self.send("#{field}=", value)
+      opt.each do |f, value|
+        self.send("#{f}=", value)
       end
 
       self.field = field

data/lib/collate/version.rb

@@ -1,3 +1,3 @@
 module Collate
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: collate
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Nicholas Page
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-08 00:00:00.000000000 Z
+date: 2017-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -31,34 +31,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 11.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 11.2.2
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 5.0.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.1
+- !ruby/object:Gem::Dependency
+  name: single_test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.6
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails-controller-testing
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.6
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement