logical_query_parser 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 717b464be4b7033bdddfcf640c16f146ace99ed3f9ec755e46c1bbb222315cc2
-  data.tar.gz: e11b02cec70f9fa280721731456dfe6d252a4a7bc7b580d9f31afc5afdbce679
+  metadata.gz: 21e876f1e9e4496b81a09656f8f9667817b79cc961fd72557dafd56ee20f7f37
+  data.tar.gz: b44d2f653f33c10de26fa2f80010836291abe78804354b84bb9aa1c54f5210ac
 SHA512:
-  metadata.gz: 62ac096dc6437121209c235b6daa522ff19d50d91ac31551129ac8aa67127f151815ee61488a88b9ed34440546540c44d7f2a152cc500fc652e70cd7dedf55d1
-  data.tar.gz: 3d9ee48804f605417a2ec86ee8151b197d8a8d5f7b157dd969c6c3f07a34fa95dc9171dcdf090f6b6b0269c8df3f070f19fa6cf81177867a9a2c9231af58b4ad
+  metadata.gz: 0b1337963075eb702293de0b3f9fb01880db2e2b7ed15b265858806fd5a75c25c0dd253c309060c7fa6982a8eda8e1b42d1ed82a3d978ac94a58f6169b9959e3
+  data.tar.gz: 02a3028859413314aee0284ac1beda1355dd633101ed449c2029447277a5e3c8fd552afc683313f276e8bdd25f9a868f6fc8b1cbd443603c9f6ce422947f3104

data/.github/workflows/ci.yml

@@ -4,11 +4,11 @@ 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]
+        ruby: [2.3, 2.4, 2.5, 2.6, 2.7, '3.0', 3.1, 3.2, 3.3]
         gemfile: ['rails42', 'rails50', 'rails51', 'rails52', 'rails60', 'rails61', 'rails70', 'rails71']
         exclude:
           - ruby: 2.3
@@ -61,6 +61,14 @@ jobs:
             gemfile: rails51
           - ruby: 3.2
             gemfile: rails52
+          - ruby: 3.3
+            gemfile: rails42
+          - ruby: 3.3
+            gemfile: rails50
+          - ruby: 3.3
+            gemfile: rails51
+          - ruby: 3.3
+            gemfile: rails52
 
     name: ruby ${{ matrix.ruby }}, ${{ matrix.gemfile }}
 
@@ -68,7 +76,7 @@ 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 }}

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 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/gemfiles/rails60.gemfile

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

data/gemfiles/rails61.gemfile

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

data/gemfiles/rails70.gemfile

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

data/gemfiles/rails71.gemfile

@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 
 gem "rails", "~> 7.1.0"
+gem "sqlite3", "~> 1.6.6"
 
 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.4.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__)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logical_query_parser
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - Yoshikazu Kaneta
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-30 00:00:00.000000000 Z
+date: 2024-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop