trackman 0.6.6 → 0.6.7

data/Gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: .
   specs:
-    trackman (0.6.5)
+    trackman (0.6.8)
       heroku (>= 2.26.2)
       json
       nokogiri

data/lib/generators/controller/controller_generator.rb

@@ -5,7 +5,7 @@ module Trackman
     argument :controller_name, :type => :string, :default => 'errors'
    
     @@actions = ['not_found', 'error', 'maintenance', 'maintenance_error']
-    @@routes = {'not-found' => 'not_found', 'error' => 'error', 'maintenance' => 'maintenance', 'maintenance-error' => 'maintenance_error'}
+    @@routes = {'404' => 'not_found', '500' => 'error', '503' => 'maintenance', '503-error' => 'maintenance_error'}
 
     def create_controller
       template "controller_layout.rb.erb", "app/controllers/#{controller_name}_controller.rb"
@@ -17,7 +17,7 @@ module Trackman
     
     def create_routes
       @@routes.each do |k, v|
-        route "match \"/#{k}\", :to => \"#{controller_name}##{v}\""
+        route "match \"#{controller_name.camelize}/#{k}\", :to => \"#{controller_name}##{v}\""
       end
     end
     

data/lib/trackman/assets/composite_asset.rb

@@ -1,9 +1,6 @@
 module Trackman
   module Assets
-    module CompositeAsset
-      @@url ||= /url\(['"]?([^'"\)]+)['"]?\)/
-      @@import ||= /url\(['"]?[^'"\)]+['"]?\)/
-      
+    module CompositeAsset 
       def self.included(mod)
         mod.send(:include, Path::Resolver)
       end
@@ -22,22 +19,6 @@ module Trackman
       def asset_from(virtual, physical)
         Asset.create(:virtual_path => virtual, :path => physical)  
       end
