rango 0.2.3 → 0.2.4.1

data/.gitignore

@@ -5,5 +5,5 @@
 .yardoc
 
 script/*
-gems/*
-!gems/cache
+.bundle
+.rvmrc

data/CHANGELOG

@@ -75,3 +75,12 @@
   * [FIX] Cookies are passed into the redirect request
   * [FIX] All non-http exceptions which occur in controller are captured and passed to rescue_http_error as a new instance of InternalServerError, except development environment where we want to get the Rack error screen.
   * [FIX] Fixed encoding problem in messages. It's actually Rack fault, but hey.
+
+= Version 0.2.4
+  * Removed all helpers, if you need some, use http://github.com/botanicus/helpers
+  * [FEATURE] Added rango/mailer with mail helper for sending e-mails
+  * Rango.root & Rango.media_path are now instances of Pathname rather than String
+  * rango/environments are no longer optional
+  * Ripple support in stack generator
+  * Removed Erubis support, since it doesn't support <%= block(&block) %> so it's useless for us
+  * Specs are green again

data/CONTRIBUTORS

@@ -1,5 +1,4 @@
 Jakub Šťastný aka Botanicus (main author)
 Grant Michael Levkoff aka grantmichaels (wrote awesome http://www.rubyinside.com/rango-ruby-web-app-framework-2858.html)
-Martin Hrdlička
 Tomasz Werbicki aka neaf
 Simon Hafner aka Tass

data/Gemfile

@@ -1,11 +1,7 @@
 # encoding: utf-8
 
-# configuration
-bundle_path "gems"
-bin_path "script"
-disable_rubygems
+source :gemcutter
 
-# gems
 gem "nake"
 gem "code-cleaner"
 
@@ -15,6 +11,6 @@ gem "rack"
 gem "haml"
 gem "erubis"
 
-only(:test) do
+group(:test) do
   gem "rspec"
 end

data/lib/rango.rb

@@ -5,29 +5,30 @@ if RUBY_VERSION < "1.9.1"
 end
 
 require "rango/cli"
+require "rango/version"
+require "rango/environments"
+require "pathname"
 
 module Rango
-  VERSION = "0.2.1"
-
   # all the helpers are in Rango::Helpers
   # so if you want to register your own, just
   # Rango::Helpers.send(:include, Pupu::Helpers)
-  Helpers ||= Module.new
+  module Helpers; end
 
   def self.root=(root)
-    @@root = root
+    @@root = Pathname.new(root)
   end
 
   def self.root
-    @@root ||= Dir.pwd
+    @@root ||= Pathname.new(Dir.pwd)
   end
 
   def self.media_root=(media_root)
-    @@media_root = media_root
+    @@media_root = Pathname.new(media_root)
   end
 
   def self.media_root
-    @@media_root ||= File.join(self.root, "media")
+    @@media_root ||= self.root.join("media")
   end
 
   # Basic environment support. Use rango/environments.rb for more advanced behaviour.
@@ -47,7 +48,9 @@ module Rango
   def self.environment=(environment)
     ENV["RACK_ENV"] = environment
     @@environment   = environment
+    verbose, $VERBOSE = $VERBOSE, nil
     const_set(:RACK_ENV, environment)
+    $VERBOSE = verbose
   end
 
   def self.environment?(environment)

data/lib/rango/cli.rb

@@ -6,7 +6,7 @@ module Rango
     # if you will run this script with -i argument, interactive session will begin
     Rango.interactive if ARGV.delete("-i")
     # so it can work as a runner
-    load ARGV.shift if ARGV.first && File.exist?(ARGV.first)
+    load ARGV.shift if ARGV.first && File.exist?(ARGV.first) && ARGV.first.end_with?(".rb")
   end
 
   # Start IRB interactive session

data/lib/rango/contrib/pagination/adapters/sequel.rb

@@ -5,10 +5,14 @@ module Rango
     module Sequel
       module Dataset
         # @since 0.2.2
-        def paginate(current = 1, per_page = Page.per_page, options = Hash.new)
+        # @example
+        #   Sticker.paginate(page, 20, online: false)
+        #   Sticker.filter(online: false).paginate(page)
+        def paginate(current = 1, per_page = Page.per_page, options = nil)
           current = current ? current.to_i : 1 # current can be nil or "1"
           page = Page.new(current: current, count: self.count, per_page: per_page)
-          return page, limit(per_page, (current - 1) * per_page)
+          dataset = options ? self.filter(options) : self
+          return page, dataset.limit(per_page, (current - 1) * per_page)
         end
       end
     end

data/lib/rango/controller.rb

@@ -59,7 +59,7 @@ module Rango
     rescue HttpError => exception
       self.rescue_http_error(exception)
     rescue Exception => exception # so we can be sure that all the exceptions which occures in controller can be captured by rescue_http_error method
-      if Rango.development?
+      if Rango.development? or Rango.testing?
         raise exception
       else
         message = "#{exception.class}: #{exception.message}"
@@ -91,7 +91,7 @@ module Rango
     # @since 0.0.2
     # @version 0.2.1
     # @return [String] Escaped URL (which is RFC recommendation)
-    def redirect(location, status = 301, &block)
+    def redirect(location, status = 303, &block)
       if (300..399).include?(status)
         exception = Redirection.new(absolute_uri(location))
         exception.status = status
@@ -119,26 +119,15 @@ module Rango
     def_delegators :request, :cookies, :session
 
     def router_params
-      @router_params ||= begin
-        params = self.env["rango.router.params"]
-        raise "rango.router.params property has to be setup at least to empty hash" if params.nil?
-
-        symbolize_keys = lambda do |hash|
-          hash.reduce(Hash.new) do |hash, pair|
-            if pair.last.is_a?(Hash)
-              hash.merge(pair.first.to_sym => symbolize_keys.call(pair.last))
-            else
-              hash.merge(pair.first.to_sym => pair.last)
-            end
-          end
-        end
-
-        symbolize_keys.call(params)
-      end
+      @router_params ||= self.env["rango.router.params"]
     end
 
     def params
-      @params ||= self.request.params.merge(self.router_params).symbolize_keys
+      @params ||= begin
+        params = self.request.params
+        params.merge!(self.router_params) if router_params
+        params
+      end
     end
 
     # redefine this method for your controller if you want to provide custom error pages
@@ -152,7 +141,22 @@ module Rango
     end
 
     def render_http_error(exception)
-      "EXCEPTION"
+      exception.headers["Content-Type"] = "text/html"
+      if Rango.production?
+        <<-EOF
+<h1>Application Error</h1>
+<p>
+  The application you are trying to reach has currently some issues. Please contact our team and tell us about the troubles. Thank you.
+</p>
+        EOF
+      else
+        <<-EOF
+<h1>#{exception.class}: #{exception.message}</h1>
+<ul>
+  <li>#{exception.backtrace.join("</li><li>")}</li>
+</ul>
+        EOF
+      end
     end
   end
 end

data/lib/rango/core_ext.rb

@@ -1,22 +1,12 @@
 # encoding: utf-8
 
-module Enumerable
-  # similar to
-  def inject!(&block)
-    self.inject(self.class.new, &block)
-  end
-end
-
 class String
-  ##
   # Convert to snake case.
-  #
   #   "FooBar".snake_case           #=> "foo_bar"
   #   "HeadlineCNNNews".snake_case  #=> "headline_cnn_news"
   #   "CNN".snake_case              #=> "cnn"
   #
   # @return [String] Receiver converted to snake case.
-  #
   # @api public
   def snake_case
     return self.downcase if self =~ /^[A-Z]+$/
@@ -24,43 +14,15 @@ class String
       return $+.downcase
   end
 
-  ##
   # Convert to camel case.
-  #
   #   "foo_bar".camel_case          #=> "FooBar"
   #
   # @return [String] Receiver converted to camel case.
-  #
   # @api public
   def camel_case
     return self if self !~ /_/ && self =~ /[A-Z]+.*/
     split('_').map{|e| e.capitalize}.join
   end
-
-  ##
-  # Convert a path string to a constant name.
-  #
-  #   "merb/core_ext/string".to_const_string #=> "Merb::CoreExt::String"
-  #
-  # @return [String] Receiver converted to a constant name.
-  #
-  # @api public
-  def to_const_string
-    gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
-  end
-
-  ##
-  # Convert a constant name to a path, assuming a conventional structure.
-  #
-  #   "FooBar::Baz".to_const_path # => "foo_bar/baz"
-  #
-  # @return [String] Path to the file containing the constant named by receiver
-  #   (constantized string), assuming a conventional structure.
-  #
-  # @api public
-  def to_const_path
-    snake_case.gsub(/::/, "/")
-  end
 end
 
 class Hash
@@ -75,30 +37,63 @@ class Hash
       result
     end
   end
+end
 
-  # Replace keys in self by coresponding symbols
-  #
-  # @author Botanicus
-  # @since 0.0.2
-  # @return [Hash] A hash with all keys transformed into symbols
-  def symbolize_keys!
-    self.replace(self.symbolize_keys)
+module ParamsMixin
+  def self.switch_string_to_symbol_or_back(value)
+    if value.is_a?(String)
+      value.to_sym
+    elsif value.is_a?(Symbol)
+      value.to_s
+    else
+      value
+    end
   end
 
-  # Return duplication of self with all keys recursively converted to symbols
-  #
-  # @author Botanicus
-  # @since 0.0.2
-  # @return [Hash] A hash with all keys transformed into symbols even in inner hashes
-  def deep_symbolize_keys
-    self.inject(Hash.new) do |result, array|
-      key, value = array.first, array.last
-      if value.respond_to?(:symbolize_keys)
-        result[key.to_sym] = value.symbolize_keys
-      else
-        result[key.to_sym] = value
-      end
-      result
+  def self.convert(hash)
+    hash.extend(ParamsMixin)
+    hash.each do |key, value|
+      self.convert(value) if value.is_a?(Hash)
+    end
+  end
+
+  def [](key)
+    if self.has_key?(key)
+      super(key)
+    elsif key2 = ParamsMixin.switch_string_to_symbol_or_back(key)
+      super(key2)
+    else # get the default value or run the default block
+      super(key)
     end
   end
+
+  def []=(key, value)
+    if self.has_key?(key)
+      super(key, value)
+    elsif key2 = ParamsMixin.switch_string_to_symbol_or_back(key)
+      super(key2, value)
+    else # get the default value or run the default block
+      super(key, value)
+    end
+  end
+
+  # This might be very nasty if you expect a symbol,
+  # but we can't just call #to_sym on it because of
+  # security. Symbols aren't GCed, so if someone would
+  # send a lot of requests with different keys, it will
+  # crash your app or even server because it would run
+  # out of memory.
+  def keys
+    super.map do |key|
+      key.is_a?(Symbol) ? key.to_s : key
+    end
+  end
+
+  def merge(*args)
+    super(*args).extend(ParamsMixin)
+  end
+
+  def merge!(*args)
+    super(*args).extend(ParamsMixin)
+  end
 end

data/lib/rango/exceptions.rb

@@ -83,7 +83,7 @@ module Rango
       # @returns [String]
       # @example NotFound.new.to_snakecase # "not_found"
       def to_snakecase
-        self.class.name.split("::").last.snake_case
+        self.class.name.gsub(" ", "_").downcase
       end
 
       def to_response
@@ -137,7 +137,7 @@ module Rango
     Error300 = MultipleChoices = Class.new(Redirection)             { self.status ||= 300; self.name ||= "Multiple Choices" }
     Error301 = MovedPermanently = Class.new(Redirection)            { self.status ||= 301; self.name ||= "Moved Permanently" }
     Error302 = MovedTemporarily = Class.new(Redirection)            { self.status ||= 302; self.name ||= "Moved Temporarily" }
-    Error303 = SeeOther = Class.new(Redirection)                    { self.status ||= 303; self.name ||= "See Other" }
+    Error303 = SeeOther = Class.new(Redirection)                    { self.status ||= 303; self.name ||= "See Other" } # this is the redirect you want to use after POST
     Error304 = NotModified = Class.new(Redirection)                 { self.status ||= 304; self.name ||= "Not Modified" }
     Error305 = UseProxy = Class.new(Redirection)                    { self.status ||= 305; self.name ||= "Use Proxy" }
     Error307 = TemporaryRedirect = Class.new(Redirection)           { self.status ||= 307; self.name ||= "Temporary Redirect" }

data/lib/rango/gv/router.rb

@@ -32,7 +32,7 @@ module Rango
     # any particular router and your router might not provide this
     # functionality. In this case you can always use this generic view.
     # get("/index.php").to(Rango::GV.redirect("/"))
-    def self.redirect(url, status = 302)
+    def self.redirect(url, status = 301)
       Rango::Mini.app do |request, response|
         response.redirect(url, status)
         return String.new

data/lib/rango/gv/scaffolding.rb

@@ -5,7 +5,6 @@ require "rango/mini"
 require "rango/mixins/render"
 
 require "rango" # Rango.root
-Rango::Template.template_paths.push(File.join(Rango.root, "templates"))
 
 # NOTE: this is just proof of concept, do not use it so far!
 # However this is the way how we can use CRUD in Rango.

data/lib/rango/mailer.rb

@@ -1,48 +1,28 @@
 # encoding: utf-8
 
-require "net/smtp"
-
-# Mailer.new("noreply@rangoproject.org", "RangoProject.org")
-#  self.to = "tony@example.com"
-#  self.subject = "Just hey"
-#  self.body = "Hey Tony, what's up?"
+# mail("rango@project.org", "joe@doe.com", "Free VIAGRA") do
+#   render "mails/spam.html"
 # end
-module Rango
-  class Mailer
-    @@config = {smtp: ["localhost", 25]}
-
-    def self.mail(options = Hash.new)
-      self.new(options[:from]).tap do |mailer|
-        mailer.body = options[:body]
-      end
-    end
-
-    attr_accessor :to, :to_alias
-    attr_accessor :from, :from_alias
-    attr_accessor :body, :subject
-
-    def initialize(from, from_alias = from, &block)
-      @from, @from_alias = from, from_alias
-      unless block.nil?
-        block.instance_eval(&block)
-        block.send
-      end
-    end
-
-    def raw
-      <<-EOF
-From: #{from_alias} <#{from}>
-To: #{to_alias} <#{to}>
-Subject: #{subject}
-
-#{body}
-      EOF
-    end
+begin
+  require "mail"
+rescue LoadError
+  raise "You have to install mail gem!"
+end
 
-    def send(to)
-      Net::SMTP.start(*@@config[:smtp]) do |smtp|
-        smtp.send_message(self.raw, @from, to)
+module Rango
+  module Mailing
+    def mail(to, from, subject, &block)
+      Mail.deliver do |mail|
+        mail.to = to
+        mail.from = from
+        mail.subject = subject
+        mail.body = block.call
+        puts self
       end
+    rescue Errno::ECONNREFUSED
+      Rango.logger.error("E-mail from #{caller[0]} can't be send due to refused connection to the SMTP server")
     end
   end
 end
+
+Rango::Controller.send(:include, Rango::Mailing)