liquid-c 4.0.0.rc1 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c625a10bf29068a8d124df52ea012868d936f2ea
-  data.tar.gz: 537c2e49a4a6b65c693e7f51d2432d0f969dcb3f
+SHA256:
+  metadata.gz: 4e8ca00871b405a80337964e8d16fbd9e2c7eebc1174e04149193ed2b6dec69e
+  data.tar.gz: 6beb1f9af62e04c208735e733536631b0bb48a734f6f25a79e69e0032a71b6df
 SHA512:
-  metadata.gz: 5390b71dc89234cd139d6e3234473cc00c200e37380ba8a140c1e49c58fe1d7db68dd98ee79d8d023cf4994c9c7b472031504bde9b2bc27312f9f0bb04a56902
-  data.tar.gz: 99565b5eb0e6458afa0b9d7608b67160b1972892c6fa2bf2a4850eca80428b25f49743a57e9380ce6294448442f462109c917c7a702f647597a78d4443215402
+  metadata.gz: 9f6eb35fdd601a8ecc6d1f00beb3ef4d06ecb51c0de7fe5e9efbe9795d9ddc9828f5b0a4fe65cb719d91b322d3162a61e561c45b03f6cafebdc773a1f6bf2b7e
+  data.tar.gz: d2c21226bb648cdd9b062997fede49f6b0a2bc8896c216c5e66554b4962cd9524fe0a09b25450f8a1ac76bce2cf7f61ccdec039bc35079ce28cb0770c4a6cfbf

data/.github/workflows/liquid.yml

@@ -0,0 +1,23 @@
+name: Liquid
+on: [push, pull_request]
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        entry:
+          - { ruby: 2.7 }
+          - { ruby: 3.2 }
+    name: test (${{ matrix.entry.ruby }})
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.entry.ruby }}
+      - uses: actions/cache@v1
+        with:
+          path: vendor/bundle
+          key: ${{ runner.os }}-gems-${{ hashFiles('Gemfile') }}
+          restore-keys: ${{ runner.os }}-gems-
+      - run: bundle install --jobs=3 --retry=3 --path=vendor/bundle
+      - run: bundle exec rake

data/Gemfile

@@ -2,8 +2,7 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'liquid', github: 'Shopify/liquid', branch: 'master'
-
+gem 'liquid', github: 'Shopify/liquid', branch: '4-0-stable'
 
 group :test do
   gem 'spy', '0.4.1'

data/ext/liquid_c/extconf.rb

@@ -1,8 +1,14 @@
 require 'mkmf'
-$CFLAGS << ' -Wall -Werror -Wextra -Wno-unused-parameter -Wno-missing-field-initializers'
+$CFLAGS << ' -std=c99 -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers'
+# In Ruby 2.6 and earlier, the Ruby headers did not have struct timespec defined
+valid_headers = RbConfig::CONFIG['host_os'] !~ /linux/ || Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.7")
+pedantic = !ENV['LIQUID_C_PEDANTIC'].to_s.empty?
+if pedantic && valid_headers
+  $CFLAGS << ' -Werror'
+end
 compiler = RbConfig::MAKEFILE_CONFIG['CC']
 if ENV['DEBUG'] == 'true' && compiler =~ /gcc|g\+\+/
   $CFLAGS << ' -fbounds-check'
 end
-$warnflags.gsub!(/-Wdeclaration-after-statement/, "")
+$warnflags.gsub!(/-Wdeclaration-after-statement/, "") if $warnflags
 create_makefile("liquid_c")

data/ext/liquid_c/parser.c

@@ -120,9 +120,8 @@ static VALUE parse_variable(parser_t *p)
     }
 
     if (RARRAY_LEN(lookups) == 0) {
-        VALUE undefined = FIXNUM_P(-1);
-        VALUE literal = rb_hash_lookup2(vLiquidExpressionLiterals, name, undefined);
-        if (literal != undefined) return literal;
+        VALUE literal = rb_hash_lookup2(vLiquidExpressionLiterals, name, Qundef);
+        if (literal != Qundef) return literal;
     }
 
     VALUE args[4] = {Qfalse, name, lookups, INT2FIX(command_flags)};

data/ext/liquid_c/tokenizer.c

@@ -88,6 +88,7 @@ void tokenizer_next(tokenizer_t *tokenizer, token_t *token)
             tokenizer->lstrip_flag = 0;
             goto found;
         }
+        tokenizer->lstrip_flag = 0;
         token->type = TOKEN_INVALID;
         token->lstrip = token->rstrip;
         token->rstrip = 0;

data/lib/liquid/c/version.rb

@@ -1,5 +1,5 @@
 module Liquid
   module C
-    VERSION = "4.0.0.rc1"
+    VERSION = "4.0.1"
   end
 end

data/liquid-c.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Justin Li", "Dylan Thacker-Smith"]
   spec.email         = ["gems@shopify.com"]
   spec.summary       = "Liquid performance extension in C"
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/shopify/liquid-c"
   spec.license       = "MIT"
 
   spec.extensions    = ['ext/liquid_c/extconf.rb']
@@ -18,9 +18,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.metadata["allowed_push_host"] = "https://rubygems.org"
+
   spec.add_dependency 'liquid', '>= 3.0.0'
 
-  spec.add_development_dependency "bundler", "~> 1.5"
+  spec.add_development_dependency "bundler", ">= 1.5"
   spec.add_development_dependency "rake"
   spec.add_development_dependency 'rake-compiler'
   spec.add_development_dependency 'minitest'

data/test/liquid_test.rb

@@ -1,11 +1,11 @@
-liquid_lib_dir = $LOAD_PATH.detect{ |p| File.exists?(File.join(p, 'liquid.rb')) }
+liquid_lib_dir = $LOAD_PATH.detect{ |p| File.exist?(File.join(p, 'liquid.rb')) }
 liquid_test_dir = File.join(File.dirname(liquid_lib_dir), 'test')
 $LOAD_PATH << liquid_test_dir
 
 require 'test_helper'
 require 'liquid/c'
 
-test_files = FileList[File.join(liquid_test_dir, 'integration/**/*_test.rb')]
+test_files = Dir[File.join(liquid_test_dir, "integration/**/*_test.rb")]
 test_files.each do |test_file|
   require test_file
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: liquid-c
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc1
+  version: 4.0.1
 platform: ruby
 authors:
 - Justin Li
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-13 00:00:00.000000000 Z
+date: 2023-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -29,14 +29,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
@@ -103,8 +103,8 @@ extensions:
 - ext/liquid_c/extconf.rb
 extra_rdoc_files: []
 files:
+- ".github/workflows/liquid.yml"
 - ".gitignore"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -130,10 +130,11 @@ files:
 - test/test_helper.rb
 - test/unit/tokenizer_test.rb
 - test/unit/variable_test.rb
-homepage: ''
+homepage: https://github.com/shopify/liquid-c
 licenses:
 - MIT
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -145,12 +146,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: Liquid performance extension in C

data/.travis.yml

@@ -1,12 +0,0 @@
-language: ruby
-
-rvm:
-  - 2.0
-  - 2.1
-  - 2.2
-  - ruby-head
-
-sudo: false
-
-notifications:
-  disable: true