html_mockup 0.7.0 → 0.7.1

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Version 0.7.1
+* Pass target_file to the ERBTemplate to files with erb errors
+* Fix env["MOCKUP_PROJECT"] setting in extractor
+
 ## Version 0.7.0
 * Replace --quiet with -s in as it's no longer supported in newer GIT versions
 * Add support for ENV passing to the partials

data/html_mockup.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "html_mockup"
-  s.version = "0.7.0"
+  s.version = "0.7.1"
   
   s.authors = ["Flurin Egger", "Edwin van der Graaf"]
   s.email = ["info@digitpaint.nl", "flurin@digitpaint.nl"]  

data/lib/html_mockup/extractor.rb

@@ -28,7 +28,7 @@ module HtmlMockup
       
       @options.update(options) if options
       
-      env.update("MOCKUP_PROJECT" => project)
+      @options[:env].update("MOCKUP_PROJECT" => project)
     end
     
     def run!
@@ -60,11 +60,11 @@ module HtmlMockup
     # Runs the extractor on a single file and return processed source.
     def extract_source_from_file(file_path, env = {})
       source = HtmlMockup::Template.open(file_path, :partial_path => self.project.partial_path).render(env)
-          
+
       if @options[:url_relativize]
         source = relativize_urls(source, file_path)
       end
-
+      
       source
     end
     

data/lib/html_mockup/template.rb

@@ -44,12 +44,13 @@ module HtmlMockup
     # @param [Hash] options See options
     #
     # @option options [String] partial_path Path where the partials reside (default: $0/../../partials)
+    # @option options [String] target_file Path of the processed file
     def initialize(source, options={})
       defaults = {
         :partial_path => File.dirname(__FILE__) + "/../../partials/"
       }
       @source = source
-      @template = Tilt::ERBTemplate.new{ @source }      
+      @template = Tilt::ERBTemplate.new(options[:target_file].to_s){ @source }      
       @options = defaults.update(options)
       raise "Partial path '#{self.options[:partial_path]}' not found" unless File.exist?(self.options[:partial_path])
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: html_mockup
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2013-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70345877984660 !ruby/object:Gem::Requirement
+  requirement: &70340987175420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 0.16.0
   type: :runtime
   prerelease: false
-  version_requirements: *70345877984660
+  version_requirements: *70340987175420
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70345877984180 !ruby/object:Gem::Requirement
+  requirement: &70340987174940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70345877984180
+  version_requirements: *70340987174940
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70345877983700 !ruby/object:Gem::Requirement
+  requirement: &70340986945660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70345877983700
+  version_requirements: *70340986945660
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &70345877983200 !ruby/object:Gem::Requirement
+  requirement: &70340998865640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: 0.6.4
   type: :runtime
   prerelease: false
-  version_requirements: *70345877983200
+  version_requirements: *70340998865640
 description: 
 email:
 - info@digitpaint.nl