rango 0.2.1 → 0.2.3

data/CHANGELOG

@@ -65,3 +65,13 @@
   * More inteligent environments handling, just use Rango.environment and it will detect the proper one from ENV["RACK_ENV"], RACK_ENV constant or it will defaults to development. Rango.environment=(environment) will set all these variables so everything will stay consistent.
   * MongoMapper supported in stack generator (rango create stack blog --orm=mongomapper)
   * Added Rango::StackController which is more complete than just basic Rango::Controller
+
+= Version 0.2.2
+  * Sequel support in contrib/pagination
+
+= Version 0.2.3
+  * Experimental support for bundler 0.9
+  * Controller#redirect takes a block where you get the exception, so you can set headers etc
+  * [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.

data/CONTRIBUTORS

@@ -2,3 +2,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/lib/rango/cli.rb

@@ -2,10 +2,11 @@
 
 module Rango
   def self.parse(args = ARGV)
+    return if args.empty?
     # 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 File.exist?(ARGV.first)
+    load ARGV.shift if ARGV.first && File.exist?(ARGV.first)
   end
 
   # Start IRB interactive session

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

@@ -2,24 +2,25 @@
 
 require "dm-aggregates"
 
-module DataMapper
-  module Model
-    # @since 0.0.2
-    # @example Post.paginate(page, order: [:updated_at.desc])
-    def paginate(pagenum = 1, options = Hash.new)
-      pagenum = 1 if pagenum.nil?
-      page = self.page(pagenum.to_i, options)
-      Page.current = page
-      offset = page.number(:db) * page.per_page
-      self.all(options.merge!(offset: offset, limit: page.per_page))
-    end
+module Rango
+  module Pagination
+    module DataMapper
+      module Model
+        # @since 0.2.2
+        attr_accessor :page
 
-    # @since 0.0.2
-    def page(current, options = Hash.new)
-      per_page = defined?(PER_PAGE) ? PER_PAGE : 10
-      # the count options are very important
-      # Product.count vs. Product.count(online: true)
-      Page.new(current: current, count: self.count(options), per_page: per_page)
+        # @since 0.0.2
+        # @example Post.paginate(page, order: [:updated_at.desc])
+        # the count options are very important
+        # Product.count vs. Product.count(online: true)
+        def paginate(current = 1, per_page = Page.per_page, options = Hash.new)
+          current = current ? current.to_i : 1 # current can be nil or "1"
+          page = Page.new(current: current, count: self.count(options), per_page: per_page)
+          offset = page.number(:db) * page.per_page
+          dataset = self.all(options.merge!(offset: offset, limit: page.per_page))
+          return page, dataset
+        end
+      end
     end
   end
 end

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

@@ -0,0 +1,18 @@
+# encoding: utf-8
+
+module Rango
+  module Pagination
+    module Sequel
+      module Dataset
+        # @since 0.2.2
+        def paginate(current = 1, per_page = Page.per_page, options = Hash.new)
+          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)
+        end
+      end
+    end
+  end
+end
+
+Sequel::Dataset.send(:include, Rango::Pagination::Sequel::Dataset)

data/lib/rango/contrib/pagination/helpers.rb

@@ -4,19 +4,19 @@ module Rango
   module Pagination
     module PaginationMixin
       # @since 0.0.2
-      def paginate(page = Page.current)
+      def paginate(page)
         root = File.dirname(__FILE__)
         template = File.join(root, "pagination")
         partial template, page: page
       end
 
       # @since 0.0.7
-      def previous_page(text, page = Page.current)
+      def previous_page(text, page)
         link_to text, Page.route(request, page, page.previous.number)
       end
 
       # @since 0.0.7
-      def next_page(text, page = Page.current)
+      def next_page(text, page)
         link_to text, Page.route(request, page, page.next.number)
       end
     end

data/lib/rango/contrib/pagination/page.rb

@@ -2,21 +2,15 @@
 
 class Page
   class << self
-    # @since 0.0.2
-    attr_writer :current
-
     # @since 0.0.2
     attr_accessor :route_hook
 
-    # @since 0.0.2
-    def current
-      Rango.logger.debug("Page initialized: #{@current.inspect}")
-      return @current
+    # @since 0.2.2
+    attr_writer :per_page
+    def per_page
+      @per_page ||= 10
     end
 
