logical_query_parser 0.3.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 717b464be4b7033bdddfcf640c16f146ace99ed3f9ec755e46c1bbb222315cc2
-  data.tar.gz: e11b02cec70f9fa280721731456dfe6d252a4a7bc7b580d9f31afc5afdbce679
+  metadata.gz: 22d02f1282d55df340c385cd13c61186f4230f22f8282c7fd67b781dacd2fbd0
+  data.tar.gz: b952657d8f60d182c037c308005b5e6fca626b2a607fbc6d8892b93b48e74daa
 SHA512:
-  metadata.gz: 62ac096dc6437121209c235b6daa522ff19d50d91ac31551129ac8aa67127f151815ee61488a88b9ed34440546540c44d7f2a152cc500fc652e70cd7dedf55d1
-  data.tar.gz: 3d9ee48804f605417a2ec86ee8151b197d8a8d5f7b157dd969c6c3f07a34fa95dc9171dcdf090f6b6b0269c8df3f070f19fa6cf81177867a9a2c9231af58b4ad
+  metadata.gz: 4eba4f1502637981543337180b179dbd03ee0cb7eabc4215cf256a3f1654bb3bbd2db9b4690e4dc9c1f81f4a3fa2a7bdae3da3b9c75700bcd693f6b9c877ebaa
+  data.tar.gz: 256ad90335de5fe846cd6b38620b7dbca8f480c1a3783141adcb53691f28cd6172df75774c51eabca395562b340c493992c2935504b00cc32a7886b8dac5013f

data/.github/workflows/ci.yml

@@ -4,63 +4,23 @@ on: [push, pull_request]
 
 jobs:
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.3, 2.4, 2.5, 2.6, 2.7, '3.0', 3.1, 3.2]
-        gemfile: ['rails42', 'rails50', 'rails51', 'rails52', 'rails60', 'rails61', 'rails70', 'rails71']
+        ruby: ['3.0', 3.1, 3.2, 3.3, 3.4, '4.0']
+        gemfile: ['rails70', 'rails71', 'rails72', 'rails80', 'rails81']
         exclude:
-          - ruby: 2.3
-            gemfile: rails60
-          - ruby: 2.3
-            gemfile: rails61
-          - ruby: 2.3
-            gemfile: rails70
-          - ruby: 2.3
-            gemfile: rails71
-          - ruby: 2.4
-            gemfile: rails60
-          - ruby: 2.4
-            gemfile: rails61
-          - ruby: 2.4
-            gemfile: rails70
-          - ruby: 2.4
-            gemfile: rails71
-          - ruby: 2.5
-            gemfile: rails70
-          - ruby: 2.5
-            gemfile: rails71
-          - ruby: 2.6
-            gemfile: rails70
-          - ruby: 2.6
-            gemfile: rails71
-          - ruby: 2.7
-            gemfile: rails42
           - ruby: 3.0
-            gemfile: rails42
+            gemfile: rails72
           - ruby: 3.0
-            gemfile: rails50
+            gemfile: rails80
           - ruby: 3.0
-            gemfile: rails51
-          - ruby: 3.0
-            gemfile: rails52
-          - ruby: 3.1
-            gemfile: rails42
+            gemfile: rails81
           - ruby: 3.1
-            gemfile: rails50
+            gemfile: rails80
           - ruby: 3.1
-            gemfile: rails51
-          - ruby: 3.1
-            gemfile: rails52
-          - ruby: 3.2
-            gemfile: rails42
-          - ruby: 3.2
-            gemfile: rails50
-          - ruby: 3.2
-            gemfile: rails51
-          - ruby: 3.2
-            gemfile: rails52
+            gemfile: rails81
 
     name: ruby ${{ matrix.ruby }}, ${{ matrix.gemfile }}
 
@@ -68,11 +28,14 @@ jobs:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
         bundler-cache: true
+    - name: Bundle list
+      run: |
+        bundle list
     - name: Run test
       run: |
         bundle exec rspec

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG
 
+## 0.5.0
+
+* Drop support for ruby <= 2.7, rails <= 6.1.
+
+## 0.4.0
+
+* Add `frozen_string_literal: true`.
+* Fix internal hash key for building sql.
+
 ## 0.3.4
 
 * Just rebuild gem file to fix file permission.

data/Gemfile

@@ -1,3 +1,6 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem "activerecord", ">= 7.0.0"
+gem "sqlite3"

data/README.md

@@ -4,9 +4,9 @@ A parser to generate a tree structure from a logical search query string using t
 
 ## Dependencies
 
-* ruby 2.3+
+* ruby 3.0+
 * treetop 1.6+
-* activerecord 4.2+ (optional)
+* activerecord 7.0+ (optional)
 
 ## Installation
 

data/gemfiles/rails70.gemfile

@@ -1,5 +1,13 @@
 source 'https://rubygems.org'
 
-gem "rails", "~> 7.0.1"
+gem "activerecord", "~> 7.0.1"
+gem "sqlite3", "~> 1.4.0"
+
+gem "concurrent-ruby", "<= 1.3.4"
+
+if RUBY_VERSION >= "3.4"
+  gem "bigdecimal"
+  gem "mutex_m"
+end
 
 gemspec path: "../"

