snippr 0.15.21 → 0.15.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd5e914f8d8ff99c134b3c0e3ae285bd4d7579c9
-  data.tar.gz: a4f5bb34d2ddf5b38704bdee282b5e2d92a9e21b
+  metadata.gz: 7285f9e6b5d7271ae0d46e93fc3b4fdb630e0af0
+  data.tar.gz: c7c3d8a708304c4184cdbb40321bb3a72aea8882
 SHA512:
-  metadata.gz: 4989ca6050828708d6dc54134185ead7e052913913a7b3f90586f3430f41d841bc9aa7f191ca1c3b05ea224ebfa25383876696ab7ba96d6e9ed4017d9174a899
-  data.tar.gz: 203ed4d06059918c6eea51c21b47f52e37ed0e5991650bf14b4cd01bc6d026fb331b51ee4ca341baeba00d54fc199dc738943202698a6c4508dfc4261e23238d
+  metadata.gz: e3ff81c780ad5b2636f0620bd613ef2d242b2b782f04c55f64419bdbf8a06185f1bbc1908ae70eb2cf1b883874b7751935878d4c7f9fa76e621e189d33a44a3f
+  data.tar.gz: cb86a46ff9c499bd1be46960df280bb86b75da4827eec12afa6dfaacfe5be75530015bb28ccd45a3e27e854ed02cc5ca38a45e2580c4da00e82afbb67a0401e2

data/lib/snippr/processor/dynamics.rb

@@ -15,19 +15,19 @@ module Snippr
 
         matches.each do |match_data|
           replacement = match_data[:all]
-          value = opts[match_data[:placeholder].to_sym]
+          placeholder = match_data[:placeholder].strip.to_sym
+          value = opts[placeholder]
           if match_data[:method] && (value.respond_to?(match_data[:method]) || match_data[:respond_to_check] == "!")
             params = (match_data[:parameters] || "").gsub(/[\t\r\n]/,"").split("\",\"")
             replacement = value.send(match_data[:method], *params).to_s
           elsif match_data[:method]
             replacement = match_data[:all]
-          else
+          elsif value
             replacement = value.to_s
           end
 
           # default set?
           replacement = match_data[:default_when_empty].strip if replacement.empty? && match_data[:default_when_empty]
-
           content.gsub!(match_data[:all], replacement)
         end
         content

data/snippr.gemspec

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

data/spec/fixtures/using_brackets_for_inline_styles/snippet.snip

@@ -0,0 +1,6 @@
+<style>
+.clazz {
+}
+
+.clazz {}
+</style>

data/spec/snippr/clock_spec.rb

@@ -10,16 +10,16 @@ describe "Snippr::Clock" do
   describe ".now" do
     # use TimeCop here
     it "returns a time object" do
-      Snippr::Clock.now.should be_a(Time)
+      expect(Snippr::Clock.now).to be_a(Time)
     end
 
     it "returns the current time if no interval is given" do
-      Snippr::Clock.now.to_i.should == Time.now.to_i
+      expect(Snippr::Clock.now.to_i).to eq(Time.now.to_i)
     end
 
     it "returns the modified time if an interval is set" do
       Snippr::Clock.interval="+1d"
-      Snippr::Clock.now.to_i.should == (Time.now + 86400).to_i
+      expect(Snippr::Clock.now.to_i).to eq((Time.now + 86400).to_i)
     end
 
   end
@@ -28,50 +28,50 @@ describe "Snippr::Clock" do
     it "resets the time" do
       Snippr::Clock.interval="+1d"
       Snippr::Clock.reset
-      Snippr::Clock.now.to_i.should == Time.now.to_i
+      expect(Snippr::Clock.now.to_i).to eq(Time.now.to_i)
     end
   end
 
   describe ".interval=" do
     it "sets the time forward" do
       Snippr::Clock.interval="+1m"
