rango 0.2.5.1 → 0.2.6

data/lib/rango/mixins/conventional_rendering.rb

@@ -57,7 +57,7 @@ module Rango
 
     def display(object)
       autorender
-    rescue TemplateNotFound
+    rescue TemplateInheritance::TemplateNotFound
       callback = self.formats[request.action]
       callback.call
     end

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

@@ -1,5 +1,8 @@
 # encoding: utf-8
 
+# lazy-loading for datamapper
+autoload "DataMapper", "dm-core/migrations"
+
 # @since 0.0.2.1
 # ./tasks.rb db:automigrate test
 Task.new("db:automigrate") do |task|
@@ -7,7 +10,7 @@ Task.new("db:automigrate") do |task|
   task.define do |environment = "development", options|
     Task[:environment].call(environment)
     Rango.logger.info("[#{Rango.environment}] Migrating databases ...")
-    result = DataMapper.auto_migrate!
+    result = ::DataMapper.auto_migrate!
     Rango.logger.debug("Result: #{result.inspect}")
   end
 end
@@ -19,7 +22,7 @@ Task.new("db:autoupgrade") do |task|
   task.define do |environment = "development", options|
     Task[:environment].call(environment)
     Rango.logger.info("[#{Rango.environment}] Upgrading databases ...")
-    result = DataMapper.auto_upgrade!
+    result = ::DataMapper.auto_upgrade!
     Rango.logger.debug("Result: #{result.inspect}")
   end
 end
@@ -31,7 +34,7 @@ Task.new("db:report") do |task|
   task.define do |environment = "development", options|
     Task[:environment].call(environment)
     ObjectSpace.classes.each do |klass|
-      if klass.included(DataMapper::Resource)
+      if klass.included(::DataMapper::Resource)
         puts "#{model_class}: #{model_class.count}"
       end
     end

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

@@ -0,0 +1,48 @@
+# encoding: utf-8
+
+begin
+  require "http_router"
+rescue LoadError
+  raise LoadError, "You have to install http_router gem!"
+end
+
+Rango::Router.implement(:http_router) do |env|
+  env["rango.router.params"] = env["router.params"] || Hash.new # TODO: nil
+end
+
+module Rango
+  module UrlHelper
+    # url(:login)
+    def url(*args)
+      generator  = Rango::Router.app.router.generator
+      route_name = args.shift
+      route = generator.usher.named_routes[route_name]
+      raise "No route found" if route.nil? # TODO: add RouteNotFound to usher and use it here as well
+      if args.empty?
+        generator.generate(route_name) # TODO: usher should probably have path.to_url
+      else
+        alts = route.paths.map(&:dynamic_keys) # one route can have multiple paths as /:id or /:id.:format
+        keys = alts.first
+        # FIXME: take a look at other alts as well !!!!
+        # keys = alts.find.with_index { |item, index|  }
+
+        # TODO: optional args
+        keys_generator = keys.each
+        args_generator = args.each
+        opts = Hash.new
+
+        keys.length.times do |index|
+          key = keys_generator.next
+          arg = args_generator.next
+          if arg.respond_to?(key) # post instance
+            opts[key] = arg.send(key)
+          else # it's already a slug
+            opts[key] = arg
+          end
+        end
+
+        generator.generate(route_name, opts)
+      end
+    end
+  end
+end

data/lib/rango/tasks/spec.nake

@@ -3,7 +3,6 @@
 Task.new(:spec) do |task|
   task.description = "Run specs"
   task.define do |path = "spec", options|
-    path = args.path ? "spec" : args.path
-    sh "./bin/spec --options spec/spec.opts #{path}"
+    sh "spec --options spec/spec.opts #{path || "spec"}"
   end
 end

data/lib/rango/template.rb

