rango 0.0.3 → 0.0.4

data/lib/rango/templates/adapters/erubis.rb

@@ -1,60 +1,65 @@
-# coding: utf-8
+# encoding: utf-8
+
+# Features:
+#   - autoescaping
+#   - caching
+#   - preprocessing (not yet, see ticket #68)
 
 require "erubis"
 Rango.import("templates/adapter")
 
-class Rango
-  module Templates
-    class Erubis < ::Rango::Templates::Adapter
-      # TODO: context {foo: "bar"} => @foo instead of just foo
-      # http://www.kuwata-lab.com/erubis/users-guide.02.html#tut-context
-
-      # TODO: result vs. evaluate
-      # http://www.kuwata-lab.com/erubis/users-guide.02.html#tut-context
-      # http://www.kuwata-lab.com/erubis/users-guide.06.html#topics-context-vs-binding
-
-      # TODO: maybe preprocessing
-      # http://www.kuwata-lab.com/erubis/users-guide.05.html#rails-preprocessing
-      # http://www.kuwata-lab.com/erubis/users-guide.06.html#topics-caching
+module Erubis
+  class FastEscapedEruby < FastEruby
+    include EscapeEnhancer
+  end
+end
 
+module Rango
+  module Templates
+    class ErubisAdapter < Adapter
       # @since 0.0.2
-      # @see http://www.kuwata-lab.com/erubis/users-guide.02.html#tut-escape
-      def render(io, context)
+      def render(io, context = Hash.new)
         if Project.settings.erubis.custom_class
           klass = Project.settings.erubis.custom_class
-        elsif Project.settings.autoescape
-          klass = ::Erubis::EscapedEruby
+        elsif Project.settings.template.autoescape
+          klass = Erubis::FastEscapedEruby
         else
-          klass = ::Erubis::Eruby
+          klass = Erubis::FastEruby
         end
-        pattern = Project.settings.erubis_pattern
-        klass.new(io.read).result(context, binding, pattern: pattern)
+        pattern = Project.settings.erubis.pattern
+        # Erubis::Engine.load_file is good for caching
+        # http://www.kuwata-lab.com/erubis/users-guide.06.html#topics-caching
+        if Project.settings.template.caching
+          begin
+            template = klass.load_file(io.path, pattern: pattern, filename: io.path)
+          rescue NoMethodError
+            Rango.logger.error("Class #{klass} must respond to load_file method if you like to use caching")
+          end
+        else
+          template = klass.new(io.read, pattern: pattern, filename: io.path)
+        end
+        template.extend(CaptureErubis)
+        return template.result(context)
       end
     end
   end
 
-  class Controller
-    # ==== Parameters
-    # *args:: Arguments to pass to the block.
-    # &block:: The template block to call.
-    #
-    # ==== Returns
-    # String:: The output of the block.
-    #
-    # ==== Examples
-    # Capture being used in a .html.erb page:
-    #
+  module CaptureErubis
+    # @example Capture being used in a .html.erb page:
     #   <% @foo = capture do %>
     #     <p>Some Foo content!</p>
     #   <% end %>
     #
-    # :api: private
+    # @params [*args]  Arguments to pass to the block.
+    # @params [&block] The template block to call.
+    # @return [String] The output of the block.
+    # @api private
     def capture_erubis(*args, &block)
       _old_buf, @_erb_buf = @_erb_buf, ""
       block.call(*args)
-      ret = @_erb_buf
-      @_erb_buf = _old_buf
-      ret
+      @_erb_buf.dup.tap do |buf|
+        @_erb_buf = _old_buf
+      end
     end
   end
 end

data/lib/rango/templates/adapters/haml.rb

@@ -1,16 +1,25 @@
-# coding: utf-8
+# encoding: utf-8
+
+# Features:
+#   - autoescaping
+#   - caching (not yet)
 
 require "haml"
 Rango.import("templates/adapter")
 
-class Rango
+module Rango
   module Templates
-    class Haml < ::Rango::Templates::Adapter
+    class HamlAdapter < Adapter
       # @since 0.0.2
       def render(io, scope, locals = Hash.new)
         options = Project.settings.haml.to_hash ### FIXME
         options[:filename] = io.path
-        ::Haml::Engine.new(io.read, options).render(scope, locals)
+        if File.exist?("#{io.path}.cache")
+          eval(File.read("#{io.path}.cache"), scope)
+        else
+          engine = Haml::Engine.new(io.read, options)
+          engine.render(scope, locals)
+        end
       end
     end
   end

data/lib/rango/templates/template.rb

@@ -1,7 +1,9 @@
+# encoding: utf-8
+
 # TODO: qattribute :partial, true
 # => define #partial?
 
-class Rango
+module Rango
   module Templates
     class Template
       # template -> supertemplate is the same relationship as class -> superclass

data/rango.gemspec

@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 
 # Run thor package:gem or gem build rango.gemspec
 $:.unshift(File.join(File.dirname(__FILE__), "lib"))
@@ -9,27 +9,35 @@ rescue SecurityError
   # http://gems.github.com
 end
 
-class Rango
-  VERSION  = "0.0.3"
-  CODENAME = "Smart Kangaroo"
-  SPECIFICATION = ::Gem::Specification.new do |s|
-    s.name = "rango"
-    # s.version = Rango::VERSION
-    s.version = Rango::VERSION
-    s.authors = ["Jakub Šťastný aka Botanicus"]
-    s.homepage = "http://github.com/botanicus/rango"
-    s.summary = "Rango is ultralightweight, ultracustomizable, ultracool web framework deeply inspired by Django."
-    s.description = "" # TODO: long description
-    s.cert_chain = nil
-    s.email = ["knava.bestvinensis", "gmail.com"].join("@")
-    s.files = Dir.glob("**/*") - Dir.glob("pkg/*")
-    s.executables = ["rango"]
-    s.default_executable = "rango"
-    s.add_dependency "rack"
-    # s.add_dependency "thor"
-    s.add_dependency "extlib"
-    s.require_paths = ["lib"]
-    s.required_ruby_version = ::Gem::Requirement.new(">= 1.9.1")
-    s.rubyforge_project = "rango"
-  end
+::Gem::Specification.new do |s|
+  s.name = "rango"
+  s.version = "0.0.4"
+  s.authors = ["Jakub Šťastný aka Botanicus"]
+  s.homepage = "http://github.com/botanicus/rango"
+  s.summary = "Rango is ultralightweight, ultracustomizable, ultracool web framework deeply inspired by Django."
+  s.description = "" # TODO: long description
+  s.cert_chain = nil
+  s.email = ["knava.bestvinensis", "gmail.com"].join("@")
+
+  # files
+  s.files = Dir.glob("**/*") - Dir.glob("pkg/*")
+  s.executables = ["rango"]
+  s.default_executable = "rango"
+  s.require_paths = ["lib"]
+
+  # Ruby version
+  s.required_ruby_version = ::Gem::Requirement.new(">= 1.9.1")
+
+  # runtime dependencies
+  s.add_dependency "rack"
+  s.add_dependency "extlib"
+  s.add_dependency "path"
+
+  # development dependencies
+  # use gem install rango --development if you want to install them
+  s.add_development_dependency "erubis"
+  s.add_development_dependency "thor"
+
+  # RubyForge
+  s.rubyforge_project = "rango"
 end

data/rango.gemspec.erb

@@ -0,0 +1,43 @@
+# encoding: utf-8
+
+# Run thor package:gem or gem build rango.gemspec
+$:.unshift(File.join(File.dirname(__FILE__), "lib"))
+
+begin
+  require "rubygems/specification"
+rescue SecurityError
+  # http://gems.github.com
+end
+
+::Gem::Specification.new do |s|
+  s.name = "rango"
+  s.version = "<%= Rango::VERSION %>"
+  s.authors = ["Jakub Šťastný aka Botanicus"]
+  s.homepage = "http://github.com/botanicus/rango"
+  s.summary = "Rango is ultralightweight, ultracustomizable, ultracool web framework deeply inspired by Django."
+  s.description = "" # TODO: long description
+  s.cert_chain = nil
+  s.email = ["knava.bestvinensis", "gmail.com"].join("@")
+
+  # files
+  s.files = Dir.glob("**/*") - Dir.glob("pkg/*")
+  s.executables = ["rango"]
+  s.default_executable = "rango"
+  s.require_paths = ["lib"]
+
+  # Ruby version
+  s.required_ruby_version = ::Gem::Requirement.new(">= 1.9.1")
+
+  # runtime dependencies
+  s.add_dependency "rack"
+  s.add_dependency "extlib"
+  s.add_dependency "path"
+
+  # development dependencies
+  # use gem install rango --development if you want to install them
+  s.add_development_dependency "erubis"
+  s.add_development_dependency "thor"
+
+  # RubyForge
+  s.rubyforge_project = "rango"
+end

data/spec/factories.rb

@@ -1,4 +1,6 @@
-# coding: utf-8
+# encoding: utf-8
+
+require "rack/mock"
 
 class Factory
   class << self
@@ -6,7 +8,6 @@ class Factory
       {"PATH_INFO" => "/blog/post/a-slug", "REQUEST_METHOD" => "GET"}.merge(environment)
     end
 
-    # TODO: Rack MocRequest
     def request
       Rango::Request.new(self.rack_env)
     end

data/spec/rango/boot_spec.rb

@@ -1,6 +1,6 @@
-# coding: utf-8
+# encoding: utf-8
 
-require File.join(Dir.pwd, "spec", "spec_helper")
+require_relative "../spec_helper"
 
 describe Rango do
   describe ".environment" do
@@ -12,8 +12,4 @@ describe Rango do
       Rango.environment.should eql("development")
     end
   end
-
-  describe ".dependency" do
-    # TODO
-  end
 end

data/spec/rango/contrib/pagination/page_spec.rb

@@ -1,7 +1,7 @@
-# coding: utf-8
+# encoding: utf-8
 
 # version 1.0
-require File.join(File.dirname(__FILE__), '..', '..', '..', "spec_helper")
+require_relative "../../../spec_helper"
 require "rango/contrib/pagination/page"
 
 describe Page do

data/spec/rango/controller_spec.rb

@@ -0,0 +1,24 @@
+# encoding: utf-8
+
+require_relative "../spec_helper"
+
+Rango.import("controller")
+
+describe Rango::Controller do
+  before(:each) do
+    @controller = Factory.controller
+  end
+
+  it "should respond to request" do
+    @controller.should respond_to(:request)
+  end
+
+  it "should respond to params" do
+    @controller.should respond_to(:params)
+  end
+
+  it "should have logger" do
+    @controller.should respond_to(:logger)
+    @controller.logger.should eql(Project.logger)
+  end
+end

data/spec/rango/exceptions_spec.rb

@@ -0,0 +1,74 @@
+require_relative "../spec_helper"
+
+describe Rango::HttpError do
+  before(:each) do
+    @error = Rango::NotFound.new("Post with given ID doesn't exist")
+  end
+
+  describe "constants" do
+    it "should has CONTENT_TYPE" do
+      Rango::HttpError.constants.should include(:CONTENT_TYPE)
+    end
+    
+    it "should xxxxxxxxx" do
+      @class  = Class.new(Rango::HttpError)
+      -> { @class::STATUS }.should raise_error(NameError, /has to have defined constant STATUS/)
+    end
+  end
+
+  describe "#status" do
+    it "should returns HTTP status status" do
+      @error.status.should eql(404)
+    end
+  end
+
+  describe "#content_type" do
+    it "should returns HTTP status status" do
+      @error.content_type.should eql(@error.class::CONTENT_TYPE)
+    end
+
+    it "should returns HTTP status status" do
+      @error.content_type = "text/xml"
+      @error.content_type.should eql("text/xml")
+    end
+  end
+
+  describe "#headers" do
+    it "should returns HTTP status status" do
+      @error.headers.should be_kind_of(Hash)
+    end
+
+    it "should returns HTTP status status" do
+      @error.headers = "text/xml"
+      @error.headers.should eql("text/xml")
+    end
+  end
+
+  describe "#to_snakecase" do
+    it "should returns snakecased name of class" do
+      @error.to_snakecase.should eql("not_found")
+    end
+  end
+  
+  describe "#to_reponse" do
+    before(:each) do
+      @status, @headers, @body = @error.to_response
+    end
+
+    it "should returns standard response array for Rack" do
+      @status.should eql(@error.status)
+    end
+
+    it "should returns standard response array for Rack" do
+      @headers.should be_kind_of(Hash)
+    end
+
+    it "should write Content-Type header" do
+      @headers["Content-Type"].should eql @error.content_type
+    end
+
+    it "should returns standard response array for Rack" do
+      @body.should respond_to(:each)
+    end
+  end
+end

data/spec/rango/ext/array_spec.rb

@@ -0,0 +1,19 @@
+# encoding: utf-8
+
+require_relative "../../../lib/rango/ext/array"
+
+describe Array do
+  describe "#only" do
+    it "should returns the only item in array" do
+      [:first].only.should eql(:first)
+    end
+
+    it "should raise index error if array has more items" do
+      -> { [1, 2].only }.should raise_error(IndexError)
+    end
+
+    it "should returns the only item in array" do
+      -> { Array.new.only }.should raise_error(IndexError)
+    end
+  end
+end

data/spec/rango/ext/attribute_spec.rb

@@ -0,0 +1,37 @@
+# encoding: utf-8
+
+require_relative "../../../lib/rango/ext/attribute"
+
+describe AttributeMixin do
+  describe "#private_alias" do
+    before(:each) do
+      @class = Class.new { private_alias :class }
+    end
+
+    it "should creates __alias__ of given method" do
+      @class.new.tap do |instance|
+        instance.class.should eql(instance.send(:__class__))
+      end
+    end
+
+    it "should be private" do
+      @class.private_instance_methods.should include(:__class__)
+    end
+  end
+
+  describe "#attribute" do
+    it
+  end
+
+  describe "#hattribute" do
+    it
+  end
+
+  describe "#questionable" do
+    it
+  end
+
+  describe "#default_hattribute_names" do
+    it
+  end
+end