multigiri 0.0.4 → 0.0.5

data/CHANGELOG

@@ -7,3 +7,11 @@
 
 = Version 0.0.3
   * Added middleware for HTML minification
+
+= Version 0.0.4
+  * Fixed NoMethodError in multigiri.rb
+
+= Version 0.0.5
+  * Nokogiri was divided into Nokogiri::HTML & Nokogiri::XML
+  * Added content_types option which can take an array of strings or regexps for matching if multigiri will run for current content type
+  * Improved performance

data/examples/config.ru

@@ -11,23 +11,29 @@ require "multigiri/google_analytics"
 # nokogiri, document so instead of [status, headers, body] you'll get
 # [status, headers, document]. After the multigiri block everything
 # will get to normal, so middlewares whichrun later won't be affected.
-use Multigiri do
-  use HTML5::Forms
-  use HTML5::Hidden
-  use EmailObfuscator
-  use GoogleAnalytics, :my_tracking_code
+use Multigiri::HTML do
+  use Multigiri::HTML5::Forms
+  use Multigiri::HTML5::Hidden
+  use Multigiri::EmailObfuscator
+  use Multigiri::GoogleAnalytics, :my_tracking_code
 end
 
-# It's especially important to run these middlewares after multigiri,
-# because in multigiri middleware you probably change the resulted HTML
-use ContentType
-use ContentLength
+# RSS / Atom feeds processing
+use Multigiri::XML, content_types: ["application/rss+xml", "application/atom+xml"] do
+  # TODO
+end
 
-# We can't use the trick with __END__ as is used in sinatra, since Rack
-# authors are stupid idiots and the content of the rackup file is eval-ed.
-# This crappy design leads to more problems than just this one.
-# template = ::File.read(__FILE__).split("__END__").last
+# Generic XML processing
+use Multigiri::XML, content_types: [/\/xml$/] do
+  # TODO
+end
 
+use Rack::ContentType, "text/html"
+
+# We can't use the trick with __END__ as is used in sinatra,
+# since the content of the rackup file is eval-ed. This
+# crappy design leads to more problems than just this one.
+# template = ::File.read(__FILE__).split("__END__").last
 template = ::File.read(__FILE__).match(/=begin template\n(.+)\n=end/m)[1]
 
 run lambda { |env| [200, Hash.new, [template]] }

data/lib/multigiri.rb

@@ -10,34 +10,81 @@
 require "nokogiri"
 
 # TODO: args for nokogiri, export format, indentation etc
-class Multigiri
-  attr_reader :options, :block
-  def initialize(app, options = Hash.new, &block)
-    @app, @options, @block = app, options, block
-    @options[:indentation] ||= 2
-  end
+module Multigiri
+  class HTML
+    # Ruby GC is weak
+    CONTENT_TYPE   = "Content-Type"
+    CONTENT_LENGTH = "Content-Length"
+    DEFAULT_TYPES  = ["text/html"]
+
+    attr_reader :options, :block
+    def initialize(app, options = Hash.new, &block)
+      @app, @options, @block = app, options, block
+      @options[:indentation]   ||= 2
+      @options[:content_types] ||= self.class::DEFAULT_TYPES
+    end
+
+    def call(env)
+      status, headers, chunks = @app.call(env)
+      check_content_type(headers)
+      if options[:content_types].empty? || options[:content_types].any? { |type| headers[CONTENT_TYPE].match(type) }
+        run(env, status, headers, chunks)
+      else
+        [status, headers, chunks]
+      end
+    end
 
-  def call(env)
     # convert to a Nokogiri document
-    status, headers, chunks = @app.call(env)
-    # the only what we know about body is that it has to respond to #each
-    body = String.new
-    chunks.each { |chunk| body += chunk }
-    document = Nokogiri::HTML(body) # before
-    @stack = lambda { |env| [status, headers, document] }
-
-    # get middlewares
-    self.instance_eval(&@block) if @block
-
-    # convert back to a [String]
-    status, headers, document = @stack.call(env)
-    body = document.to_html(indentation: options[:indentation]) # TODO
-    headers["Content-Length"] = body.bytesize.to_s
-    [status, headers, [body]]
+    def run(env, status, headers, chunks)
+      # the only what we know about body is that it has to respond to #each
+      body = String.new
+      chunks.each { |chunk| body += chunk }
+      document = Nokogiri::HTML(body) # before
+      @stack = lambda { |env| [status, headers, document] }
+
+      # get middlewares
+      self.instance_eval(&@block) if @block
+
+      # convert back to a [String]
+      status, headers, document = @stack.call(env)
+      body = document.to_html(indentation: options[:indentation]) # TODO
+      headers[CONTENT_LENGTH] = body.bytesize.to_s
+      return [status, headers, [body]]
+    end
+
+    # GoogleAnalytics.new(Other.new(self), tracking_code)
+    def use(klass, *args, &block)
+      @stack = klass.new(@stack, *args, &block)
+    end
+
+    protected
+    def check_content_type(headers)
+      if headers[CONTENT_TYPE].nil? && !options[:content_types].empty?
+        raise "Content-Type has to be set before you call multigiri, so multigiri can decide if it will parse the document or not!"
+      end
+    end
   end
 
