datewari 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bf4bf4a79564aa3543d05ee1aa60a4f615726538
-  data.tar.gz: 89a58b9db6d661931f619365e3911c98b7b8b89d
+SHA256:
+  metadata.gz: d4757bf96a70bad10143eb9c2b790b73d684c0053cd820ade449095cc185f53c
+  data.tar.gz: a5c23c968a696c0dd6a9217d4b7b3c1a8c0d68559019cd0370122ea8a4689417
 SHA512:
-  metadata.gz: f4d2f499c621733fc876670d13116dea294f0c041e67267c93ac55744c7b904b10c63aa906719c7737b543dc7deb675c07c154bbb2428fb5c65b2bb0937efbb4
-  data.tar.gz: 90c4156ec06c15657e2099e4f835e68045e0ec162ffeb6168624a45504c97a081c2cdbc35a8a5b17788f7bdc5f592461bee932a400883b617d76ed8517a916aa
+  metadata.gz: 4be75ff27c66c363c231bed355e1942e7abc82f48619fdd1e12685af9e35b6c7f48d34980f2ce2d46b980a65ae525428865e0e326ac4d95a8e6c7665e3bbc5eb
+  data.tar.gz: b4361ed839a63ee21015281b68a6af0a8ac075a907e885d2378a11d3a21e156ec96cc05e925fa92b1ceb9e25a24395f96b9317c3c4db9f59d016b01cf457ceba

data/.github/workflows/ci.yml

@@ -0,0 +1,75 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-20.04
+    services:
+      postgres:
+        image: postgis/postgis:10-2.5
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+        ports:
+          - 5432:5432
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+      mysql:
+        image: mysql:5.7
+        env:
+          MYSQL_ALLOW_EMPTY_PASSWORD: yes
+        ports:
+          - 3306:3306
+        options: --health-cmd "mysqladmin ping -h localhost" --health-interval 20s --health-timeout 10s --health-retries 10
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [2.4, 2.5, 2.6, 2.7, '3.0', 3.1]
+        gemfile: ['rails50', 'rails51', 'rails52', 'rails60', 'rails61', 'rails70']
+        database: ['mysql', 'postgresql', 'postgis']
+        exclude:
+          - ruby: 2.4
+            gemfile: rails60
+          - ruby: 2.4
+            gemfile: rails61
+          - ruby: 2.4
+            gemfile: rails70
+          - ruby: 2.5
+            gemfile: rails70
+          - ruby: 2.6
+            gemfile: rails70
+          - ruby: 3.0
+            gemfile: rails50
+          - ruby: 3.0
+            gemfile: rails51
+          - ruby: 3.0
+            gemfile: rails52
+          - ruby: 3.1
+            gemfile: rails50
+          - ruby: 3.1
+            gemfile: rails51
+          - ruby: 3.1
+            gemfile: rails52
+
+    name: ruby ${{ matrix.ruby }}, ${{ matrix.gemfile }}, ${{ matrix.database }}
+
+    env:
+      DATABASE: ${{ matrix.database }}
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+      BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
+
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - name: Prepare test
+      run: |
+        cd spec/dummy
+        BUNDLE_GEMFILE=../../${{ env.BUNDLE_GEMFILE }} RAILS_ENV=test bundle exec rake db:create db:migrate db:seed
+        cd ../..
+    - name: Run test
+      run: |
+        bundle exec rspec

data/.gitignore

@@ -1,12 +1,9 @@
 .bundle/
-.yardoc
 .project
 Gemfile.lock
-_yardoc/
 coverage/
