rango 0.1.0 → 0.1.1

data/lib/rango/helpers.rb

@@ -21,4 +21,3 @@ end
 require "rango/helpers/assets"
 require "rango/helpers/syntax"
 require "rango/helpers/general"
-require "rango/helpers/merb-helpers"

data/lib/rango/helpers/assets.rb

@@ -3,6 +3,8 @@
 # TODO: javascript "application" => media/javascripts/application.js
 # ... but what if I need full path? It should be tested if file exist, of course
 # javascript Path.new("design/whatever.js")
+require "rango/helpers"
+
 module Rango
   module Helpers
     # stolen from pupu (but it's OK, it's my code)

data/lib/rango/helpers/general.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require "uri"
+require "rango/helpers"
 
 module Rango
   module Helpers

data/lib/rango/helpers/syntax.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require "rango/helpers"
+
 module Rango
   module Helpers
     # @since 0.0.1

data/lib/rango/mini.rb

@@ -0,0 +1,30 @@
+# encoding: utf-8
+
+# Rango::Mini is the most low-level part which can render
+# templates standalone. More low-level is only the RenderMixin.
+# See http://wiki.github.com/botanicus/rango/template-rendering
+
+require "rango/router"
+require "rango/mixins/render"
+require "rango/rack/request"
+
+module Rango
+  module Mini
+    include Rango::RenderMixin
+    extend self # so you can run Rango::Mini.app
+    def app(&block)
+      raise ArgumentError, "Block is required" unless block_given?
+      lambda do |env|
+        Rango::Router.set_rack_env(env)
+        request = Rango::Request.new(env)
+        response = Rack::Response.new
+        body = block.call(request, response)
+        # TODO: check how rack test if object is stringable, probably not this way
+        raise ArgumentError, "It has to return a valid rack body, #{body.inspect} returned" unless body.respond_to?(:each) || body.is_a?(String)
+        response.write(body)
+        array = response.finish
+        [array[0], array[1], body] # we don't want to have Rack::Response instance instead body, it's mess!
+      end
+    end
+  end
+end

data/lib/rango/mixins/application.rb

@@ -1,8 +1,10 @@
 # encoding: utf-8
 
+require "rubyexts/mixins/import"
+
 module Rango
   module ApplicationMixin
-    include Rango::ImportMixin
+    include RubyExts::ImportMixin
     # @since 0.0.1
     # @see Path
     # @return [Path] Path reprezentation of project root directory.
@@ -17,9 +19,9 @@ module Rango
     end
 
     # @since 0.0.1
-    # @return [Rango::Logger] Logger for project related stuff.
+    # @return [RubyExts::Logger] Logger for project related stuff.
     def logger
-      @logger ||= Rango::Logger.new
+      @logger ||= RubyExts::Logger.new
     end
   end
 end

data/lib/rango/mixins/configurable.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 
+# TODO: move into separate gem with settings
 module Rango
   module Configurable
     # @since 0.0.1

data/lib/rango/mixins/render.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 
+require "rango/project"
 require "rango/router"
 require "rango/templates/template"
 
@@ -7,65 +8,8 @@ require "rango/templates/template"
 module Rango
   module RenderMixin
     include Rango::UrlHelper
+    extend self # so you can use Rango::RenderMixin.render
 
-    # @since 0.0.1
-    # @return [Rango::Request]
-    # @see Rango::Request
-    attr_accessor :request, :params, :cookies, :response
-    # @since 0.0.1
-    # @return [Hash] Hash with params from request. For example <code>{messages: {success: "You're logged in"}, post: {id: 2}}</code>
-    attr_accessor :params
-
-    attribute :status
-    attribute :headers, Hash.new
-
-    # @since 0.0.1
-    # @return [Rango::Logger] Logger for logging project related stuff.
-    # @see Rango::Logger
-    attribute :logger, Project.logger
-
-    # The rails-style flash messages
-    # @since 0.0.2
-    def message
-      @message ||= (request.GET[:msg] || Hash.new)
-    end
-
-    # @since 0.0.2
-    def redirect(url, options = Hash.new)
-      self.status = 302
-
-      # for example ?msg[error]=foo
-      [:error, :success, :notice].each do |type|
-        if msg = (options[type] || message[type])
-          url.concat("?msg[#{type}]=#{msg}")
-        end
-      end
-
-      self.headers["Location"] = URI.escape(url)
-      return String.new
-    end
-
-    # Calls the capture method for the selected template engine.
-    #
-    # ==== Parameters
-    # *args:: Arguments to pass to the block.
-    # &block:: The block to call.
-    #
-    # ==== Returns
-    # String:: The output of a template block or the return value of a non-template block converted to a string.
-    #
-    # :api: public
-    def capture(*args, &block)
-      ret = nil
-
-      captured = send("capture_#{Project.settings.template_engine}", *args) do |*args|
-        ret = yield *args
-      end
-
-      # return captured value only if it is not empty
-      captured.empty? ? ret.to_s : captured
-    end
-    
     # class Posts < Rango::Controller
     #   def context
     #     Object.new
@@ -82,46 +26,31 @@ module Rango
     # This context will be extended by same crucial methods from template mixin
     # We are in context of current controller by default
     def context
-      self
+      Object.new.extend(Rango::Helpers)
     end
 
-    # Calls the concatenate method for the selected template engine.
-    #
-    # ==== Parameters
-    # str<String>:: The string to concatenate to the buffer.
-    # binding<Binding>:: The binding to use for the buffer.
-    #
-    # :api: public
-    def concat(str, binding)
-      self.send("concat_#{Project.settings.template_engine}", str, binding)
-    end
-
-    # view:
-    # render "index"
-    # template:
-    # extends "base.html" if layout
-    # This is helper can works as render layout: false for AJAX requests when you probably would like to render just the page without layout
-    def layout
-      request.ajax?
-    end
-
-    # RENDERING #
-    def template_location(extension = "html")
-      File.join(self.controller_name, "#{self.env[:action]}.#{extension}")
+    # 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, locals)
+      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
+      return template2.render(locals)
     end
 
     # @since 0.0.2

data/lib/rango/orm/tasks/datamapper.rake

@@ -6,7 +6,7 @@ namespace :db do
   task :automigrate, :environment do |task, args|
     RANGO_ENV = args.environment || ENV["RANGO_ENV"] || "development"
     Rake::Task[:environment].invoke
-    Rango.logger.info("[#{Rango.environment}] Migrating database #{Project.settings.database_name} ...")
+    Rango.logger.info("[#{Rango.environment}] Migrating databases ...")
     result = DataMapper.auto_migrate!
     Rango.logger.debug("Result: #{result.inspect}")
   end
@@ -16,7 +16,7 @@ namespace :db do
   task :autupgrade, :environment do |task, args|
     RANGO_ENV = args.environment || ENV["RANGO_ENV"] || "development"
     Rake::Task[:environment].invoke
-    Rango.logger.info("[#{Rango.environment}] Upgrading database #{Project.settings.database_name} ...")
+    Rango.logger.info("[#{Rango.environment}] Upgrading databases ...")
     result = DataMapper.auto_upgrade!
     Rango.logger.debug("Result: #{result.inspect}")
   end

data/lib/rango/project.rb

@@ -1,13 +1,13 @@
 # encoding: utf-8
 
 require "rango/settings"
-require "rango/mixins/import"
 require "rango/mixins/application"
 require "rango/mixins/configurable"
+require "rubyexts/mixins/import"
 
 class Project
   class << self
-    include Rango::ImportMixin
+    include RubyExts::ImportMixin
     include Rango::ApplicationMixin
     include Rango::Configurable
     # @since 0.0.1

data/lib/rango/rack/middlewares/basic.rb

@@ -19,11 +19,12 @@ module Rango
     class Basic
       attr_accessor :before, :after
       def initialize(app, &block)
+        @@called = false unless defined?(@@called) # I'm not entirely sure why we have to do this
         @app = app.extend(Rango::RackDebug)
 
         #, key: 'rack.session', domain: 'foo.com', path: '/', expire_after: 2592000, secret: 'change_me'
         self.before = [Rango::Middlewares::Encoding, Rack::MethodOverride, [Rack::Session::Cookie, path: '/']]
-        self.after = [Rack::ContentType, Rack::ContentLength, Rango::Middlewares::Encoding, Rack::Head]
+        self.after = [Rack::ContentType, Rack::ContentLength, Rack::Head]
 
         self.static_files_serving
         
@@ -36,18 +37,21 @@ module Rango
       def call(env)
         # Matryoshka principle
         # MethodOverride.new(Encoding.new(@app))
-        middlewares = self.before + self.after
-        @app = middlewares.inject(@app) do |app, klass|
-          args = Array.new
-          if klass.is_a?(Array)
-            klass, args = klass
-            args = [args]
-            Rango.logger.debug("#{klass}.new(app, #{args.map { |arg| arg.inspect }.join(", ")})")
-          else
-            Rango.logger.debug("#{klass}.new(app)")
+        unless @@called
+          middlewares = self.before.reverse + self.after.reverse
+          @app = middlewares.inject(@app) do |app, klass|
+            args = Array.new
+            if klass.is_a?(Array)
+              klass, args = klass
+              args = [args]
+              Rango.logger.debug("#{klass}.new(app, #{args.map { |arg| arg.inspect }.join(", ")})")
+            else
+              Rango.logger.debug("#{klass}.new(app)")
+            end
+            klass.new(app, *args).extend(RackDebug)
           end
-          klass.new(app, *args).extend(RackDebug)
         end
+        @@called = true
         @app.call(env)
       end
 

data/lib/rango/rack/request.rb

@@ -36,13 +36,15 @@
 # http://rack.rubyforge.org/doc/
 # http://rack.rubyforge.org/doc/classes/Rack/Request.html
 
+require "rack"
+require "rubyexts/try"
 require "rubyexts/hash" # Hash#except
 
 module Rango
   module Session
   end
 
