collate 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94cfb77ae2c2ee79dd927782c5450491c658fe02
-  data.tar.gz: 58c968df9aad21f0e194e6f5b3108bd2ecbea4ab
+  metadata.gz: fd74069c85dcc3b7256daf1ce1494763cf549b80
+  data.tar.gz: 78720066818348405fb2f321e9c4b28c28a06473
 SHA512:
-  metadata.gz: d0e101db11da883bfdb65d40ad3db4c8459bf4481e602a064d7f585eb85eed0653aa22a8913adde699db8862d8e480afb055a34b39acfbc8051f61e97376b565
-  data.tar.gz: 7e5df6f52f0629bde97dbc90457bd36f7e42f42f77ce0229c57c24da8a67beb6c1468449cf81e79c70ca11b92eed6eb0eb39df2395c1b0b90c797942cee4e692
+  metadata.gz: 103708f1a0080664d45f75b3f1d3abad5aaed36eea0c74a48f53639424ca550999e7966b689d4863401c534a55176b639b31d5aa7ddc8ef635ee58ed6b6b6e35
+  data.tar.gz: 0f13c2ba71fc696271588d760f2a9660477a98c25ff12e6cb45821f87640057b0d00e791139f20cef2374952e17b1ff607db544ec31f4b2bb8ad7ca0490695ab

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.4.1

data/circle.yml

@@ -1,10 +1,10 @@
 dependencies:
   override:
-    - rvm --default use ruby-2.3.3
+    - rvm --default use ruby-2.4.1
     - gem install bundler
     - bundle
   cache_directories:
-    - "/opt/circleci/.rvm/gems/ruby-2.3.3"
+    - "/opt/circleci/.rvm/gems/ruby-2.4.1"
 
 database:
   override:

data/collate.gemspec

@@ -28,15 +28,16 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler",      "~> 1.14"
-  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 "bundler",                  "~> 1.14.6"
+  spec.add_development_dependency "rake",                     "~> 12.0.0"
+  spec.add_development_dependency "rails",                    "~> 5.0.2"
   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"
-  spec.add_development_dependency "simplecov",    "~> 0.12.0"
-  spec.add_development_dependency "coveralls",    "~> 0.8.15"
-  spec.add_development_dependency "haml",         "~> 4.0", ">= 4.0.7"
+  spec.add_development_dependency "mysql2",                   "~> 0.4.5"
+  spec.add_development_dependency "pg",                       "~> 0.20.0"
+  spec.add_development_dependency "minitest",                 "~> 5.10.1", "< 5.10.2"
+  spec.add_development_dependency "pry-rescue",               "~> 1.4.5"
+  spec.add_development_dependency "simplecov",                "~> 0.14.1"
+  spec.add_development_dependency "coveralls",                "~> 0.8.20"
+  spec.add_development_dependency "haml",                     "~> 4.0.7"
 end

data/lib/collate.rb

@@ -1,4 +1,5 @@
 require "collate/version"
+require "collate/database"
 require "collate/engine"
 
 module Collate

data/lib/collate/active_record_extension.rb

@@ -13,9 +13,17 @@ module Collate
     def collate_on field, opts={}
       initialize_collate
 
+      new_filter = Collate::Filter.new(field, opts.merge({base_model_table_name: self.table_name}))
+
       self.collate_filters[self.default_group] ||= {filters: []}.merge(self.group_options)
+      self.collate_filters[self.default_group][:filters] << new_filter
+
+      if self.default_field_group
+        self.collate_field_groups[self.default_group] ||= {filter_groups: {}}.merge(self.group_options)
 
-      self.collate_filters[self.default_group][:filters] << Collate::Filter.new(field, opts.merge({base_model_table_name: self.table_name}))
+        self.collate_field_groups[self.default_group][:filter_groups][self.default_field_group] ||= {filters: {}}.merge(self.field_group_options)
+        self.collate_field_groups[self.default_group][:filter_groups][self.default_field_group][:filters][new_filter.field_group_type] = new_filter
+      end
     end
 
     def collate_group name, **opts, &blk
@@ -27,6 +35,18 @@ module Collate
       blk.call
     end
 
