middleman 0.99.0.pre → 0.99.1.pre

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Thomas Reynolds
+Copyright (c) 2010 Thomas Reynolds
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -25,7 +25,7 @@ begin
     gem.add_dependency("compass",             "~>0.10.0")
     gem.add_dependency("json_pure",           "~>1.4.0")
     gem.add_dependency("smusher",             "~>0.4.5")
-    gem.add_dependency("compass-slickmap",    "~>0.3.0")
+    gem.add_dependency("compass-slickmap",    "~>0.4.0")
     # gem.add_dependency("livereload",          "~>1.4.0")
     
     gem.add_development_dependency("rspec")

data/VERSION

@@ -1 +1 @@
-0.99.0.pre
+0.99.1.pre

data/bin/mm-build

@@ -6,7 +6,7 @@ ENV['MM_ENV'] = "build"
 require File.join(File.dirname(__FILE__), "..", "lib", "middleman")
 require 'middleman/builder'
 
-# Middleman::Base.init!
+# Middleman::Server.init!
 Middleman::Builder.init!
 
 Middleman::Generators.run_cli(Dir.pwd, 'mm-build', 1,  %w(build --force).concat(ARGV))

data/bin/mm-init

@@ -22,7 +22,7 @@ module Generators
       File.join(File.dirname(__FILE__), '..', 'lib', 'middleman', 'template')
     end
     
-    template :init, "init.rb"
+    template :config, "config.rb"
     glob! :views
     glob! :public
     

data/bin/mm-server

@@ -36,7 +36,7 @@ OptionParser.new { |opts|
     env = e
   }
   opts.on("--debug", "Debug mode") {
-    ::Middleman::Base.set :logging, true
+    ::Middleman::Server.set :logging, true
   }
   
   opts.parse! ARGV
@@ -44,13 +44,13 @@ OptionParser.new { |opts|
 
 ENV['RACK_ENV'] = env
 
-class Middleman::Base
+class Middleman::Server
   set :root, Dir.pwd
 end
 
 require 'shotgun'
 config = File.join(File.dirname(__FILE__), '..', 'lib', 'middleman', 'config.ru')
-app = Shotgun.new(config, &lambda { |inner_app| Middleman::Base })
+app = Shotgun.new(config, &lambda { |inner_app| Middleman::Server })
 
 require 'rubygems'
 require 'thin'

data/features/step_definitions/asset_host_steps.rb

@@ -1,7 +1,7 @@
 Given /^I am using an asset host$/ do
-  Middleman::Base.enable :asset_host
-  Middleman::Base.set :asset_host do |asset|
+  Middleman::Server.enable :asset_host
+  Middleman::Server.set :asset_host do |asset|
     "http://assets%d.example.com" % (asset.hash % 4)
   end
-  @browser = Rack::Test::Session.new(Rack::MockSession.new(Middleman::Base.new))
+  @browser = Rack::Test::Session.new(Rack::MockSession.new(Middleman::Server.new))
 end

data/features/step_definitions/middleman_steps.rb

@@ -1,7 +1,7 @@
 Given /^"([^\"]*)" feature is "([^\"]*)"$/ do |feature, state|
   enable_or_disable = (state == "enabled") ? :enable : :disable
-  Middleman::Base.send(enable_or_disable, feature.to_sym)
-  @browser = Rack::Test::Session.new(Rack::MockSession.new(Middleman::Base.new))
+  Middleman::Server.send(enable_or_disable, feature.to_sym)
+  @browser = Rack::Test::Session.new(Rack::MockSession.new(Middleman::Server.new))
 end
 
 Given /^generated directory at "([^\"]*)"$/ do |dirname|
@@ -23,6 +23,5 @@ Then /^I should not see "([^\"]*)"$/ do |expected|
 end
 
 Then /^I should see "([^\"]*)" lines$/ do |lines|
-  $stderr.puts @browser.last_response.body
   @browser.last_response.body.chomp.split($/).length.should == lines.to_i
 end

data/features/step_definitions/page_layout_steps.rb

@@ -1,13 +1,13 @@
 Given /^page "([^\"]*)" has layout "([^\"]*)"$/ do |url, layout|
-  Middleman::Base.set :root, File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "spec", "fixtures", "sample")
-  Middleman::Base.page(url, :layout => layout.to_sym)
-  @browser = Rack::Test::Session.new(Rack::MockSession.new(Middleman::Base.new))
+  Middleman::Server.set :root, File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "spec", "fixtures", "sample")
+  Middleman::Server.page(url, :layout => layout.to_sym)
+  @browser = Rack::Test::Session.new(Rack::MockSession.new(Middleman::Server.new))
 end
 
 Given /^"([^\"]*)" with_layout block has layout "([^\"]*)"$/ do |url, layout|
