snippr 0.15.17 → 0.15.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a8c5202bb47c0c71055a5052cb4be7544026e58
-  data.tar.gz: 0533cb0bc06a2721170a79cd94d0692aa17520bd
+  metadata.gz: 566f9eaf54ec97f8798e00a5c6f39fd8025d70cf
+  data.tar.gz: dc5b9310b774e6867a160e5cccbceea2677f6430
 SHA512:
-  metadata.gz: 821e137bcb4c7df4d3756dab8eff7d87aec08f4ebc3f536f3857126e464aef8e7b029f952700b6f0769b17a8f04502d1b80cca2fdb7adefb93f1924a0b423e09
-  data.tar.gz: 31bacedcc7177ac83a30a97404ed2919c7c01b405730638df3996baa11649575a7ecd2bbbc370510ec97fff5f63e1874893bae64f3136e6a8f75313bc061dff4
+  metadata.gz: a77b2ea7277bfe2c8865730e08499886a805ac65c25bac36459778c14b817e27783a6d890aa951d45753f58efa6309d8980dbeb43c04b699975ef88d27632d89
+  data.tar.gz: 5a31458383d4c464f03ec25ff141f4839c878bd98124444a0fe0655f9ee61f38b172a0d493a5b7d351ca6fe31982e4bd05ed9a7c0b5871e487bcb7de3d36c016

data/.gitignore

@@ -11,3 +11,4 @@ coverage
 spec/reports
 Gemfile.lock
 .rvmrc
+.ruby-version

data/.travis.yml

@@ -2,7 +2,6 @@ language: ruby
 rvm:
   - 1.9.3
   - jruby-19mode # JRuby in 1.9 mode
-  - 2.0.0
   - 2.1.0
 notifications:
   email: false

data/README.md

@@ -105,7 +105,7 @@ A snippet can not only hold content but also meta infos for this snippet.
 Inspired by [jekyll](http://jekyllrb.com) a snippet can host metadata that is accessable via the `.meta` method on a loaded snippet.
 `.meta' will return an empty hash when no data was found.
 
-Metadata must be placed at the top of the snippet and is delimited with three dashed.
+Metadata must be placed at the top of the snippet or directly after the segment filter and is delimited with three dashed.
 The data itself is parsed as YAML:
 
     ---  
@@ -113,6 +113,18 @@ The data itself is parsed as YAML:
     ---  
     normal snippet content comes here until the end of the file
 
+Or with Segmentfilter:
+
+    ---
+	a_yaml: old
+	---
+	old snippet content comes here until before segment filter
+	==== valid_from: 2013-05-17 13:15:00 ====
+	---
+	a_yaml: new
+	---
+	new snippet content after segment filter
+
 ### Including snippr files inside other files
 
 A snippr file can include another snippr file:

data/lib/snippr/snip.rb

@@ -14,7 +14,9 @@ module Snippr
       @opts.symbolize_keys!
       @name = "#{Path.normalize_name(*names)}#{ I18n.locale(@opts[:i18n]) }"
       @path = Path.path_from_name @name, (@opts[:extension] || FILE_EXTENSION)
-      @unprocessed_content, @meta = MetaData.extract(names, raw_content)
+      @unprocessed_content = raw_content
+      @meta = {}
+      content
       after_initialize
     end
 
@@ -26,8 +28,9 @@ module Snippr
         if missing?
           "<!-- missing snippr: #{name} -->"
         else
-          content = SegmentParser.new(@unprocessed_content).content
-          content = Processor.process content, opts
+          content = SegmentParser.new(raw_content).content
+          @unprocessed_content, @meta = MetaData.extract(name, content)
+          content = Processor.process @unprocessed_content, opts
           "<!-- starting snippr: #{name} -->\n#{content}\n<!-- closing snippr: #{name} -->"
         end
       end

data/snippr.gemspec

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

data/spec/fixtures/meta/onlyContent_de.snip

@@ -0,0 +1 @@
+<p>So meta!</p>

data/spec/fixtures/meta/withContentAndSegmentfilter.snip

@@ -0,0 +1,10 @@
+---
+description: Die mit dem Fluegli
+keywords: blau Mobilfunk GmbH, blau.de, blauworld, handy, sim
+---
+<p>So meta!</p>
+==== valid_from: 1099-05-01 09:00:00 ====
+---
+description: neues meta
+---
+<p>neuer content</p>

data/spec/snippr/meta_data_spec.rb

@@ -0,0 +1,40 @@
+# -*- encoding : utf-8 -*-
+require "spec_helper"
+
+describe Snippr::MetaData do
+  include Snippr::ViewHelper
+
+  TEST_CONTENT = 'Hier ist jede Menge Content.'
+  TEST_CONTENT_WITH_METABLOCK = "---\nyml_key: yml_value\n---\n#{TEST_CONTENT}"
+
+  describe '.extract' 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.first).to be_a String
+      expect(result.second).to be_a Hash
+    end
+
+    it 'returns raw content for non existing metablock' do
+      result = Snippr::MetaData.extract([:content], TEST_CONTENT)
+      expect(result.first).to eq TEST_CONTENT
+    end
+
+    it 'returns empty hash for non existing metablock' do
+      result = Snippr::MetaData.extract([:content], TEST_CONTENT)
+      expect(result.second).to eq({})
+    end
+
+    it 'returns a hash from given metablock' do
+      result = Snippr::MetaData.extract([:content], TEST_CONTENT_WITH_METABLOCK)
+      expect(result.second).to eq({'yml_key' => 'yml_value'})
+    end
+
+    it 'returns content as content without metablock' do
+      result = Snippr::MetaData.extract([:content], TEST_CONTENT_WITH_METABLOCK)
+      expect(result.first).to eq TEST_CONTENT
+    end
+  end
+
+end

data/spec/snippr/segment_parser_spec.rb

@@ -34,4 +34,12 @@ describe "SegmentParser" do
   it "chooses the correct segment even with \r\n" do
     Snippr::SegmentParser.new("alt\r\n==== valid_from: 1099-05-01 09:00:00 ====\r\nneu\r\n").content.should == "neu"
   end
+
+  it 'works with yml block in old block' do
+    Snippr::SegmentParser.new("---\nyml_key: yml_value\nalt\n==== valid_from: 1099-05-01 09:00:00 ====\nneu\n").content.should == "neu"
+  end
+
+  it 'works with yml block in new block' do
+    Snippr::SegmentParser.new("---\nyml_key: yml_value\n---\nalt\n==== valid_from: 1099-05-01 09:00:00 ====\n---\nyml_key: yml_value\n---\nneu\n").content.should == "---\nyml_key: yml_value\n---\nneu"
+  end
 end

data/spec/snippr/snip_spec.rb

@@ -176,4 +176,14 @@ describe Snippr::Snip do
 
   end
 
+  describe '#meta' do
+    it 'returns metadata from valid segment' do
+      expect(Snippr::Snip.new(:meta, :with_content_and_segmentfilter).meta).to eq({'description' => 'neues meta'})
+    end
+
+    it 'initializes meta with empty hash' do
+      expect(Snippr::Snip.new(:meta, :missing_snippet).meta).to eq({})
+    end
+  end
+
 end

data/spec/snippr/view_helper_spec.rb

@@ -51,22 +51,19 @@ describe Snippr::ViewHelper do
     end
 
     context "snippr with meta data" do
-
       context "and content" do
-
         it "returns a Hash of meta information" do
           snippr(:meta, :with_content).meta.should == {
-            "description" => "Die mit dem Fluegli",
-            "keywords" => "blau Mobilfunk GmbH, blau.de, blauworld, handy, sim"
+              "description" => "Die mit dem Fluegli",
+              "keywords"    => "blau Mobilfunk GmbH, blau.de, blauworld, handy, sim"
           }
         end
 
         it "returns a hash ofmeta information even if the YAML Fron Matter BLock ends without newline" do
           snippr(:meta, :with_content_no_newline).meta.should == {
-            "description" => "Die mit dem Fluegli",
-            "keywords" => "blau Mobilfunk GmbH, blau.de, blauworld, handy, sim"
+              "description" => "Die mit dem Fluegli",
+              "keywords"    => "blau Mobilfunk GmbH, blau.de, blauworld, handy, sim"
           }
-
         end
 
         it "accepts a key to search for" do
@@ -76,36 +73,37 @@ describe Snippr::ViewHelper do
         it "returns the content without meta information" do
           snippr(:meta, :with_content).to_s.should == "<!-- starting snippr: meta/withContent -->\n<p>So meta!</p>\n<!-- closing snippr: meta/withContent -->"
         end
-
       end
 
       context "and no content" do
-
         it "still returns a Hash of meta information" do
           snippr(:meta, :with_no_content).meta.should == {
-            "description" => "Die mit dem Fluegli",
-            "keywords" => "blau Mobilfunk GmbH, blau.de, blauworld, handy, sim"
+              "description" => "Die mit dem Fluegli",
+              "keywords"    => "blau Mobilfunk GmbH, blau.de, blauworld, handy, sim"
           }
         end
-
       end
 
+      context 'with segmentfilter' do
+        it 'uses new meta data and new content' do
+          # snippr(:meta, :with_content).to_s.should == "<!-- starting snippr: meta/withContentandSegmentfilter -->\n<p>So meta!</p>\n<!-- closing snippr: meta/withContentandSegmentfilter -->"
+          expect(snippr(:meta, :with_content_and_segmentfilter).to_s).to eq "<!-- starting snippr: meta/withContentAndSegmentfilter -->\n<p>neuer content</p>\n<!-- closing snippr: meta/withContentAndSegmentfilter -->"
+          expect(snippr(:meta, :with_content_and_segmentfilter).meta('description')).to eq 'neues meta'
+        end
+      end
     end
 
     context "snippr with broken meta data" do
-
       it "logs a warning and acts as if no meta information exist" do
-        expect(Snippr.logger).to receive(:warn).with(/Unable to extract meta data from Snip \[:meta, :broken\]/)
+        expect(Snippr.logger).to receive(:warn).with(/Unable to extract meta data from Snip \"meta\/broken\"/)
 
         snip = snippr(:meta, :broken)
         snip.meta.should == {}
         snip.to_s.should == "<!-- starting snippr: meta/broken -->\n<p>Broken!</p>\n<!-- closing snippr: meta/broken -->"
       end
-
     end
 
     context "existing snippr" do
-
       it "calls html_safe and return html safe value" do
         content = snippr(:home)
         content.should == "<!-- starting snippr: home -->\n<p>Home</p>\n<!-- closing snippr: home -->"
@@ -122,7 +120,9 @@ describe Snippr::ViewHelper do
       end
 
       it "returns 0 with block" do
-        snippr(:home) do; end.should == 0
+        snippr(:home) do
+          ;
+        end.should == 0
       end
 
     end
@@ -223,7 +223,5 @@ describe Snippr::ViewHelper do
         snippr_with_path(:deeper, :nested, :snippet).should == "<!-- missing snippr: withUnderscore/andUnderscore/deeper/nested/snippet -->"
       end
     end
-
   end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: snippr
 version: !ruby/object:Gem::Version
-  version: 0.15.17
+  version: 0.15.19
 platform: ruby
 authors:
 - Daniel Harrington
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -156,7 +156,9 @@ files:
 - spec/fixtures/i18n/shop_de.snip
 - spec/fixtures/i18n/shop_en.snip
 - spec/fixtures/meta/broken.snip
+- spec/fixtures/meta/onlyContent_de.snip
 - spec/fixtures/meta/withContent.snip
+- spec/fixtures/meta/withContentAndSegmentfilter.snip
 - spec/fixtures/meta/withContentNoNewline.snip
 - spec/fixtures/meta/withNoContent.snip
 - spec/fixtures/topup/someError.snip
@@ -167,6 +169,7 @@ files:
 - spec/snippr/clock_spec.rb
 - spec/snippr/i18n_spec.rb
 - spec/snippr/links_spec.rb
+- spec/snippr/meta_data_spec.rb
 - spec/snippr/normalizer/camelizer_spec.rb
 - spec/snippr/normalizer/de_rester_spec.rb
 - spec/snippr/normalizer_spec.rb
@@ -222,7 +225,9 @@ test_files:
 - spec/fixtures/i18n/shop_de.snip
 - spec/fixtures/i18n/shop_en.snip
 - spec/fixtures/meta/broken.snip
+- spec/fixtures/meta/onlyContent_de.snip
 - spec/fixtures/meta/withContent.snip
+- spec/fixtures/meta/withContentAndSegmentfilter.snip
 - spec/fixtures/meta/withContentNoNewline.snip
 - spec/fixtures/meta/withNoContent.snip
 - spec/fixtures/topup/someError.snip
@@ -233,6 +238,7 @@ test_files:
 - spec/snippr/clock_spec.rb
 - spec/snippr/i18n_spec.rb
 - spec/snippr/links_spec.rb
+- spec/snippr/meta_data_spec.rb
 - spec/snippr/normalizer/camelizer_spec.rb
 - spec/snippr/normalizer/de_rester_spec.rb
 - spec/snippr/normalizer_spec.rb