+    def collate_filter_group group_name, **opts, &blk
+      initialize_collate
+
+      opts[:label] ||= group_name.to_s.titleize
+      self.field_group_options = opts
+      self.default_field_group = group_name
+
+      blk.call
+
+      self.default_field_group = nil
+    end
+
     def collate params
       initialize_collate
 
@@ -62,13 +82,16 @@ module Collate
     def initialize_collate
       if !self.respond_to? :collate_filters
         class << self
-          attr_accessor :collate_filters, :collate_sorters, :default_group, :group_options
+          attr_accessor :collate_filters, :collate_sorters, :default_group,
+                        :group_options, :default_field_group, :collate_field_groups,
+                        :field_group_options
         end
 
         self.collate_filters ||= {}
         self.collate_sorters ||= []
         self.default_group ||= :main
         self.group_options ||= {}
+        self.collate_field_groups ||= {}
       end
     end
 

data/lib/collate/database.rb

@@ -0,0 +1,5 @@
+module Collate
+  def self.database_type
+    ActiveRecord::Base.connection.adapter_name.downcase.to_sym
+  end
+end

data/lib/collate/filter.rb

@@ -1,6 +1,6 @@
 module Collate
   class Filter
-    OPERATORS = [:eq, :ilike, :in, :le, :ge, :null, :contains, :present?, :&]
+    OPERATORS = [:eq, :ilike, :in, :le, :ge, :null, :contains, :present?, :&, :like]
 
     FIELD_TRANSFORMATIONS = [:date_difference, :date_part, :array_agg, :downcase, :split, :array_length]
     AGGREGATE_TRANSFORMATIONS = [:array_agg]
@@ -8,7 +8,7 @@ module Collate
 
     attr_accessor :field, :operator, :base_model_table_name, :field_transformations, :label,
                   :component, :joins, :value_transformations, :grouping, :html_id, :having,
-                  :joins_prefix, :not, :or
+                  :joins_prefix, :not, :or, :field_group_type
 
     def initialize(field, opt={})
       opt.each do |f, value|
@@ -27,8 +27,8 @@ module Collate
         :eq
       end
       self.field = "#{base_model_table_name}.#{field}" if field.is_a? Symbol
-      self.field_transformations ||= {}
-      self.value_transformations ||= {}
+      self.field_transformations ||= []
+      self.value_transformations ||= []
 
       self.html_id ||= param_key.gsub('{','').gsub('}','').gsub('.','_')
 
@@ -97,6 +97,16 @@ module Collate
       elsif component[:tags]
         self.component[:values] = []
       end
+
+      ## MySQL support
+      if Collate::database_type == :mysql2
+        # Translate all ILIKE operators to LIKE operators while downcasing values
+        if self.operator == :ilike
+          self.operator = :like
+          self.field_transformations << [:downcase]
+          self.value_transformations << [:downcase]
+        end
+      end
     end
 
     def param_key

data/lib/collate/version.rb

@@ -1,3 +1,3 @@
 module Collate
-  VERSION = "0.1.14"
+  VERSION = "0.1.15"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: collate
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Nicholas Page
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-06 00:00:00.000000000 Z
+date: 2017-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -17,42 +17,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: 1.14.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: 1.14.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.2.2
+        version: 12.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.2.2
+        version: 12.0.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 5.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 5.0.2
 - !ruby/object:Gem::Dependency
   name: single_test
   requirement: !ruby/object:Gem::Requirement
@@ -81,90 +81,101 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.5
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.4
+        version: 0.20.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.4
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.10.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.10.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.10.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.10.2
 - !ruby/object:Gem::Dependency
   name: pry-rescue
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 1.4.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 1.4.5
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.14.1
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.15
+        version: 0.8.20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.15
+        version: 0.8.20
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.7
   type: :development
@@ -172,9 +183,6 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.7
 description: Add some DSL to your model, then run a single method in your controller,
@@ -187,6 +195,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -203,6 +212,7 @@ files:
 - lib/collate.rb
 - lib/collate/action_view_extension.rb
 - lib/collate/active_record_extension.rb
+- lib/collate/database.rb
 - lib/collate/engine.rb
 - lib/collate/filter.rb
 - lib/collate/sorter.rb
@@ -228,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Facilitates the filtering of ActiveRecord models using simplified DSL.