snippr 0.13.2 → 0.14.1

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YTAxMWYzNWFmOWYyMTc1OTM5MjAwYzM1Nzg1ZjQwNTIzZDNjNzU2Yg==
+  data.tar.gz: !binary |-
+    MzVkNWE2NjM5NzMyYjI2MWVhZjFmYjUzZDg1YjQ4Y2VkN2Q2NzJiYw==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NGI2MGNmYjY2MGQzZmZkOGRhYTFiNDg0NjFmODRhZDMyMjQ4YzI3OWY4NWMx
+    NDI4YjE0YTFjMTkzZDZlNmFiYjk3NTIwNGI4Y2ZmMWUyMDA2YTc3NTU2ODYz
+    ODI0Mzg3YjU1NTZlN2JkOGIzNDc3NGMzZjg5MTBiYTc4OGRmZDc=
+  data.tar.gz: !binary |-
+    MDE4OTgyYzQ5MDAyOWUyMWU3MTU5YTE3MjliMzRmZWU0N2Y5ZTgyNGVlMjRl
+    Yjc3YmQzMmRiYjM5OGU4YWZiY2Q1Nzg1YTE0NzBiNDgxNDZmOWM3ZDI4ZmMz
+    NWNkMjlkM2Y5ZDViMmIyMTdhOWUxNjJhMjVjNzQ5NWVlYjlmODM=

data/README.md

@@ -74,6 +74,22 @@ will yield:
   
     <p>Snippr says: HELLO SNIPPR</p>
 
+The last parameter can also be passed in in 'block' form:
+
+    {a_variable.doitagain()}
+    SNIPPR
+    {/a_variable.doitagain}
+
+Notice that you have to leave that last parameter out of the signature of the snippr call:
+
+    {two_parameters.signature("ONE","TWO")}
+
+is equivalent to
+
+    {two_parameters.signature("ONE")}
+    TWO
+    {/two_parameters.signature}
+
 ### Meta Infos
 
 A snippet can not only hold content but also meta infos for this snippet.

data/lib/snippr.rb

@@ -15,6 +15,7 @@ require 'snippr/view_helper'
 require 'snippr/normalizer/camelizer'
 require 'snippr/normalizer/de_rester'
 
+require 'snippr/processor/block'
 require 'snippr/processor/dynamics'
 require 'snippr/processor/functions'
 require 'snippr/processor/links'
@@ -24,6 +25,7 @@ Snippr::Normalizer.normalizers << Snippr::Normalizer::Camelizer.new
 # don't use DeRester this for all apps, but configure it as needed
 # Snippr::Normalizer.normalizers << Snippr::Normalizer::DeRester.new
 
+Snippr::Processor.processors << Snippr::Processor::Block.new
 Snippr::Processor.processors << Snippr::Processor::Functions.new
 Snippr::Processor.processors << Snippr::Processor::Dynamics.new
 Snippr::Processor.processors << Snippr::Processor::Links.new

data/lib/snippr/normalizer/camelizer.rb

@@ -1,6 +1,3 @@
-# = Snippr::Normalizer::Camelizer
-#
-# When given a symbol, normalizes it to a lower camelized string, otherwise just returns the given string.
 module Snippr
 
   module Normalizer

data/lib/snippr/path.rb

@@ -35,7 +35,7 @@ module Snippr
     def self.list(*names)
       dir = path_from_name normalize_name *names
       Dir["#{dir}/*#{I18n.locale}.#{Snip::FILE_EXTENSION}"].map do |snip|
-        snip.gsub(/^.*\/([^\.]+)?\.#{Snip::FILE_EXTENSION}$/, '\1').gsub(/_.*$/, '').underscore
+        snip.force_encoding("UTF-8").gsub(/^.*\/([^\.]+)?\.#{Snip::FILE_EXTENSION}$/, '\1').gsub(/_.*$/, '').underscore
       end.sort.map(&:to_sym)
     end
 

data/lib/snippr/processor/block.rb

@@ -0,0 +1,31 @@
+# -*- encoding : utf-8 -*-
+module Snippr
+
+  module Processor
+
+    class Block
+
+      def process(content, opts = {})
+        opts.inject(content) do |c, pv|
+          placeholder, value = pv
+          c.gsub(/\{(.*)\((.*)\)\}(.*)\{\/\1\}/m) do |match|
+            # match[0] = {a.b("1","2")} INNEN {/a.b}
+            # match[1] = a.b
+            # match[2] = "1","2"
+            # match[3] =  INNEN
+            message = $1
+            signature = $2
+            block_quoted = $3.gsub("\"","\"").strip
+            new_signature = []
+            new_signature << signature unless signature.empty?
+            new_signature << block_quoted unless block_quoted.empty?
+            "{#{message}(#{new_signature.map { |e| "\"#{e}\""}.join(',')})}"
+          end
+        end
+      end
+
+    end
+
+  end
+
+end

data/lib/snippr/processor/dynamics.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 # = Snippr::Processor::Dynamics
 #
 # Replaces {placeholder} placeholders in the content with values taken from the given opts.

data/lib/snippr/railtie.rb

@@ -9,6 +9,7 @@ module Snippr
       Snippr.i18n = app.config.snippr.i18n
       Snippr.path = app.config.snippr.path
       Snippr::Normalizer.add app.config.snippr.normalizers if app.config.snippr.normalizers
+      Snippr.adjust_urls_except += Array(app.config.snippr.adjust_urls_except) if app.config.snippr.adjust_urls_except
     end
 
   end

data/snippr.gemspec

@@ -1,13 +1,14 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = "snippr"
-  s.version     = "0.13.2"
+  s.version     = "0.14.1"
   s.date        = Time.now
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Daniel Harrington", "Thomas Jachmann"]
   s.email       = ["me@rubiii.com", "self@thomasjachmann.com"]
   s.homepage    = "http://github.com/blaulabs/snippr"
   s.summary     = %q{File based content management}
+  s.license     = "MIT"
   s.description = %q{This gem provides ways to access file based cms resources from a rails app.}
 
   s.rubyforge_project = "snippr"
@@ -17,11 +18,12 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "ci_reporter", "~> 1.6.5"
   s.add_development_dependency "rspec", "~> 2.8.0"
-  s.add_development_dependency "mocha", "0.11.4"
-  s.add_development_dependency "rake", "~> 0.9.2"
+  s.add_development_dependency "mocha", "= 0.11.4"
+  s.add_development_dependency "rake", "~> 0.9.0"
+  s.add_development_dependency "debugger"
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.files         = `git ls-files`.split("\n").reject{ |a| a.start_with?("\"") }
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n").reject{ |a| a.start_with?("\"") }
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 end

data/spec/fixtures/withBlock.snip

@@ -0,0 +1,4 @@
+{view.with_block("PARAM")}
+IN BLOCK-
+LINE "TWO" 
+{/view.with_block}

data/spec/snippr/path_spec.rb

@@ -65,6 +65,10 @@ 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/dynamics_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require "spec_helper"
 
 describe Snippr::Processor::Dynamics do
@@ -8,7 +9,7 @@ describe Snippr::Processor::Dynamics do
     def method3(param1, param2); "METHOD WITH #{param1} AND #{param2}"; end
   end
 
-  it "should replace placeholders with dynamic values" do
+  it "replaces placeholders with dynamic values" do
     today = Date.today
     subject.process('Your topup of {topup_amount} at {date_today} was successful.', {
       :topup_amount => "15,00 €",
@@ -26,22 +27,22 @@ describe Snippr::Processor::Dynamics do
     subject.process(tpl, :var => Klass.new).should == "An instance METHOD WITH PART1 SPACE PART2"
   end
 
-  it "should allow calling methods on placeholders" do
+  it "allows calling methods on placeholders" do
     tpl = "An instance {var.method()}"
     subject.process(tpl, :var => Klass.new).should == "An instance METHOD"
   end
 
-  it "should allow calling methods with parameters on placeholders" do
+  it "allows calling methods with parameters on placeholders" do
     tpl = 'An instance {var.method2("PARAMETER")}'
     subject.process(tpl, :var => Klass.new).should == "An instance METHOD WITH PARAMETER"
   end
 
-  it "should allow calling methods with multiple parameters on placeholders" do
+  it "allows calling methods with multiple parameters on placeholders" do
     tpl = 'An instance {var.method3("PARAMETER1","PARAMETER2")}'
     subject.process(tpl, :var => Klass.new).should == "An instance METHOD WITH PARAMETER1 AND PARAMETER2"
   end
 
-  it "should keep the {snip} if calling a method but the method is not defined" do
+  it "keeps the {snip} if calling a method but the method is not defined" do
     tpl = "An instance {var.method_not_exist()}"
     subject.process(tpl, :var => Klass.new).should == tpl
   end

data/spec/snippr/processor_spec.rb

@@ -1,27 +1,29 @@
+# -*- encoding : utf-8 -*-
 require "spec_helper"
 
 describe Snippr::Processor do
 
   describe ".processors" do
 
-    it "should be an array" do
+    it "is an array" do
       subject.processors.should be_an(Array)
     end
 
-    it "should have a set of default processors" do
+    it "has a set of default processors" do
       processors = subject.processors
-      processors.size.should == 4
-      processors[0].should be_a(Snippr::Processor::Functions)
-      processors[1].should be_a(Snippr::Processor::Dynamics)
-      processors[2].should be_a(Snippr::Processor::Links)
-      processors[3].should be_a(Snippr::Processor::Wikilinks)
+      processors.size.should == 5
+      processors[0].should be_a(Snippr::Processor::Block)
+      processors[1].should be_a(Snippr::Processor::Functions)
+      processors[2].should be_a(Snippr::Processor::Dynamics)
+      processors[3].should be_a(Snippr::Processor::Links)
+      processors[4].should be_a(Snippr::Processor::Wikilinks)
     end
 
   end
 
   describe ".process" do
 
-    it "should call process on all processors, passing the content between them and returning the last result" do
+    it "calls process on all processors, passing the content between them and returning the last result" do
       seq = sequence 'processors'
       subject.processors.each_with_index do |processor, i|
         processor.should respond_to(:process)

data/spec/snippr/view_helper_spec.rb

@@ -10,10 +10,20 @@ describe Snippr::ViewHelper do
       "wrapppppp #{param.upcase} ppppppparw"
     end
 
-    it "should allow calling of methods on a Rails view" do
+    def with_block(param1, block_content)
+      "block result: #{block_content}"
+    end
+
+    it "allows calling of methods on a Rails view" do
       snippr(:with_view_helper_method).should == "<!-- starting snippr: withViewHelperMethod -->\nwith helper *wrapppppp TEST ppppppparw*\n<!-- closing snippr: withViewHelperMethod -->"
     end
 
+    context "block given in snippet" do
+      it "returns a correct snippet" do
+        snippr(:with_block).should == "<!-- starting snippr: withBlock -->\nblock result: IN BLOCK-LINE \"TWO\"\n<!-- closing snippr: withBlock -->"
+      end
+    end
+
     context "existance check on string returned by snippr" do
 
       context "existing snippet" do
@@ -98,13 +108,13 @@ describe Snippr::ViewHelper do
 
     context "existing snippr" do
 
-      it "should call html_safe and return html safe value" 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 -->"
         content.should be_html_safe
       end
 
-      it "should pass html_safe snippr to block" do
+      it "passes html_safe snippr to block" do
         lambda {
           snippr(:home) do |snippr|
             snippr.should be_html_safe
@@ -113,7 +123,7 @@ describe Snippr::ViewHelper do
         }.should raise_error StandardError, 'block should be called'
       end
 
-      it "should return 0 with block" do
+      it "returns 0 with block" do
         snippr(:home) do; end.should == 0
       end
 
@@ -121,13 +131,13 @@ describe Snippr::ViewHelper do
 
     context "empty snippr" do
 
-      it "should call html_safe return html save value" do
+      it "calls html_safe return html save value" do
         content = snippr(:empty)
         content.should == "<!-- starting snippr: empty -->\n\n<!-- closing snippr: empty -->"
         content.should be_html_safe
       end
 
-      it "should not pass snippr to block but concat snippr and return 0" do
+      it "doesn't pass snippr to block but concat snippr and return 0" do
         expects(:concat).with("<!-- starting snippr: empty -->\n\n<!-- closing snippr: empty -->")
         lambda {
           snippr(:empty) do
@@ -140,13 +150,13 @@ describe Snippr::ViewHelper do
 
     context "missing snippr" do
 
-      it "should call html_safe return html save value" do
+      it "calls html_safe return html save value" do
         content = snippr(:doesnotexist)
         content.should == '<!-- missing snippr: doesnotexist -->'
         content.should be_html_safe
       end
 
-      it "should not pass snippr to block but concat snippr and return 0" do
+      it "doesn't pass snippr to block but concat snippr and return 0" do
         expects(:concat).with('<!-- missing snippr: doesnotexist -->')
         lambda {
           snippr(:doesnotexist) do
@@ -194,7 +204,7 @@ describe Snippr::ViewHelper do
         stubs(:params).returns(:action => :and_underscore)
       end
 
-      it "should camelize controller and action names" do
+      it "camelizes controller and action names" do
         snippr_with_path(:a_snippet).should == "<!-- starting snippr: withUnderscore/andUnderscore/aSnippet -->\nan underscored snippet with param {param}\n<!-- closing snippr: withUnderscore/andUnderscore/aSnippet -->"
       end
 
@@ -211,7 +221,7 @@ describe Snippr::ViewHelper do
         snippr_with_path(:a_snippet, :param => "value").should == "<!-- starting snippr: withUnderscore/andUnderscore/aSnippet -->\nan underscored snippet with param value\n<!-- closing snippr: withUnderscore/andUnderscore/aSnippet -->"
       end
 
-      it "should allow multiple arguments" do
+      it "allows multiple arguments" do
         snippr_with_path(:deeper, :nested, :snippet).should == "<!-- missing snippr: withUnderscore/andUnderscore/deeper/nested/snippet -->"
       end
     end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: snippr
 version: !ruby/object:Gem::Version
-  version: 0.13.2
-  prerelease: 
+  version: 0.14.1
 platform: ruby
 authors:
 - Daniel Harrington
@@ -10,74 +9,106 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-15 00:00:00.000000000 Z
+date: 2013-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2183725920 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2183725920
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2183725480 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2183725480
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &2183774080 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.5
   type: :development
   prerelease: false
-  version_requirements: *2183774080
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.5
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2183773580 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *2183773580
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2183773120 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.11.4
   type: :development
   prerelease: false
-  version_requirements: *2183773120
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.11.4
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2183772660 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.9.0
+- !ruby/object:Gem::Dependency
+  name: debugger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2183772660
+  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
   app.
 email:
@@ -103,6 +134,7 @@ files:
 - lib/snippr/normalizer/de_rester.rb
 - lib/snippr/path.rb
 - lib/snippr/processor.rb
+- lib/snippr/processor/block.rb
 - lib/snippr/processor/dynamics.rb
 - lib/snippr/processor/functions.rb
 - lib/snippr/processor/links.rb
@@ -126,6 +158,7 @@ files:
 - spec/fixtures/meta/withNoContent.snip
 - spec/fixtures/topup/someError.snip
 - spec/fixtures/topup/success.snip
+- spec/fixtures/withBlock.snip
 - spec/fixtures/withUnderscore/andUnderscore/aSnippet.snip
 - spec/fixtures/withViewHelperMethod.snip
 - spec/snippr/i18n_spec.rb
@@ -144,28 +177,28 @@ files:
 - spec/snippr/view_helper_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/blaulabs/snippr
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: snippr
-rubygems_version: 1.8.11
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: File based content management
 test_files:
 - spec/fixtures/a/path/aSnippet.snip
@@ -182,6 +215,7 @@ test_files:
 - spec/fixtures/meta/withNoContent.snip
 - spec/fixtures/topup/someError.snip
 - spec/fixtures/topup/success.snip
+- spec/fixtures/withBlock.snip
 - spec/fixtures/withUnderscore/andUnderscore/aSnippet.snip
 - spec/fixtures/withViewHelperMethod.snip
 - spec/snippr/i18n_spec.rb