curly-templates 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2818caa59f5bef7c626637f7836e1af656b7e80f
-  data.tar.gz: 4ca1146d648950e76512b621161f83b4af455829
+  metadata.gz: e826dc5149782e2edd2cb773a52640b9e57c65eb
+  data.tar.gz: 1c3672b608b4954d81e1385070c850a22a95d8f7
 SHA512:
-  metadata.gz: 80c963f1466c87b64c3a34af2a60c1a9be706623513688226ce2c3cb62aedae3abcaf8947d39620966960570aed0b3867d3fd4e5c72140405c061d4b62892bc8
-  data.tar.gz: 8fbbaf7cf446034b96343ee77f766bafc473d62e01a4010fa412fe4806538505929ee30843685f46b969a2fade65d2b43ad303aa9ace72d0cf0d64627229aa3a
+  metadata.gz: bbc93550fccfd6bb3767f2e908db58a9b8386adfb21f0b53d2438fde2d1edb4d6d7034abb6514b38af4158718bdef4f25cb6f8dfb25d044ebb7f533d78c7eae1
+  data.tar.gz: 87694f0ffd409ca5a60bdc1411234ee7d0d1aec9b596cd45efe1ee6c830a52dbbefdd5dd1c4c073a4d0f3a9302d7d87a420bd0fbacfb7724363b8413bc8f7430

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 ### Unreleased
 
+### Curly 2.0.1 (September 9, 2014)
+
+* Fixed an issue when using Curly with Rails 4.1.
+
+  *Daniel Schierbeck*
+
+* Add line number information to syntax errors.
+
+  *Jeremy Rodi*
+
 ### Curly 2.0.0 (July 1, 2014)
 
 * Rename Curly::CompilationError to Curly::PresenterNotFound.

data/README.md

@@ -1,7 +1,3 @@
-Note: this documentation is for the upcoming Curly v2 – you may be looking for the
-[documentation for the latest final release](https://github.com/zendesk/curly/tree/1-0-stable).
-
-
 Curly
 =======
 

data/curly-templates.gemspec

@@ -4,8 +4,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'curly-templates'
-  s.version           = '2.0.0'
-  s.date              = '2014-07-01'
+  s.version           = '2.0.1'
+  s.date              = '2014-09-09'
 
   s.summary     = "Free your views!"
   s.description = "A view layer for your Rails apps that separates structure and logic."
@@ -19,9 +19,9 @@ Gem::Specification.new do |s|
 
   s.rdoc_options = ["--charset=UTF-8"]
 
-  s.add_dependency("actionpack", [">= 3.1", "< 4.1"])
+  s.add_dependency("actionpack", [">= 3.1", "< 4.2"])
 
-  s.add_development_dependency("railties", [">= 3.1", "< 4.1"])
+  s.add_development_dependency("railties", [">= 3.1", "< 4.2"])
   s.add_development_dependency("rake")
   s.add_development_dependency("rspec", "~> 2.12")
   s.add_development_dependency("genspec")

data/lib/curly.rb

@@ -26,7 +26,7 @@
 # See Curly::Presenter for more information on presenters.
 #
 module Curly
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 
   # Compiles a Curly template to Ruby code.
   #

data/lib/curly/syntax_error.rb

@@ -7,10 +7,12 @@ module Curly
     end
 
     def message
-      start = [@position - 8, 0].max
-      stop = [@position + 8, @source.length].min
+      start   = [@position - 8, 0].max
+      stop    = [@position + 8, @source.length].min
       snippet = @source[start..stop].strip
-      "invalid syntax near `#{snippet}` in template:\n\n#{@source}\n"
+      line    = @source[0..@position].count("\n") + 1
+      "invalid syntax near `#{snippet}` on line #{line} in " \
+        "template:\n\n#{@source}\n"
     end
   end
 end

data/lib/curly/template_handler.rb

@@ -59,7 +59,7 @@ class Curly::TemplateHandler
         options = local_assigns
       end
 
-      presenter = #{presenter_class}.new(self, options.with_indifferent_access)
+      presenter = ::#{presenter_class}.new(self, options.with_indifferent_access)
       presenter.setup!
 
       @output_buffer = output_buffer || ActiveSupport::SafeBuffer.new

data/spec/syntax_error_spec.rb

@@ -4,9 +4,9 @@ describe Curly::SyntaxError, "#message" do
   it "includes the context of the error in the message" do
     source = "I am a very bad error that has snuck in"
     error = Curly::SyntaxError.new(13, source)
-    
+
     error.message.should == <<-MESSAGE.strip_heredoc
-      invalid syntax near `a very bad error` in template:
+      invalid syntax near `a very bad error` on line 1 in template:
 
       I am a very bad error that has snuck in
     MESSAGE

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: curly-templates
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Daniel Schierbeck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-01 00:00:00.000000000 Z
+date: 2014-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -19,7 +19,7 @@ dependencies:
         version: '3.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '3.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: '3.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '3.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement