vanilla 1.17.3 → 1.17.4

data/Rakefile

@@ -76,7 +76,7 @@ if Object.const_defined?(:Gem)
     s.add_dependency("rack-test", ">=0.5.7")
 
     s.add_development_dependency("rake", ">= 0.9.1")
-    s.add_development_dependency("kintama", ">= 0.1.7") # add any other gems for testing/development
+    s.add_development_dependency("kintama", ">= 0.1.11") # add any other gems for testing/development
     s.add_development_dependency("mocha")
     s.add_development_dependency("capybara")
     s.add_development_dependency("launchy")

data/lib/vanilla/atom_feed.rb

@@ -52,7 +52,7 @@ module Vanilla
           e.title = snip.title || snip.name
           e.authors = [Atom::Person.new(:name => snip.author || domain)]
           e.links << Atom::Link.new(:href => "http://#{domain}#{app.url_to(snip.name)}")
-          e.id = "tag:#{domain},#{atom_time(snip.created_at || Time.now).split("T")[0]}:/#{snip.name}"
+          e.id = "tag:#{domain},#{atom_time(snip.created_at || Time.now).split("T")[0]}:#{app.url_to(snip.name)}"
         end
       end
     end

data/lib/vanilla/snip_reference_parser.rb

@@ -37,12 +37,11 @@ module Vanilla
       rule(:right_brace) { str("}") }
 
       rule(:word) { match("[a-zA-Z0-9_\\-]").repeat(1) }
-      rule(:quotables) { word | comma | spaces }
       rule(:double_quoted_string) do
-        dquote >> (quotables | squote).repeat(1).as(:string) >> dquote
+        dquote >> (dquote.absent? >> any).repeat(1).as(:string) >> dquote
       end
       rule(:single_quoted_string) do
-        squote >> (quotables | dquote).repeat(1).as(:string) >> squote
+        squote >> (squote.absent? >> any).repeat(1).as(:string) >> squote
       end
       rule(:spaced_string) { (word >> (spaces >> word).repeat).as(:string) }
       rule(:string) do
@@ -99,4 +98,4 @@ module Vanilla
       rule(:key_value_arg_list => sequence(:x)) { x.inject({}) { |h, kv| h.merge(kv.to_h) } }
     end
   end
-end
+end

data/lib/vanilla.rb

@@ -1,5 +1,5 @@
 module Vanilla
-  VERSION = "1.17.3"
+  VERSION = "1.17.4"
 
   autoload :Renderers, "vanilla/renderers"
   autoload :App, "vanilla/app"

data/test/core/atom_feed_test.rb

@@ -199,6 +199,13 @@ context "An atom feed" do
       assert_equal "tag:yourdomain.example.com,2011-01-01:/Hello", get_feed.entries.first.id
     end
 
+    should "not include snip name spaces in ID" do
+      stub_app_soup({:name => "snip name", :content => "The *content*",
+               :render_as => "markdown", :created_at => Time.parse("2011-01-01 12:23").to_s})
+
+      assert_equal "tag:yourdomain.example.com,2011-01-01:/snip+name", get_feed.entries.first.id
+    end
+
     should "set the published date based on the snip created_at date" do
       assert_equal Time.parse("2011-01-01 12:23"), get_feed.entries.first.published
     end

data/test/core/snip_reference_parser_test.rb

@@ -83,6 +83,7 @@ context "The SnipReference parser" do
       %|{s 'arg, comma'}|     => {:snip => 's', :attribute => nil, :arguments => ['arg, comma']},
       # %|{s "arg { open"}|     => {:snip => 's', :attribute => nil, :arguments => ['arg { open']},
       # %|{s "arg } close"}|    => {:snip => 's', :attribute => nil, :arguments => ['arg } close']}
+      %|{s 'arg.with.fullstop'}| => {:snip => 's', :attribute => nil, :arguments => ['arg.with.fullstop']},
     },
 
     :html_quoting_arguments => {
@@ -124,4 +125,4 @@ context "The SnipReference parser" do
     end
     create_snip(attributes)
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vanilla
 version: !ruby/object:Gem::Version
-  version: 1.17.3
+  version: 1.17.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-04 00:00:00.000000000 Z
+date: 2012-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -162,7 +162,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 0.1.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -170,7 +170,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 0.1.11
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -329,7 +329,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 110256896921410377
+      hash: 243429165522352075
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -338,7 +338,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 110256896921410377
+      hash: 243429165522352075
 requirements: []
 rubyforge_project: vanilla
 rubygems_version: 1.8.23