pieces 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64cbce7a11d487d3cd6ba5b28592c05777238d69
-  data.tar.gz: 7372e016548ffafb26cccfa147c9b929079fcd13
+  metadata.gz: 7161643008f10d4bbf17b26d79e932f4372f004b
+  data.tar.gz: 2c6d081965d88f549c94de4af7b9ad2be023b191
 SHA512:
-  metadata.gz: bd1f4366fdb91cbea5628c12b8516c278d627414c55cef67dd6df71c4ac49c5447a35cd0222ce0dae28237aabfa4ba6b749d3d6a6f428c727762e7deb6e141f9
-  data.tar.gz: 64f235649c1c8b096f11f0d642183e05645a7a0c7022d70fc6c94fa52bcb8c0ec92426920e12f90745a63953aa8ccb3dd360fc7f3122f958f80043b1729ea8fa
+  metadata.gz: e7dbcb86cff8f805379f89749dc21d49a2be17ae1afc458fa8b2e681c632789db36c5abf19c15dd098d6926443fe70d7397c17b328939a9b4dd2bb8c7810eaf8
+  data.tar.gz: 0d3e2772554880ef914e915cc1fe82674dca8f7e06c141b132cbfbfb5d4d60656ca2b7abaffa81bdd097011cf916a29a726043c611492a95ac9fbee77baf14da

data/README.md

@@ -123,7 +123,11 @@ The child pieces will be rendered in order and passed into the parent
 
 ## More Examples
 
-For more examples please see: https://github.com/drpheltright/pieces/tree/master/example
+ - [Original example][original] using .erb and .mustache (liek wtf!)
+ - [Boilerplate example][boilerplate] used by `pieces init`
+
+[original]: https://github.com/drpheltright/pieces/tree/master/examples/original
+[boilerplate]: https://github.com/drpheltright/pieces/tree/master/examples/boilerplate
 
 ## Contributing
 

data/examples/original/pieces/application/header.html.erb

@@ -1,3 +1,3 @@
 <header>
-  <%= self['title'] %>
+  <%= title %>
 </header>

data/lib/pieces/version.rb

@@ -1,3 +1,3 @@
 module Pieces
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

data/lib/tilt/mustache.rb

@@ -7,7 +7,23 @@ module Tilt
     def prepare; end
 
     def evaluate(scope, locals, &block)
-      Mustache.render(data, locals.merge(scope.is_a?(Hash) ? scope : {}).merge(:yield => block.nil? ? '' : block.call))
+      Mustache.render(data, with_block(view_model(scope, locals), &block))
+    end
+
+    private
+
+    def view_model(scope, locals)
+      if scope.is_a?(Hash)
+        locals.merge(scope)
+      elsif scope.respond_to?(:to_h)
+        locals.merge(scope.to_h)
+      else
+        locals
+      end
+    end
+
+    def with_block(view_model, &block)
+      view_model.merge(:yield => block.nil? ? '' : block.call)
     end
   end
 end

data/pieces.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'codeclimate-test-reporter'
   spec.add_development_dependency 'mustache'
+  spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pieces
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Luke Morton
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement