snippr 0.15.16 → 0.15.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e25773d2d7ad82e84565b0b71c6e84148da25b7
-  data.tar.gz: 5a2d3ee1f3f6cb03005a33a5723bd27c86f8b03f
+  metadata.gz: 9a8c5202bb47c0c71055a5052cb4be7544026e58
+  data.tar.gz: 0533cb0bc06a2721170a79cd94d0692aa17520bd
 SHA512:
-  metadata.gz: cf7690affccd3f54b7a2f37094c7075e4f86ffb00db5cbab7430ffa7d324be7ebcd0a3117f88e748b1c3161d8d71b2a6ba3e4c111394935ed28d63f28bed39dc
-  data.tar.gz: 6883b8fcae4c16d40a8d9febe9cdefe25c93fd65695ec70f615734cb541e962d7fcd2f119c2133c7a1accb21fe83737febd6ec1ad20b188099e9cce28ff910c8
+  metadata.gz: 821e137bcb4c7df4d3756dab8eff7d87aec08f4ebc3f536f3857126e464aef8e7b029f952700b6f0769b17a8f04502d1b80cca2fdb7adefb93f1924a0b423e09
+  data.tar.gz: 31bacedcc7177ac83a30a97404ed2919c7c01b405730638df3996baa11649575a7ecd2bbbc370510ec97fff5f63e1874893bae64f3136e6a8f75313bc061dff4

data/lib/app/views/partials/_snippr_tardis.html.erb

@@ -11,7 +11,7 @@
   <div class="content">
     <%= Snippr::Clock.now %>
     <input class="interval" type="text" placeholder="<%= session[:snippr_tardis_interval] || "+1d" %>" />
-    <button class="warp">Warp</botton>
-    <button class="reset">Reset</botton>
+    <button class="warp">Warp</button>
+    <button class="reset">Reset</button>
   </div>
 </div>

data/lib/snippr/processor/functions.rb

@@ -29,17 +29,25 @@ module Snippr
       end
 
       # home
-      # snip=home
-      # snip=home,var=1
+      # home,var=1
+      # home,var1="1"
+      # home,var1="1,2,3"
       def hashify(func_options="")
         options = {}
+
+        # replace comma temporarily
+        func_options.scan(/(["'])?(.*?)(\1){1}/).each do |delimiter, value, _|
+          func_options.gsub!("#{delimiter}#{value}#{delimiter}", "#{delimiter}#{value.gsub(",", "@@comma@@")}#{delimiter}")
+        end
+
+        # Split on comma which is secure now
         func_options.split(",").each do |option|
           opt_key, opt_value = option.split("=")
           unless opt_value
             opt_value = opt_key
             opt_key = :default
           end
-          options[opt_key.to_sym] = opt_value.match(/^["']?(.*?)["']?$/)[1]
+          options[opt_key.to_sym] = opt_value.match(/^["']?(.*?)["']?$/)[1].gsub("@@comma@@", ",")
         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.16"
+  s.version     = "0.15.17"
   s.date        = Time.now
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Daniel Harrington", "Thomas Jachmann", "Frank Schumacher"]

data/spec/snippr/path_spec.rb

@@ -64,10 +64,6 @@ describe Snippr::Path do
         subject.list(:doesnotexist).should == []
       end
 
-      it "can cope with umlauts in the name" do
-        subject.list(:mixed_encoding).first.encoding.to_s.should == "UTF-8"
-      end
-
     end
 
     context "with I18n" do

data/spec/snippr/processor/functions_spec.rb

@@ -82,6 +82,9 @@ describe Snippr::Processor::Functions do
       subject.send(:hashify, 'key="quoted"').should == { :key => 'quoted' }
     end
 
+    it "allows a comma inside quotes strings" do
+      subject.send(:hashify, 'key="with,comma"').should == { :key => 'with,comma' }
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: snippr
 version: !ruby/object:Gem::Version
-  version: 0.15.16
+  version: 0.15.17
 platform: ruby
 authors:
 - Daniel Harrington
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-17 00:00:00.000000000 Z
+date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n