rango 0.2.1.pre → 0.2.1

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

@@ -2,28 +2,24 @@
 
 require "dm-aggregates"
 
-module Rango
-  module Pagination
-    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 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
 
-        # @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)
-        end
-      end
+    # @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)
     end
   end
 end

data/lib/rango/controller.rb

@@ -53,8 +53,6 @@ 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)
     end
@@ -68,22 +66,12 @@ 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)
       if (300..399).include?(status)
-        exception = Redirection.new(absolute_uri(location))
+        exception = Redirection.new(location)
         exception.status = status
         raise exception
       else

data/lib/rango/mixins/message.rb

@@ -19,23 +19,6 @@ module Rango
             def context
               super.merge!(message: self.message)
             end
-
-            def redirect(uri, status = 301, options = Hash.new)
-              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
@@ -46,5 +29,27 @@ module Rango
     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}"
+        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/templates/helpers.rb

@@ -4,8 +4,6 @@ require "rango"
 require "rango/templates/template"
 
 module Rango
-  SubtemplateNotFound = Class.new(StandardError)
-
   module TemplateHelpers
     def self.extended(scope)
       class << scope
@@ -50,7 +48,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
@@ -90,14 +88,12 @@ module Rango
     #   render "base.html"
     #   render "./base.html"
     #   render "../base.html"
-    def render(path, context = Hash.new)
-      full_path = normalize_template_path(path)
+    def render(template, context = Hash.new)
+      normalize_template_path(template)
       original_template = self.template
-      template = Rango::Template.new(full_path, self) # self is scope
+      template = Rango::Template.new(template, 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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rango
 version: !ruby/object:Gem::Version 
-  version: 0.2.1.pre
+  version: 0.2.1
 platform: ruby
 authors: 
 - "Jakub \xC5\xA0\xC5\xA5astn\xC3\xBD aka Botanicus"
 autorequire: 
 bindir: bin
 cert_chain: 
-date: 2010-02-15 00:00:00 +00:00
+date: 2010-02-09 00:00:00 +00:00
 default_executable: rango
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -270,7 +270,6 @@ 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
@@ -455,7 +454,9 @@ has_rdoc: true
 homepage: http://github.com/botanicus/rango
 licenses: []
 
-post_install_message: 
+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"
 rdoc_options: []
 
 require_paths: 
@@ -468,9 +469,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.3.1
+      version: "0"
   version: 
 requirements: []
 

data/lib/rango/mailer.rb

@@ -1,48 +0,0 @@
-# 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