rango 0.1.1.2.5 → 0.1.1.2.6

data/lib/rango/mixins/rendering.rb

@@ -1,7 +1,10 @@
 # encoding: utf-8
 
+require "rango/mixins/render"
+
 module Rango
   module ExplicitRendering
+    include Rango::RenderMixin
     def render(template, locals = Hash.new)
       super(template, self.locals.merge!(locals))
     end

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

@@ -10,7 +10,8 @@ module Rango
   module UrlHelper
     # url(:login)
     def url(*args)
-      Project.router.router.generator.generate(*args)
+      raise "You have to asign your routes to Project.router, for example Project.router = Usher::Interface.for(:rack) { get('/') }" if Project.router.nil?
+      self.router.router.generator.generate(*args)
     end
   end
 end

data/lib/rango/templates/helpers.rb

@@ -5,8 +5,8 @@ require "rango"
 module Rango
   module Templates
     module TemplateHelpers
-      def self.extended(context)
-        class << context
+      def self.extended(scope)
+        class << scope
           attr_accessor :_template
           # @example Capture being used in a .html.erb page:
           #   <% @foo = capture do %>
@@ -47,8 +47,8 @@ module Rango
         end
       end
 
-      def self.included(context_class)
-        context_class.class_eval { attr_accessor :_template}
+      def self.included(scope_class)
+        scope_class.class_eval { attr_accessor :_template}
       end
 
       # post/show.html: it's block is the block we like to see in output
@@ -56,7 +56,7 @@ module Rango
       # base.html: here it will be rendered, so we need block to returns the correct block code
       # @since 0.0.2
       def block(name, value = nil, &block)
-        value = self._template.context.capture(&block) if value.nil? && block
+        value = self._template.scope.capture(&block) if value.nil? && block
         self._template.blocks[name] ||= value
         return self._template.blocks[name]
       end
@@ -75,7 +75,7 @@ module Rango
       #   != pupu :lighter, syntax: "html", theme: "standard"
       #   = superblock
       def extend_block(name, value = nil, &block)
-        value = self._template.context.capture(&block) if value.nil? && block
+        value = self._template.scope.capture(&block) if value.nil? && block
         self._template.blocks[name] += value
         return self._template.blocks[name]
       end
@@ -89,7 +89,7 @@ module Rango
         else
           template = "_#{template}"
         end
-        template = Rango::Templates::Template.new(template, self._template.context, locals)
+        template = Rango::Templates::Template.new(template, self._template.scope, locals)
         template.partial = true
         # TODO: #block in partial templates
         output = template.render

data/lib/rango/templates/template.rb

@@ -15,16 +15,16 @@ module Rango
     class Template
       # template -> supertemplate is the same relationship as class -> superclass
       # @since 0.0.2
-      attr_accessor :path, :context, :supertemplate
+      attr_accessor :path, :scope, :supertemplate
 
       # @since 0.0.2
       attribute :blocks, Hash.new
 
       # @since 0.0.2
-      def initialize(path, context = Object.new)
-        self.path    = path#[context.class.template_prefix.chomp("/"), template].join("/")
-        self.context = context.extend(TemplateHelpers)
-        self.context._template = self
+      def initialize(path, scope = Object.new)
+        self.path    = path#[scope.class.template_prefix.chomp("/"), template].join("/")
+        self.scope = scope.extend(TemplateHelpers)
+        self.scope._template = self
       end
 
       # @since 0.0.2
@@ -57,14 +57,14 @@ module Rango
       # @since 0.0.2
       def render(locals = Hash.new)
         raise Errors::TemplateNotFound.new("Template #{self.path} wasn't found in these template_dirs: #{Project.settings.template_dirs.inspect}") if self.fullpath.nil?
-        value = self.template.render(self.context, locals)
+        value = self.template.render(self.scope, locals)
         Rango.logger.info("Rendering template #{self.path}")
         Rango.logger.inspect(self.blocks)
         if self.supertemplate
           Rango.logger.debug("Extends call: #{self.supertemplate}")
-          supertemplate = self.class.new(self.supertemplate, self.context)
+          supertemplate = self.class.new(self.supertemplate, self.scope)
           supertemplate.blocks = self.blocks
-          return supertemplate.render(self.scope, locals)
+          return supertemplate.render(locals)
         end
         value
       end

data/lib/rango/version.rb

@@ -3,5 +3,5 @@
 # NOTE: Do not edit this file manually, this
 # file is regenerated by task rake version:increase
 module Rango
-  VERSION ||= "0.1.1.2.5"
+  VERSION ||= "0.1.1.2.6"
 end

data/stubs/app/content/views.rb.rbt

@@ -3,15 +3,15 @@
 # http://wiki.github.com/botanicus/rango/controllers
 
 require "rango/controller"
-require "rango/mixins/render"
 require "rango/mixins/filters"
+require "rango/mixins/rendering"
 require "rango/mixins/message"
 
 module <%= @name.camel_case %>
   class Application < Rango::Controller
     include Rango::FiltersMixin
     include Rango::MessageMixin
-    include Rango::RenderMixin
+    include Rango::ExplicitRendering
   end
 
   class ShowCase < Application

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

@@ -39,7 +39,10 @@ Rango.boot(environment: environment)
 require_relative "<%= @name %>/init.rb"
 
 # database connection
+<% case @orm %>
+<% when "datamapper" %>
 DataMapper.setup(:default, "sqlite3:#{Rango.environment}.db")
+<% end %>
 
 # if you will run this script with -i argument, interactive session will begin
 Rango.interactive if ARGV.delete("-i")

data/stubs/project/content/spec/spec_helper.rb

@@ -8,6 +8,7 @@ RANGO_ENV = "test"
 require_relative "../init.rb"
 
 # load config.ru
+require "rango/utils"
 Rango::Utils.load_rackup
 
 # webrat

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rango
 version: !ruby/object:Gem::Version 
-  version: 0.1.1.2.5
+  version: 0.1.1.2.6
 platform: ruby
 authors: 
 - "Jakub \xC5\xA0\xC5\xA5astn\xC3\xBD aka Botanicus"