@@ -0,0 +1,10 @@
+# encoding: utf-8
+
+begin
+  require "template-inheritance"
+rescue LoadError
+  raise LoadError, "You have to install the template-inheritance gem if you want to use templates!"
+end
+
+TemplateInheritance::Template.paths << Rango.root.join("templates").to_s
+TemplateInheritance.logger = Rango.logger

data/lib/rango/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Rango
-  VERSION = "0.2.5.1"
+  VERSION = "0.2.6"
 end

data/spec/rango/mixins/render_spec.rb

@@ -41,8 +41,8 @@ describe Rango::RenderMixin do
       body.should match(/Hi\!/)
     end
 
-    it "should raise TemplateNotFound if template wasn't found" do
-      -> { render "idonotexist.html" }.should raise_error(Rango::Exceptions::TemplateNotFound)
+    it "should raise TemplateInheritance::TemplateNotFound if template wasn't found" do
+      -> { render "idonotexist.html" }.should raise_error(TemplateInheritance::TemplateNotFound)
     end
   end
 end

data/stubs/stack/content/Gemfile.rbt

@@ -40,8 +40,7 @@ gem "rack-mount"#, git: "git://github.com/josh/rack-mount.git"
 gem "rack-router"#, git: "git://github.com/carllerche/rack-router.git"
 <% end %>
 
-gem "tilt"#, git: "git://github.com/rtomayko/tilt.git"
-gem "haml"#, git: "git://github.com/nex3/haml.git"
+gem "template-inheritance"#, git: "git://github.com/botanicus/template-inheritance.git"
 gem "helpers"#, git: "git://github.com/botanicus/helpers.git"
 gem "formidable"#, git: "git://github.com/botanicus/formidable.git"
 gem "pupu"#, git: "git://github.com/botanicus/pupu.git"

data/stubs/stack/content/lib/%name%/views.rb.rbt

@@ -24,7 +24,7 @@ module <%= @name.camel_case %>
 
     def render_http_error_template(exception)
       render "errors/#{exception.status}.html"
-    rescue TemplateNotFound
+    rescue TemplateInheritance::TemplateNotFound
       render "errors/500.html"
     end
   end

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

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

metadata

@@ -5,22 +5,22 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 5
-  - 1
-  version: 0.2.5.1
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - "Jakub \xC5\xA0\xC5\xA5astn\xC3\xBD aka Botanicus"
 autorequire: 
 bindir: bin
 cert_chain: 
-date: 2010-05-08 00:00:00 +01:00
+date: 2010-10-04 00:00:00 +01:00
 default_executable: rango
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: simple-templater
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -36,6 +36,7 @@ dependencies:
   name: bundler
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -119,6 +120,7 @@ files:
 - lib/rango/rest_controller.rb
 - lib/rango/router.rb
 - lib/rango/router/adapters/crudtree.rb
+- lib/rango/router/adapters/http_router.rb
 - lib/rango/router/adapters/rack_mount.rb
 - lib/rango/router/adapters/urlmap.rb
 - lib/rango/router/adapters/usher.rb
@@ -129,10 +131,7 @@ files:
 - lib/rango/support/cucumber/steps/when_steps.rb
 - lib/rango/tasks/spec.nake
 - lib/rango/tasks/spec.rake
-- lib/rango/templates/exts/haml.rb
-- lib/rango/templates/exts/tilt.rb
-- lib/rango/templates/helpers.rb
-- lib/rango/templates/template.rb
+- lib/rango/template.rb
 - lib/rango/utils.rb
 - lib/rango/version.rb
 - rango.gemspec
@@ -184,10 +183,6 @@ files:
 - spec/rango/support/cucumber/steps/given_steps_spec.rb
 - spec/rango/support/cucumber/steps/then_steps_spec.rb
 - spec/rango/support/cucumber/steps/when_steps_spec.rb
-- spec/rango/templates/exts/haml_spec.rb
-- spec/rango/templates/exts/tilt_spec.rb
-- spec/rango/templates/helpers_spec.rb
-- spec/rango/templates/template_spec.rb
 - spec/rango/utils_spec.rb
 - spec/rango/version_spec.rb
 - spec/rango_spec.rb
@@ -195,35 +190,6 @@ files:
 - spec/spec_helper.rb
 - spec/stubs/config.ru
 - spec/stubs/flat.rb
-- spec/stubs/templates/block/block.html.haml
-- spec/stubs/templates/block/blocks.html.haml
-- spec/stubs/templates/block/error.html.haml
-- spec/stubs/templates/block/getter.html.haml
-- spec/stubs/templates/block/value.html.haml
-- spec/stubs/templates/context_id.html.haml
-- spec/stubs/templates/enhance_block/basic.html.haml
-- spec/stubs/templates/enhance_block/error.html.haml
-- spec/stubs/templates/enhance_block/name_error.html.haml
-- spec/stubs/templates/enhance_block/nil.html.haml
-- spec/stubs/templates/enhance_block/standalone.html.haml
-- spec/stubs/templates/extend_block/basic.html.haml
-- spec/stubs/templates/extend_block/error.html.haml
-- spec/stubs/templates/extend_block/error2.html.haml
-- spec/stubs/templates/extend_block/name_error.html.haml
-- spec/stubs/templates/extend_block/nil.html.haml
-- spec/stubs/templates/includes/base.html.haml
-- spec/stubs/templates/includes/basic.html.haml
-- spec/stubs/templates/includes/includes.html.haml
-- spec/stubs/templates/includes/integration.html.haml
-- spec/stubs/templates/includes/integration2.html.haml
-- spec/stubs/templates/index.html.haml
-- spec/stubs/templates/inheritance/basic/base.html.haml
-- spec/stubs/templates/inheritance/basic/index.html.haml
-- spec/stubs/templates/inheritance/capture/haml/base.html.haml
-- spec/stubs/templates/inheritance/capture/haml/index.html.haml
-- spec/stubs/templates/library.html.haml
-- spec/stubs/templates/test.html.haml
-- spec/stubs/templates/variables.html.haml
 - stubs/features/content/env.rb
 - stubs/features/content/shared/.gitignore
 - stubs/features/metadata.yml
@@ -281,19 +247,13 @@ has_rdoc: true
 homepage: http://github.com/botanicus/rango
 licenses: []
 
-post_install_message: "[\e[32mVersion 0.2.5\e[0m] Conventional rendering mixin for high-level rendering methods like autorender\n\
-  [\e[32mVersion 0.2.5\e[0m] Added RESTController class as a base class for REST controllers\n\
-  [\e[32mVersion 0.2.5\e[0m] Added CRUDMixin with controller CRUD methods\n\
-  [\e[32mVersion 0.2.5\e[0m] UrlHelper#url can work not just as url(:post, @post.id) but also as url(:post, @post)\n\
-  [\e[32mVersion 0.2.5\e[0m] Action args mixin doesn't raise argument error if there are some splat or block arguments\n\
-  [\e[32mVersion 0.2.5\e[0m] Template caching\n\
-  [\e[32mVersion 0.2.5\e[0m] Fixed gemspec to find executables\n\
-  [\e[32mVersion 0.2.5\e[0m] First simple MIME support\n"
+post_install_message: 
 rdoc_options: []
 
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ~>
     - !ruby/object:Gem::Version 
@@ -302,6 +262,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 9
       version: "1.9"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -311,7 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rango
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Rango is ultralightweight, ultracustomizable, ultracool web framework deeply inspired by Django.

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