-  # GoogleAnalytics.new(Other.new(self), tracking_code)
-  def use(klass, *args, &block)
-    @stack = klass.new(@stack, *args, &block)
+  class XML < HTML
+    # XML has many MIME types, if you want to work with all posible XML MIME types, you can use
+    # use Multigiri, mime_type: /xml/
+    DEFAULT_TYPES = ["text/xml"]
+
+    def run(env, status, headers, chunks)
+      # the only what we know about body is that it has to respond to #each
+      body = String.new
+      chunks.each { |chunk| body += chunk }
+      document = Nokogiri::XML(body) # before
+      @stack = lambda { |env| [status, headers, document] }
+
+      # get middlewares
+      self.instance_eval(&@block) if @block
+
+      # convert back to a [String]
+      status, headers, document = @stack.call(env)
+      body = document.to_xml(indentation: options[:indentation]) # TODO
+      headers[CONTENT_LENGTH] = body.bytesize.to_s
+      return [status, headers, [body]]
+    end
   end
 end

data/lib/multigiri/default_attributes.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-class Multigiri
+module Multigiri
   class DefaultAttributes
     def initialize(app, defaults = nil)
       @app, @defaults = app, defaults

data/lib/multigiri/email_obfuscator.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-class Multigiri
+module Multigiri
   class EmailObfuscator
     def initialize(app)
       @app = app

data/lib/multigiri/google_analytics.rb

@@ -7,7 +7,7 @@
 #     use GoogleAnalytics, :my_tracking_code if Rango.production?
 #   end
 
-class Multigiri
+module Multigiri
   class GoogleAnalytics
     attr_accessor :tracking_code
     def initialize(app, tracking_code)
@@ -27,7 +27,7 @@ class Multigiri
 
     protected
     def script(body, content)
-      script = Nokogiri::XML::Node.new(:script, body.document)
+      script = Nokogiri::XML::Node.new("script", body.document)
       script.inner_html = content
       body.add_child(script)
     end

data/lib/multigiri/html5.rb

@@ -4,7 +4,7 @@
 
 # In future it can detect if the browser is capable to deal with given HTML 5 feature and
 # if yes, then there will be no transformation required. But then carefully with caching :)
-class Multigiri
+module Multigiri
   module HTML5
     # Browsers supporting HTML 5 should can submit forms through PUT or DELETE natively.
     class Forms

data/lib/multigiri/link_checker.rb

@@ -8,7 +8,7 @@
 #       end
 #     end
 #   end
-class Multigiri
+module Multigiri
   class LinkChecker
     def initialize(app, logger, patterns = nil, &block)
       @app, @logger, @patterns = app, logger, patterns

data/lib/multigiri/minify.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-class Multigiri
+module Multigiri
   class Minify
     def initialize(app)
       @app = app

data/lib/multigiri/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
-class Multigiri
-  VERSION = "0.0.4"
+module Multigiri
+  VERSION = "0.0.5"
 end

metadata

@@ -1,26 +1,33 @@
 --- !ruby/object:Gem::Specification 
 name: multigiri
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Jakub Stastny aka Botanicus
 autorequire: 
 bindir: bin
 cert_chain: 
-date: 2010-03-14 00:00:00 +00:00
+date: 2010-03-24 00:00:00 +00:00
 default_executable: multigiri
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: ""
 email: stastny@101ideas.cz
 executables: []
@@ -57,7 +64,9 @@ has_rdoc: true
 homepage: http://github.com/botanicus/multigiri
 licenses: []
 
-post_install_message: "[\e[32mVersion 0.0.3\e[0m] Added middleware for HTML minification\n"
+post_install_message: "[\e[32mVersion 0.0.5\e[0m] Nokogiri was divided into Nokogiri::HTML & Nokogiri::XML\n\
+  [\e[32mVersion 0.0.5\e[0m] Added content_types option which can take an array of strings or regexps for matching if multigiri will run for current content type\n\
+  [\e[32mVersion 0.0.5\e[0m] Improved performance\n"
 rdoc_options: []
 
 require_paths: 
@@ -66,18 +75,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 9
       version: "1.9"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: multigiri
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: ""