-doc/
+gemfiles/*.lock
 pkg/
-spec/reports/
 spec/dummy/config/database.yml
 spec/dummy/db/schema.rb
 spec/dummy/db/*.sqlite3

data/CHANGELOG.md

@@ -0,0 +1,21 @@
+# CHANGELOG
+
+## 1.1.0
+
+* Drop support for ruby 2.3.
+
+## 1.0.3
+
+* Support postgis adapter.
+
+## 1.0.2
+
+* Support ruby 2.5 and rails 5.2.
+
+## 1.0.1
+
+* Remove constant from included module.
+
+## 1.0.0
+
+* First release.

data/Gemfile

@@ -1,7 +1,3 @@
 source 'https://rubygems.org'
 
-gem "rails", "~> 5.1.0"
-gem "mysql2", "~> 0.4.4"
-gem "pg", "~> 0.18"
-
 gemspec

data/README.md

@@ -4,7 +4,7 @@ An ActiveRecord extension to build date oriented pagination links such as monthl
 
 ## Dependencies
 
-* ruby 2.3+
+* ruby 2.4+
 * rails 5.0+ (activerecord, activesupport, actionview)
 
 Following ActiveRecord adapters are supported:

data/datewari.gemspec

@@ -24,9 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rails", ">= 5.0"
   spec.add_development_dependency "mysql2"
   spec.add_development_dependency "pg"
+  spec.add_development_dependency "activerecord-postgis-adapter"
   spec.add_development_dependency "rspec-rails"
-  spec.add_development_dependency "rails-controller-testing"
   spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "pry-rails"
-  spec.add_development_dependency "pry-byebug"
 end

data/gemfiles/rails50.gemfile

@@ -1,7 +1,8 @@
 source 'https://rubygems.org'
 
 gem "rails", "~> 5.0.0"
-gem "mysql2", "~> 0.4.4"
+gem "mysql2", "~> 0.5.0"
 gem "pg", "~> 0.18"
+gem "activerecord-postgis-adapter", "~> 4.1"
 
 gemspec path: "../"

data/gemfiles/rails51.gemfile

@@ -1,7 +1,8 @@
 source 'https://rubygems.org'
 
 gem "rails", "~> 5.1.0"
-gem "mysql2", "~> 0.4.4"
+gem "mysql2", "~> 0.5.0"
 gem "pg", "~> 0.18"
+gem "activerecord-postgis-adapter", "~> 5.1"
 
 gemspec path: "../"

data/gemfiles/rails52.gemfile

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

data/gemfiles/rails60.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem "rails", "~> 6.0.0"
+gem "psych", "~> 3.3.0"
+
+gemspec path: "../"

data/gemfiles/rails61.gemfile

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

data/gemfiles/rails70.gemfile

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

data/lib/datewari/helper.rb

@@ -3,12 +3,10 @@ require_relative 'helper/parts_builder'
 
 module Datewari
   module Helper
-    I18N_KEY = 'date_paginate'
-
     def date_paginate(rel, config = {})
       [:previous_label, :next_label, :page_gap, :link_separator,
        :yearly_format,  :monthly_format, :weekly_format, :daily_format].each do |key|
-        config[key] ||= I18n.t("#{I18N_KEY}.#{key}").html_safe
+        config[key] ||= I18n.t("date_paginate.#{key}").html_safe
       end
 
       config[:page_links] = true unless config.key?(:page_links)
@@ -23,7 +21,7 @@ module Datewari
 
     def date_page_entries_info(rel)
       paginator = rel.paginator
-      i18n_key = "#{I18N_KEY}.page_entries_info"
+      i18n_key = "date_paginate.page_entries_info"
 
       content_tag :div, class: 'pageEntryInfo' do
         case paginator.pages.size

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/paginator.rb

@@ -26,7 +26,7 @@ module Datewari
       @scope = options[:scope].to_sym
 
       @query = case rel.klass.connection.adapter_name
-               when 'PostgreSQL'
+               when 'PostgreSQL', 'PostGIS'
                  require_relative 'paginator/postgresql'
                  Postgresql.new(rel, column, order, options)
                when 'Mysql2'

data/lib/datewari/version.rb

@@ -1,3 +1,3 @@
 module Datewari
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datewari
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Yoshikazu Kaneta
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-12 00:00:00.000000000 Z
+date: 2022-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: activerecord-postgis-adapter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails-controller-testing
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -136,34 +136,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: An ActiveRecord extension to build date oriented pagination links such
   as monthly pages and weekly pages
 email:
@@ -172,9 +144,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE
@@ -183,6 +156,10 @@ files:
 - datewari.gemspec
 - gemfiles/rails50.gemfile
 - gemfiles/rails51.gemfile
+- gemfiles/rails52.gemfile
+- gemfiles/rails60.gemfile
+- gemfiles/rails61.gemfile
+- gemfiles/rails70.gemfile
 - lib/datewari.rb
 - lib/datewari/helper.rb
 - lib/datewari/helper/link_renderer.rb
@@ -214,8 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: An ActiveRecord extension to build date oriented pagination links

data/.travis.yml

@@ -1,20 +0,0 @@
-language: ruby
-rvm:
-  - 2.3
-  - 2.4
-services:
-  - mysql
-  - postgresql
-addons:
-  postgresql: "9.5"
-env:
-  - DATABASE=mysql
-  - DATABASE=postgresql
-gemfile:
-  - gemfiles/rails50.gemfile
-  - gemfiles/rails51.gemfile
-before_script:
-  - cd spec/dummy
-  - bundle exec rake db:create db:migrate db:seed RAILS_ENV=test
-  - cd ../..
-script: bundle exec rspec