data/gemfiles/rails71.gemfile

@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 
-gem "rails", "~> 7.1.0"
+gem "activerecord", "~> 7.1.0"
+gem "sqlite3", "~> 1.6.6"
 
 gemspec path: "../"

data/gemfiles/{rails61.gemfile → rails72.gemfile}

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

data/gemfiles/rails80.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem "activerecord", "~> 8.0.0"
+gem "sqlite3"
+
+gemspec path: "../"

data/gemfiles/rails81.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem "activerecord", "~> 8.1.0"
+gem "sqlite3"
+
+gemspec path: "../"

data/lib/logical_query_parser/assoc.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LogicalQueryParser
   class Assoc
     attr_accessor :column_mapping, :structure

data/lib/logical_query_parser/assoc_resolver.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'assoc'
 
 module LogicalQueryParser

data/lib/logical_query_parser/nodes/active_record.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module LogicalQueryParser
   module ExpNode
     def to_sql(params = {})
-      params[:sql] ||= ''
+      params[:_sql] ||= ''.dup
       exp.to_sql(params)
     end
   end
@@ -15,10 +17,10 @@ module LogicalQueryParser
       exp.to_sql(params)
       rparen.to_sql(params)
       if rexp.elements.size > 0
-        params[:sql] += ' AND '
+        params[:_sql] += ' AND '
         rexp.elements[0].to_sql(params)
       end
-      params[:sql]
+      params[:_sql]
     end
   end
 
@@ -33,38 +35,38 @@ module LogicalQueryParser
   module LiteralExpNode
     def to_sql(params)
       literal.to_sql(params)
-      params[:sql] << ' AND '
+      params[:_sql] << ' AND '
       exp.to_sql(params)
     end
   end
 
   module LParenNode
     def to_sql(params)
-      params[:sql] << '('
+      params[:_sql] << '('
     end
   end
 
   module RParenNode
     def to_sql(params)
-      params[:sql] << ')'
+      params[:_sql] << ')'
     end
   end
 
   module AndNode
     def to_sql(params)
-      params[:sql] << ' AND '
+      params[:_sql] << ' AND '
     end
   end
 
   module OrNode
     def to_sql(params)
-      params[:sql] << ' OR '
+      params[:_sql] << ' OR '
     end
   end
 
   module NotNode
     def to_sql(params)
-      params[:sql] << 'NOT '
+      params[:_sql] << 'NOT '
     end
   end
 
@@ -75,7 +77,7 @@ module LogicalQueryParser
       
       sql = build_arel(params, operator, text).reduce(logic).to_sql
       sql = "(#{sql})" if sql[0] != '(' && sql[-1] != ')'
-      params[:sql] << sql
+      params[:_sql] << sql
     end
 
     private

data/lib/logical_query_parser/nodes/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LogicalQueryParser
   module ExpNode
   end

data/lib/logical_query_parser/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LogicalQueryParser
-  VERSION = "0.3.4"
+  VERSION = "0.5.0"
 end

data/lib/logical_query_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'treetop'
 Treetop.load File.expand_path("../logical_query_parser.treetop", __FILE__)
 

data/logical_query_parser.gemspec

@@ -19,12 +19,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = ">= 3.0"
+
   spec.add_dependency "treetop", "~> 1.6.8"
 
   spec.add_development_dependency "bundler"
+  spec.add_development_dependency "irb"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "activerecord"
-  spec.add_development_dependency "sqlite3"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: logical_query_parser
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Yoshikazu Kaneta
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-30 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
@@ -39,21 +38,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
-  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: rspec
+  name: irb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +52,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +66,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +80,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -127,14 +112,11 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- gemfiles/rails42.gemfile
-- gemfiles/rails50.gemfile
-- gemfiles/rails51.gemfile
-- gemfiles/rails52.gemfile
-- gemfiles/rails60.gemfile
-- gemfiles/rails61.gemfile
 - gemfiles/rails70.gemfile
 - gemfiles/rails71.gemfile
+- gemfiles/rails72.gemfile
+- gemfiles/rails80.gemfile
+- gemfiles/rails81.gemfile
 - lib/logical_query_parser.rb
 - lib/logical_query_parser.treetop
 - lib/logical_query_parser/assoc.rb
@@ -147,7 +129,6 @@ homepage: https://github.com/kanety/logical_query_parser
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -155,15 +136,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A parser for a logical query string.
 test_files: []

data/gemfiles/rails42.gemfile

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gem "activerecord", "~> 4.2.9"
-gem "sqlite3", "~> 1.3.6"
-
-gemspec path: "../"

data/gemfiles/rails50.gemfile

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gem "activerecord", "~> 5.0.5"
-gem "sqlite3", "~> 1.3.6"
-
-gemspec path: "../"

data/gemfiles/rails51.gemfile

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gem "activerecord", "~> 5.1.3"
-gem "sqlite3", "~> 1.3.6"
-
-gemspec path: "../"

data/gemfiles/rails52.gemfile

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gem "activerecord", "~> 5.2.0"
-gem "sqlite3", "~> 1.3.6"
-
-gemspec path: "../"

data/gemfiles/rails60.gemfile

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