rango 0.1.1.3 → 0.2.pre

data/lib/rango/exceptions.rb

@@ -29,7 +29,7 @@ module Rango
     end
 
     def to_response
-      headers = self.headers.reverse_merge("Content-Type" => self.content_type)
+      headers = {"Content-Type" => self.content_type}.merge(self.headers)
       [self.status, headers, [self.message]]
     end
 

data/lib/rango/forms/form.rb

@@ -9,7 +9,8 @@
 # @future 0.0.3 It's just a prototype now
 module Rango
   class Form
-    attribute :media
+    def media
+    end
 
     def valid?
     end

data/lib/rango/helpers/assets.rb

@@ -4,7 +4,12 @@
 # ... 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"
-require "media-path"
+
+begin
+  require "media-path"
+rescue LoadError
+  raise LoadError, "You have to install media-path gem!"
+end
 
 module Rango
   module Helpers

data/lib/rango/helpers/general.rb

@@ -46,7 +46,7 @@ module Rango
         options[:size]     = args[0] || 75
         options[:omission] = args[1] || "..."
       end
-      options.reverse_merge!(:size => 75, :omission => "...")
+      options = {size: 75, omission: "..."}.merge(options)
       text.scan(/(\S+)(\s+)/)[0..options[:size]].flatten.join << options[:omission] if text
     end
   end

data/lib/rango/mixins/action_args.rb

@@ -0,0 +1,48 @@
+# encoding: utf-8
+
+# class Application < Rango::Controller
+#   include Rango::ActionArgsMixin
+# end
+
+# def test(name, params = Hash.new, *args)
+# end
+# method(:test).parameters
+# => [[:req, :name], [:opt, :params], [:rest, :args]]
+
+if RUBY_VERSION < "1.9.2"
+  begin
+    require "methopara"
+  rescue LoadError
+    raise LoadError, "Method#parameters is part of Ruby 1.9.2 and higher. If you want to use this feature with Ruby 1.9.1, you have to install methopara gem (http://github.com/genki/methopara)"
+  end
+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
+
+      # validate types
+      if types.include?(:rest)
+        raise ArgumentError, "View can't have splat argument. Use just this: def #{action}(#{names[0..-2].join(", ")})"
+      elsif types.include?(:block)
+        raise ArgumentError, "View can't have block argument. Use just this: def #{action}(#{names[0..-2].join(", ")})"
+      end
+
+      # validate names
+      unless (extra_keys = required - self.params.keys).empty?
+        raise ArgumentError, "Following keys aren't available in params: #{extra_keys.inspect}\nAvailable keys: #{self.params.keys.inspect}"
+      end
+
+      args = Array.new
+      view.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}##{action} with #{args.map(&:inspect).join(", ")}"
+      self.send(action, *args)
+    end
+  end
+end

data/lib/rango/mixins/chainable.rb

@@ -0,0 +1,66 @@
+# encoding: utf-8
+
+# from merb-core
+module Chainable
+  # Allows the definition of methods on a class that will be available via
+  # super.
+  #
+  # ==== Examples
+  #     class Foo
+  #       extend Chainable
+  #       chainable do
+  #         def hello
+  #           "hello"
+  #         end
+  #       end
+  #     end
+  #
+  #     class Foo
+  #       def hello
+  #         super + " Merb!"
+  #       end
+  #     end
+  #
+  # # Example with mixin:
+  # module TestMixin
+  #   extend Chainable
+  #   chainable do
+  #     def test
+  #       "from mixin!"
+  #     end
+  #   end
+  # end
+  #
+  # class Test
+  #   include TestMixin
+  #   def test
+  #     "hello " + super
+  #   end
+  # end
+  #
+  # puts Test.new.test
+  #
+  #
+  # Foo.new.hello #=> "hello Merb!"
+  #
+  # ==== Parameters
+  # &block::
+  #   a block containing method definitions that should be
+  #   marked as chainable
+  #
+  # ==== Returns
+  # Module:: The anonymous module that was created
+  def chainable(method = nil, &block)
+    if method.nil? && block_given?
+      mixin = Module.new(&block)
+      include mixin
+      return mixin
+    elsif method && ! block_given?
+      # TODO
+      # def test
+      #   # ...
+      # end
+      # chainable :test
+    end
+  end
+end

data/lib/rango/mixins/filters.rb

@@ -16,7 +16,7 @@ module Rango
     # @since 0.0.2
     def run_filters(name, method)
       # Rango.logger.debug(self.class.instance_variables)
-      # Rango.logger.inspect(name: name, method: method)
+      # #Rango.logger.inspect(name: name, method: method)
       self.class.get_filters(name).each do |filter_method, options|
         unless options[:except] && options[:except].include?(method)
           if filter_method.is_a?(Symbol) && self.respond_to?(filter_method)
@@ -33,17 +33,19 @@ module Rango
     end
 
     module ClassMethods
-      def inherited(subclass)
-        inherit_filters(subclass, :before)
-        inherit_filters(subclass, :after)
-        inherit_filters(subclass, :before_render)
-        inherit_filters(subclass, :after_render)
-        inherit_filters(subclass, :before_display)
-        inherit_filters(subclass, :after_display)
+      #def inherited(subclass)
+      #  subclass.before_filters = self.before_filters.dup
+      #  subclass.after_filters  = self.after_filters.dup
+      #end
+
+      # @since 0.2
+      def before_filters
+        @@before_filters ||= Hash.new
       end
 
-      def inherit_filters(subclass, name)
-        subclass.send("#{name}_filters=", self.send("#{name}_filters").dup)
+      # @since 0.2
+      def after_filters
+        @@after_filters ||= Hash.new
       end
 
       # before :login
@@ -62,16 +64,6 @@ module Rango
       def get_filters(type)
         self.send("#{type}_filters")
       end
-
-      # @since 0.0.2
-      attribute :before_filters, Hash.new
-      attribute :after_filters,  Hash.new
-
-      attribute :before_render_filters, Array.new
-      attribute :after_render_filters, Array.new
-
-      attribute :before_display_filters, Array.new
-      attribute :after_display_filters, Array.new
     end
   end
 end

data/lib/rango/mixins/logger.rb

@@ -17,3 +17,4 @@ module Rango
     end
   end
 end
+

data/lib/rango/mixins/message.rb

@@ -6,12 +6,11 @@ module Rango
     # @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?(:context)
-      controller.class_eval do
-        def context
-          @context ||= super.merge!(message: self.message)
+      if controller.method_defined?(:context)
+        controller.class_eval do
+          def context
+            @context ||= super.merge!(message: self.message)
+          end
         end
       end
     end

data/lib/rango/mixins/render.rb

@@ -10,7 +10,7 @@ module Rango
     # @since 0.0.2
     def render(path, scope = Object.new, context = Hash.new)
       scope, context = Object.new, scope if context.empty? && scope.is_a?(Hash)
-      Rango.logger.inspect(context: context)
+      #Rango.logger.inspect(context: context)
       template = Rango::Template.new(path, scope)
       return template.render(context)
     end

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

@@ -4,7 +4,7 @@ namespace :db do
   # @since 0.0.2
   desc "Automigrate the database. It will destroy all the data!"
   task :automigrate, :environment, :needs => :environment do |task, args|
-    RANGO_ENV = args.environment || ENV["RANGO_ENV"] || "development"
+    RACK_ENV = args.environment || ENV["RACK_ENV"] || "development"
     Rango.logger.info("[#{Rango.environment}] Migrating databases ...")
     result = DataMapper.auto_migrate!
     Rango.logger.debug("Result: #{result.inspect}")
@@ -13,7 +13,7 @@ namespace :db do
   # @since 0.0.2
   desc "Autoupgrade the database structure. Data should stay untouched."
   task :autupgrade, :environment, :needs => :environment do |task, args|
-    RANGO_ENV = args.environment || ENV["RANGO_ENV"] || "development"
+    RACK_ENV = args.environment || ENV["RACK_ENV"] || "development"
     Rango.logger.info("[#{Rango.environment}] Upgrading databases ...")
     result = DataMapper.auto_upgrade!
     Rango.logger.debug("Result: #{result.inspect}")
@@ -21,7 +21,7 @@ namespace :db do
 
   desc "Report count of objects in database"
   task :report, :environment, :needs => :environment do |task, args|
-    RANGO_ENV = args.environment || ENV["RANGO_ENV"] || "development"
+    RACK_ENV = args.environment || ENV["RACK_ENV"] || "development"
     ObjectSpace.classes.each do |klass|
       if klass.included(DataMapper::Resource)
         puts "#{model_class}: #{model_class.count}"
@@ -32,7 +32,7 @@ namespace :db do
   # @since 0.0.2
   desc "Run migrations"
   task :migrate, :environment, :needs => :environment do |task, args|
-    RANGO_ENV = args.environment || ENV["RANGO_ENV"] || "development"
+    RACK_ENV = args.environment || ENV["RACK_ENV"] || "development"
     abort "Use rake db:migrate:up[version] or db:migrate:down[version]"
   end
 

data/lib/rango/path.rb

@@ -1,7 +1,12 @@
 # encoding: utf-8
 
 require "rango"
-require_gem "media-path"
+
+begin
+  require "media-path"
+rescue LoadError
+  raise LoadError, "You have to install media-path gem!"
+end
 
 # @since 0.0.2
 # @example

data/lib/rango/rack/request.rb

@@ -37,8 +37,7 @@
 # http://rack.rubyforge.org/doc/classes/Rack/Request.html
 
 require "rack"
-require "rubyexts/try"
-require "rubyexts/hash" # Hash#except
+require "rango/core_ext"
 
 module Rango
   module Session
@@ -49,9 +48,6 @@ module Rango
     # @return [Hash] Original Rack environment.
     attr_reader :env
 
-    # @since 0.0.2
-    #attribute :message, Hash.new
-
     # @since 0.0.1
     # @example: blog/post/rango-released
     # @return [Hash] Original Rack environment.
@@ -64,16 +60,17 @@ module Rango
       # /path will be transformed to path/
       @path = env["PATH_INFO"]
       @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
+      @method = (env["REQUEST_METHOD"] || String.new).downcase
+      session.extend(Session)
+      Rango.logger.debug("Session: #{@env['rack.session'].inspect}")
     end
 
     def GET
-      super.deep_symbolize_keys.except(:_method)
+      normalize_params(super)
     end
 
     def POST
-      super.deep_symbolize_keys.except(:_method) if self.post?
+      normalize_params(super)
     end
 
     def PUT
@@ -88,36 +85,29 @@ 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
-          @env["rack.request.form_hash"].deep_symbolize_keys.except(:_method)
+          normalize_params(@env["rack.request.form_hash"])
         else
           {}
         end
       end
     end
 
-    def DELETE
-      {}.deep_symbolize_keys.except(:_method)
-    end
-
     def params
-      @params = Hash.new
-      [self.GET, self.POST, self.PUT, self.DELETE].each do |data|
-        @params.merge!(data) if data.respond_to?(:merge) # Hash, Mash and friends
+      input = [self.GET, self.POST, self.PUT]
+      input.inject(Hash.new) do |result, hash|
+        hash ? result.merge!(hash) : result
       end
-      @params.deep_symbolize_keys.except(:msg, :_method)
     end
 
     def cookies
-      super.except("rack.session").symbolize_keys
+      super.tap { |cookies| cookies.delete("rack.session") }.symbolize_keys
     end
 
     def form
-      data = env["rack.request.form_hash"] || Hash.new
-      data.deep_symbolize_keys.except(:_method)
+      normalize_params(env["rack.request.form_hash"] || Hash.new)
     end
 
     def session
-      # Rango.logger.inspect(session: @env['rack.session'])
       @env['rack.session'] ||= {}
     end
 
@@ -125,13 +115,6 @@ module Rango
       env["HTTP_X_REQUESTED_WITH"] == "XMLHttpRequest"
     end
 
-    # TODO: use extend method
-    def extend_session
-      class << session
-        include Rango::Session
-      end
-    end
-
     # @since 0.0.1
     # @example: "cz"
     # @return [String] Top level domain.
@@ -142,6 +125,7 @@ module Rango
     # @since 0.0.1
     # @example: "101ideas.cz"
     # @return [String] Domain name.
+    # FIXME: what about .co.uk? Rewrite in the same way as subdomains
     def domain
       if host.match(/^localhost/)
         return host.split(".").last
@@ -172,5 +156,10 @@ 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

@@ -6,7 +6,7 @@ module Rango
   module UrlHelper
     # url(:login)
     def url(*args)
-      raise "Your router or your router adapter doesn't support this method"
+      raise NotImplementedError, "Your router or your router adapter doesn't support this method"
     end
   end
 

data/lib/rango/stacks/controller.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 require "rango"
-require "rango/logger"
 require "rango/controller"
 require "rango/environments"
 require "rango/rack/middlewares/basic"

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

@@ -1,11 +1,11 @@
 # encoding: utf-8
 
 require "tilt"
-require "rubyexts/mixins/chainable"
+require "rango/mixins/chainable"
 
 module Tilt
   ErubisTemplate.class_eval do
-    extend RubyExts::Chainable
+    extend Chainable
     chainable do
       def initialize_engine
         super
@@ -15,7 +15,7 @@ module Tilt
   end
 
   HamlTemplate.class_eval do
-    extend RubyExts::Chainable
+    extend Chainable
     chainable do
       def initialize_engine
         super