alula 0.4.9 → 0.4.10

data/VERSION

@@ -1 +1 @@
-0.4.9
+0.4.10

data/lib/alula/compressors.rb

@@ -1,6 +1,7 @@
 require 'sass'
 require 'uglifier'
 require 'htmlcompressor'
+require 'alula/core_ext/htmlcompressor'
 
 module Alula
   class Compressors
@@ -48,7 +49,7 @@ module Alula
     
     class HTMLCompressor
       def initialize
-        HtmlCompressor::Compressor.send(:include, HTMLCompressorExt)
+        # HtmlCompressor::Compressor.send(:include, HTMLCompressorExt)
         @compressor = HtmlCompressor::Compressor.new
         #   remove_surrounding_spaces: HtmlCompressor::Compressor::BLOCK_TAGS_MAX + ",source,title,meta,header,footer,div,section,article,time,img,video,script",
         #   remove_intertag_spaces: true,
@@ -79,42 +80,6 @@ module Alula
       ensure
         @compressor.profile = _old_profile
       end
-      
-      module HTMLCompressorExt
-        def profile
-          @profile
-        end
-      
-        def profile=(profile)
-          @profile = profile
-          case profile
-          when :none
-            @options[:enabled] = false
-          when :normal
-            @options[:enabled] = true
-            @options[:remove_surrounding_spaces] = HtmlCompressor::Compressor::BLOCK_TAGS_MAX + ",source,title,meta,header,footer,div,section,article,time,img,video,script"
-            @options[:remove_intertag_spaces] = true
-            @options[:remove_quotes] = false
-            @options[:remove_script_attributes] = true
-            @options[:remove_style_attributes] = true
-            @options[:remove_link_attributes] = true
-            @options[:simple_boolean_attributes] = true
-            @options[:remove_http_protocol] = false
-            @options[:remove_https_protocol] = false
-          when :high
-            @options[:enabled] = true
-            @options[:remove_surrounding_spaces] = HtmlCompressor::Compressor::BLOCK_TAGS_MAX + ",source,title,meta,header,footer,div,section,article,time,img,video,script"
-            @options[:remove_intertag_spaces] = true
-            @options[:remove_quotes] = true
-            @options[:remove_script_attributes] = true
-            @options[:remove_style_attributes] = true
-            @options[:remove_link_attributes] = true
-            @options[:simple_boolean_attributes] = true
-            @options[:remove_http_protocol] = "href,src,cite,action,data-original,data-hires"
-            @options[:remove_https_protocol] = "href,src,cite,action,data-original,data-hires"
-          end
-        end
-      end
     end
   end
 end

data/lib/alula/core_ext/htmlcompressor.rb

@@ -0,0 +1,87 @@
+module HtmlCompressor
+  class Compressor
+    def profile
+      @profile
+    end
+  
+    def profile=(profile)
+      @profile = profile
+      case profile
+      when :none
+        @options[:enabled] = false
+      when :normal
+        @options[:enabled] = true
+        @options[:remove_surrounding_spaces] = HtmlCompressor::Compressor::BLOCK_TAGS_MAX + ",source,title,meta,header,footer,div,section,article,time,img,video,script"
+        @options[:remove_intertag_spaces] = true
+        @options[:remove_quotes] = false
+        @options[:remove_script_attributes] = true
+        @options[:remove_style_attributes] = true
+        @options[:remove_link_attributes] = true
+        @options[:simple_boolean_attributes] = true
+        @options[:remove_http_protocol] = false
+        @options[:remove_https_protocol] = false
+      when :high
+        @options[:enabled] = true
+        @options[:remove_surrounding_spaces] = HtmlCompressor::Compressor::BLOCK_TAGS_MAX + ",source,title,meta,header,footer,div,section,article,time,img,video,script"
+        @options[:remove_intertag_spaces] = true
+        @options[:remove_quotes] = true
+        @options[:remove_script_attributes] = true
+        @options[:remove_style_attributes] = true
+        @options[:remove_link_attributes] = true
+        @options[:simple_boolean_attributes] = true
+        @options[:remove_http_protocol] = "href,src,cite,action,data-original,data-hires"
+        @options[:remove_https_protocol] = "href,src,cite,action,data-original,data-hires"
+      end
+    end
+
+    def remove_http_protocol(html)
+      # remove http protocol from tag attributes
+      if @options[:remove_http_protocol]
+        pattern = case @options[:remove_http_protocol]
+          when true
+            HTTP_PROTOCOL_PATTERN
+          else
+            Regexp.new("(<[^>]+?(?:#{@options[:remove_http_protocol].gsub(",", "|")})\\s*=\\s*['\"])http:(//[^>]+?>)", Regexp::MULTILINE | Regexp::IGNORECASE)
+          end
+        html = html.gsub(pattern) do |match|
+          group_1 = $1
+          group_2 = $2
+
+          if match =~ REL_EXTERNAL_PATTERN
+            match
+          else
+            "#{group_1}#{group_2}"
+          end
+        end
+      end
+
+      html
+    end
+
+    def remove_https_protocol(html)
+      # remove https protocol from tag attributes
+      if @options[:remove_https_protocol]
+        pattern = case @options[:remove_https_protocol]
+          when true
+            HTTPS_PROTOCOL_PATTERN
+          else
+            Regexp.new("(<[^>]+?(?:#{@options[:remove_https_protocol].gsub(",", "|")})\\s*=\\s*['\"])http:(//[^>]+?>)", Regexp::MULTILINE | Regexp::IGNORECASE)
+          end
+
+        html = html.gsub(pattern) do |match|
+          group_1 = $1
+          group_2 = $2
+
+          if match =~ REL_EXTERNAL_PATTERN
+            match
+          else
+            "#{group_1}#{group_2}"
+          end
+        end
+      end
+
+      html
+    end
+
+  end
+end

data/lib/alula/core_ext.rb

@@ -1,4 +1,4 @@
 require 'alula/core_ext/tag'
 require 'alula/core_ext/filter'
 
-require 'alula/core_ext/environment'
+require 'alula/core_ext/environment'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alula
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.4.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-04 00:00:00.000000000 Z
+date: 2012-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -478,6 +478,7 @@ files:
 - lib/alula/core_ext/environment.rb
 - lib/alula/core_ext/filter.rb
 - lib/alula/core_ext/filters/smilies.rb
+- lib/alula/core_ext/htmlcompressor.rb
 - lib/alula/core_ext/tag.rb
 - lib/alula/core_ext/tags/attachment.rb
 - lib/alula/core_ext/tags/blockquote.rb
@@ -644,7 +645,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2079066484659239768
+      hash: 1426660746450185901
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -653,7 +654,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2079066484659239768
+      hash: 1426660746450185901
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23