rango 0.2.3 → 0.2.4.1

data/lib/rango/mixins/action_args.rb

@@ -9,19 +9,20 @@
 # method(:test).parameters
 # => [[:req, :name], [:opt, :params], [:rest, :args]]
 
-if RUBY_VERSION < "1.9.2"
+unless Kernel.method(:require).respond_to?(:parameters)
   raise <<-EOF
-Method#parameters is a part of Ruby 1.9.2 and higher, you can't use it with Ruby #{RUBY_VERSION}.
+For action args mixin you need to have Method#parameters defined. This method is defined in 1.9.2 and higher or you can use genkhi/methopara on GitHub to get it working in Ruby 1.9.1, if it will work, but it never did for me.
   EOF
 end
 
 module Rango
   module ActionArgsMixin
     def invoke_action(action)
-      view     = self.method(action)
-      names    = view.parameters.map { |type, name| name }
-      types    = view.parameters.map { |type, name| type }
-      required = view.parameters.map { |type, name| name if type.eql?(:req) }.compact
+      view       = self.method(action)
+      parameters = view.parameters.map! { |type, name| [type, name.to_s] }
+      names      = parameters.map { |type, name| name }
+      types      = parameters.map { |type, name| type }
+      required   = parameters.map { |type, name| name if type.eql?(:req) }.compact
 
       # validate types
       if types.include?(:rest)
@@ -36,7 +37,7 @@ module Rango
       end
 
       args = Array.new
-      view.parameters.each do |type, name|
+      parameters.each do |type, name|
         args.push(self.params[name]) if type.eql?(:req) || (type.eql?(:opt) && !self.params[name].nil?) # this is a bit complex, but we have to do because of rewriting optional args by nil value if we use just map with params[name]
       end
       puts "Rendering #{self.class}##{action} with #{args.map(&:inspect).join(", ")}"

data/lib/rango/mixins/filters.rb

@@ -38,6 +38,7 @@ module Rango
       def inherited(subclass)
         subclass.before_filters.replace(self.before_filters)
         subclass.after_filters.replace(self.after_filters)
+        super
       end
 
       # @since 0.2

data/lib/rango/mixins/message.rb

@@ -1,55 +1,59 @@
 # encoding: utf-8
 
-require "rango/mixins/chainable"
-
 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)
-      unless controller.method_defined?(:request)
-        raise "Rango::MessageMixin requires method request to be defined"
-      end
-      if controller.method_defined?(:context)
-        Rango.logger.debug("Extending context by message")
-        controller.class_eval do
-          extend Chainable
-          chainable do
+      controller.class_eval do
+        if self.method_defined?(:context)
+          Rango.logger.debug("Extending #{self}#context by message")
+          # This could be in the mixin itself, but we don't want
+          # to define it if the context method doesn't exist, so
+          # context.respond_to?(:context) as a detection of explicit
+          # rendering mixin and similar can work. BTW the following
+          # doesn't work with do/end syntax.
+          include Module.new {
             def context
-              super.merge!(message: self.message)
-            end
-
-            def redirect(uri, status = 301, options = Hash.new, &block)
-              status, options = 301, status if status.is_a?(Hash)
-              if options.respond_to?(:inject)
-                # redirect "/post", error: "Try again"
-                # ?msg[error]="Try again"
-                uri = options.inject(uri) do |uri, pair|
-                  type, message = pair
-                  uri + "?msg[#{type}]=#{message}"
-                end
-              else
-                # redirect "/post", "Try again"
-                # ?msg="Try again"
-                uri.concat("?msg=#{options}")
-              end
-              super(uri, status)
+              @context ||= super.merge!(message: self.message)
             end
-          end
+          }
+        else
+          Rango.logger.warn("Context #{self}#method isn't defined")
         end
-      else
-        Rango.logger.warn("Context method isn't defined")
       end
     end
 
     def message
       @message ||= begin
         messages = request.GET[:msg] || Hash.new
-        messages.inject(Hash.new) do |result, pair|
-          result.merge(pair[0] => pair[1].force_encoding(Encoding.default_external))
+        if messages.is_a?(String)
+          messages.force_encoding(Encoding.default_external)
+        elsif messages.is_a?(Hash)
+          messages.inject(Hash.new.extend(ParamsMixin)) do |result, pair| # TODO: here is the problem, Hash.new isn't params mixin
+            result.merge(pair[0] => pair[1].force_encoding(Encoding.default_external))
+          end
+        end
+      end
+    end
+    alias_method :flash, :message
+
+    def redirect(uri, options = Hash.new, status = 303, &block)
+      # status, options = 303, status if status.is_a?(Hash)
+      if options.respond_to?(:inject)
+        # redirect "/post", error: "Try again"
+        # ?msg[error]="Try again"
+        uri = options.inject(uri) do |uri, pair|
+          type, message = pair
+          uri + "?msg[#{type}]=#{message}"
         end