@@ -1,33 +0,0 @@
-# encoding: utf-8
-
-# Option default_attributes
-#
-# A hash of default attributes for tags (`{tag => {attribute => default_value}}`).
-# Attributes of each tag will reverse merged with his default attributes, so you
-# don't have to write over and over that script tag has attribute `type` with value
-# `text/javascript`. For example, `%script` compiles to `<script type="text/javascript"></script>`.
-# Defaults to `{script: {type: "text/javascript"}, form: {method: "POST"}}`
-
-module Haml
-  module Precompiler
-    alias_method :__prerender_tag__, :prerender_tag
-    def prerender_tag(name, self_close, attributes)
-      # merge given attributes with default attributes from options
-      defaults = Tilt::HamlTemplate.options[:default_attributes][name.to_sym]
-      attributes = defaults.merge(attributes) if defaults
-      __prerender_tag__(name, self_close, attributes)
-    end
-  end
-
-  class Buffer
-    alias_method :__open_tag__, :open_tag
-    def open_tag(name, self_closing, try_one_line, preserve_tag, escape_html, class_id,
-                 nuke_outer_whitespace, nuke_inner_whitespace, obj_ref, content, *attributes_hashes)
-      defaults = Tilt::HamlTemplate.options[:default_attributes][name.to_sym]
-      attributes_hashes.unshift(defaults) if defaults
-
-      __open_tag__(name, self_closing, try_one_line, preserve_tag, escape_html, class_id,
-                    nuke_outer_whitespace, nuke_inner_whitespace, obj_ref, content, *attributes_hashes)
-    end
-  end
-end

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

@@ -1,29 +0,0 @@
-# encoding: utf-8
-
-require "tilt"
-
-module Rango
-  module TiltExtensions
-    # Tilt::HamlTemplate.options[:default_attributes] = {script: {type: "text/javascript"}, form: {method: "POST"}}
-    module Haml
-      def self.included(klass)
-        klass.send(:remove_method, :initialize_engine)
-        def klass.options
-          @options ||= Hash.new
-        end
-      end
-
-      def initialize_engine
-        require_template_library 'haml' unless defined? ::Haml::Engine
-        require "rango/templates/exts/haml" if self.class.options[:default_attributes]
-      end
-
-      def initialize(*args)
-        super
-        self.options.merge!(self.class.options)
-      end
-    end
-  end
-end
-
-Tilt::HamlTemplate.send(:include, Rango::TiltExtensions::Haml)

data/lib/rango/templates/helpers.rb