-    # Page.current = page # implicitly in datamapper.rb
-    # paginate Page.current
-
     # register_route_hook do ... end
     # OR
     # register_route_hook method(:foo)

data/lib/rango/controller.rb

@@ -6,6 +6,7 @@ require "forwardable"
 require "rango/router"
 require "rango/exceptions"
 require "rango/rack/request"
+require "rango/environments"
 
 module Rango
   class Controller
@@ -53,8 +54,19 @@ module Rango
       self.run_action
       #self.response.finish # do we need this?
       [response.status, response.headers, [response.body]] # this way we got real body rather than response object
+    rescue Redirection => redirection
+      redirection.to_response
     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?
+        raise exception
+      else
+        message = "#{exception.class}: #{exception.message}"
+        server_error = InternalServerError.new(message)
+        server_error.backtrace = caller
+        self.rescue_http_error(server_error)
+      end
     end
 
     # @since 0.0.1
@@ -66,13 +78,25 @@ module Rango
     def_delegators :response, :status, :status=
     def_delegators :response, :headers, :headers=
 
+    # absolute_uri "http://google.com" => "http://google.com"
+    # absolute_uri "/products" => "http://localhost:4000/products"
+    def absolute_uri(path)
+      if path.match(/^https?:\/{2}/)
+        path
+      else
+        (request.base_url.chomp("/") + path).chomp("/")
+      end
+    end
+
     # @since 0.0.2
     # @version 0.2.1
     # @return [String] Escaped URL (which is RFC recommendation)
-    def redirect(location, status = 301)
+    def redirect(location, status = 301, &block)
       if (300..399).include?(status)
-        exception = Redirection.new(location)
+        exception = Redirection.new(absolute_uri(location))
         exception.status = status
+        exception.headers["Set-Cookie"] = response["Set-Cookie"] # otherwise it don't save cookies
+        block.call(exception) unless block.nil?
         raise exception
       else
         raise ArgumentError, "Status has to be between 300 and 399"

data/lib/rango/exceptions.rb

@@ -24,6 +24,12 @@ module Rango
         @message = message
       end
 
+      # backtrace isn't writable, but we want to set it time to time, see Controller.call
+      attr_writer :backtrace
+      def backtrace
+        super || @backtrace
+      end
+
       def self.message
         @message ||= begin
           self.superclass.message
@@ -107,6 +113,16 @@ module Rango
       self.name ||= "Redirection"
       alias_method :location, :message
 
+      def body
+        %{Please follow <a href="#{URI.escape(self.location)}">#{self.location}</a>}
+      end
+
+      def to_response
+        super.tap do |response|
+          response[2] = [self.body]
+        end
+      end
+
       # use raise MovedPermanently, "http://example.com"
       # Yes, you can use just redirect method from the controller, but
       # this will work even in filters or in environments without controllers

data/lib/rango/mailer.rb

@@ -0,0 +1,48 @@
+# 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?"
+# 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
+
+    def send(to)
+      Net::SMTP.start(*@@config[:smtp]) do |smtp|
+        smtp.send_message(self.raw, @from, to)
+      end
+    end
+  end
+end

data/lib/rango/mixins/message.rb

@@ -19,6 +19,23 @@ module Rango
             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)
+            end
           end
         end
       else
@@ -27,29 +44,12 @@ module Rango
     end
 
     def message
-      @message ||= (request.GET[:msg] || Hash.new)
-    end
-
-    # @since 0.0.2
-    def redirect(url, options = Hash.new)
-      url = [self.request.base_url.chomp("/"), url].join("/").chomp("/") unless url.match(/^http/)
-
-      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}"
+      @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))
         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
   end
 end

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

@@ -0,0 +1,15 @@
+require "crudtree/generator"
+require_relative "usher"
+
+module Rango
+  module UrlHelper
+    # resource(@post, :edit), resource(:posts)
+    def resource(*args)
+      crudtree_generator.generate(*args)
+    end
+
+    def crudtree_generator
+      @@generator ||= CRUDtree::Generator.new(Rango::Router.app.master)
+    end
+  end
+end