-      Snippr::Clock.interval.should == +60
+      expect(Snippr::Clock.interval).to eq +60
     end
 
     it "sets the time backward" do
       Snippr::Clock.interval="-1m"
-      Snippr::Clock.interval.should == -60
+      expect(Snippr::Clock.interval).to eq(-60)
     end
 
     it "accepts seconds as scale" do
       Snippr::Clock.interval="+1s"
-      Snippr::Clock.interval.should == +1
+      expect(Snippr::Clock.interval).to eq +1
     end
 
     it "accepts minutes as scale" do
       Snippr::Clock.interval="+1m"
-      Snippr::Clock.interval.should == +60
+      expect(Snippr::Clock.interval).to eq +60
     end
 
     it "accepts hours as scale" do
       Snippr::Clock.interval="+1h"
-      Snippr::Clock.interval.should == +3600
+      expect(Snippr::Clock.interval).to eq +3600
     end
 
     it "accepts days as scale" do
       Snippr::Clock.interval="+1d"
-      Snippr::Clock.interval.should == +86400
+      expect(Snippr::Clock.interval).to eq +86400
     end
 
     it "doesn't set the time if the interval is invalid" do
       Snippr::Clock.interval="blubb"
-      Snippr::Clock.interval.should == 1
+      expect(Snippr::Clock.interval).to eq(1)
     end
   end
 
   describe "interval" do
     it "returns the interval in seconds" do
-      Snippr::Clock.interval.should == 0
+      expect(Snippr::Clock.interval).to eq(0)
     end
   end
 end

data/spec/snippr/i18n_spec.rb

@@ -6,9 +6,9 @@ describe Snippr::I18n do
 
     it "should store the enabled state" do
       subject.enabled = nil
-      subject.enabled?.should == false
+      expect(subject.enabled?).to eq(false)
       subject.enabled = true
-      subject.enabled?.should == true
+      expect(subject.enabled?).to eq(true)
     end
 
   end
@@ -17,12 +17,12 @@ describe Snippr::I18n do
 
     it "should return an empty string when I18n is not enabled" do
       subject.enabled = false
-      subject.locale.should == ''
+      expect(subject.locale).to eq('')
     end
 
     it "should return the locale string when I18n is enabled" do
       subject.enabled = true
-      subject.locale.should == "_#{I18n.locale}"
+      expect(subject.locale).to eq("_#{I18n.locale}")
     end
 
   end

data/spec/snippr/links_spec.rb

@@ -7,12 +7,12 @@ describe Snippr::Links do
 
     it "defaults to [/^#/, /^[a-z]+:/i]" do
       subject.adjust_urls_except = nil