@@ -1,147 +0,0 @@
-# encoding: utf-8
-
-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>
-        #   <% end %>
-        #
-        # @params [*args]  Arguments to pass to the block.
-        # @params [&block] The template block to call.
-        # @return [String] The output of the block.
-        # @api private
-        def capture(*args, &block)
-          capture_method = "capture_#{self.template.adapter}"
-          if self.respond_to?(capture_method) # tilt doesn't support @_out_buf for haml
-            self.send("capture_#{self.template.adapter}", *args, &block)
-          else
-            # @_out_buf comes from tilt
-            unless self.instance_variable_defined?("@_out_buf")
-              raise "Adapter #{self.template.adapter} doesn't support capturing"
-            end
-            _old_buf, @_out_buf = @_out_buf, ""
-            block.call(*args)
-            @_out_buf = _old_buf.chomp.strip
-          end
-        end
-
-        def concat(string)
-          concat_method = "concat_#{self.template.adapter}"
-          if self.respond_to?(concat_method) # tilt doesn't support @_out_buf for haml
-            self.send("concat_#{self.template.adapter}", string)
-          else
-            # @_out_buf comes from tilt
-            unless self.instance_variable_defined?("@_out_buf")
-              raise "Adapter #{self.template.adapter} doesn't support concating"
-            end
-            @_out_buf << string
-          end
-        end
-      end
-    end
-
-    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
-    # post/base.html
-    # base.html: here it will be rendered, so we need block to returns the correct block code
-    # @since 0.0.2
-    # @version 0.2
-    def block(name, value = nil, &block)
-      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
-      self.template.blocks[name] ||= block ? self.template.scope.capture(&block) : value
-      return self.template.blocks[name]
-    end
-
-    # - extend_block(:head) do
-    #   = pupu :lighter, syntax: "html", theme: "standard"
-    #   = block(:head)
-    def extend_block(name, value = nil, &block)
-      unless self.template.blocks[name]
-        raise NameError, "Block #{name.inspect} wasn't defined yet, you can't extend it!"
-      end
-      self.enhance_block(name, value, &block)
-    end
-
-    def enhance_block(name, value = nil, &block)
-      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] = value if value
-      return self.template.blocks[name]
-    end
-
-    # Clears default content of given block.
-    #
-    # @example
-    #   clear_block(:flyout)
-    def clear_block(name)
-      raise ArgumentError, "You need to specify name of block to clear." if name.nil?
-      self.template.blocks[name] = String.new
-    end
-
-    # Low-level rendering method for templates.
-    #
-    # @since 0.2
-    # @example
-    #   render "base.html"
-    #   render "./base.html"
-    #   render "../base.html"
-    def render(path, context = Hash.new)
-      full_path = normalize_template_path(path)
-      original_template = self.template
-      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"
-    # @since 0.0.2
-    # @version 0.2.1
-    def partial(template, extra_context = Hash.new)
-      # NOTE: we can't use File.split because it normalize the path,
-      # so "./base.html" will be the same as "base.html", but it shouldn't be
-      *path, basename = template.split("/")
-      render File.join(path.join("/"), "_#{basename}"), self.template.context.merge(extra_context)
-    end
-
-    # @since 0.2
-    def includes(template, context = Hash.new)
-      render normalize_template_path(template), context
-      return true
-    end
-
-    # extends "base.html"
-    # @since 0.0.2
-    def extends(path)
-      # we can't just create a new template, because it has to do it after it reads the whole file
-      self.template.supertemplate = normalize_template_path(path)
-    end
-
-    # @since 0.2
-    def normalize_template_path(template)
-      if template.start_with?("./")
-        File.expand_path(File.join(File.dirname(self.template.fullpath), template))
-      elsif template.start_with?("../")
-        File.expand_path(File.join(File.dirname(self.template.fullpath), "..", template))
-      else
-        template
-      end
-    end
-  end
-end

data/lib/rango/templates/template.rb

@@ -1,87 +0,0 @@
-# encoding: utf-8
-
-require "rango/templates/exts/tilt"
-require "rango/core_ext" # String#snake_case
-require "rango/templates/helpers"
-require "rango/exceptions"
-
-module Rango
-  module Exceptions # so we can catch it with other HTTP errors
-    TemplateNotFound = Class.new(NotFound) { self.name = "Template Not Found" }
-  end
-
-  class Template
-    def self.template_paths
-      @@template_paths ||= [Rango.root.join("templates").to_s]
-    end
-
-    # template -> supertemplate is the same relationship as class -> superclass
-    # @since 0.0.2
-    attr_accessor :path, :scope, :supertemplate, :context
-
-    # @since 0.0.2
-    attr_writer :blocks
-    def blocks
-      @blocks ||= Hash.new
-    end
-
-    # @since 0.0.2
-    def initialize(path, scope = Object.new)
-      self.path  = path#[scope.class.template_prefix.chomp("/"), template].join("/")
-      self.scope = scope
-      self.scope.extend(TemplateHelpers)
-      # this enables template caching
-      unless Rango.development?
-        self.scope.extend(Tilt::CompileSite)
-      end
-      self.scope.template = self
-    end
-
-    # @since 0.0.2
-    def fullpath
-      @fullpath ||= begin
-        if self.path.match(/^(\/|\.)/) # /foo or ./foo
-          Dir[self.path, "#{self.path}.*"].find {|file| !File.directory?(file)}
-        else
-          self.find_in_template_paths
-        end
-      end
-    end
-
-    def adapter
-      self.template.class.name.split("::").last.snake_case.sub("_template", "")
-    end
-
-    def extension # haml, erb ...
-      File.extname(path)[1..-1]
-    end
-
-    def template(options = Hash.new)
-      @template ||= Tilt.new(self.fullpath, nil, options)
-    end
-
-    # @since 0.0.2
-    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.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
-        Rango.logger.debug("Extends call: #{self.supertemplate}")
-        supertemplate = self.class.new(self.supertemplate, self.scope)
-        supertemplate.blocks = self.blocks
-        return supertemplate.render(context)
-      end
-      value
-    end
-
-    protected
-    def find_in_template_paths
-      self.class.template_paths.each do |directory|
-        path = File.join(directory, self.path)
-        return Dir[path, "#{path}.*"].find {|file| !File.directory?(file)}
-      end
-    end
-  end
-end

