feather 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1de807935a97f70d69017324bb6afde148c0670a
-  data.tar.gz: addc943b185f849e2962b0cd0160e5262b5cdfb0
+  metadata.gz: 85c43bfc423dc5a8dbd77857b92a2c9d74bb73c2
+  data.tar.gz: 95d9b80ee144392fe22c7e107926f4d6aad4215c
 SHA512:
-  metadata.gz: 99cc59b1e93a2cbac2190dd4df4eac34be97d9737c4ea13cb5cb5b933a388bfcfca9e7a41c256e6acb5863efea7e346b52c34458cf84281b39c85f099701123e
-  data.tar.gz: 5e8f80df8cf82d39b4ceeb89f8408793c218a711034414601099c1c62754c2611659bbba1f3eab28728ccc07762a69ab197fba39392c2dc4161cc9bf94ac3f69
+  metadata.gz: b38495655005155dd0ef4d3d684bad79ab9ca71f3d530f7d845f67f1b69feecb188246fdacd70474e5aa7daf519f9b4dd80f9c72e8b928baae348105a8c19468
+  data.tar.gz: 2d6b49b9e1a689b771899874df3d889bf63c8a97d7268d48ba7c00de31121c735c1f58b66185281d8fb2bae7d4de89f6a564c1e1285b7812639795c5ffbb848f

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+before_install: gem install bundler
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.5
+  - 2.2.0
+  - 2.3.0

data/Gemfile

@@ -1,5 +1,8 @@
-source :rubygems
+source 'https://rubygems.org/'
+
+gem 'addressable'
 
 group :development do
   gem 'jeweler'
+  gem 'minitest'
 end

data/README.md

@@ -47,6 +47,6 @@ as a reference.
 
 ## Copyright
 
-Copyright (c) 2011-2013 Scott Tadman, The Working Group Inc.
+Copyright (c) 2011-2015 Scott Tadman, The Working Group Inc.
 See LICENSE.txt for further details.
 

data/RELEASES.txt

@@ -1,3 +1,6 @@
+0.4.2
+ - Updates to run clean with -w warnings turned on.
+ - Removing old YAML encoding stub and using encode_with(coder)
 0.4.1
  - Minor bugfixes with HTML-escaped content being specified with array values.
 0.4.0

data/Rakefile

@@ -23,4 +23,4 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-task :default => :test
+task default: :test

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/feather.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: feather 0.4.1 ruby lib
+# stub: feather 0.4.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "feather"
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Scott Tadman"]
-  s.date = "2015-01-26"
+  s.date = "2016-03-28"
   s.description = "A simple light-weight text templating system"
   s.email = "github@tadman.ca"
   s.extra_rdoc_files = [
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    ".travis.yml",
     "Gemfile",
     "LICENSE.txt",
     "README.md",
@@ -38,19 +39,25 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/twg/feather"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.2"
+  s.rubygems_version = "2.5.1"
   s.summary = "Light-weight text tempating system"
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<addressable>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<minitest>, [">= 0"])
     else
+      s.add_dependency(%q<addressable>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<minitest>, [">= 0"])
     end
   else
+    s.add_dependency(%q<addressable>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<minitest>, [">= 0"])
   end
 end
 

data/lib/feather/support.rb

@@ -5,7 +5,7 @@ module Feather::Support
   # == Module/Mixin Methods =================================================
 
   def uri_escape(object)
-    URI.escape(object.to_s, /[^a-z0-9\-\.]/i)
+    Addressable::URI.normalize_component(object.to_s, /[^a-z0-9\-\.]/i)
   end
   
   def html_escape(object)

data/lib/feather/template.rb

@@ -4,8 +4,6 @@ class Feather::Template
   TOKEN_REGEXP = /((?:[^\{]|\{[^\{]|\{\{\{)+)|\{\{\s*([\&\%\$\.\:\#\^\*\/\=\!]|\?\!?)?([^\}]*)\}\}/.freeze
   TOKEN_TRIGGER = /\{\{/.freeze
     
-  TO_YAML_PROPERTIES = %w[ @content @escape_method ].freeze
-
   # == Utility Classes ======================================================
   
   class TemplateHash < Hash; end
@@ -33,6 +31,8 @@ class Feather::Template
   # * :html - Automatically escape fields for HTML
   # * :text - Default mode, render all fields literally
   def initialize(content, options = nil)
+    @escape_method = nil
+
     if (options)
       if (source = options[:escape])
         case (source.to_sym)
@@ -62,7 +62,7 @@ class Feather::Template
     @_proc ||= begin
       source = ''
 
-      self.compile(:source => source, :escape_method => @escape_method)
+      self.compile(source: source, escape_method: @escape_method)
 
       eval(source)
     end
@@ -88,7 +88,7 @@ class Feather::Template
             when Feather::Template, Proc, Array
               v
             when TOKEN_TRIGGER
-              self.class.new(v, :escape => @escape_method)
+              self.class.new(v, escape: @escape_method)
             when nil
               nil
             else
@@ -107,7 +107,7 @@ class Feather::Template
         _parent = _parents.shift
         
         unless (_parent.is_a?(Feather::Template))
-          _parent = self.class.new(_parent, :escape => @escape_method)
+          _parent = self.class.new(_parent, escape: @escape_method)
         end
         
         _parent.render(
@@ -208,7 +208,7 @@ class Feather::Template
           stack << [ :section, tag, VariableTracker.new ]
 
           source and source << "if(v);s<<v;v=v.is_a?(Array)?v[#{index}]:(v.is_a?(Hash)&&v[#{tag.inspect}]);"
-          source and source << "h.iterate(v){|v|;v=h.cast_as_vars(v, s);"
+          source and source << "h.iterate(v){|_v|;v=h.cast_as_vars(_v, s);"
           
           sections and sections[tag] = true
         when '^'
@@ -294,9 +294,10 @@ class Feather::Template
     true
   end
   
-  # For compatibility with YAML.dump
-  def to_yaml_properties
-    TO_YAML_PROPERTIES
+  # For compatibility with YAML
+  def encode_with(coder)
+    coder['content'] = @content
+    coder['escape_method'] = @escape_method
   end
   
   # For compatibility with the Psych YAML library
@@ -314,7 +315,7 @@ class Feather::Template
     
   # For compatibility with Marshal.dump
   def marshal_dump
-    [ @content, { :escape => @escape_method } ]
+    [ @content, { escape: @escape_method } ]
   end
   
   # For compatibility with Marshal.load

data/test/helper.rb

@@ -1,4 +1,16 @@
 require 'rubygems'
+require 'bundler'
+
+begin
+  Bundler.setup(:default, :development)
+  
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+
+gem 'minitest'
 require 'minitest/autorun'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
@@ -6,7 +18,7 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require 'feather'
 
-class Minitest::Test
+class MiniTest::Test
   def assert_exception(exception_class, message = nil)
     begin
       yield

data/test/test_feather.rb

@@ -1,6 +1,6 @@
 require_relative './helper'
 
-class TestFeather < Minitest::Test
+class TestFeather < MiniTest::Test
   def test_module_loaded
     assert Feather
 

data/test/test_feather_support.rb

@@ -2,9 +2,19 @@ require_relative './helper'
 
 require 'yaml'
 
-class TestFeatherSupport < Minitest::Test
-  def test_variable_stack
-    test = { :test => [ { :a => 'a', :b => 'b' }, { :c => 'c' } ] }
+class TestFeatherSupport < MiniTest::Test
+  def test_variable_stack_with_symbol_keys
+    test = {
+      test: [
+        {
+          a: 'a',
+          b: 'b'
+        },
+        {
+          c: 'c'
+        }
+      ]
+    }
     
     variables = Feather::Support.variable_stack(test)
     
@@ -14,8 +24,20 @@ class TestFeatherSupport < Minitest::Test
     assert_equal 'b', variables[:test][0][:b]
     assert_equal 'c', variables[:test][1][:c]
     assert_equal nil, variables[:test][1][:d]
+  end
 
-    test = { 'test' => [ { 'a' => :a, 'b' => :b }, { 'c' => :c } ] }
+  def test_variable_stack_with_string_keys
+    test = {
+      'test' => [
+        {
+          'a' => :a,
+          'b' => :b
+        },
+        {
+          'c' => :c
+        }
+      ]
+    }
     
     variables = Feather::Support.variable_stack(test)
     
@@ -27,13 +49,39 @@ class TestFeatherSupport < Minitest::Test
     assert_equal [ 'test' ],  Feather::Support.variable_stack('test')
     assert_equal [ 'test' ],  Feather::Support.variable_stack([ 'test' ], false)
     assert_equal [ 'test' ],  Feather::Support.variable_stack([ 'test' ])
-    
-    variables = Feather::Support.variable_stack(:head => [ { :tag => 'meta' }, { :tag => 'link' } ])
+  end
+
+  def test_variable_stack_with_multiple_values
+    variables = Feather::Support.variable_stack(
+      head: [
+        {
+          tag: 'meta'
+        },
+        {
+          tag: 'link'
+        }
+      ]
+    )
     
     assert_equal 'meta', variables[:head][0][:tag]
     assert_equal 'link', variables[:head][1][:tag]
-    
-    test = { 'top' => { 'layer' => 'top', 't' => 'top', 'middle' => { 'layer' => 'middle', 'm' => 'middle', 'bottom' => { 'layer' => 'bottom', 'b' => 'bottom' } } } }
+  end
+
+  def test_variable_stack_with_deeper_nesting
+    test = {
+      'top' => {
+        'layer' => 'top',
+        't' => 'top',
+        'middle' => {
+          'layer' => 'middle',
+          'm' => 'middle',
+          'bottom' => {
+            'layer' => 'bottom',
+            'b' => 'bottom'
+          }
+        }
+      }
+    }
     
     variables = Feather::Support.variable_stack(test)
     

data/test/test_feather_template.rb

@@ -2,7 +2,7 @@ require_relative './helper'
 
 require 'yaml'
 
-class TestFeatherTemplate < Minitest::Test
+class TestFeatherTemplate < MiniTest::Test
   def test_empty_template
     template = Feather::Template.new('')
     

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: feather
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Scott Tadman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-26 00:00:00.000000000 Z
+date: 2016-03-28 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: addressable
+  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: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -24,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  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: A simple light-weight text templating system
 email: github@tadman.ca
 executables: []
@@ -33,6 +61,7 @@ extra_rdoc_files:
 - README.md
 files:
 - ".document"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -68,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Light-weight text tempating system