+      else
+        # redirect "/post", "Try again"
+        # ?msg="Try again"
+        uri.concat("?msg=#{options}")
       end
+      super(uri, status)
     end
   end
 end

data/lib/rango/mixins/rack-flash.rb

@@ -0,0 +1,44 @@
+# encoding: utf-8
+
+# @see http://nakajima.github.com/rack-flash
+# @example
+#   use Rack::Flash
+#   message["notice"]
+#   flash["notice"]
+#   OR
+#   use Rack::Flash, accessorize: [:notice, :error]
+#   message.notice
+#   flash.notice
+module Rango
+  module RackFlashMixin
+    # @since 0.2.4
+    # NOTE: it's important to include this mixin after ImplicitRendering mixin
+    def self.included(controller)
+      if controller.method_defined?(:context)
+        Rango.logger.debug("Extending context by message")
+        controller.class_eval do
+          include Module.new {
+            def context
+              @context ||= super.merge!(message: self.message)
+            end
+          }
+        end
+      else
+        Rango.logger.warn("Context method isn't defined")
+      end
+    end
+
+    def message
+      @message ||= begin
+        request.env["x-rack.flash"]
+      end
+    end
+    alias_method :flash, :message
+
+    def redirect(uri, status = 303, options = Hash.new, &block)
+      status, options = 303, status if status.is_a?(Hash)
+      options.each { |type, message| flash[type] = message }
+      super(uri, status)
+    end
+  end
+end

data/lib/rango/rack/request.rb

@@ -66,11 +66,11 @@ module Rango
     end
 
     def GET
-      normalize_params(super)
+      ParamsMixin.convert(super)
     end
 
     def POST
-      normalize_params(super)
+      ParamsMixin.convert(super)
     end
 
     def PUT
@@ -85,7 +85,7 @@ module Rango
             @env["rack.request.form_hash"] = Utils.parse_query(@env["rack.request.form_vars"])
             @env["rack.input"].rewind if @env["rack.input"].respond_to?(:rewind)
           end
-          normalize_params(@env["rack.request.form_hash"])
+          ParamsMixin.convert(@env["rack.request.form_hash"])
         else
           {}
         end
@@ -93,9 +93,13 @@ module Rango
     end
 
     def params
-      input = [self.GET, self.POST, self.PUT]
-      input.inject(Hash.new) do |result, hash|
-        hash ? result.merge!(hash) : result
+      @params ||= begin
+        input = [self.GET, self.POST, self.PUT]
+        ParamsMixin.convert(
+          input.inject(Hash.new) do |result, hash|
+            hash ? result.merge!(hash) : result
+          end
+        )
       end
     end
 
@@ -104,16 +108,14 @@ module Rango
     end
 
     def form
-      normalize_params(env["rack.request.form_hash"] || Hash.new)
+      ParamsMixin.convert(env["rack.request.form_hash"] || Hash.new)
     end
 
     def session
       @env['rack.session'] ||= {}
     end
 
-    def ajax?
-      env["HTTP_X_REQUESTED_WITH"] == "XMLHttpRequest"
-    end
+    alias_method :ajax?, :xhr?
 
     # @since 0.0.1
     # @example: "cz"
@@ -156,10 +158,5 @@ module Rango
       end
       url
     end
-
-    protected
-    def normalize_params(hash)
-      hash.deep_symbolize_keys.tap { |hash| hash.delete(:_method) }
-    end
   end
 end

data/lib/rango/router.rb

@@ -3,6 +3,10 @@
 require "rango" # for helpers
 
 module Rango
+  module Exceptions
+    class RouterNotInitialized < StandardError; end
+  end
+
   module UrlHelper
     # url(:login)
     def url(*args)
@@ -16,8 +20,8 @@ module Rango
     @@routers ||= Hash.new
     def self.app
       @@app
-    rescue
-      raise "You have to assign your router application to Rango::Router.app\nFor example Rango::Router.app = Usher::Interface.for(:rack, &block)"
+    rescue NameError
+      raise Exceptions::RouterNotInitialized, "You have to assign your router application to Rango::Router.app\nFor example Rango::Router.app = Usher::Interface.for(:rack, &block)"
     end
 
     def self.app=(app)
@@ -26,7 +30,7 @@ module Rango
 
     def self.router
       @@router
-    rescue
+    rescue NameError
       raise "You have to run Rango::Router.use(router_name) first!"
     end
 

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

@@ -1,6 +1,13 @@
-require "crudtree/generator"
+# encoding: utf-8
+
 require_relative "usher"
 
+begin
+  require "crudtree/generator"
+rescue LoadError
+  raise LoadError, "You have to install crudtree gem!"
+end
+
 module Rango
   module UrlHelper
     # resource(@post, :edit), resource(:posts)

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

@@ -1,6 +1,10 @@
 # encoding: utf-8
 
-require "rack/mount"
+begin
+  require "rack/mount"
+rescue LoadError
+  raise LoadError, "You have to install rack-mount gem!"
+end
 
 Rango::Router.implement(:rack_mount) do |env|
   env["rango.router.params"] = env["rack.routing_args"]

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

@@ -1,6 +1,10 @@
 # encoding: utf-8
 
-require "usher"
+begin
+  require "usher"
+rescue LoadError
+  raise LoadError, "You have to install usher gem!"
+end
 
 Rango::Router.implement(:usher) do |env|
   # when usher routes to the default app, then usher.params is nil
@@ -11,7 +15,6 @@ module Rango
   module UrlHelper
     # url(:login)
     def url(*args)
-      raise "You have to asign your routes to Rango::Router.app, for example Rango::Router.app = Usher::Interface.for(:rack) { get('/') }" if Rango::Router.app.nil?
       Rango::Router.app.router.generator.generate(*args)
     end
   end

data/lib/rango/stacks/controller.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 require "rango"
-require "rango/helpers"
 require "rango/controller"
 require "rango/environments"
 require "rango/mixins/rendering"

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

@@ -9,26 +9,25 @@
 # Defaults to `{script: {type: "text/javascript"}, form: {method: "POST"}}`
 
 module Haml
-  class Engine
-    alias_method :__initialize__, :initialize
-    def initialize(template, options = Hash.new)
-      __initialize__(template, options)
-      @options[:default_attributes] = Hash.new
-      # symbolize keys
-      @options[:default_attributes] = @options[:default_attributes].inject(Hash.new) do |options, pair|
-        options.merge(pair.first.to_sym => pair.last)
-      end
-    end
-  end
-
   module Precompiler
     alias_method :__prerender_tag__, :prerender_tag
     def prerender_tag(name, self_close, attributes)
       # merge given attributes with default attributes from options
-      if default_attributes = @options[:default_attributes][name.to_sym]
-        attributes = default_attributes.merge(attributes)
-      end
+      defaults = Tilt::HamlTemplate.options[:default_attributes][name.to_sym]
+      attributes = defaults.merge(attributes) if defaults
       __prerender_tag__(name, self_close, attributes)
     end
   end
+
+  class Buffer
+    alias_method :__open_tag__, :open_tag
+    def open_tag(name, self_closing, try_one_line, preserve_tag, escape_html, class_id,
+                 nuke_outer_whitespace, nuke_inner_whitespace, obj_ref, content, *attributes_hashes)
+      defaults = Tilt::HamlTemplate.options[:default_attributes][name.to_sym]
+      attributes_hashes.unshift(defaults) if defaults
+
+      __open_tag__(name, self_closing, try_one_line, preserve_tag, escape_html, class_id,
+                    nuke_outer_whitespace, nuke_inner_whitespace, obj_ref, content, *attributes_hashes)
+    end
+  end
 end

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

@@ -1,36 +1,29 @@
 # encoding: utf-8
 
 require "tilt"
-require "rango/mixins/chainable"
 
-module Tilt
-  ErubisTemplate.class_eval do
-    extend Chainable
-    chainable do
-      def initialize_engine
-        super
-        require "rango/templates/exts/erubis"
+module Rango
+  module TiltExtensions
+    # Tilt::HamlTemplate.options[:default_attributes] = {script: {type: "text/javascript"}, form: {method: "POST"}}
+    module Haml
+      def self.included(klass)
+        klass.send(:remove_method, :initialize_engine)
+        def klass.options
+          @options ||= Hash.new
+        end
       end
-    end
-  end
-
-  # Tilt::HamlTemplate.options[:default_attributes] = {script: {type: "text/javascript"}, form: {method: "POST"}}
-  HamlTemplate.class_eval do
-    extend Chainable
 
-    def self.options
-      @options ||= Hash.new
-    end
-
-    chainable do
       def initialize_engine
-        super
-        require "rango/templates/exts/haml"
+        require_template_library 'haml' unless defined? ::Haml::Engine
+        require "rango/templates/exts/haml" if self.class.options[:default_attributes]
       end
 
-      def haml_options
-        super.merge!(self.class.options)
+      def initialize(*args)
+        super
+        self.options.merge!(self.class.options)
       end
     end
   end
 end
+
+Tilt::HamlTemplate.send(:include, Rango::TiltExtensions::Haml)

data/lib/rango/templates/helpers.rb

@@ -84,6 +84,15 @@ module Rango
       return self.template.blocks[name]
     end
 
+    # Clears default content of given block.
+    #
+    # @example
+    #   clear_block(:flyout)
+    def clear_block(name)
+      raise ArgumentError, "You need to specify name of block to clear." if name.nil?
+      self.template.blocks[name] = String.new
+    end
+
     # Low-level rendering method for templates.
     #
     # @since 0.2
@@ -113,7 +122,7 @@ module Rango
 
     # @since 0.2
     def includes(template, context = Hash.new)
-      render template, context
+      render normalize_template_path(template), context
       return true
     end