-  class Request < Rack::Request
+  class Request < ::Rack::Request
     # @since 0.0.1
     # @return [Hash] Original Rack environment.
     attr_reader :env
@@ -61,8 +63,8 @@ module Rango
       @env  = env
       # /path will be transformed to path/
       @path = env["PATH_INFO"]
-      @path.chomp!("/") if @path.length > 1 # so let the / just if the path is only /
-      @method = env["REQUEST_METHOD"].downcase
+      @path.chomp!("/") if @path && @path.length > 1 # so let the / just if the path is only /
+      @method = env["REQUEST_METHOD"].try(:downcase)
       self.extend_session
     end
 

data/lib/rango/router.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require "rango" # for helpers
+
 module Rango
   module UrlHelper
     # url(:login)
@@ -11,7 +13,18 @@ module Rango
   Helpers.send(:include, UrlHelper)
 
   class Router
-    @@routers = Hash.new unless defined?(@@routers)
+    @@routers ||= Hash.new
+
+    def self.router
+      @@router
+    rescue
+      raise "You have to run Rango::Router.use(router_name) first!"
+    end
+
+    def self.router=(router)
+      @@router = router
+    end
+
     def self.implement(router, &block)
       @@routers[router] = block
     end
@@ -19,8 +32,13 @@ module Rango
     def self.use(router)
       require_relative "router/adapters/#{router}"
       Rango.logger.debug("Using router #{router}")
-      define_method(:set_rack_env, @@routers[router])
       @@router = router
     end
+
+    def self.set_rack_env(env)
+      unless env["rango.router.params"]
+        @@routers[self.router].call(env)
+      end
+    end
   end
 end

data/lib/rango/router/adapters/rack_mount.rb

@@ -4,7 +4,6 @@ require "rack/mount"
 
 Rango::Router.implement(:rack_mount) do |env|
   env["rango.router.params"] = env["rack.routing_args"]
-  env["rango.router.app"] = self
 end
 
 module Rango

data/lib/rango/router/adapters/rack_router.rb

@@ -4,5 +4,4 @@ require "rack/router"
 
 Rango::Router.implement(:rack_router) do |env|
   env["rango.router.params"] = env["rack_router.params"]
-  env["rango.router.app"] = self
 end

data/lib/rango/router/adapters/urlmap.rb

@@ -6,5 +6,4 @@
 
 Rango::Router.implement(:urlmap) do |env|
   env["rango.router.params"] = Hash.new
-  env["rango.router.app"] = self
 end

data/lib/rango/router/adapters/usher.rb

@@ -4,7 +4,6 @@ require "usher"
 
 Rango::Router.implement(:usher) do |env|
   env["rango.router.params"] = env["usher.params"]
-  env["rango.router.app"] = self
 end
 
 module Rango

data/lib/rango/settings/framework.rb

@@ -5,10 +5,6 @@ require "rango/settings"
 module Rango
   module Settings
     class Framework < Settings
-      # @since 0.0.1
-      # @return [Boolean] explanation
-      hattribute :debug, true
-
       # @since 0.0.1
       # @return [String] Path to your +media+ directory.
       hattribute :media_root, lambda { File.join(Project.root, "media") }
@@ -21,49 +17,12 @@ module Rango
       # @return [Array[String]] Array with paths where Rango will trying to find templates.
       hattribute :template_dirs, ["templates"]
 
-      # @since 0.0.1
-      # @return [String] Name of your database or path to the database if you are using SQLite3.
-      hattribute :database_name, lambda { "#{Rango.environment}.db" }
-
-      # @since 0.0.2
-      # @return [String] Array of emails.
-      hattribute :admins, Array.new
-
-      # @since 0.0.1
-      # @return [String] Database adapter.
-      hattribute :database_adapter, "sqlite3"
-
-      # @since 0.0.1
-      # @return [String] explanation
-      # hattribute :logger_strategy, "fireruby"
-
-      # @since 0.0.1
-      # @return [Boolean] ORM. Can be datamapper or nil.
-      hattribute :orm
-
-      # @since 0.0.1
-      # @return [Boolean] Template engine. Can be haml, erb, erubis or nil (so just plain html will be returned).
-      hattribute :template_engine, "haml"
-
-      # @since 0.0.1
-      # @return [Boolean] Testing engine. Can be rspec or nil.
-      hattribute :testing_engine
-
-      # @since 0.0.1
-      # @return [Boolean] Features engine. Can be cucumber or nil.
-      hattribute :features_engine
-
       # @since 0.0.2
       hattribute :mime_formats, Array.new
 
       # @since 0.0.2
-      hattribute :autoescape, false
-
-      # @since 0.0.2
-      hattribute :gems_directory, lambda { File.join(Project.root, "gems") }
-
-      # @since 0.0.2
-      hattribute :sources_directory, lambda { File.join(Project.root, "sources") }
+      # Just informative for plugins, it doesn't really do anything
+      hattribute :orm
 
       # @since 0.0.2
       # Project.settings.erubis.pattern