datewari 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dec8cf1e6c45aa68ce501284959ed48299aa7774
-  data.tar.gz: c11f2163c2f62424d6afdec9ae53f8f48ea4d274
+  metadata.gz: 806cd3dfa1308d8e3f4596f4d463b9b01a5ac177
+  data.tar.gz: 1a638d6a1c8d82856d9825c5800d12c60c592719
 SHA512:
-  metadata.gz: 399e2bd2386561a99ff1e4321709be91af4c8d70f3d386cea2bbd0718b94f1affefd67e57e267362994990f2151a0facf635499f20453c3cff08463b62a5808d
-  data.tar.gz: 0020c883a0598a8c6096d32a1e68a8bd04305ba6a8a7ca6930ca84546f12b62fd5585e1c30b3a9bffdb1da415927927f26f1db4ca449fca9108359b5f810307e
+  metadata.gz: 40adf2af7d6ba56e8f52fafef3c76a16ee64f12f6b03340fd6c39e51166cea7cdfe763d52a39d9bc37ba5ec5babba95b46fde8478b57782391fe3f4a727ef204
+  data.tar.gz: 99e987da82d255de1259be243f46b45465715085008fda2cb4185e7192945954f599bdb4ccaa0bc8600004fdfa25fdb1320015bcdfc780e461eda2b360bdcd29

data/.travis.yml

@@ -2,6 +2,7 @@ language: ruby
 rvm:
   - 2.3
   - 2.4
+  - 2.5
 services:
   - mysql
   - postgresql
@@ -13,6 +14,7 @@ env:
 gemfile:
   - gemfiles/rails50.gemfile
   - gemfiles/rails51.gemfile
+  - gemfiles/rails52.gemfile
 before_script:
   - cd spec/dummy
   - bundle exec rake db:create db:migrate db:seed RAILS_ENV=test

data/gemfiles/rails52.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem "rails", "~> 5.2.0.rc1"
+
+gemspec path: "../"

data/lib/datewari/paginator/base.rb

@@ -16,7 +16,7 @@ module Datewari
 
       def paginate(start_date, end_date)
         @rel.where("#{quoted_column} BETWEEN ? AND ?", start_date, end_date)
-            .order("#{quoted_column} #{@order.to_s.upcase}")
+            .order(Arel.sql("#{quoted_column} #{@order.to_s.upcase}"))
       end
 
       def total_entries
@@ -59,8 +59,8 @@ module Datewari
         @rel.limit(nil)
             .offset(nil)
             .group(date_sql)
-            .reorder("#{date_sql} #{@order}")
-            .pluck(date_sql)
+            .reorder(Arel.sql("#{date_sql} #{@order}"))
+            .pluck(Arel.sql(date_sql))
       end
     end
   end

data/lib/datewari/version.rb

@@ -1,3 +1,3 @@
 module Datewari
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datewari
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Yoshikazu Kaneta
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-24 00:00:00.000000000 Z
+date: 2018-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -183,6 +183,7 @@ files:
 - datewari.gemspec
 - gemfiles/rails50.gemfile
 - gemfiles/rails51.gemfile
+- gemfiles/rails52.gemfile
 - lib/datewari.rb
 - lib/datewari/helper.rb
 - lib/datewari/helper/link_renderer.rb