-      subject.adjust_urls_except.should == [/^#/, /^[a-z]+:/i]
+      expect(subject.adjust_urls_except).to eq([/^#/, /^[a-z]+:/i])
     end
 
     it "stores exceptions" do
       subject.adjust_urls_except = [/^cms.*/]
-      subject.adjust_urls_except.should == [/^cms.*/]
+      expect(subject.adjust_urls_except).to eq([/^cms.*/])
     end
 
   end
@@ -20,22 +20,22 @@ describe Snippr::Links do
   describe ".adjust_link" do
 
     it "returns an a without href unchanged" do
-      subject.adjust_link('<a name="headline"/>').should == '<a name="headline"/>'
+      expect(subject.adjust_link('<a name="headline"/>')).to eq('<a name="headline"/>')
     end
 
     it "adjusts the href to the adjustd_url" do
-      subject.should_receive(:adjust_url).with('url').and_return('adjustd_url')
-      subject.adjust_link('<a onclick="return true;" href="url" class="link">test</a>').should == '<a onclick="return true;" href="adjustd_url" class="link">test</a>'
+      expect(subject).to receive(:adjust_url).with('url').and_return('adjustd_url')
+      expect(subject.adjust_link('<a onclick="return true;" href="url" class="link">test</a>')).to eq('<a onclick="return true;" href="adjustd_url" class="link">test</a>')
     end
 
     it "adds an onclick when href starts with popup:" do
-      subject.should_receive(:adjust_url).with('popup_url').and_return('adjustd_url')
-      subject.adjust_link('<a href="popup:popup_url" class="link">test</a>').should == '<a href="adjustd_url" class="link" onclick="if (typeof popup == \'undefined\') { return true; } else { popup(this); return false; }">test</a>'
+      expect(subject).to receive(:adjust_url).with('popup_url').and_return('adjustd_url')
+      expect(subject.adjust_link('<a href="popup:popup_url" class="link">test</a>')).to eq('<a href="adjustd_url" class="link" onclick="if (typeof popup == \'undefined\') { return true; } else { popup(this); return false; }">test</a>')
     end
 
     it "replaces an existing onclick when href starts with popup:" do
-      subject.should_receive(:adjust_url).with('url').and_return('adjustd_url')
-      subject.adjust_link('<a onclick="return true;" href="popup://url" class="link">test</a>').should == '<a onclick="if (typeof popup == \'undefined\') { return true; } else { popup(this); return false; }" href="adjustd_url" class="link">test</a>'
+      expect(subject).to receive(:adjust_url).with('url').and_return('adjustd_url')
+      expect(subject.adjust_link('<a onclick="return true;" href="popup://url" class="link">test</a>')).to eq('<a onclick="if (typeof popup == \'undefined\') { return true; } else { popup(this); return false; }" href="adjustd_url" class="link">test</a>')
     end
 
   end
@@ -47,40 +47,40 @@ describe Snippr::Links do
     end
 
     it "leaves absolute links (http) as is" do
-      subject.adjust_url('http://www.blaulabs.de').should == 'http://www.blaulabs.de'
+      expect(subject.adjust_url('http://www.blaulabs.de')).to eq('http://www.blaulabs.de')
     end
 
     it "leaves absolute links (https) as is" do
-      subject.adjust_url('https://www.blaulabs.de').should == 'https://www.blaulabs.de'
+      expect(subject.adjust_url('https://www.blaulabs.de')).to eq('https://www.blaulabs.de')
     end
 
     it "leaves special links (mailto) as is" do
-      subject.adjust_url('mailto:info@blau.de').should == 'mailto:info@blau.de'
+      expect(subject.adjust_url('mailto:info@blau.de')).to eq('mailto:info@blau.de')
     end
 
     it "converts relative links to server absolute links" do
-      subject.adjust_url('relative.html').should == '/root/relative.html'
+      expect(subject.adjust_url('relative.html')).to eq('/root/relative.html')
     end
 
     it "converts app absolute links to server absolute links" do
-      subject.adjust_url('/absolute.html').should == '/root/absolute.html'
+      expect(subject.adjust_url('/absolute.html')).to eq('/root/absolute.html')
     end
 
     it "leaves internal links (#) as is" do
-      subject.adjust_url('#aname').should == '#aname'
+      expect(subject.adjust_url('#aname')).to eq('#aname')
     end
 
     it "converts links excepted in next test to server absolute links" do
-      subject.adjust_url('/cms/excepted.html').should == '/root/cms/excepted.html'
+      expect(subject.adjust_url('/cms/excepted.html')).to eq('/root/cms/excepted.html')
     end
 
     it "leaves server absolute links as is" do
-      subject.adjust_url('/root/bla/absolute.html').should == '/root/bla/absolute.html'
+      expect(subject.adjust_url('/root/bla/absolute.html')).to eq('/root/bla/absolute.html')
     end
 
     it "leaves excepted links as is" do
       subject.adjust_urls_except << /^\/cms\//
-      subject.adjust_url('/cms/excepted.html').should == '/cms/excepted.html'
+      expect(subject.adjust_url('/cms/excepted.html')).to eq('/cms/excepted.html')
     end
 
   end
@@ -88,7 +88,7 @@ describe Snippr::Links do
   describe ".relative_url_root" do
 
     it "returns / without rails" do
-      subject.relative_url_root.should == '/'
+      expect(subject.relative_url_root).to eq('/')
     end
 
     context "with rails" do
@@ -103,32 +103,32 @@ describe Snippr::Links do
 
       it "returns / with relative_url_root set to nil" do
         allow(ActionController::Base).to receive(:config).and_return(double :relative_url_root => nil)
-        subject.relative_url_root.should == '/'
+        expect(subject.relative_url_root).to eq('/')
       end
 
       it "returns / with relative_url_root set to empty string" do
         allow(ActionController::Base).to receive(:config).and_return(double :relative_url_root => '')
-        subject.relative_url_root.should == '/'
+        expect(subject.relative_url_root).to eq('/')
       end
 
       it "returns / with relative_url_root set to /" do
         allow(ActionController::Base).to receive(:config).and_return(double :relative_url_root => '/')
-        subject.relative_url_root.should == '/'
+        expect(subject.relative_url_root).to eq('/')
       end
 
       it "returns /root/ with relative_url_root set to root" do
         allow(ActionController::Base).to receive(:config).and_return(double :relative_url_root => 'root')
-        subject.relative_url_root.should == '/root/'
+        expect(subject.relative_url_root).to eq('/root/')
       end
 
       it "returns /root/ with relative_url_root set to /root" do
         allow(ActionController::Base).to receive(:config).and_return(double :relative_url_root => '/root')
-        subject.relative_url_root.should == '/root/'
+        expect(subject.relative_url_root).to eq('/root/')
       end
 
       it "returns /root/ with relative_url_root set to /root/" do
         allow(ActionController::Base).to receive(:config).and_return(double :relative_url_root => '/root/')
-        subject.relative_url_root.should == '/root/'
+        expect(subject.relative_url_root).to eq('/root/')
       end
 
     end

data/spec/snippr/meta_data_spec.rb

@@ -11,7 +11,7 @@ describe Snippr::MetaData do
     it 'returns an array with 2 elements [contentstring, metahash]' do
       result = Snippr::MetaData.extract([:content], TEST_CONTENT)
       expect(result).to be_a Array
-      expect(result).to have(2).items
+      expect(result.size).to eq(2)
       expect(result.first).to be_a String
       expect(result.second).to be_a Hash
     end

data/spec/snippr/normalizer/camelizer_spec.rb

@@ -3,11 +3,11 @@ require "spec_helper"
 describe Snippr::Normalizer::Camelizer do
 
   it "should leave a string as is" do
-    subject.normalize("blaHui_ja").should == "blaHui_ja"
+    expect(subject.normalize("blaHui_ja")).to eq("blaHui_ja")
   end
 
   it "should lower camelize a symbol" do
-    subject.normalize(:symbol_with_separators).should == "symbolWithSeparators"
+    expect(subject.normalize(:symbol_with_separators)).to eq("symbolWithSeparators")
   end
 
 end

data/spec/snippr/normalizer/de_rester_spec.rb

@@ -17,7 +17,7 @@ describe Snippr::Normalizer::DeRester do
     :update => "edit"
   }.each do |replace, with|
     it "should replace #{replace.inspect} in a path with #{with.inspect}" do
-      subject.normalize(replace).should == with
+      expect(subject.normalize(replace)).to eq(with)
     end
   end
 

data/spec/snippr/normalizer_spec.rb

@@ -6,13 +6,13 @@ describe Snippr::Normalizer do
   describe ".normalizers" do
 
     it "is an array" do
-      subject.normalizers.should be_an(Array)
+      expect(subject.normalizers).to be_an(Array)
     end
 
     it "has a set of default normalizers" do
       normalizers = subject.normalizers
-      normalizers.size.should == 1
-      normalizers[0].should be_a(Snippr::Normalizer::Camelizer)
+      expect(normalizers.size).to eq(1)
+      expect(normalizers[0]).to be_a(Snippr::Normalizer::Camelizer)
     end
 
   end
@@ -29,10 +29,10 @@ describe Snippr::Normalizer do
 
     it "calls normalize on all normalizers, passing the path element between them and returning the last result" do
       subject.normalizers.each_with_index do |normalizer, i|
-        normalizer.should respond_to(:normalize)
+        expect(normalizer).to respond_to(:normalize)
         expect(normalizer).to receive(:normalize).with(i.to_s).and_return((i + 1).to_s)
       end
-      subject.normalize('0').should == subject.normalizers.size.to_s
+      expect(subject.normalize('0')).to eq(subject.normalizers.size.to_s)
     end
 
   end
@@ -46,12 +46,12 @@ describe Snippr::Normalizer do
 
     it "adds the normalizer if an class" do
       subject.add(Snippr::Normalizer::DeRester.new)
-      subject.normalizers.should have(2).normalizers
+      expect(subject.normalizers.size).to eq(2)
     end
 
     it "adds the normalizers if an array" do
       subject.add([Snippr::Normalizer::DeRester.new, Snippr::Normalizer::DeRester.new])
-      subject.normalizers.should have(3).normalizers
+      expect(subject.normalizers.size).to eq(3)
     end
 
   end

data/spec/snippr/path_spec.rb

@@ -10,14 +10,14 @@ describe Snippr::Path do
     end
 
     it "stores the path if set as string" do
-      subject.path.should == ''
+      expect(subject.path).to eq('')
       subject.path = 'path'
-      subject.path.should == 'path'
+      expect(subject.path).to eq('path')
     end
 
     it "stores and defers the path evaluation if passed a lambda" do
       subject.path = lambda { "WOW LAMBDA ACTION!" }
-      subject.path.should == "WOW LAMBDA ACTION!"
+      expect(subject.path).to eq("WOW LAMBDA ACTION!")
     end
 
   end
@@ -27,7 +27,7 @@ describe Snippr::Path do
     it "calls Snippr::Normalizer.normalize with all names and return normalized result" do
       expect(Snippr::Normalizer).to receive(:normalize).with("a").and_return("AA")
       expect(Snippr::Normalizer).to receive(:normalize).with(:b).and_return("BB")
-      subject.normalize_name("a", :b).should == "AA/BB"
+      expect(subject.normalize_name("a", :b)).to eq("AA/BB")
     end
 
   end
@@ -39,11 +39,11 @@ describe Snippr::Path do
     end
 
     it "joins path and name (with extension)" do
-      subject.path_from_name('name', 'snip').should == 'path/name.snip'
+      expect(subject.path_from_name('name', 'snip')).to eq('path/name.snip')
     end
 
     it "joins path and name (without extension)" do
-      subject.path_from_name('file').should == 'path/file'
+      expect(subject.path_from_name('file')).to eq('path/file')
     end
 
   end
@@ -57,11 +57,11 @@ describe Snippr::Path do
       end
 
       it "returns a list of all snippr names" do
-        subject.list(:topup).should == [:some_error, :success]
+        expect(subject.list(:topup)).to eq([:some_error, :success])
       end
 
       it "returns an empty array for non existant dirs" do
-        subject.list(:doesnotexist).should == []
+        expect(subject.list(:doesnotexist)).to eq([])
       end
 
     end
@@ -74,16 +74,16 @@ describe Snippr::Path do
 
       it "returns a list of all snippr names of the current locale (de)" do
         I18n.locale = :de
-        subject.list(:i18n).should == [:list, :shop]
+        expect(subject.list(:i18n)).to eq([:list, :shop])
       end
 
       it "returns a list of all snippr names of the current locale (en)" do
         I18n.locale = :en
-        subject.list(:i18n).should == [:shop]
+        expect(subject.list(:i18n)).to eq([:shop])
       end
 
       it "returns an empty array for non existant dirs" do
-        subject.list(:doesnotexist).should == []
+        expect(subject.list(:doesnotexist)).to eq([])
       end
 
     end