braai 1.6.0 → 1.6.1

data/Gemfile

@@ -3,4 +3,5 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in braai.gemspec
 gemspec
 
-gem "minitest-colorize"
+gem "minitest-colorize"
+gem "rake"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    braai (1.6.0)
+    braai (1.6.1)
       activesupport
 
 GEM
@@ -18,6 +18,7 @@ GEM
     mocha (0.12.4)
       metaclass (~> 0.0.1)
     multi_json (1.6.1)
+    rake (10.0.3)
 
 PLATFORMS
   ruby
@@ -26,3 +27,4 @@ DEPENDENCIES
   braai!
   minitest-colorize
   mocha
+  rake

data/README.md

@@ -99,4 +99,5 @@ res.should match("<h2>MARK</h2>")
 
 * Mark Bates
 * Nick Plante
-* Kevin Incorvia
+* Sam Beam
+* Kevin Incorvia

data/lib/braai/handlers/default.rb

@@ -1,15 +1,24 @@
 module Braai::Handlers
   class Default < Base
     def perform
+      value = nil
       chain = matches[1].split('.')
-      value = template.attributes[chain.shift]
-      return nil unless value
+
+      if template.attributes.has_key?(chain.first)
+        value = template.attributes[chain.shift] || ''
+      else
+        return nil unless value
+      end
 
       chain.each do |a|
         if value.respond_to?(a.to_sym)
-          value = value.send(a)
+          value = value.send(a) || ''
         elsif value.is_a?(Hash)
-          value = value[a.to_sym] || value[a.to_s]
+          if value.has_key?(a.to_sym) || value.has_key?(a.to_s)
+            value = value[a.to_sym] || value[a.to_s] || ''
+          else
+            return nil
+          end
         else
           return nil
         end

data/lib/braai/version.rb

@@ -1,3 +1,3 @@
 module Braai
-  VERSION = "1.6.0"
+  VERSION = "1.6.1"
 end

data/spec/braai/handlers/default_spec.rb

@@ -17,6 +17,12 @@ describe Braai::Handlers::Default do
     res.must_equal("Hi {{ name.upcase }}")
   end
 
+  it "handles nil attributes (that are actually nil, not missing)" do
+    person = OpenStruct.new(salutation: nil, name: 'Fred Rogers')
+    res = Braai::Template.new("{{ greet }} {{ person.salutation }} {{ person.name }}").render(greet: "Hi", person: person)
+    res.must_equal("Hi  Fred Rogers")
+  end
+
   it "handles deeply nested attributes" do
     res = Braai::Template.new(adv_template).render(greet: "Hello", name: OpenStruct.new(full_name: 'inigo montoya'))
     res.must_equal("Hello my name is INIGO MONTOYA")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: braai
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-08 00:00:00.000000000 Z
+date: 2013-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -87,12 +87,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -348262951032349536
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -348262951032349536
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25