data/lib/rango/templates/helpers.rb

@@ -4,10 +4,13 @@ require "rango"
 require "rango/templates/template"
 
 module Rango
+  SubtemplateNotFound = Class.new(StandardError)
+
   module TemplateHelpers
     def self.extended(scope)
       class << scope
         attr_accessor :template
+        attr_accessor :context
         # @example Capture being used in a .html.erb page:
         #   <% @foo = capture do %>
         #     <p>Some Foo content!</p>
@@ -48,7 +51,7 @@ module Rango
     end
 
     def self.included(scope_class)
-      scope_class.class_eval { attr_accessor :template}
+      scope_class.class_eval { attr_accessor :template }
     end
 
     # post/show.html: it's block is the block we like to see in output
@@ -77,7 +80,7 @@ module Rango
       raise ArgumentError, "Block has to have a name!" if name.nil?
       raise ArgumentError, "You have to provide value or block, not both of them!" if value && block
       value = self.template.scope.capture(&block) if value.nil? && block
-      self.template.blocks[name] = "#{self.template.blocks[name]}\n#{value}" if value
+      self.template.blocks[name] = value if value
       return self.template.blocks[name]
     end
 
@@ -88,12 +91,14 @@ module Rango
     #   render "base.html"
     #   render "./base.html"
     #   render "../base.html"
-    def render(template, context = Hash.new)
-      normalize_template_path(template)
+    def render(path, context = Hash.new)
+      full_path = normalize_template_path(path)
       original_template = self.template
-      template = Rango::Template.new(template, self) # self is scope
+      template = Rango::Template.new(full_path, self) # self is scope
       self.template = original_template
       return template.render(context)
+    rescue Exceptions::TemplateNotFound # FIXME: this doesn't work
+      raise SubtemplateNotFound, "Template #{path} doesn't exist in #{full_path}"
     end
 
     # partial "products/list"

data/lib/rango/templates/template.rb

@@ -59,7 +59,7 @@ module Rango
     def render(context = Hash.new)
       raise Exceptions::TemplateNotFound.new("Template #{self.path} wasn't found in these template_paths: #{self.class.template_paths.inspect}") if self.fullpath.nil?
       Rango.logger.info("Rendering template #{self.path} with context keys #{context.keys.inspect}")
-      self.context = context
+      self.scope.context = self.context = context # so we can access context in the scope object as well
       value = self.template.render(self.scope, context)
       Rango.logger.debug("Available blocks: #{self.blocks.keys.inspect}")
       if self.supertemplate

data/rango.gemspec

@@ -5,7 +5,7 @@ require "base64"
 
 Gem::Specification.new do |s|
   s.name = "rango"
-  s.version = "0.2.1"
+  s.version = "0.2.3"
   s.authors = ["Jakub Šťastný aka Botanicus"]
   s.homepage = "http://github.com/botanicus/rango"
   s.summary = "Rango is ultralightweight, ultracustomizable, ultracool web framework deeply inspired by Django."
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   # Ruby version to 1.9, even if it actually is 1.9.1
   s.required_ruby_version = ::Gem::Requirement.new("~> 1.9")
 
-  # === Dependencies ===
+  # Dependencies
   # RubyGems has runtime dependencies (add_dependency) and
   # development dependencies (add_development_dependency)
   # Rango isn't a monolithic framework, so you might want

data/simple-templater.scope

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 SimpleTemplater.scope(:rango) do
   root = File.join(File.dirname(__FILE__))
   Dir["#{root}/stubs/*"].each do |path|

data/stubs/stack/content/init.rb.rbt

@@ -29,7 +29,7 @@ Rango.boot
 
 $LOAD_PATH.unshift(File.expand_path("../lib", __FILE__))
 
-require "<%= name %>"
+require "<%= @name %>"
 
 # Available arguments:
 #   ./init.rb -i

data/stubs/stack/content/tasks.rb.rbt

@@ -1,7 +1,14 @@
 #!/usr/bin/env nake
 # encoding: utf-8
 
-require_relative "gems/environment.rb"
+begin
+  require File.expand_path("../.bundle/environment", __FILE__)
+rescue LoadError
+  require "bundler"
+  Bundler.setup
+end
+
+$LOAD_PATH.unshift(File.expand_path("../lib", __FILE__))
 
 # Boot environment
 # This task isn't useful as is, but a lot of Rango tasks expect this

data/stubs/stack/setup.rb

@@ -17,5 +17,5 @@ hook do |generator, context|
   context[:template_engine] = "haml" unless context[:template_engine]
   context[:git_deployer] = true unless context.has_key?(:git_deployer)
   context[:code_cleaner] = true unless context.has_key?(:git_deployer)
-  context[:email_hash] = Base64.encode64(context[:email])
+  context[:email_hash] = Base64.encode64(context[:email]) if context[:email]
 end

data/tasks.rb

@@ -1,13 +1,14 @@
-#!./script/nake
+#!/usr/bin/env nake
 # encoding: utf-8
 
 begin
-  require_relative "gems/environment.rb"
+  require File.expand_path("../.bundle/environment", __FILE__)
 rescue LoadError
-  abort "You have to install bundler and run gem bundle first!"
+  require "bundler"
+  Bundler.setup
 end
 
-ENV["PATH"] = "script:#{ENV["PATH"]}"
+$LOAD_PATH.unshift(File.expand_path("../lib", __FILE__))
 
 require "nake/tasks/gem"
 require "nake/tasks/spec"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rango
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors: 
 - "Jakub \xC5\xA0\xC5\xA5astn\xC3\xBD aka Botanicus"
 autorequire: 
 bindir: bin
 cert_chain: 
-date: 2010-02-09 00:00:00 +00:00
+date: 2010-03-05 00:00:00 +00:00
 default_executable: rango
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -253,6 +253,7 @@ files:
 - lib/rango/contrib/pagination/TODO
 - lib/rango/contrib/pagination/_pagination.html.haml
 - lib/rango/contrib/pagination/adapters/datamapper.rb
+- lib/rango/contrib/pagination/adapters/sequel.rb
 - lib/rango/contrib/pagination/helpers.rb
 - lib/rango/contrib/pagination/page.rb
 - lib/rango/contrib/pagination/strategies.rb
@@ -270,6 +271,7 @@ files:
 - lib/rango/helpers/assets.rb
 - lib/rango/helpers/general.rb
 - lib/rango/helpers/syntax.rb
+- lib/rango/mailer.rb
 - lib/rango/mini.rb
 - lib/rango/mini_render.rb
 - lib/rango/mixins/action_args.rb
@@ -292,6 +294,7 @@ files:
 - lib/rango/rack/middlewares/static.rb
 - lib/rango/rack/request.rb
 - lib/rango/router.rb
+- lib/rango/router/adapters/crudtree.rb
 - lib/rango/router/adapters/rack_mount.rb
 - lib/rango/router/adapters/rack_router.rb
 - lib/rango/router/adapters/urlmap.rb
@@ -454,9 +457,11 @@ has_rdoc: true
 homepage: http://github.com/botanicus/rango
 licenses: []
 
-post_install_message: "[\e[32mVersion 0.2.1\e[0m] More inteligent environments handling, just use Rango.environment and it will detect the proper one from ENV[\"RACK_ENV\"], RACK_ENV constant or it will defaults to development. Rango.environment=(environment) will set all these variables so everything will stay consistent.\n\
-  [\e[32mVersion 0.2.1\e[0m] MongoMapper supported in stack generator (rango create stack blog --orm=mongomapper)\n\
-  [\e[32mVersion 0.2.1\e[0m] Added Rango::StackController which is more complete than just basic Rango::Controller\n"
+post_install_message: "[\e[32mVersion 0.2.3\e[0m] Experimental support for bundler 0.9\n\
+  [\e[32mVersion 0.2.3\e[0m] Controller#redirect takes a block where you get the exception, so you can set headers etc\n\
+  [\e[32mVersion 0.2.3\e[0m] [FIX] Cookies are passed into the redirect request\n\
+  [\e[32mVersion 0.2.3\e[0m] [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.\n\
+  [\e[32mVersion 0.2.3\e[0m] [FIX] Fixed encoding problem in messages. It's actually Rack fault, but hey.\n"
 rdoc_options: []
 
 require_paths: