rango 0.1.1.2.10 → 0.1.1.2.11

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.10"
+  VERSION ||= "0.1.1.2.11"
 end

data/spec/rango/controller_spec.rb

@@ -2,6 +2,7 @@
 
 require_relative "../spec_helper"
 
+require "rango/logger"
 require "rango/controller"
 require "rack/mock"
 

data/spec/rango/mixins/message_spec.rb

@@ -18,9 +18,9 @@ describe Rango::MessageMixin do
   end
 
   describe ".included" do
-    it "should not do anything if method locals isn't defined" do
+    it "should not do anything if method context isn't defined" do
       pending "How to implement it?"
-      @controller.should_not respond_to(:locals)
+      @controller.should_not respond_to(:context)
     end
 
     class ExplicitRenderingController < Rango::Controller
@@ -28,9 +28,9 @@ describe Rango::MessageMixin do
       include Rango::MessageMixin
     end
 
-    it "should add message to locals if method locals is defined" do
+    it "should add message to context if method context is defined" do
       controller = ExplicitRenderingController.new(@env)
-      controller.locals.should have_key(:message)
+      controller.context.should have_key(:message)
     end
   end
 

data/spec/rango/mixins/render_spec.rb

@@ -5,7 +5,7 @@ require_relative "../../spec_helper"
 require "rango/project"
 require "rango/mixins/render"
 
-Project.settings.template_dirs = [File.join(STUBS_ROOT, "templates")]
+Rango::Template.template_paths = [File.join(STUBS_ROOT, "templates")]
 
 describe Rango::RenderMixin do
   it "should work standalone" do
@@ -24,20 +24,20 @@ describe Rango::RenderMixin do
       body.should be_kind_of(String)
     end
 
-    it "should take a context as the second argument" do
+    it "should take a scope as the second argument" do
       context    = Object.new
       body       = render "context_id.html", context
       context_id = body.chomp.to_i
       context_id.should eql(context.object_id)
     end
 
-    it "should take locals as the third argument" do
+    it "should take context as the third argument" do
       context = Object.new
       body    = render "index.html", context, title: "Hi!"
       body.should match(/Hi\!/)
     end
 
-    it "should take the second arguments as a locals if it's a hash and there is no third argument" do
+    it "should take the second arguments as a context if it's a hash and there is no third argument" do
       body = render "index.html", title: "Hi!"
       body.should match(/Hi\!/)
     end

data/spec/rango/project_spec.rb

@@ -1,6 +1,8 @@
 # encoding: utf-8
 
 require_relative "../spec_helper"
+require "media-path"
+require "rango/project"
 
 describe Project do
   it "should have root" do

data/spec/rango/templates/template_spec.rb

@@ -4,25 +4,25 @@ require_relative "../../spec_helper"
 require "rango/templates/template"
 require "rubyexts/string" # TODO: remove this after rubyexts update
 
-Project.settings.template_dirs = [File.join(STUBS_ROOT, "templates")]
+Rango::Template.template_paths = [File.join(STUBS_ROOT, "templates")]
 
-describe Rango::Templates::Template do
+describe Rango::Template do
   describe "#initialize" do
     it "should take path as a first argument" do
-      template = Rango::Templates::Template.new("test.html")
+      template = Rango::Template.new("test.html")
       template.path.should eql("test.html")
     end
 
-    it "should take context as an optional second argument" do
-      context  = Object.new
-      template = Rango::Templates::Template.new("test.html", context)
-      template.context.should eql(context)
+    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::Templates::Template.new("test.html")
+      template = Rango::Template.new("test.html")
       fullpath = File.join(STUBS_ROOT, "templates", "test.html.haml")
       template.fullpath.should eql(fullpath)
     end
@@ -30,51 +30,51 @@ describe Rango::Templates::Template do
 
   describe "#render" do
     it "should raise TemplateNotFound if template can't be found" do