data/spec/rango/templates/helpers_spec.rb

@@ -1,139 +0,0 @@
-# encoding: utf-8
-
-require_relative "../../spec_helper"
-require "rango/templates/helpers"
-
-Rango::Template.template_paths.clear.push(File.join(STUBS_ROOT, "templates"))
-
-describe Rango::TemplateHelpers do
-  include Rango::TemplateHelpers
-  describe "#partial" do
-    it "should work" do
-      pending "This can't work because self.template doesn't exist, we have to use render mixin"
-      partial "basic.html"
-    end
-
-    it "should share context with the parent template" do
-      pending
-    end
-
-    it "should be able to specify additional context which isn't propagated to the parent template" do
-      pending
-    end
-  end
-
-  describe "#render" do
-    it "should consider 'path.html' as a path relative to Template.template_paths" do
-      pending
-    end
-
-    it "should consider './path.html' as a path relative to the current template" do
-      pending
-    end
-
-    it "should look for '../path.html' in the parent directory of directory with current template" do
-      pending
-    end
-  end
-
-  describe "#includes" do
-    require "rango/mixins/render"
-    it "should return true" do
-      Rango::RenderMixin.render("includes/basic.html").strip.should eql("true")
-    end
-
-    it "should work with blocks" do
-      Rango::RenderMixin.render("includes/includes.html")
-    end
-
-    it "should work with extends" do
-      output = Rango::RenderMixin.render("includes/integration.html")
-      output.strip.should eql("Greeting by Jakub Stastny")
-    end
-
-    it "should work with extends" do
-      output = Rango::RenderMixin.render("includes/integration2.html")
-      output.strip.should eql("Greeting by Jakub Stastny")
-    end
-  end
-
-  describe "extends" do
-  end
-
-  describe "block" do
-    it "should raise argument error if name isn't specified" do
-      -> { block(nil) }.should raise_error(ArgumentError)
-    end
-
-    it "should work as a setter if a value is provided" do
-      output = Rango::RenderMixin.render("block/value.html")
-      output.strip.should eql("a value")
-    end
-
-    it "should work as a setter if a block is provided" do
-      output = Rango::RenderMixin.render("block/block.html")
-      output.strip.should eql("a block")
-    end
-
-    it "should work as a getter" do
-      output = Rango::RenderMixin.render("block/getter.html")
-      output.strip.should eql("Hello World!")
-    end
-
-    it "should raise argument error if both value and block is provided" do
-      -> { Rango::RenderMixin.render("block/error.html") }.should raise_error(ArgumentError)
-    end
-
-    it "should store the first non-nil value" do
-      output = Rango::RenderMixin.render("block/blocks.html")
-      output.strip.should eql("first")
-    end
-  end
-
-  describe "extend_block" do
-    it "should raise argument error if name isn't specified" do
-      -> { Rango::RenderMixin.render("extend_block/name_error.html") }.should raise_error(NameError)
-    end
-
-    it "should raise argument error if both value and block is provided" do
-      -> { Rango::RenderMixin.render("extend_block/error.html") }.should raise_error(ArgumentError)
-    end
-
-    it "should raise argument error if block of given name doesn't exist so far" do
-      -> { Rango::RenderMixin.render("extend_block/error2.html") }.should raise_error
-    end
-
-    it "should work with super()-like inheritance" do
-      Rango::RenderMixin.render("extend_block/basic.html")
-    end
-
-    it "should do nothing if the value or block is nil" do
-      output = Rango::RenderMixin.render("extend_block/nil.html")
-      output.strip.should eql("Original")
-    end
-  end
-
-  describe "enhance_block" do
-    it "should work even if the block isn't defined so far" do
-      output = Rango::RenderMixin.render("enhance_block/standalone.html")
-      output.strip.should eql("Hello World!")
-    end
-
-    it "should not raise argument error if name isn't specified" do
-      -> { Rango::RenderMixin.render("enhance_block/name_error.html") }.should_not raise_error(NameError)
-    end
-
-    it "should raise argument error if both value and block is provided" do
-      -> { Rango::RenderMixin.render("enhance_block/error.html") }.should raise_error(ArgumentError)
-    end
-
-    it "should work with super()-like inheritance" do
-      Rango::RenderMixin.render("enhance_block/basic.html")
-    end
-
-    it "should do nothing if the value or block is nil" do
-      output = Rango::RenderMixin.render("enhance_block/nil.html")
-      output.strip.should eql("Original")
-    end
-  end
-end

