snippr 0.15.15 → 0.15.16

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NDUxZDgxNzQ4M2E0NDAzNzcxMDQyMDU5MzBlMTAyYmU1ZWZlYzQ2NQ==
-  data.tar.gz: !binary |-
-    YzM1NGU3MDgxZWIwZDNhMWIzYmUxMWZhMmJhZjFmZmY2YTM4ZDFmZA==
+SHA1:
+  metadata.gz: 5e25773d2d7ad82e84565b0b71c6e84148da25b7
+  data.tar.gz: 5a2d3ee1f3f6cb03005a33a5723bd27c86f8b03f
 SHA512:
-  metadata.gz: !binary |-
-    ZTFlOTM3MTFiMmYwMDJlNDdkNGFmMDJiYjRkMDQxNDU3N2NmMzg4OThmZGZh
-    NTAwOGRlMDQ3ODc2NmIzYWQwNGQyMTVmMDIyMTk0ZDRiMGQ0NjQxZWFhZTMz
-    MGFjZTkwYzg5MmM0NjE1OTQxNGI1Njg1N2FmZTM4YmJlYzRhNTc=
-  data.tar.gz: !binary |-
-    OWNjNzc1MTUzYWVkNmJhZDAzMjQxMWI5ODc1OGE5NzkyMTUyOTcyN2JkNTll
-    MzFiMGU0OTM1NjY3NTI3NGM5ZWQyN2VlNmFlY2JiNDk1OTNlYjRkMmExZTU5
-    MzgyYTk1ZTk2YzZiN2RlMzUzMGJjZjA5NGU2NzM2NzE0MzEwMWM=
+  metadata.gz: cf7690affccd3f54b7a2f37094c7075e4f86ffb00db5cbab7430ffa7d324be7ebcd0a3117f88e748b1c3161d8d71b2a6ba3e4c111394935ed28d63f28bed39dc
+  data.tar.gz: 6883b8fcae4c16d40a8d9febe9cdefe25c93fd65695ec70f615734cb541e962d7fcd2f119c2133c7a1accb21fe83737febd6ec1ad20b188099e9cce28ff910c8

data/README.md

@@ -127,7 +127,12 @@ You can pass additional dynamic values when using `{snip}`. These will override
 
     {snip:filepath/of/snip,dyn_key1=dyn_value,dyn_key2=dyn_value2}
 
-Those will be available as {dyn_key1} and {dyn_key2} in filepath/of/snip.snip
+or
+
+    {snip:filepath/of/snip,dyn_key1="dyn_value",dyn_key2='dyn_value2'}
+
+Those will be available as {dyn_key1} and {dyn_key2} in filepath/of/snip.snip  
+Outer quotes and double quotes will be removed
 
 ### Segments (as of Snippr 0.15.0)
 

data/lib/snippr/processor/functions.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 # = Snippr::Processor::Functions
 #
 # Processes several functions in {command:options} syntax.
@@ -38,7 +39,7 @@ module Snippr
             opt_value = opt_key
             opt_key = :default
           end
-          options[opt_key.to_sym] = opt_value
+          options[opt_key.to_sym] = opt_value.match(/^["']?(.*?)["']?$/)[1]
         end
         options
       end

data/snippr.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = "snippr"
-  s.version     = "0.15.15"
+  s.version     = "0.15.16"
   s.date        = Time.now
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Daniel Harrington", "Thomas Jachmann", "Frank Schumacher"]

data/spec/snippr/processor/functions_spec.rb

@@ -1,34 +1,41 @@
+# -*- encoding : utf-8 -*-
 require "spec_helper"
 
 describe Snippr::Processor::Functions do
 
   describe "#cmd_snip" do
 
-    it "should include snips inside of snips" do
+    it "includes snips inside of snips" do
       subject.process('Include a {snip:home} inside a snip').should == "Include a <!-- starting snippr: home -->\n<p>Home</p>\n<!-- closing snippr: home --> inside a snip"
     end
 
-
-    it "should pass parameters to the include" do
+    it "passes parameters to the include" do
       subject.process('Include a {snip:topup/success} inside a snip', {
         :topup_amount => '10',
         :date_today => '123'
       }).should == "Include a <!-- starting snippr: topup/success -->\n<p>You're topup of 10 at 123 was successful.</p>\n<!-- closing snippr: topup/success --> inside a snip"
     end
 
-    it "should allow additional parameters to be passed to the included snippet" do
+    it "allows additional parameters to be passed to the included snippet" do
       subject.process('Include a {snip:topup/success,topup_amount=99} inside a snip', {
         :date_today => '123'
       }).should == "Include a <!-- starting snippr: topup/success -->\n<p>You're topup of 99 at 123 was successful.</p>\n<!-- closing snippr: topup/success --> inside a snip"
     end
 
-    it "should allow additional parameters of the snip call to override parent options" do
+    it "allows additional parameters of the snip call to override parent options" do
       subject.process('Include a {snip:topup/success,topup_amount=99} inside a snip', {
         :date_today => '123',
         :topup_amount => '1'
       }).should == "Include a <!-- starting snippr: topup/success -->\n<p>You're topup of 99 at 123 was successful.</p>\n<!-- closing snippr: topup/success --> inside a snip"
     end
 
+    it "allows additional parameters of the snip call to override parent options" do
+      subject.process('Include a {snip:topup/success,topup_amount="A B C"} inside a snip', {
+        :date_today => '123',
+        :topup_amount => '1'
+      }).should == "Include a <!-- starting snippr: topup/success -->\n<p>You're topup of A B C at 123 was successful.</p>\n<!-- closing snippr: topup/success --> inside a snip"
+    end
+
     context "for home/show/blauappOverviewBoxMobile (regression test)" do
 
       before do
@@ -41,7 +48,7 @@ describe Snippr::Processor::Functions do
         Snippr::Normalizer.normalizers.pop # remove second normalizer
       end
 
-      it "should work" do
+      it "works" do
         subject.process("{snip:home/show/blauappOverviewBoxMobile}").should == "<!-- missing snippr: home/show/blauappOverviewBoxMobile_de -->"
       end
 
@@ -51,22 +58,30 @@ describe Snippr::Processor::Functions do
 
   describe "#hashify" do
 
-    it "should process a single argument with no value as default" do
+    it "processes a single argument with no value as default" do
       subject.send(:hashify, "test").should == { :default => "test" }
     end
 
-    it "should process a single argument with key and value" do
+    it "processes a single argument with key and value" do
       subject.send(:hashify, "key=value").should == { :key => "value" }
     end
 
-    it "should process multiple arguments delimited by comma" do
+    it "processes multiple arguments delimited by comma" do
       subject.send(:hashify, "key=value,key2=value2").should == { :key => "value", :key2 => "value2" }
     end
 
-    it "should process a combination of all arguments" do
+    it "processes a combination of all arguments" do
       subject.send(:hashify, "default,key=value,key2=value2").should == { :default => 'default', :key => "value", :key2 => "value2" }
     end
 
+    it "removes leading and trailing quotes" do
+      subject.send(:hashify, "key='quoted'").should == { :key => 'quoted' }
+    end
+
+    it "removes leading and trailing double quotes" do
+      subject.send(:hashify, 'key="quoted"').should == { :key => 'quoted' }
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: snippr
 version: !ruby/object:Gem::Version
-  version: 0.15.15
+  version: 0.15.16
 platform: ruby
 authors:
 - Daniel Harrington
@@ -10,90 +10,90 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
+date: 2014-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ci_reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.5
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: pry-debugger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: This gem provides ways to access file based cms resources from a rails
@@ -106,9 +106,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -198,17 +198,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: snippr
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: File based content management
@@ -254,4 +254,3 @@ test_files:
 - spec/snippr/tardis_spec.rb
 - spec/snippr/view_helper_spec.rb
 - spec/spec_helper.rb
-has_rdoc: