html_mockup 0.6.2 → 0.6.3

data/examples/default_template/.gitignore

@@ -0,0 +1,2 @@
+# Ignore apple specific files
+.DS_Store

data/lib/html_mockup/extractor.rb

@@ -5,9 +5,16 @@ module HtmlMockup
     
     attr_reader :project, :target_path
     
-    def initialize(project, target_path)
+    def initialize(project, target_path, options={})
       @project = project
       @target_path = Pathname.new(target_path)
+      
+      @options = {
+        :url_attributes => %w{src href action}
+      }
+      
+      @options.update(options) if options
+      
     end
     
     def run!
@@ -30,7 +37,7 @@ module HtmlMockup
           cur_dir = Pathname.new(file_name).dirname
           up_to_root = File.join([".."] * (file_name.split("/").size - 1))
           doc = Hpricot(source)
-          %w{src href action}.each do |attribute|
+          @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)
               

data/lib/html_mockup/release/cleaner.rb

@@ -3,6 +3,7 @@ module HtmlMockup
     def initialize(pattern)
       @pattern = pattern
     end
+    
     def call(release, options = {})
       # We switch to the build path and append the globbed files for safety, so even if you manage to sneak in a
       # pattern like "/**/*" it won't do you any good as it will be reappended to the path

data/lib/html_mockup/release/finalizers/dir.rb

@@ -5,16 +5,16 @@ require 'fileutils'
 # The directory name will have the format PREFIX-VERSION
 #
 module HtmlMockup::Release::Finalizers
-  class Dir < Base
-    def initialize(options = {})
-      @options = options
-    end
-    
+  class Dir < Base    
     # @option options :prefix Prefix to put before the version (default = "html")
     def call(release, options = {})
-      @options.update(options)
+      if options
+        options = @options.dup.update(options)
+      else
+        options = @options
+      end
 
-      name = [(@options[:prefix] || "html"), release.scm.version].join("-")      
+      name = [(options[:prefix] || "html"), release.scm.version].join("-")      
       release.log(self, "Finalizing release to #{release.target_path + name}")
       
       if File.exist?(release.target_path + name)

data/lib/html_mockup/release/finalizers.rb

@@ -1,5 +1,11 @@
 module HtmlMockup::Release::Finalizers
   class Base    
+    
+    def initialize(options = {})
+      @options = {}
+      @options.update(options) if options
+    end
+    
     def call(release, options = {})
       raise ArgumentError, "Implement in subclass"
     end

data/lib/html_mockup/release/processors/requirejs.rb

@@ -17,12 +17,10 @@ module HtmlMockup::Release::Processors
     def call(release, options={})
       @options.update(options)
       
-      puts @options.inspect
-      
       begin
         `#{@options[:node]} -v`
       rescue Errno::ENOENT
-        raise RuntimeError, "Could not find node in #{node.inspect}"
+        raise RuntimeError, "Could not find node in #{@options[:node].inspect}"
       end
       
       rjs_command = rjs_check()

data/lib/html_mockup/release/processors.rb

@@ -1,5 +1,12 @@
 module HtmlMockup::Release::Processors
-  class Base    
+  class Base
+    
+    def initialize(options = {})
+      @options = {}
+      @options.update(options) if options
+    end
+  
+    
     def call(release, options = {})
       raise ArgumentError, "Implement in subclass"
     end

data/lib/html_mockup/release.rb

@@ -135,7 +135,7 @@ module HtmlMockup
     # @examples
     #   release.finalize :zip
     def finalize(finalizer, options = {})
-      @finalize << [self.class.get_callable(finalizer, HtmlMockup::Release::Finalizers), options]
+      @finalizers << [self.class.get_callable(finalizer, HtmlMockup::Release::Finalizers), options]
     end
     
     # Files to clean up in the build directory just before finalization happens
@@ -187,13 +187,23 @@ module HtmlMockup
       end
     end
     
+    # Extract the mockup, this will happen anyway, and will always happen first
+    # This method gives you a way to pass options to the extractor.
+    #
+    # @param Hash options Options hash passed to extractor
+    #
+    # @see  HtmlMockup::Extractor for more information
+    def extract(options = {})
+      @extractor_options = options
+    end
+    
     # Actually perform the release
     def run!
       # Validate paths
       validate_paths!
       
       # Extract valid mockup
-      extract!
+      run_extractor!
       
       # Run stack
       run_stack!
@@ -235,8 +245,8 @@ module HtmlMockup
       raise ArgumentError, "Target path \"#{self.target_path}\" does not exist" if !self.target_path.exist?      
     end
     
-    def extract!
-      extractor = Extractor.new(self.project, self.build_path)
+    def run_extractor!
+      extractor = Extractor.new(self.project, self.build_path, @extractor_options)
       extractor.run!
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: html_mockup
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-21 00:00:00.000000000 Z
+date: 2012-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70236893702460 !ruby/object:Gem::Requirement
+  requirement: &70100536874920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 0.16.0
   type: :runtime
   prerelease: false
-  version_requirements: *70236893702460
+  version_requirements: *70100536874920
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70236893701860 !ruby/object:Gem::Requirement
+  requirement: &70100536873660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70236893701860
+  version_requirements: *70100536873660
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70236893701080 !ruby/object:Gem::Requirement
+  requirement: &70100536872460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70236893701080
+  version_requirements: *70100536872460
 description: 
 email: flurin@digitpaint.nl
 executables:
@@ -54,9 +54,12 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - bin/mockup
+- examples/default_template/.gitignore
 - examples/default_template/CHANGELOG
 - examples/default_template/Gemfile
 - examples/default_template/Mockupfile
+- examples/default_template/html/.empty_directory
+- examples/default_template/partials/.empty_directory
 - lib/html_mockup/cli.rb
 - lib/html_mockup/extractor.rb
 - lib/html_mockup/generators.rb
@@ -83,7 +86,8 @@ files:
 - lib/html_mockup/w3c_validator.rb
 - README.rdoc
 homepage: http://github.com/digitpaint/html_mockup
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8