html_mockup 0.6.4 → 0.6.5

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Version 0.6.5
+* Allow disabling of URL relativizing in the extractor with `release.extract :url_relativize => false`
+* Add missing Hpricot dependency to gem
+
 ## Version 0.6.4
 * Add RsyncFinalizer to automatically upload your mockup
 

data/html_mockup.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "html_mockup"
-  s.version = "0.6.4"
+  s.version = "0.6.5"
   
   s.authors = ["Flurin Egger", "Edwin van der Graaf"]
   s.email = ["info@digitpaint.nl", "flurin@digitpaint.nl"]  
@@ -28,4 +28,5 @@ Gem::Specification.new do |s|
   s.add_dependency("thor", ["~> 0.16.0"])
   s.add_dependency("rack", [">= 1.0.0"])
   s.add_dependency("tilt", [">= 0"])
+  s.add_dependency("hpricot", [">= 0.6.4"])  
 end

data/lib/html_mockup/extractor.rb

@@ -5,16 +5,23 @@ module HtmlMockup
     
     attr_reader :project, :target_path
     
+    
+    # @param [Project] project Project object
+    # @param [String,Pathname] target_path Path to extract to
+    # @param [Hash] options Options hash
+    
+    # @option options [Array] :url_attributes The element attributes to parse and relativize
+    # @option options [Array] :url_relativize Wether or not we should relativize
     def initialize(project, target_path, options={})
       @project = project
       @target_path = Pathname.new(target_path)
       
       @options = {
-        :url_attributes => %w{src href action}
+        :url_attributes => %w{src href action},
+        :url_relativize => true
       }
       
       @options.update(options) if options
-      
     end
     
     def run!
@@ -34,23 +41,12 @@ module HtmlMockup
       Dir.chdir(source_path) do
         Dir.glob(filter).each do |file_name|
           source = HtmlMockup::Template.open(file_name, :partial_path => partial_path).render
-          cur_dir = Pathname.new(file_name).dirname
-          up_to_root = File.join([".."] * (file_name.split("/").size - 1))
-          doc = Hpricot(source)
-          @options[:url_attributes].each do |attribute|
-            (doc/"*[@#{attribute}]").each do |tag|
-              converted_url = convert_relative_url_to_absolute_url(tag[attribute], cur_dir,  up_to_root)
-              
-              case converted_url
-              when String
-                tag[attribute] = converted_url
-              when nil
-                puts "Could not resolve link #{tag[attribute]} in #{file_name}"
-              end
-            end
+          
+          if @options[:url_relativize]
+            source = relativize_urls(source, file_name)
           end
 
-          File.open(target_path + file_name,"w"){|f| f.write(doc.to_original_html) }
+          File.open(target_path + file_name,"w"){|f| f.write(source) }
         end
       end           
     end
@@ -58,6 +54,27 @@ module HtmlMockup
     
     protected
     
+    def relativize_urls(source, file_name)
+      cur_dir = Pathname.new(file_name).dirname
+      up_to_root = File.join([".."] * (file_name.split("/").size - 1))
+          
+      doc = Hpricot(source)
+      @options[:url_attributes].each do |attribute|
+        (doc/"*[@#{attribute}]").each do |tag|
+          converted_url = convert_relative_url_to_absolute_url(tag[attribute], cur_dir,  up_to_root)
+              
+          case converted_url
+          when String
+            tag[attribute] = converted_url
+          when nil
+            puts "Could not resolve link #{tag[attribute]} in #{file_name}"
+          end
+        end
+      end
+      
+      doc.to_original_html      
+    end
+    
     # @return [false, nil, String] False if it can't be converted, nil if it can't be resolved and the converted string if it can be resolved.
     def convert_relative_url_to_absolute_url(url, cur_dir, up_to_root)
       # Skip if the url doesn't start with a / (but not with //)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: html_mockup
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-28 00:00:00.000000000 Z
+date: 2012-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70163962703500 !ruby/object:Gem::Requirement
+  requirement: &70323203509020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 0.16.0
   type: :runtime
   prerelease: false
-  version_requirements: *70163962703500
+  version_requirements: *70323203509020
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70163962703020 !ruby/object:Gem::Requirement
+  requirement: &70323203508540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70163962703020
+  version_requirements: *70323203508540
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70163962702540 !ruby/object:Gem::Requirement
+  requirement: &70323202817780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,18 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70163962702540
+  version_requirements: *70323202817780
+- !ruby/object:Gem::Dependency
+  name: hpricot
+  requirement: &70323202816620 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.4
+  type: :runtime
+  prerelease: false
+  version_requirements: *70323202816620
 description: 
 email:
 - info@digitpaint.nl