-      
-      def inner_css_paths
-        #clean css comments
-        my_data = data.gsub(/\/\*.*\*\//m, '')
-        my_data = my_data.gsub(/\<\!\-\-.*\-\-\>/m, '')
-        my_data.scan(@@import).collect{|x| @@url.match(x)[1]}.select{|x| !x.embedded? }
-      end
     end
   end
-end
-
-class String
-  def internal_path? 
-    self !~ /^http/
-  end
-  def embedded?
-    self.include? 'data:'
-  end 
 end

data/lib/trackman/assets/css_asset.rb

@@ -1,11 +1,12 @@
 module Trackman
   module Assets
     class CssAsset < Asset
-      include CompositeAsset
+      include CompositeAsset, Trackman::Urls::CssParser
 
       protected
-		    alias children_paths inner_css_paths
-		
+		    def children_paths
+		      @children ||= parse_css(data)
+        end
     end
   end
 end

data/lib/trackman/assets/html_asset.rb

@@ -2,29 +2,10 @@ require 'nokogiri'
 module Trackman
   module Assets
     class HtmlAsset < Asset
-      include CompositeAsset
-
-      def document
-        @doc ||= Nokogiri::HTML(data)     
-      end  
-      
-      def img_paths        
-        @images_paths ||= refine_path(document.css('img'), 'src')
-      end
-      def js_paths
-        @js_paths ||= refine_path(document.xpath('//script'), 'src')
-      end
-      def css_paths
-        @css_paths ||= refine_path(document.xpath('//link[@type="text/css"]'), 'href')
-      end
+      include CompositeAsset, Trackman::Urls::HtmlParser
 
       def children_paths
-         @children_paths ||= img_paths + js_paths + css_paths + inner_css_paths
-      end
-
-      def refine_path(paths, node)
-        temp = paths.map{|n| n[node].to_s.gsub(/\?[^\?]*$/, '') }
-        temp.select{|n| n && n =~ /\w/ && n.internal_path? && !n.embedded? }
+        @children ||= parse(data)
       end
     end 
   end

data/lib/trackman/scaffold/content_saver.rb

@@ -4,9 +4,12 @@ module Trackman
   module Scaffold
     module ContentSaver      
       def self.included(base)
-        class << base; attr_accessor :nodes_to_remove, :nodes_to_edit, :mappings; end
+        class << base
+          attr_accessor :nodes_to_remove, :nodes_to_edit, :text_to_edit, :mappings 
+        end
         base.nodes_to_remove = {}
         base.nodes_to_edit = {}
+        base.text_to_edit = {}
 
         if defined?(Rails)
           base.mappings = { :maintenance => '503', :maintenance_error => '503-error', :not_found => '404', :error => '500' }
@@ -21,6 +24,9 @@ module Trackman
           raise 'block parameter is mandatory' unless block_given?
           nodes_to_edit[selector] = block
         end
+        def gsub pattern, replacement
+          text_to_edit[pattern] = replacement
+        end
         def remove selector, &predicate
           nodes_to_remove[selector] = predicate
         end
@@ -45,6 +51,13 @@ module Trackman
           end
           doc
         end
+        def gsub_html text
+          self.class.text_to_edit.each do |pattern, replacement|
+            text.gsub! pattern, replacement
+          end
+          text 
+        end
+
         def xslt
           @xslt ||= Nokogiri::XSLT(File.open("#{File.dirname(__FILE__)}/pretty-print.xslt"))
         end
@@ -55,7 +68,8 @@ module Trackman
           edit_nodes html
           remove_nodes html
           
-          xslt.apply_to(html).to_s
+          html = xslt.apply_to(html).to_s
+          gsub_html(html)
         end 
         
         def render_content

data/lib/trackman/urls/css_parser.rb

@@ -0,0 +1,19 @@
+module Trackman
+  module Urls
+    module CssParser
+      @@url ||= /url\(['"]?([^'"\)]+)['"]?\)/
+      @@import ||= /url\(['"]?[^'"\)]+['"]?\)/
+      
+      def parse_css value
+        value = value.dup
+        clean_comments value
+        value.scan(@@import).collect{|x| @@url.match(x)[1]}.select{|x| !x.embedded? }
+      end
+
+      def clean_comments value
+        value.gsub!(/\/\*.*\*\//m, '')
+        value.gsub!(/\<\!\-\-.*\-\-\>/m, '')
+      end
+    end
+  end
+end 

data/lib/trackman/urls/html_parser.rb

@@ -0,0 +1,32 @@
+require 'nokogiri'
+module Trackman
+  module Urls
+    module HtmlParser
+      include CssParser
+      
+      def parse html
+        doc = Nokogiri::HTML(html)
+        img(doc) + js(doc) + css(doc) + parse_css(html)
+      end
+      
+      def img doc
+        imgs = refine(doc.css('img'), 'src')
+        icons = refine(doc.xpath('//link[@rel="icon"]'), 'href')
+        
+        imgs + icons
+      end
+      
+      def js doc
+        refine(doc.xpath('//script'), 'src')
+      end
+      def css doc
+        refine(doc.xpath('//link[@type="text/css"]'), 'href')
+      end
+
+      def refine(paths, node)
+        temp = paths.map{|n| n[node].to_s.gsub(/\?[^\?]*$/, '') }
+        temp.select{|n| n && n =~ /\w/ && n.internal_path? && !n.embedded? }
+      end
+    end
+  end
+end

data/lib/trackman/urls.rb

@@ -0,0 +1,6 @@
+module Trackman
+  module Urls
+    autoload :HtmlParser, 'trackman/urls/html_parser'
+    autoload :CssParser, 'trackman/urls/css_parser'
+  end
+end

data/lib/trackman/utility/core_extensions.rb

@@ -8,6 +8,12 @@ class String
     word.downcase!
     word
   end
+  def internal_path? 
+    self !~ /^http/
+  end
+  def embedded?
+    self.include? 'data:'
+  end 
 end
 
 class Symbol

data/lib/trackman/version.rb

@@ -1,3 +1,3 @@
 module Trackman
-  VERSION = "0.6.6"
+  VERSION = "0.6.7"
 end

data/lib/trackman.rb

@@ -10,6 +10,7 @@ module Trackman
   autoload :Errors, 'trackman/errors'
   autoload :Path, 'trackman/path'
   autoload :Utility, 'trackman/utility'
+  autoload :Urls, 'trackman/urls'
 
 end
 require File.expand_path("../trackman/version", __FILE__)

data/rails_generators/trackman_controller/trackman_controller_generator.rb

@@ -8,7 +8,7 @@ class TrackmanControllerGenerator < ::Rails::Generator::Base
   attr_accessor :controller_name
 
   @@actions = ['not_found', 'error', 'maintenance', 'maintenance_error']
-  @@routes = {'not-found' => 'not_found', 'error' => 'error', 'maintenance' => 'maintenance', 'maintenance-error' => 'maintenance_error'}
+  @@routes = {'404' => 'not_found', '500' => 'error', '503' => 'maintenance', '503-error' => 'maintenance_error'}
 
   def manifest # this method is default entrance of generator
     puts route_doc false
@@ -27,15 +27,18 @@ class TrackmanControllerGenerator < ::Rails::Generator::Base
       @@actions.each do |n|
         m.template layout, "#{view_folder}/#{n}.html.#{engine}"
       end
-
+    end
 
     def route_doc show_as_comments = false
       char = show_as_comments ? '#' : ''
-"\n#{char} Don't forget to add the routes in config/routes.rb\n#{char} ------
-#{char} map.not_found '/not-found', :controller => '#{controller_name}', :action => :not_found
-#{char} map.error '/error', :controller => '#{controller_name}', :action => :error
-#{char} map.maintenance '/maintenance', :controller => '#{controller_name}', :action => :maintenance
-#{char} map.maintenance_error '/maintenance-error', :controller => '#{controller_name}', :action => :maintenance_error
-#{char} ------\n\n"
+      camelized = controller_name.camelize
+      
+      doc = "\n#{char} Don't forget to add the routes in config/routes.rb\n#{char} ------\n"
+      @@routes.each do |k, v|
+        doc << "#{char} map.#{v} '#{camelized}/#{k}', :controller => '#{controller_name}', :action => :#{v}\n"        
+      end
+      doc << "#{char} ------\n\n"
+
+      doc
     end
 end

data/spec/html_asset_spec.rb

@@ -53,7 +53,7 @@ describe Trackman::Assets::HtmlAsset do
     asset = Asset.create(:path => 'spec/fixtures/composite_assets/query_string_in_path.html')
     expected = [
       '/assets/burndownchartslogo.png', '/assets/google.png', '/assets/facebook.png', 
-      '/assets/twitter.png', '/assets/application.js', '/assets/application.css'
+      '/assets/twitter.png', '/assets/favicon.png', '/assets/application.js', '/assets/application.css'
     ]
 
     actual = asset.children_paths
@@ -69,4 +69,13 @@ describe Trackman::Assets::HtmlAsset do
     
     actual.should == expected
   end
+
+  it "returns all link tags" do
+    asset = Asset.create(:path => 'spec/test_data/html/favicon.html')
+    expected = ['assets/trackman70x70.png', '/assets/application.css']
+
+    actual = asset.children_paths
+    
+    actual.should == expected
+  end
 end

data/spec/scaffold_spec.rb

@@ -125,4 +125,31 @@ describe Trackman::Scaffold::ContentSaver do
     actual.should include('bobby')
     actual.should include('span')
   end
+
+  it "edits multiple things" do
+    TestSaver.gsub 'wallo', 'bobby'
+
+    TestSaver.gsub /ginette/, 'johnny'
+
+    html = "
+    <html>
+      <head></head>
+      <body>
+        <a href='wallo'></a>
+        <a href='ginette'></a>
+        <a href='/world'></a>
+
+        <div class='bobby'></div>
+        <div>
+          <p>allo</p>
+        </div>
+      </body>
+    </html>"
+
+    @saver.send(:gsub_html, html)
+
+    html.should_not include('/abc')
+    html.should include('bobby')
+    html.should include('johnny')
+  end
 end

data/spec/test_data/html/favicon.html

@@ -0,0 +1,13 @@
+
+<html>
+   <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+      <link href="assets/trackman70x70.png" rel="icon" type="image/png">
+      <title>Trackman - Don't spend your time on maintenance pages</title>
+      <link href="http://fonts.googleapis.com/css?family=Arapey:400italic,400" rel="stylesheet" type="text/css">
+      <meta content="Rails and Sinatra maintenance pages made easy. Trackman is an Heroku add-on for building, deploying and hosting your maintenance pages." name="description">
+      <link href="/assets/application.css" media="screen" rel="stylesheet" type="text/css">
+   </head>
+   <body id="home">
+   </body>
+</html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trackman
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-17 00:00:00.000000000 Z
+date: 2012-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -189,6 +189,9 @@ files:
 - lib/trackman/scaffold/content_saver.rb
 - lib/trackman/scaffold/pretty-print.xslt
 - lib/trackman/tasks/trackman.rake
+- lib/trackman/urls.rb
+- lib/trackman/urls/css_parser.rb
+- lib/trackman/urls/html_parser.rb
 - lib/trackman/utility.rb
 - lib/trackman/utility/configuration.rb
 - lib/trackman/utility/core_extensions.rb
@@ -487,6 +490,7 @@ files:
 - spec/test_data/external_paths/1.css
 - spec/test_data/external_paths/1.html
 - spec/test_data/html/comments.html
+- spec/test_data/html/favicon.html
 - spec/test_data/sample.html
 - spec/test_data/test1.jpeg
 - spec/test_data/test2.png
@@ -803,6 +807,7 @@ test_files:
 - spec/test_data/external_paths/1.css
 - spec/test_data/external_paths/1.html
 - spec/test_data/html/comments.html
+- spec/test_data/html/favicon.html
 - spec/test_data/sample.html
 - spec/test_data/test1.jpeg
 - spec/test_data/test2.png