-      template = Rango::Templates::Template.new("idonotexist.html")
+      template = Rango::Template.new("idonotexist.html")
       -> { template.render }.should raise_error(Rango::Errors::TemplateNotFound)
     end
 
     it "should render" do
-      template = Rango::Templates::Template.new("test.html")
+      template = Rango::Template.new("test.html")
       template.render.should eql("<html></html>\n")
     end
 
     it "should have template inheritance" do
-      template = Rango::Templates::Template.new("inheritance/basic/index.html")
+      template = Rango::Template.new("inheritance/basic/index.html")
     end
 
     it "should capture haml" do
-      template = Rango::Templates::Template.new("inheritance/capture/haml/index.html")
+      template = Rango::Template.new("inheritance/capture/haml/index.html")
       template.render
       template.blocks[:content].should match("Hello!")
     end
 
     it "should capture erubis" do
-      template = Rango::Templates::Template.new("inheritance/capture/erubis/index.html")
+      template = Rango::Template.new("inheritance/capture/erubis/index.html")
       template.render
       template.blocks[:content].should match("Hello!")
     end
 
     it "should capture erb" do
       pending "ERB or ERB adapter in Tilt seems to have problems with capturing"
-      template = Rango::Templates::Template.new("inheritance/capture/erb/index.html")
+      template = Rango::Template.new("inheritance/capture/erb/index.html")
       template.render
       template.blocks[:content].should match("Hello!")
     end
   end
-  
+
   describe "variables" do
     before(:each) do
-      @template = Rango::Templates::Template.new("variables.html")
+      @template = Rango::Template.new("variables.html")
     end
 
     it "should capture erb" do
       @template.render(title: "Hi!").should match("Hi!")
     end
-    
+
     it "should <%= &block %>" do
       pending "<%= &block %> should works for Erubis"
-      template = Rango::Templates::Template.new("erubis.html")
+      template = Rango::Template.new("erubis.html")
       puts template.render
     end
   end

data/stubs/{project → stack}/content/init.rb.rbt

@@ -1,4 +1,8 @@
+<% if defined?(JRUBY_VERSION) %>
+<%= shebang rubypath, ["--1.9", "--disable-gems"] %>
+<% else %>
 <%= shebang rubypath, ["--disable-gems"] %>
+<% end %>
 # encoding: utf-8
 
 # This file should set Rango environment
@@ -13,7 +17,6 @@ rescue LoadError => exception
 end
 
 # settings
-require_relative "settings"
 require_relative "settings_local"
 
 require "rango"
@@ -38,12 +41,6 @@ Rango.boot(environment: environment)
 # register applications
 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/stack/content/settings_local.rb.rbt

@@ -0,0 +1,20 @@
+# encoding: utf-8
+
+# database connection
+<% case @orm %>
+<% when "sequel" %>
+# http://sequel.rubyforge.org/rdoc/files/doc/opening_databases_rdoc.html
+case Rango.environment
+when "development", "production", "staging"
+  DB = Sequel.connect("sqlite://db/#{Rango.environment}.db")
+when "test", "spec", "cucumber"
+  DB = Sequel.sqlite # in memory database
+end
+<% when "datamapper" %>
+case Rango.environment
+when "development", "production", "staging"
+  DataMapper.setup(:default, "sqlite3:db/#{Rango.environment}.db")
+when "test", "spec", "cucumber"
+  DataMapper.setup(:default, "sqlite3::memory:")
+end
+<% end %>

data/stubs/stack/content/templates/errors/404.html.haml

@@ -0,0 +1 @@
+# TODO

data/stubs/stack/content/templates/errors/500.html.haml

@@ -0,0 +1 @@
+= h exception.inspect

data/stubs/{app → stack}/content/views.rb.rbt

@@ -13,6 +13,19 @@ module <%= @name.camel_case %>
     include Rango::FiltersMixin
     include Rango::MessageMixin
     include Rango::ExplicitRendering
+
+    # http://wiki.github.com/botanicus/rango/errors-handling
+    def render_http_error(exception)
+      if self.respond_to?(exception.to_snakecase)
+        self.send(exception.to_snakecase, exception)
+      else
+        begin
+          render "errors/#{exception.status}.html"
+        rescue TemplateNotFound
+          render "errors/500.html"
+        end
+      end
+    end
   end
 
   class ShowCase < Application

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification 
 name: rango
 version: !ruby/object:Gem::Version 
-  version: 0.1.1.2.10
+  version: 0.1.1.2.11
 platform: ruby
 authors: 
 - "Jakub \xC5\xA0\xC5\xA5astn\xC3\xBD aka Botanicus"
 autorequire: 
 bindir: bin
 cert_chain: 
-date: 2009-12-11 00:00:00 +00:00
+date: 2009-12-13 00:00:00 +00:00
 default_executable: rango
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
-  type: :runtime
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -23,7 +23,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: tilt
-  type: :runtime
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -33,7 +33,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: rubyexts
-  type: :runtime
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -43,7 +43,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: media-path
-  type: :runtime
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -53,7 +53,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: simple-templater
-  type: :runtime
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -63,13 +63,13 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: bundler
-  type: :runtime
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0.7"
+        version: "0"
     version: 
 description: ""
 email: knava.bestvinensis@gmail.com
@@ -91,32 +91,36 @@ files:
 - lib/rango/contrib/pagination.rb
 - lib/rango/contrib/syndication.rb
 - lib/rango/controller.rb
+- lib/rango/core_ext.rb
 - lib/rango/environments.rb
 - lib/rango/exceptions.rb
 - lib/rango/forms/form.rb
+- lib/rango/gv/router.rb
+- lib/rango/gv/scaffolding.rb
 - lib/rango/gv/static.rb
 - lib/rango/gv.rb
 - lib/rango/helpers/assets.rb
 - lib/rango/helpers/general.rb
 - lib/rango/helpers/syntax.rb
 - lib/rango/helpers.rb
+- lib/rango/interactive.rb
+- lib/rango/logger.rb
 - lib/rango/loggers/fireruby.rb
 - lib/rango/mini.rb
+- lib/rango/mini_render.rb
 - lib/rango/mixins/application.rb
 - lib/rango/mixins/configurable.rb
 - lib/rango/mixins/filters.rb
 - lib/rango/mixins/http_caching.rb
+- lib/rango/mixins/logger.rb
 - lib/rango/mixins/message.rb
 - lib/rango/mixins/render.rb
 - lib/rango/mixins/rendering.rb
-- lib/rango/orm/adapter.rb
-- lib/rango/orm/adapters/datamapper.rb
-- lib/rango/orm/adapters/sequel.rb
-- lib/rango/orm/orm.txt
+- lib/rango/orm/README.textile
 - lib/rango/orm/support/datamapper/fields.rb
-- lib/rango/orm/support/datamapper/support.rb
 - lib/rango/orm/tasks/datamapper.rake
 - lib/rango/orm/tasks/sequel.rake
+- lib/rango/path.rb
 - lib/rango/project.rb
 - lib/rango/rack/middlewares/basic.rb
 - lib/rango/rack/middlewares/email_obfuscator.rb
@@ -226,17 +230,6 @@ files:
 - spec/stubs/templates/inheritance/capture/haml/index.html.haml
 - spec/stubs/templates/test.html.haml
 - spec/stubs/templates/variables.html.haml
-- stubs/app/content/init.rb.rbt
-- stubs/app/content/models.rb.rbt
-- stubs/app/content/views.rb.rbt
-- stubs/app/metadata.yml
-- stubs/app/setup.rb
-- stubs/bigapp/content/init.rb
-- stubs/bigapp/content/models/%model%.rb.rbt
-- stubs/bigapp/content/views/%controller%.rb.rbt
-- stubs/bigapp/content/views/application.rb
-- stubs/bigapp/metadata.yml
-- stubs/bigapp/setup.rb
 - stubs/features/content/env.rb
 - stubs/features/metadata.yml
 - stubs/flat/content/flat.ru