data/spec/rango/templates/template_spec.rb

@@ -1,61 +0,0 @@
-# encoding: utf-8
-
-require_relative "../../spec_helper"
-require "rango/templates/template"
-
-Rango::Template.template_paths.clear.push(File.join(STUBS_ROOT, "templates"))
-
-describe Rango::Template do
-  describe "#initialize" do
-    it "should take path as a first argument" do
-      template = Rango::Template.new("test.html")
-      template.path.should eql("test.html")
-    end
-
-    it "should take scope as an optional second argument" do
-      scope  = Object.new
-      template = Rango::Template.new("test.html", scope)
-      template.scope.should eql(scope)
-    end
-  end
-
-  describe "#fullpath" do
-    it "should find" do
-      template = Rango::Template.new("test.html")
-      fullpath = File.join(STUBS_ROOT, "templates", "test.html.haml")
-      template.fullpath.should eql(fullpath)
-    end
-  end
-
-  describe "#render" do
-    it "should raise TemplateNotFound if template can't be found" do
-      template = Rango::Template.new("idonotexist.html")
-      -> { template.render }.should raise_error(Rango::Exceptions::TemplateNotFound)
-    end
-
-    it "should render" do
-      template = Rango::Template.new("test.html")
-      template.render.should eql("<html></html>\n")
-    end
-
-    it "should have template inheritance" do
-      template = Rango::Template.new("inheritance/basic/index.html")
-    end
-
-    it "should capture haml" do
-      template = Rango::Template.new("inheritance/capture/haml/index.html")
-      template.render
-      template.blocks[:content].should match("Hello!")
-    end
-  end
-
-  describe "variables" do
-    before(:each) do
-      @template = Rango::Template.new("variables.html")
-    end
-
-    it "should capture erb" do
-      # @template.render(title: "Hi!").should match("Hi!")
-    end
-  end
-end

data/spec/stubs/templates/block/block.html.haml

@@ -1,2 +0,0 @@
-= block(:second) do
-  a block

data/spec/stubs/templates/block/blocks.html.haml

@@ -1,5 +0,0 @@
-- block(:head, nil)
-- block(:head, "first")
-- block(:head, "second")
-
-= block(:head)

data/spec/stubs/templates/block/error.html.haml

@@ -1,2 +0,0 @@
-= block(:content, "value") do
-  Content from block

data/spec/stubs/templates/block/getter.html.haml

@@ -1,3 +0,0 @@
-- block(:content, "Hello World!")
-
-= block(:content)

data/spec/stubs/templates/block/value.html.haml

@@ -1 +0,0 @@
-= block(:one, "a value")

data/spec/stubs/templates/context_id.html.haml

@@ -1 +0,0 @@
-= self.object_id

data/spec/stubs/templates/enhance_block/basic.html.haml

@@ -1,5 +0,0 @@
-- block(:content) do
-  Original
-
-= enhance_block(:content) do
-  I own the only #{block(:content)}!

data/spec/stubs/templates/enhance_block/error.html.haml

@@ -1,3 +0,0 @@
-= enhance_block(:content, "another value") do
-  Content from block
-

data/spec/stubs/templates/enhance_block/name_error.html.haml

@@ -1 +0,0 @@
-- enhance_block(nil)

data/spec/stubs/templates/enhance_block/nil.html.haml

@@ -1,3 +0,0 @@
-- block(:content, "Original")
-
-= enhance_block(:content, nil)

data/spec/stubs/templates/enhance_block/standalone.html.haml

@@ -1,2 +0,0 @@
-= enhance_block(:content) do
-  Hello World!

data/spec/stubs/templates/extend_block/basic.html.haml

@@ -1,5 +0,0 @@
-- block(:content) do
-  Original
-
-= extend_block(:content) do
-  I own the only #{block(:content)}!

data/spec/stubs/templates/extend_block/error.html.haml

@@ -1,5 +0,0 @@
-- block(:content, "value")
-
-= extend_block(:content, "another value") do
-  Content from block
-

data/spec/stubs/templates/extend_block/error2.html.haml

@@ -1 +0,0 @@
-= extend_block(:content, "foo")

data/spec/stubs/templates/extend_block/name_error.html.haml

@@ -1 +0,0 @@
-- extend_block(nil)

data/spec/stubs/templates/extend_block/nil.html.haml

@@ -1,4 +0,0 @@
-- block(:content) do
-  Original
-
-= extend_block(:content, nil)

data/spec/stubs/templates/includes/base.html.haml

@@ -1 +0,0 @@
-== #{block(:title)} by #{block(:author)}

data/spec/stubs/templates/includes/basic.html.haml

@@ -1 +0,0 @@
-= includes "library.html"

data/spec/stubs/templates/includes/includes.html.haml

@@ -1,7 +0,0 @@
-- includes "library.html"
-
-%html
-  %head
-    %title= block(:title)
-
-  %body= block(:content)

data/spec/stubs/templates/includes/integration.html.haml

@@ -1,4 +0,0 @@
-- includes "library.html"
-- extends "includes/base.html"
-
-= block(:author, "Jakub Stastny")

data/spec/stubs/templates/includes/integration2.html.haml

@@ -1,4 +0,0 @@
-- extends "includes/base.html"
-- includes "library.html"
-
-= block(:author, "Jakub Stastny")

data/spec/stubs/templates/index.html.haml

@@ -1 +0,0 @@
-= title

data/spec/stubs/templates/inheritance/basic/base.html.haml

@@ -1,2 +0,0 @@
-%html
-  %body= block(:content)

data/spec/stubs/templates/inheritance/basic/index.html.haml

@@ -1,2 +0,0 @@
-- extends "inheritance/basic/base.html"
-- block(:content, "Hello!")

data/spec/stubs/templates/inheritance/capture/haml/base.html.haml

@@ -1,2 +0,0 @@
-%html
-  %body= block(:content)

data/spec/stubs/templates/inheritance/capture/haml/index.html.haml

@@ -1,3 +0,0 @@
-- extends "inheritance/capture/haml/base.html"
-- block(:content) do
-  Hello!

data/spec/stubs/templates/library.html.haml

@@ -1,3 +0,0 @@
-- block(:title, "Greeting") # we don't want to show this in the partial
-- block(:content) do
-  Hello World!

data/spec/stubs/templates/test.html.haml

@@ -1 +0,0 @@
-%html

data/spec/stubs/templates/variables.html.haml

@@ -1 +0,0 @@
-= title