html_mockup 0.3.5 → 0.4.0

data/README.rdoc

@@ -39,6 +39,11 @@ through standard instance methods. The example below would create the instance v
 
   <!-- [START:partial_name?key=value] -->Text<!-- [STOP:partial_name] -->
 
+=== Partials in subdirectories
+
+The partials path can have it's own directory structure. You can create tags with slashes in them
+to access partials in subdirectories.
+
 
 === Mockup commandline
 

data/lib/html_mockup/template.rb

@@ -27,7 +27,7 @@ module HtmlMockup
       end
       
       def partial_files(path)
-        filter = "*.part.{?h,h}tml"
+        filter = "**/*.part.{?h,h}tml"
         files = []
         Dir.chdir(Pathname.new(path)) do 
           files = Dir.glob(filter)        
@@ -58,10 +58,13 @@ module HtmlMockup
   
     # Renders the template and returns it as a string
     #
+    # ==== Parameters
+    # env<Hash>:: An environment hash (mostly used in combination with Rack)
+    #
     # ==== Returns
     # String:: The rendered template
     #--
-    def render
+    def render(env={})
       out = ""
     	while (partial = self.parse_partial_tag!) do
     	  tag,params,scanned = partial
@@ -70,7 +73,7 @@ module HtmlMockup
 
     		# scan until end of tag
     		current_content = self.scanner.scan_until(/<!-- \[STOP:#{tag}\] -->/)
-    		out << (render_partial(tag,params) || current_content)
+    		out << (render_partial(tag, params) || current_content)
     	end
     	out << scanner.rest    
     end
@@ -92,7 +95,7 @@ module HtmlMockup
       begin_of_tag = self.scanner.scan_until(/<!-- \[START:/)
       return nil unless begin_of_tag
       scanned << begin_of_tag
-      scanned << tag = self.scanner.scan(/[a-z0-9_]+/)
+      scanned << tag = self.scanner.scan(/[a-z0-9_\/\-]+/)
       if scanned_questionmark = self.scanner.scan(/\?/)
         scanned << scanned_questionmark
         scanned << raw_params = self.scanner.scan_until(/\] -->/)
@@ -107,21 +110,28 @@ module HtmlMockup
       [tag,params,scanned]
     end
   
-    def render_partial(tag,params)      
+    # Actually renders the tag as ERB
+    def render_partial(tag, params, env = {})
       unless self.available_partials[tag]
         raise MissingPartial.new("Could not find partial '#{tag}' in partial path '#{@options[:partial_path]}'")
       end
       template = ERB.new(self.available_partials[tag])
-      context = TemplateContext.new(params)
+      context = TemplateContext.new(params, env)
       "\n" + template.result(context.get_binding).rstrip + "\n<!-- [STOP:#{tag}] -->"
     end
   
     class TemplateContext
-      def initialize(params)
+      # Params will be set as instance variables
+      def initialize(params, env = {})
         params.each do |k,v|
           self.instance_variable_set("@#{k}",v)
         end
+        
+        @_env = env;
       end
+      
+      def env; @_env; end
+      
       def get_binding; binding(); end
     end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: html_mockup
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-12 00:00:00.000000000Z
+date: 2012-04-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70185227460540 !ruby/object:Gem::Requirement
+  requirement: &70245084497540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70185227460540
+  version_requirements: *70245084497540
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70185227459700 !ruby/object:Gem::Requirement
+  requirement: &70245084496900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70185227459700
+  version_requirements: *70245084496900
 description: 
 email: flurin@digitpaint.nl
 executables: