rango 0.1.1.1 → 0.1.1.2

data/README.textile

@@ -11,6 +11,23 @@ h1. Installation via "Rip":http://hellorip.com
 * Install edge version: @rip install git://github.com/botanicus/rango.git@
 * Install tagged version: @rip install git://github.com/botanicus/rango.git 0.1@
 
+h1. How to Contribute To Rango
+
+Contributions to Rango is easy, you don't have to create a ticket or something, the only thing you really have to do is write good code. Before you send a pull request, please ensure that you:
+* Wrote YARD documentation
+* Wrote specs and run them under at least under Ruby 1.9.1, ideally under all the supported Ruby platforms:
+
+<pre>
+# run all the specs under Ruby 1.9.1 and Ruby 1.9.2
+rvm specs 1.9.1,1.9.2
+
+# run given spec under all installed Ruby implementations
+rvm ruby ./script/spec spec/rango/mixins/message_spec.rb
+
+# run given spec under Ruby 1.9.1
+rvm 1.9.1 ruby ./script/spec spec/rango/mixins/message_spec.rb
+</pre>
+
 h1. Documentation
 
 * "Wiki":http://wiki.github.com/botanicus/rango

data/Rakefile

@@ -1,5 +1,11 @@
 # encoding: utf-8
 
+require_relative "lib/rango/version"
+
+# ENV setup for external commands
+ENV["RUBYLIB"] = Dir["vendor/*/lib"].join(":")
+$LOAD_PATH.clear.push(*Dir["vendor/*/lib"])
+
 # http://support.runcoderun.com/faqs/builds/how-do-i-run-rake-with-trace-enabled
 Rake.application.options.trace = true
 
@@ -8,5 +14,9 @@ task :default => ["submodules:init", :spec]
 
 # load tasks
 Dir["tasks/*.rake"].each do |taskfile|
-  load taskfile
+  begin
+    load File.join(Dir.pwd, taskfile)
+  rescue Exception => exception
+    puts exception
+  end
 end

data/lib/rango.rb

@@ -19,9 +19,7 @@ end
 Encoding.default_internal = "utf-8"
 
 module Rango
-  VERSION ||= "0.1.1.1"
   extend ApplicationMixin
-
   def self.root
     File.join(File.dirname(__FILE__), "rango")
   end

data/lib/rango/controller.rb

@@ -8,33 +8,36 @@ require "rango/rack/request"
 
 module Rango
   class Controller
+    include Rango::UrlHelper
     # [master] Change Merb::Controller to respond to #call and return a Rack Array. (wycats)http://rubyurl.com/BhoY
     # @since 0.0.2
     def self.call(env)
       Rango::Router.set_rack_env(env)
       request = Rango::Request.new(env)
       options = env["rango.router.params"] || raise("rango.router.params property has to be setup at least to empty hash")
-      method = env["rango.controller.action"].to_sym
       controller = self.new(env, options.merge(request.params))
-      begin
-        unless controller.respond_to?(method) # TODO: what about method_missing?
-          raise NotFound, "Controller #{self.name} doesn't have method #{method}"
-        end
-        controller.run_filters(:before, method.to_sym)
-        # If you don't care about arguments or if you prefer usage of params.
-        if controller.method(method).arity.eql?(0)
-          Rango.logger.debug("Calling method #{self.name}##{method} without arguments")
-          controller.response.body = controller.method(method).call
-        else
-          args = controller.params.values
-          Rango.logger.debug("Calling method #{self.name}##{method} with arguments #{args.inspect}")
-          controller.response.body = controller.method(method).call(*args)
-        end
-        controller.run_filters(:after, method)
-        return controller.response.finish
-      rescue HttpError => exception
-        controller.rescue_http_error(exception)
+      controller.to_response
+    end
+
+    def to_response
+      method = env["rango.controller.action"].to_sym
+      unless controller.respond_to?(method) # TODO: what about method_missing?
+        raise NotFound, "Controller #{self.name} doesn't have method #{method}"
+      end
+      controller.run_filters(:before, method.to_sym)
+      # If you don't care about arguments or if you prefer usage of params.
+      if controller.method(method).arity.eql?(0)
+        Rango.logger.debug("Calling method #{self.name}##{method} without arguments")
+        controller.response.body = controller.method(method).call
+      else
+        args = controller.params.values
+        Rango.logger.debug("Calling method #{self.name}##{method} with arguments #{args.inspect}")
+        controller.response.body = controller.method(method).call(*args)
       end
+      controller.run_filters(:after, method)
+      return controller.response.finish
+    rescue HttpError => exception
+      controller.rescue_http_error(exception)
     end
 
     # for routers

data/lib/rango/gv.rb

@@ -4,12 +4,9 @@
 # Use directly or include into a controller if you want to use filters or customize them
 # http://wiki.github.com/botanicus/rango/generic-views
 
-require "rango/mini"
 require "rango/router"
-require "rango/mixins/render"
 
 module Rango
   module GV
-    extend Rango::RenderMixin
   end
 end

data/lib/rango/gv/static.rb

@@ -1,8 +1,11 @@
 # encoding: utf-8
 
 require "rango/gv"
+require "rango/mini"
+require "rango/mixins/render"
 
 module Rango
+  extend Rango::RenderMixin
   module GV
     def self.static(template, locals = nil, &hook)
       Rango::Mini.app do |request, response|

data/lib/rango/mixins/message.rb

@@ -4,21 +4,40 @@ module Rango
   module MessageMixin
     # The rails-style flash messages
     # @since 0.0.2
+    # NOTE: it's important to include this mixin after ImplicitRendering mixin
+    def self.included(controller)
+      # How to determine
+      # respond to not, it's a class
+      # if controller.instance_methods.include?(:locals)
+      controller.class_eval do
+        def locals
+          @locals ||= super.merge!(message: self.message)
+        end
+      end
+    end
+
     def message
       @message ||= (request.GET[:msg] || Hash.new)
     end
-    
+
     # @since 0.0.2
     def redirect(url, options = Hash.new)
-      self.status = 302
+      url = [self.request.base_url.chomp("/"), url].join("/").chomp("/") unless url.match(/^http/)
 
-      # for example ?msg[error]=foo
-      [:error, :success, :notice].each do |type|
-        if msg = (options[type] || message[type])
-          url.concat("?msg[#{type}]=#{msg}")
+      if options.respond_to?(:inject)
+        # redirect "/post", error: "Try again"
+        # ?msg[error]="Try again"
+        url = options.inject(url) do |url, pair|
+          type, message = pair
+          url + "?msg[#{type}]=#{message}"
         end
+      else
+        # redirect "/post", "Try again"
+        # ?msg="Try again"
+        url.concat("?msg=#{options}")
       end
 
+      self.status = 302
       self.headers["Location"] = URI.escape(url)
       return String.new
     end

data/lib/rango/mixins/render.rb

@@ -1,81 +1,18 @@
 # encoding: utf-8
 
-require "rango/project"
-require "rango/router"
+require "rango" # logger
 require "rango/templates/template"
 
-# This mixin should be included to the all objects which are supposed to return response for Rack, so not just ControllerStrategy, but also CallableStrategy
 module Rango
   module RenderMixin
-    include Rango::UrlHelper
     extend self # so you can use Rango::RenderMixin.render
 
-    # class Posts < Rango::Controller
-    #   def context
-    #     Object.new
-    #   end
-    #
-    #   def show
-    #     # you can't use @explicit
-    #     post = Post.get(params[:id])
-    #     render "post.html", post: post
-    #   end
-    # end
-    #
-    # Context for rendering templates
-    # This context will be extended by same crucial methods from template mixin
-    # We are in context of current controller by default
-    def context
-      Object.new.extend(Rango::Helpers)
-    end
-
-    # def show
-    #   locals[:post] = Post.get(params[:id])
-    #   render "show.html", locals
-    # end
-    def locals
-      @locals ||= {message: self.message}
-    end
-
-    # TODO: extensions handling
     # @since 0.0.2
-    def render(template, locals = Hash.new)
-      Rango.logger.inspect(locals: locals.merge(request: self.request.to_s))
-      locals = {request: self.request}.merge(locals)
-      if self.class.respond_to?(:before_render_filters) # generic views, plain rack etc
-        run_filters2 self.class.before_render_filters, template, locals
-      end
-      template, locals = self.template_location, template if template.is_a?(Hash) && locals.empty?
-      template2 = Rango::Templates::Template.new(template, self.context)
-      if self.class.respond_to?(:after_render_filters)
-        run_filters2 self.class.after_render_filters, template2
-      end
-      return template2.render(locals)
-    end
-
-    # @since 0.0.2
-    def display(object, template, locals = Hash.new)
-      if self.class.respond_to?(:before_display_filters)
-        run_filters2 self.class.before_display_filters, object, template, locals
-      end
-      result = render(template)
-      if self.class.respond_to?(:after_display_filters)
-        run_filters2 self.class.after_display_filters, object, result
-      end
-      return result
-    rescue Error406
-      # TODO: provides API
-      format = Project.settings.mime_formats.find do |format|
-        object.respond_to?("to_#{format}")
-      end
-      format ? object.send("to_#{format}") : raise(Error406.new(self.params))
-    end
-
-    def run_filters2(array, *args)
-      array.each do |filter|
-        Rango.logger.debug("Calling filter #{filter.inspect}")
-        filter.call(*args)
-      end
+    def render(path, context = Object.new, locals = Hash.new)
+      context, locals = Object.new, context if locals.empty? && context.is_a?(Hash)
+      Rango.logger.inspect(locals: locals)
+      template = Rango::Templates::Template.new(path, context)
+      return template.render(locals)
     end
   end
 end

data/lib/rango/mixins/rendering.rb

@@ -5,7 +5,12 @@ module Rango
     def render(template, locals = Hash.new)
       super(template, self.locals.merge!(locals))
     end
-    
+
+    # class Posts < Rango::Controller
+    #   def context
+    #     Object.new
+    #   end
+    #
     #   def show
     #     # you can't use @explicit
     #     post = Post.get(params[:id])
@@ -25,7 +30,7 @@ module Rango
     #   render "show.html", locals
     # end
     def locals
-      @locals ||= {message: self.message}
+      @locals ||= {request: self.request}
     end
   end
 

data/lib/rango/rack/request.rb

@@ -160,11 +160,13 @@ module Rango
     end
 
     def base_url
-      require "uri"
-      fragments = URI.split("http://localhost:2000/foo/bar?q=foo")
-      fragments = fragments[0..4]
-      5.times { fragments.push(nil) }
-      URI::HTTP.new(*fragments).to_s
+      url = scheme + "://"
+      url << host
+      if scheme == "https" && port != 443 ||
+          scheme == "http" && port != 80
+        url << ":#{port}"
+      end
+      url
     end
   end
 end

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 # Option default_attributes
-# 
+#
 # A hash of default attributes for tags (`{tag => {attribute => default_value}}`).
 # Attributes of each tag will reverse merged with his default attributes, so you
 # don't have to write over and over that script tag has attribute `type` with value

data/lib/rango/version.rb

@@ -0,0 +1,7 @@
+# encoding: utf-8
+
+# NOTE: Do not edit this file manually, this
+# file is regenerated by task rake version:increase
+module Rango
+  VERSION ||= "0.1.1.2"
+end

data/spec/rango/mixins/message_spec.rb

@@ -0,0 +1,85 @@
+# encoding: utf-8
+
+require_relative "../../spec_helper"
+
+require "rack/mock"
+require "rango/controller"
+require "rango/mixins/message"
+require "rango/mixins/rendering"
+
+class TestController < Rango::Controller
+  include Rango::MessageMixin
+end
+
+describe Rango::MessageMixin do
+  before(:each) do
+    @env = Rack::MockRequest.env_for("/?msg")
+    @controller = TestController.new(@env)
+  end
+
+  describe ".included" do
+    it "should not do anything if method locals isn't defined" do
+      pending "How to implement it?"
+      @controller.should_not respond_to(:locals)
+    end
+
+    class ExplicitRenderingController < Rango::Controller
+      include Rango::ExplicitRendering
+      include Rango::MessageMixin
+    end
+
+    it "should add message to locals if method locals is defined" do
+      controller = ExplicitRenderingController.new(@env)
+      controller.locals.should have_key(:message)
+    end
+  end
+
+  describe "#message" do
+    before(:each) do
+      @env = Rack::MockRequest.env_for("/")
+    end
+
+    it "should" do
+      @env["QUERY_STRING"] = "msg=Hello%20There%21"
+      controller = TestController.new(@env)
+      controller.message.should eql("Hello There!")
+    end
+
+    it "should" do
+      @env["QUERY_STRING"] = "msg%5Berror%5D%3DHello%20There%21"
+      controller = TestController.new(@env)
+      controller.message[:error].should eql("Hello There!")
+    end
+
+    it "should" do
+      @env["QUERY_STRING"] = "msg%5Berror%5D=Hello%20There%21&msg%5Bnotice%5D=Welcome%21"
+      controller = TestController.new(@env)
+      controller.message[:error].should eql("Hello There!")
+      controller.message[:notice].should eql("Welcome!")
+    end
+  end
+
+  describe "#redirect" do
+    before(:each) do
+      @env  = Rack::MockRequest.env_for("/")
+      Posts = Class.new(Rango::Controller) { include Rango::MessageMixin }
+      @controller = Posts.new(@env)
+    end
+
+    it "should be satisfied just with url" do
+      @controller.redirect("/")
+      @controller.status.should eql(302)
+      @controller.headers["Location"].should eql("http://example.org/")
+    end
+
+    it "should be satisfied just with url" do
+      @controller.redirect("/", "Try again")
+      @controller.headers["Location"].should eql("http://example.org/?msg=Try%20again")
+    end
+
+    it "should be satisfied just with url" do
+      @controller.redirect("/", error: "Try again")
+      @controller.headers["Location"].should eql("http://example.org/?msg[error]=Try%20again")
+    end
+  end
+end

data/spec/rango/mixins/render_spec.rb

@@ -0,0 +1,49 @@
+# encoding: utf-8
+
+require_relative "../../spec_helper"
+
+require "rango/project"
+require "rango/mixins/render"
+
+Project.settings.template_dirs = [File.join(STUBS_ROOT, "templates")]
+
+describe Rango::RenderMixin do
+  it "should work standalone" do
+    Rango::RenderMixin.should respond_to(:render)
+  end
+
+  it "should work as a mixin" do
+    controller = Class.new { include Rango::RenderMixin }
+    controller.new.should respond_to(:render)
+  end
+
+  describe "#render" do
+    include Rango::RenderMixin
+    it "should take a path as the first argument" do
+      body = render "test.html"
+      body.should be_kind_of(String)
+    end
+
+    it "should take a context as the second argument" do
+      context    = Object.new
+      body       = render "context_id.html", context
+      context_id = body.chomp.to_i
+      context_id.should eql(context.object_id)
+    end
+
+    it "should take locals as the third argument" do
+      context = Object.new
+      body    = render "index.html", context, title: "Hi!"
+      body.should match(/Hi\!/)
+    end
+
+    it "should take the second arguments as a locals if it's a hash and there is no third argument" do
+      body = render "index.html", title: "Hi!"
+      body.should match(/Hi\!/)
+    end
+
+    it "should raise TemplateNotFound if template wasn't found" do
+      -> { render "idonotexist.html" }.should raise_error(Rango::Errors::TemplateNotFound)
+    end
+  end
+end

data/spec/rango_spec.rb

@@ -4,11 +4,6 @@ require_relative "spec_helper"
 require "rango"
 
 describe Rango do
-  it "should have version" do
-    Rango::VERSION.should be_kind_of(String)
-    Rango::VERSION.should match(/^\d+\.\d+\.\d+$/)
-  end
-
   it "should has logger" do
     Rango.logger.should be_kind_of(RubyExts::Logger)
   end

data/spec/stubs/templates/context_id.html.haml

@@ -0,0 +1 @@
+= self.object_id

data/spec/stubs/templates/index.html.haml

@@ -0,0 +1 @@
+= title

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rango
 version: !ruby/object:Gem::Version 
-  version: 0.1.1.1
+  version: 0.1.1.2
 platform: ruby
 authors: 
 - "Jakub \xC5\xA0\xC5\xA5astn\xC3\xBD aka Botanicus"
 autorequire: 
 bindir: bin
 cert_chain: 
-date: 2009-12-04 00:00:00 +00:00
+date: 2009-12-07 00:00:00 +00:00
 default_executable: rango
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -143,6 +143,7 @@ files:
 - lib/rango/templates/helpers.rb
 - lib/rango/templates/template.rb
 - lib/rango/utils.rb
+- lib/rango/version.rb
 - lib/rango.rb
 - spec/rango/contrib/pagination/adapters/datamapper_spec.rb
 - spec/rango/contrib/pagination/helpers_spec.rb
@@ -211,8 +212,10 @@ files:
 - spec/stubs/templates/basic.html.erb
 - spec/stubs/templates/capture.html.erb
 - spec/stubs/templates/context.html.erb
+- spec/stubs/templates/context_id.html.haml
 - spec/stubs/templates/erubis.html.erubis
 - spec/stubs/templates/exception.html.erb
+- spec/stubs/templates/index.html.haml
 - spec/stubs/templates/inheritance/basic/base.html.haml
 - spec/stubs/templates/inheritance/basic/index.html.haml
 - spec/stubs/templates/inheritance/capture/erb/base.html.erb