-  Middleman::Base.set :root, File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "spec", "fixtures", "sample")
-  Middleman::Base.with_layout(:layout => layout.to_sym) do
+  Middleman::Server.set :root, File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "spec", "fixtures", "sample")
+  Middleman::Server.with_layout(:layout => layout.to_sym) do
     page(url)
   end
-  @browser = Rack::Test::Session.new(Rack::MockSession.new(Middleman::Base.new))
+  @browser = Rack::Test::Session.new(Rack::MockSession.new(Middleman::Server.new))
 end

data/lib/middleman.rb

@@ -4,5 +4,5 @@ $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 require 'rubygems'
 
 module Middleman
-  autoload :Base, "middleman/base"  
+  autoload :Server, "middleman/server"  
 end

data/lib/middleman/assets.rb

@@ -29,5 +29,5 @@ module Middleman
 end
 
 Middleman::Assets.register :base do |path, prefix, request|
-  path.include?("://") ? path : File.join(Middleman::Base.http_prefix || "/", prefix, path)
+  path.include?("://") ? path : File.join(Middleman::Server.http_prefix || "/", prefix, path)
 end

data/lib/middleman/builder.rb

@@ -1,4 +1,4 @@
-require 'middleman/base'
+require 'middleman/server'
 require 'templater'
 require 'middleman/templater+dynamic_renderer.rb'
 
@@ -6,11 +6,12 @@ require 'middleman/templater+dynamic_renderer.rb'
 module Middleman
   class Builder < ::Templater::Generator
     
+    # Support all Tilt-enabled templates and treat js like a template
     @@template_extensions = ::Tilt.mappings.keys << "js"
     
     # Define source and desintation
     def self.source_root; Dir.pwd; end
-    def destination_root; File.join(Dir.pwd, Middleman::Base.build_dir); end
+    def destination_root; File.join(Dir.pwd, Middleman::Server.build_dir); end
 
     # Override template to ask middleman for the correct extension to output
     def self.template(name, *args, &block)
@@ -21,7 +22,7 @@ module Middleman
       end
 
       if (args[0] === args[1])
-        args[1] = args[0].gsub("#{File.basename(Middleman::Base.views)}/", "").gsub("#{File.basename(Middleman::Base.public)}/", "")
+        args[1] = args[0].gsub("#{File.basename(Middleman::Server.views)}/", "").gsub("#{File.basename(Middleman::Server.public)}/", "")
         if File.extname(args[1]) != ".js"
           args[1] = args[1].gsub!(File.extname(args[1]), "") if File.basename(args[1]).split('.').length > 2
         end
@@ -36,14 +37,14 @@ module Middleman
       return unless ::Tilt[file_ext].nil?
       
       if (args[0] === args[1])
-        args[1] = args[0].gsub("#{File.basename(Middleman::Base.views)}/", "").gsub("#{File.basename(Middleman::Base.public)}/", "")
+        args[1] = args[0].gsub("#{File.basename(Middleman::Server.views)}/", "").gsub("#{File.basename(Middleman::Server.public)}/", "")
       end
       super(name, *args, &block)
     end
 
     def self.init!
-      glob! File.basename(Middleman::Base.public),  @@template_extensions
-      glob! File.basename(Middleman::Base.views),   @@template_extensions
+      glob! File.basename(Middleman::Server.public),  @@template_extensions
+      glob! File.basename(Middleman::Server.views),   @@template_extensions
     end
     
     def after_run

data/lib/middleman/config.ru

@@ -1,2 +1,2 @@
 require 'middleman'
-run Middleman::Base
+run Middleman::Server

data/lib/middleman/features.rb

@@ -7,14 +7,16 @@ module Middleman
     
       # Default to disabled, unless the class asks to auto-enable
       activate_method = (options.has_key?(:auto_enable) && options[:auto_enable]) ? :enable : :disable
-      Middleman::Base.send(activate_method, feature_name)
+      Middleman::Server.send(activate_method, feature_name)
     end
     
-    def self.run(feature_name, scope)
+    # Initialize a feature
+    def self.run(feature_name, feature_config, scope)
       feature_class = @@features[feature_name]
-      feature_class.new(scope) unless feature_class.nil?
+      feature_class.new(scope, feature_config) unless feature_class.nil?
     end
 
+    # Get a list of all features
     def self.all
       @@features
     end
@@ -23,10 +25,10 @@ module Middleman
 end
 
 # livereload
-%w(asset_host 
+%w(default_helpers
+   asset_host 
    automatic_image_sizes
    cache_buster
-   default_helpers
    minify_css
    minify_javascript
    relative_assets

data/lib/middleman/features/asset_host.rb

@@ -1,8 +1,8 @@
 class Middleman::Features::AssetHost
-  def initialize(app)
-    Middleman::Base.after_feature_init do
-      if Middleman::Base.asset_host.is_a?(Proc)
-        ::Compass.configuration.asset_host(&Middleman::Base.asset_host)
+  def initialize(app, config)
+    Middleman::Server.after_feature_init do
+      if Middleman::Server.asset_host.is_a?(Proc)
+        ::Compass.configuration.asset_host(&Middleman::Server.asset_host)
       end
     end
     
@@ -11,7 +11,7 @@ class Middleman::Features::AssetHost
 
       valid_extensions = %w(.png .gif .jpg .jpeg .js .css)
 
-      asset_prefix = Middleman::Base.asset_host.call(original_output)
+      asset_prefix = Middleman::Server.asset_host.call(original_output)
 
       File.join(asset_prefix, original_output)
     end

data/lib/middleman/features/automatic_image_sizes.rb

@@ -1,9 +1,9 @@
 class Middleman::Features::AutomaticImageSizes
-  def initialize(app)
+  def initialize(app, config)
     require "middleman/features/automatic_image_sizes/fastimage"
 
-    Middleman::Base.send :alias_method, :pre_automatic_image_tag, :image_tag
-    Middleman::Base.helpers do
+    Middleman::Server.helpers do
+      alias_method :pre_automatic_image_tag, :image_tag
       def image_tag(path, params={})
         if (!params[:width] || !params[:height]) && !path.include?("://")
           params[:alt] ||= ""
@@ -12,7 +12,7 @@ class Middleman::Features::AutomaticImageSizes
           begin
             real_path = File.join(settings.public, settings.images_dir, path)
             if File.exists? real_path
-              dimensions = Middleman::FastImage.size(real_path, :raise_on_failure => true)
+              dimensions = ::FastImage.size(real_path, :raise_on_failure => true)
               params[:width]  ||= dimensions[0]
               params[:height] ||= dimensions[1]
             end

data/lib/middleman/features/automatic_image_sizes/fastimage.rb

@@ -32,251 +32,256 @@
 require 'net/https'
 require 'open-uri'
 
-module Middleman
-  class FastImage
-    attr_reader :size, :type
+class FastImage
+  attr_reader :size, :type
 
-    class FastImageException < StandardError # :nodoc:
-    end
-    class MoreCharsNeeded < FastImageException # :nodoc:
-    end
-    class UnknownImageType < FastImageException # :nodoc:
-    end
-    class ImageFetchFailure < FastImageException # :nodoc:
-    end
-    class SizeNotFound < FastImageException # :nodoc:
-    end
+  class FastImageException < StandardError # :nodoc:
+  end
+  class MoreCharsNeeded < FastImageException # :nodoc:
+  end
+  class UnknownImageType < FastImageException # :nodoc:
+  end
+  class ImageFetchFailure < FastImageException # :nodoc:
+  end
+  class SizeNotFound < FastImageException # :nodoc:
+  end
 
-    DefaultTimeout = 2
+  DefaultTimeout = 2
   
-    LocalFileChunkSize = 256
+  LocalFileChunkSize = 256
 
-    # Returns an array containing the width and height of the image.
-    # It will return nil if the image could not be fetched, or if the image type was not recognised.
-    #
-    # By default there is a timeout of 2 seconds for opening and reading from a remote server.
-    # This can be changed by passing a :timeout => number_of_seconds in the options.
-    #
-    # If you wish FastImage to raise if it cannot size the image for any reason, then pass
-    # :raise_on_failure => true in the options.
-    #
-    # FastImage knows about GIF, JPEG, BMP and PNG files.
-    #
-    # === Example
-    #
-    #   require 'fastimage'
-    #
-    #   FastImage.size("http://stephensykes.com/images/ss.com_x.gif")
-    #   => [266, 56]
-    #   FastImage.size("http://stephensykes.com/images/pngimage")
-    #   => [16, 16]
-    #   FastImage.size("http://farm4.static.flickr.com/3023/3047236863_9dce98b836.jpg")
-    #   => [500, 375]
-    #   FastImage.size("http://www-ece.rice.edu/~wakin/images/lena512.bmp")
-    #   => [512, 512]
-    #   FastImage.size("test/fixtures/test.jpg")
-    #   => [882, 470]
-    #   FastImage.size("http://pennysmalls.com/does_not_exist")
-    #   => nil
-    #   FastImage.size("http://pennysmalls.com/does_not_exist", :raise_on_failure=>true)
-    #   => raises FastImage::ImageFetchFailure
-    #   FastImage.size("http://stephensykes.com/favicon.ico", :raise_on_failure=>true)
-    #   => raises FastImage::UnknownImageType
-    #   FastImage.size("http://stephensykes.com/favicon.ico", :raise_on_failure=>true, :timeout=>0.01)
-    #   => raises FastImage::ImageFetchFailure
-    #   FastImage.size("http://stephensykes.com/images/faulty.jpg", :raise_on_failure=>true)
-    #   => raises FastImage::SizeNotFound
-    #
-    # === Supported options
-    # [:timeout]
-    #   Overrides the default timeout of 2 seconds.  Applies both to reading from and opening the http connection.
-    # [:raise_on_failure]
-    #   If set to true causes an exception to be raised if the image size cannot be found for any reason.
-    #
-    def self.size(uri, options={})
-      new(uri, options).size
-    end
+  # Returns an array containing the width and height of the image.
+  # It will return nil if the image could not be fetched, or if the image type was not recognised.
+  #
+  # By default there is a timeout of 2 seconds for opening and reading from a remote server.
+  # This can be changed by passing a :timeout => number_of_seconds in the options.
+  #
+  # If you wish FastImage to raise if it cannot size the image for any reason, then pass
+  # :raise_on_failure => true in the options.
+  #
+  # FastImage knows about GIF, JPEG, BMP and PNG files.
+  #
+  # === Example
+  #
+  #   require 'fastimage'
+  #
+  #   FastImage.size("http://stephensykes.com/images/ss.com_x.gif")
+  #   => [266, 56]
+  #   FastImage.size("http://stephensykes.com/images/pngimage")
+  #   => [16, 16]
+  #   FastImage.size("http://farm4.static.flickr.com/3023/3047236863_9dce98b836.jpg")
+  #   => [500, 375]
+  #   FastImage.size("http://www-ece.rice.edu/~wakin/images/lena512.bmp")
+  #   => [512, 512]
+  #   FastImage.size("test/fixtures/test.jpg")
+  #   => [882, 470]
+  #   FastImage.size("http://pennysmalls.com/does_not_exist")
+  #   => nil
+  #   FastImage.size("http://pennysmalls.com/does_not_exist", :raise_on_failure=>true)
+  #   => raises FastImage::ImageFetchFailure
+  #   FastImage.size("http://stephensykes.com/favicon.ico", :raise_on_failure=>true)
+  #   => raises FastImage::UnknownImageType
+  #   FastImage.size("http://stephensykes.com/favicon.ico", :raise_on_failure=>true, :timeout=>0.01)
+  #   => raises FastImage::ImageFetchFailure
+  #   FastImage.size("http://stephensykes.com/images/faulty.jpg", :raise_on_failure=>true)
+  #   => raises FastImage::SizeNotFound
+  #
+  # === Supported options
+  # [:timeout]
+  #   Overrides the default timeout of 2 seconds.  Applies both to reading from and opening the http connection.
+  # [:raise_on_failure]
+  #   If set to true causes an exception to be raised if the image size cannot be found for any reason.
+  #
+  def self.size(uri, options={})
+    new(uri, options).size
+  end
 
-    # Returns an symbol indicating the image type fetched from a uri.
-    # It will return nil if the image could not be fetched, or if the image type was not recognised.
-    #
-    # By default there is a timeout of 2 seconds for opening and reading from a remote server.
-    # This can be changed by passing a :timeout => number_of_seconds in the options.
-    #
-    # If you wish FastImage to raise if it cannot find the type of the image for any reason, then pass
-    # :raise_on_failure => true in the options.
-    #
-    # === Example
-    #
-    #   require 'fastimage'
-    #
-    #   FastImage.type("http://stephensykes.com/images/ss.com_x.gif")
-    #   => :gif
-    #   FastImage.type("http://stephensykes.com/images/pngimage")
-    #   => :png
-    #   FastImage.type("http://farm4.static.flickr.com/3023/3047236863_9dce98b836.jpg")
-    #   => :jpeg
-    #   FastImage.type("http://www-ece.rice.edu/~wakin/images/lena512.bmp")
-    #   => :bmp
-    #   FastImage.type("test/fixtures/test.jpg")
-    #   => :jpeg
-    #   FastImage.type("http://pennysmalls.com/does_not_exist")
-    #   => nil
-    #
-    # === Supported options
-    # [:timeout]
-    #   Overrides the default timeout of 2 seconds.  Applies both to reading from and opening the http connection.
-    # [:raise_on_failure]
-    #   If set to true causes an exception to be raised if the image type cannot be found for any reason.
-    #
-    def self.type(uri, options={})
-      new(uri, options.merge(:type_only=>true)).type
-    end
+  # Returns an symbol indicating the image type fetched from a uri.
+  # It will return nil if the image could not be fetched, or if the image type was not recognised.
+  #
+  # By default there is a timeout of 2 seconds for opening and reading from a remote server.
+  # This can be changed by passing a :timeout => number_of_seconds in the options.
+  #
+  # If you wish FastImage to raise if it cannot find the type of the image for any reason, then pass
+  # :raise_on_failure => true in the options.
+  #
+  # === Example
+  #
+  #   require 'fastimage'
+  #
+  #   FastImage.type("http://stephensykes.com/images/ss.com_x.gif")
+  #   => :gif
+  #   FastImage.type("http://stephensykes.com/images/pngimage")
+  #   => :png
+  #   FastImage.type("http://farm4.static.flickr.com/3023/3047236863_9dce98b836.jpg")
+  #   => :jpeg
+  #   FastImage.type("http://www-ece.rice.edu/~wakin/images/lena512.bmp")
+  #   => :bmp
+  #   FastImage.type("test/fixtures/test.jpg")
+  #   => :jpeg
+  #   FastImage.type("http://pennysmalls.com/does_not_exist")
+  #   => nil
+  #
+  # === Supported options
+  # [:timeout]
+  #   Overrides the default timeout of 2 seconds.  Applies both to reading from and opening the http connection.
+  # [:raise_on_failure]
+  #   If set to true causes an exception to be raised if the image type cannot be found for any reason.
+  #
+  def self.type(uri, options={})
+    new(uri, options.merge(:type_only=>true)).type
+  end
 
-    def initialize(uri, options={})
-      @property = options[:type_only] ? :type : :size
-      @timeout = options[:timeout] || DefaultTimeout
-      @uri = uri
-      @parsed_uri = URI.parse(uri.gsub(/\s/, "%20"))
+  def initialize(uri, options={})
+    @property = options[:type_only] ? :type : :size
+    @timeout = options[:timeout] || DefaultTimeout
+    @uri = uri
+    begin
+      @parsed_uri = URI.parse(uri)
+    rescue URI::InvalidURIError
+      fetch_using_open_uri
+    else
       if @parsed_uri.scheme == "http" || @parsed_uri.scheme == "https"
         fetch_using_http
       else
         fetch_using_open_uri
       end
-      raise SizeNotFound if options[:raise_on_failure] && @property == :size && !@size
-    rescue Timeout::Error, SocketError, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::ECONNRESET, ImageFetchFailure
-      raise ImageFetchFailure if options[:raise_on_failure]
-    rescue Errno::ENOENT
-      raise ImageFetchFailure if options[:raise_on_failure]    
-    rescue UnknownImageType
-      raise UnknownImageType if options[:raise_on_failure]
     end
+    raise SizeNotFound if options[:raise_on_failure] && @property == :size && !@size
+  rescue Timeout::Error, SocketError, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::ECONNRESET, 
+    ImageFetchFailure, Net::HTTPBadResponse, EOFError, Errno::ENOENT
+    raise ImageFetchFailure if options[:raise_on_failure]
+  rescue NoMethodError  # 1.8.7p248 can raise this due to a net/http bug
+    raise ImageFetchFailure if options[:raise_on_failure]
+  rescue UnknownImageType
+    raise UnknownImageType if options[:raise_on_failure]
+  end
 
-    private
+  private
 
-    def fetch_using_http
-      setup_http
-      @http.request_get(@parsed_uri.request_uri) do |res|
-        raise ImageFetchFailure unless res.is_a?(Net::HTTPSuccess)
-        res.read_body do |str|
-          break if parse_packet(str)
-        end
+  def fetch_using_http
+    setup_http
+    @http.request_get(@parsed_uri.request_uri) do |res|
+      raise ImageFetchFailure unless res.is_a?(Net::HTTPSuccess)
+      res.read_body do |str|
+        break if parse_packet(str)
       end
     end
+  end
 
-    def setup_http
-      @http = Net::HTTP.new(@parsed_uri.host, @parsed_uri.port)
-      @http.use_ssl = (@parsed_uri.scheme == "https")
-      @http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      @http.open_timeout = @timeout
-      @http.read_timeout = @timeout
-    end
+  def setup_http
+    @http = Net::HTTP.new(@parsed_uri.host, @parsed_uri.port)
+    @http.use_ssl = (@parsed_uri.scheme == "https")
+    @http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    @http.open_timeout = @timeout
+    @http.read_timeout = @timeout
+  end
 
-    def fetch_using_open_uri
-      open(@uri) do |s|
-        while str = s.read(LocalFileChunkSize)
-          break if parse_packet(str)
-        end
+  def fetch_using_open_uri
+    open(@uri) do |s|
+      while str = s.read(LocalFileChunkSize)
+        break if parse_packet(str)
       end
     end
+  end
 
-    # returns true once result is achieved
-    #
-    def parse_packet(str)
-      @str = (@unused_str || "") + str
-      @strpos = 0
-      begin
-        result = send("parse_#{@property}")
-        if result 
-          instance_variable_set("@#{@property}", result)
-          true
-        end
-      rescue MoreCharsNeeded
-        false
+  # returns true once result is achieved
+  #
+  def parse_packet(str)
+    @str = (@unused_str || "") + str
+    @strpos = 0
+    begin
+      result = send("parse_#{@property}")
+      if result 
+        instance_variable_set("@#{@property}", result)
+        true
       end
+    rescue MoreCharsNeeded
+      false
     end
+  end
 
-    def parse_size
-      @type = parse_type unless @type
-      send("parse_size_for_#{@type}")
-    end
+  def parse_size
+    @type = parse_type unless @type
+    @strpos = 0
+    send("parse_size_for_#{@type}")
+  end
 
-    def get_chars(n)
-      if @strpos + n - 1 >= @str.size
-        @unused_str = @str[@strpos..-1]
-        raise MoreCharsNeeded
-      else
-        result = @str[@strpos..(@strpos + n - 1)]
-        @strpos += n
-        result
-      end
+  def get_chars(n)
+    if @strpos + n - 1 >= @str.size
+      @unused_str = @str[@strpos..-1]
+      raise MoreCharsNeeded
+    else
+      result = @str[@strpos..(@strpos + n - 1)]
+      @strpos += n
+      result
     end
+  end
 
-    def get_byte
-      get_chars(1).unpack("C")[0]
-    end
+  def get_byte
+    get_chars(1).unpack("C")[0]
+  end
 
-    def read_int(str)
-      size_bytes = str.unpack("CC")
-      (size_bytes[0] << 8) + size_bytes[1]
-    end
+  def read_int(str)
+    size_bytes = str.unpack("CC")
+    (size_bytes[0] << 8) + size_bytes[1]
+  end
 
-    def parse_type
-      case get_chars(2)
-      when "BM"
-        :bmp
-      when "GI"
-        :gif
-      when 0xff.chr + 0xd8.chr
-        :jpeg
-      when 0x89.chr + "P"
-        :png
-      else
-        raise UnknownImageType
-      end
+  def parse_type
+    case get_chars(2)
+    when "BM"
+      :bmp
+    when "GI"
+      :gif
+    when 0xff.chr + 0xd8.chr
+      :jpeg
+    when 0x89.chr + "P"
+      :png
+    else
+      raise UnknownImageType
     end
+  end
 
-    def parse_size_for_gif
-      get_chars(9)[4..8].unpack('SS')
-    end
+  def parse_size_for_gif
+    get_chars(11)[6..10].unpack('SS')
+  end
 
-    def parse_size_for_png
-      get_chars(23)[14..22].unpack('NN')
-    end
+  def parse_size_for_png
+    get_chars(25)[16..24].unpack('NN')
+  end
 
-    def parse_size_for_jpeg
-      loop do
-        @state = case @state
-        when nil
-          get_chars(2)
-          :started
-        when :started
-          get_byte == 0xFF ? :sof : :started          
-        when :sof
-          c = get_byte
-          if (0xe0..0xef).include?(c)
-            :skipframe
-          elsif [0xC0..0xC3, 0xC5..0xC7, 0xC9..0xCB, 0xCD..0xCF].detect {|r| r.include? c}
-            :readsize
-          else
-            :skipframe
-          end
-        when :skipframe
-          @skip_chars = read_int(get_chars(2)) - 2
-          :do_skip
-        when :do_skip
-          get_chars(@skip_chars)
-          :started
-        when :readsize
-          s = get_chars(7)
-          return [read_int(s[5..6]), read_int(s[3..4])]
+  def parse_size_for_jpeg
+    loop do
+      @state = case @state
+      when nil
+        get_chars(2)
+        :started
+      when :started
+        get_byte == 0xFF ? :sof : :started          
+      when :sof
+        c = get_byte
+        if (0xe0..0xef).include?(c)
+          :skipframe
+        elsif [0xC0..0xC3, 0xC5..0xC7, 0xC9..0xCB, 0xCD..0xCF].detect {|r| r.include? c}
+          :readsize
+        else
+          :skipframe
         end
+      when :skipframe
+        @skip_chars = read_int(get_chars(2)) - 2
+        :do_skip
+      when :do_skip
+        get_chars(@skip_chars)
+        :started
+      when :readsize
+        s = get_chars(7)
+        return [read_int(s[5..6]), read_int(s[3..4])]
       end
     end
+  end
 
-    def parse_size_for_bmp
-      d = get_chars(27)[12..26]
-      d[0] == 40 ? d[4..-1].unpack('LL') : d[4..8].unpack('SS')
-    end
+  def parse_size_for_bmp
+    d = get_chars(29)[14..28]
+    d.unpack("C")[0] == 40 ? d[4..-1].unpack('LL') : d[4..8].unpack('SS')
   end
 end