Install latest bundler on travis

Merge pull request #725 from jeroenvisser101/performance-start-with-vs-regex
Use start_with? instead of Regex
2026-01-03 00:35:40 +03:00 · 2016-03-21 11:36:50 -04:00 · 2016-03-21 10:34:28 -04:00 · 2016-03-21 14:23:35 +01:00 · 2016-03-01 18:07:16 -05:00 · 2016-03-01 21:22:11 +00:00
3 changed files with 6 additions and 2 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,6 +19,10 @@ matrix:
  allow_failures:
    - rvm: jruby-head

+before_install:
+  - gem update --system
+  - gem install bundler --pre
+
 script: "bundle exec rake"

 notifications:
--- a/lib/liquid/drop.rb
+++ b/lib/liquid/drop.rb
@@ -25,7 +25,7 @@ module Liquid

    # Catch all for the method
    def liquid_method_missing(method)
-      return nil unless @context.strict_variables
+      return nil unless @context && @context.strict_variables
      raise Liquid::UndefinedDropMethod, "undefined method #{method}"
    end

--- a/lib/liquid/file_system.rb
+++ b/lib/liquid/file_system.rb
@@ -65,7 +65,7 @@ module Liquid
        File.join(root, @pattern % template_path)
      end

-      raise FileSystemError, "Illegal template path '#{File.expand_path(full_path)}'" unless File.expand_path(full_path) =~ /\A#{File.expand_path(root)}/
+      raise FileSystemError, "Illegal template path '#{File.expand_path(full_path)}'" unless File.expand_path(full_path).start_with?(File.expand_path(root))

      full_path
    end
Author	SHA1	Message	Date
Justin Li	622b8011db	Install latest bundler on travis	2016-03-21 11:36:50 -04:00
Justin Li	021bafd260	Merge pull request #725 from jeroenvisser101/performance-start-with-vs-regex Use start_with? instead of Regex	2016-03-21 10:34:28 -04:00
Jeroen Visser	04c393ab07	Use start_with? instead of Regex Performance is increased by doing this: require 'benchmark' require 'tempfile' n = 50000 test = File.expand_path(Tempfile.new('foo')) Benchmark.bm(20) do \|x\| x.report("Regex:") do n.times { test =~ /\A#{test}/ } end x.report("String#start_with?:") do n.times { test =~ test.start_with?(test) } end end Benchmark result: user system total real Regex: 0.440000 0.010000 0.450000 ( 0.447357) String#start_with?: 0.000000 0.000000 0.000000 ( 0.006313)	2016-03-21 14:23:35 +01:00
Gaurav Chande	9a7778e52c	Merge pull request #707 from Shopify/drop-without-context @context not always present on a Drop	2016-03-01 18:07:16 -05:00
Gaurav Chande	dde00253f9	context is not always present on a Drop	2016-03-01 21:22:11 +00:00
Gaurav Chande	18d1644980	Merge pull request #705 from Shopify/register-filter-warn Strainer#add_filter Raises on Private Override	2016-02-24 15:31:41 -05:00