@@ -244,23 +237,26 @@ files:
 - stubs/flat/metadata.yml
 - stubs/flat/postprocess.rb
 - stubs/flat/setup.rb
-- stubs/project/content/config.ru.rbt
-- stubs/project/content/Gemfile.rbt
-- stubs/project/content/init.rb.rbt
-- stubs/project/content/Rakefile.rbt
-- stubs/project/content/settings.rb
-- stubs/project/content/settings_local.rb.rbt
-- stubs/project/content/spec/%name%/init_spec.rb.rbt
-- stubs/project/content/spec/%name%/models_spec.rb.rbt
-- stubs/project/content/spec/%name%/views_spec.rb.rbt
-- stubs/project/content/spec/spec.opts
-- stubs/project/content/spec/spec_helper.rb
-- stubs/project/content/templates/base.html.haml.rbt
-- stubs/project/content/templates/index.html.haml
-- stubs/project/content/TODO.txt
-- stubs/project/metadata.yml
-- stubs/project/postprocess.rb
-- stubs/project/setup.rb
+- stubs/stack/content/config.ru.rbt
+- stubs/stack/content/Gemfile.rbt
+- stubs/stack/content/init.rb.rbt
+- stubs/stack/content/models.rb.rbt
+- stubs/stack/content/Rakefile.rbt
+- stubs/stack/content/settings_local.rb.rbt
+- stubs/stack/content/spec/%name%/init_spec.rb.rbt
+- stubs/stack/content/spec/%name%/models_spec.rb.rbt
+- stubs/stack/content/spec/%name%/views_spec.rb.rbt
+- stubs/stack/content/spec/spec.opts
+- stubs/stack/content/spec/spec_helper.rb
+- stubs/stack/content/templates/base.html.haml.rbt
+- stubs/stack/content/templates/errors/404.html.haml
+- stubs/stack/content/templates/errors/500.html.haml
+- stubs/stack/content/templates/index.html.haml
+- stubs/stack/content/TODO.txt
+- stubs/stack/content/views.rb.rbt
+- stubs/stack/metadata.yml
+- stubs/stack/postprocess.rb
+- stubs/stack/setup.rb
 - CHANGELOG
 - CONTRIBUTORS
 - LICENSE
@@ -271,7 +267,50 @@ has_rdoc: true
 homepage: http://github.com/botanicus/rango
 licenses: []
 
-post_install_message: 
+post_install_message: |
+  = Version 0.0.1 Miracle Born
+    * Just basics
+  
+  = Version 0.0.2 MVC Princess
+    * static files middleware
+    * MVC layer
+    * sessions, cookies
+    * integrated merb-auth
+  
+  = Version 0.0.3
+  
+  = Version 0.0.4
+  
+  = Version 0.1
+    * [FEATURE] environments support
+    * [FEATURE] installation without RubyGems
+    * [FEATURE] HTTP caching
+    * [FEATURE] Hooks for Rendering
+    * [SPECS]   Integration with RunCodeRun.com
+    * [SPECS]   All specs passing
+    * SimpleTemplater, RubyExts & CLI
+    * [FEATURE] Bundler Support
+    * [FEATURE] Generic view
+    * [FEATURE] Project generator
+    * [FEATURE] Rack-mount support
+  
+  = Version 0.1.1
+    * Tilt support
+    * Removed old merb-helpers
+    * Reworked generic views
+    * Default attributes for Haml
+    * MessagesMixin and FiltersMixin were divided from Rango::Controller
+    * Shebang is just ruby rather than ruby1.9, so it plays well with rvm
+    * ImplicitRendering and ExplicitRendering mixins for using locals
+      vs. rendering in context of current controller instance
+  
+  = Version 0.1.2, 10/12/2009, SHA1
+    * Sequel support
+    * Project generator renamed to stack generator
+    * Removed app and bigapp generators
+    * Added migration task for DataMapper
+    * Removed layer of ORM adapters
+
 rdoc_options: []
 
 require_paths: