rango 0.0.6 → 0.1.pre

data/lib/rango/router.rb

@@ -1,15 +1,6 @@
 # encoding: utf-8
 
 module Rango
-  module UrlHelper
-    # url(:login)
-    def url(*args)
-      raise "Your router or your router adapter doesn't support this method"
-    end
-  end
-
-  Helpers.send(:include, UrlHelper)
-
   class Router
     @@routers = Hash.new unless defined?(@@routers)
     def self.implement(router, &block)

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

@@ -8,7 +8,7 @@ Rango::Router.implement(:usher) do |env|
 end
 
 module Rango
-  module UrlHelper
+  class Controller
     # url(:login)
     def url(*args)
       Project.router.router.generator.generate(*args)

data/lib/rango/settings/erubis.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 
-require "rango/settings"
-
 module Rango
   module Settings
     class Erubis < Settings

data/lib/rango/settings/haml.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 
-require "rango/settings"
-
 module Rango
   module Settings
     class Haml < Settings
@@ -32,10 +30,6 @@ module Rango
       # <textarea>Foo&&#x000A;Bar</textarea>
       # Defaults to ['textarea', 'pre'].
       hattribute :preserve, %w[textarea pre]
-
-      # @since 0.0.7
-      # Haml now has an :ugly option, thanks to Wincent Colaiuta. This option forgoes pretty output formatting in favor of speed increases, which show up in particular when rendering deeply nested partials
-      hattribute :ugly, lambda { not Rango.development?  }
     end
   end
 end

data/lib/rango/settings/template.rb

@@ -1,12 +1,10 @@
 # encoding: utf-8
 
-require "rango/settings"
-
 module Rango
   module Settings
     class Template < Settings
       # @since 0.0.3
-      hattribute :caching, Rango.development?
+      hattribute :caching, Rango.debug?
 
       # @since 0.0.3
       # useful for helpers

data/lib/rango/templates/adapter.rb

@@ -5,7 +5,7 @@ module Rango
     class << self
       # @since 0.0.2
       def engine(name)
-        Rango::Templates.const_get(name.to_s.capitalize + "Adapter")
+        Rango::Templates.const_get(name.capitalize + "Adapter")
       end
     end
 

data/lib/rango/templates/erubis.rb

@@ -61,9 +61,9 @@ module Erubis
       rest = pos == 0 ? input : input[pos..-1]   # ruby1.9
       add_text(src, rest)
     end
-
+    
   end
-
+  
   class MEruby < Erubis::Eruby
     include PercentLineEnhancer
     include StringBufferEnhancer

data/lib/rango/templates/template.rb

@@ -1,10 +1,8 @@
 # encoding: utf-8
 
-# TODO: questionable :partial, true
+# TODO: qattribute :partial, true
 # => define #partial?
 
-require "rubyexts/attribute"
-
 module Rango
   module Templates
     class Template

data/lib/rango/templates/templates.txt

@@ -35,5 +35,5 @@ Project.settings => OpenStruct
 
 Project.settings.template.format = :html
 Project.settings.template.format_version = 5
-Project.settings.template.caching = Rango.development?
+Project.settings.template.caching = Rango.debug?
 	- for helpers

data/lib/rango/{utils.rb → testing.rb}

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 module Rango
-  module Utils
+  module Testing
     extend self
     def load_rackup(path = "config.ru")
       fullpath = File.join(Project.root, "config.ru")

data/rango.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.has_rdoc = true
 
   # files
-  s.files = Dir.glob("**/*") - Dir.glob("pkg/*") - Dir.glob("vendor/*") - Dir.glob("doc/*")
+  s.files = Dir.glob("**/*") - Dir.glob("pkg/*")
   s.executables = ["rango"]
   s.default_executable = "rango"
   s.require_paths = ["lib"]

data/rango.pre.gemspec

@@ -0,0 +1,48 @@
+#!/usr/bin/env gem1.9 build
+# encoding: utf-8
+
+Dir[File.join(File.dirname(__FILE__), "vendor", "*")].each do |path|
+  if File.directory?(path) && Dir["#{path}/*"].empty?
+    warn "Dependency #{File.basename(path)} in vendor seems to be empty. Run git submodule init && git submodule update to checkout it."
+  elsif File.directory?(path) && File.directory?(File.join(path, "lib"))
+    $:.unshift File.join(path, "lib")
+  end
+end
+
+# Run thor package:gem or gem build rango.gemspec
+# NOTE: we can't use require_relative because when we run gem build, it use eval for executing this file
+require File.join(File.dirname(__FILE__), "lib", "rango")
+
+Gem::Specification.new do |s|
+  s.name = "rango"
+  s.version = '0.1.pre'
+  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."
+  s.description = "" # TODO: long description
+  s.cert_chain = nil
+  s.email = ["knava.bestvinensis", "gmail.com"].join("@")
+  s.has_rdoc = true
+
+  # files
+  s.files = Dir.glob("**/*") - Dir.glob("pkg/*")
+  s.executables = ["rango"]
+  s.default_executable = "rango"
+  s.require_paths = ["lib"]
+
+  # Ruby version
+  s.required_ruby_version = ::Gem::Requirement.new(">= 1.9.1")
+
+  # runtime dependencies
+  s.add_dependency "rack", "1.0.1"
+  s.add_dependency "rubyexts"
+  s.add_dependency "media-path"
+
+  # development dependencies
+  # use gem install rango --development if you want to install them
+  s.add_development_dependency "simple-templater"
+  s.add_development_dependency "bundler"
+
+  # RubyForge
+  s.rubyforge_project = "rango"
+end

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

@@ -4,6 +4,3 @@ class <%= @name.camel_case %>
   extend Rango::ImportMixin
   extend Rango::ApplicationMixin
 end
-
-require_relative "models.rb"
-require_relative "views.rb"

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

@@ -1,17 +1,9 @@
 # encoding: utf-8
 
 <% @models.each do |model| %>
-<% case @orm %>
-<% when "datamapper" %>
-class <%= "#{@name.camel_case}::#{model.camel_case}" %>
+class <%= model.camel_case %>
   include DataMapper::Resource
   property :title, String
 end
 
-<% when "sequel" %>
-class <%= "#{@name.camel_case}::#{model.camel_case}" < Sequel::Model %>
-  # TODO: implement <%= model %> model
-end
-
 <% end %>
-<% end %>

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

@@ -1,20 +1,11 @@
 # encoding: utf-8
 
 require "rango/controller"
-
-class <%= @name.camel_case %>::Application < Rango::Controller
-  # TODO: implement application controller
-end
-
-class <%= @name.camel_case %>::ShowCase < <%= @name.camel_case %>::Application
-  def index
-    render "index.html"
-  end
-end
+require "rango/mixins/http_caching"
 
 <% @controllers.each do |controller| %>
-class <%= "#{@name.camel_case}::#{controller.camel_case}" %> < <%= @name.camel_case %>::Application
-  # TODO: implement <%= controller %> controller
+class <%= controller.camel_case %> < Rango::Controller
+  include Rango::HttpCaching
 end
 
-<% end %>
+<% end %>

data/stubs/app/setup.rb

@@ -4,10 +4,9 @@
 # You can update context hash and register hooks. Don't forget to use merge! instead of merge, because you are
 # manipulating with one object, rather than returning new one.
 
-# rango create app blog --models=post,tag --controllers=posts,tags --orm=sequel
+# rango create app blog --models=post,tag --controllers=posts,tags
 hook do |generator, context|
-  context[:orm] = "datamapper" unless context.has_key?(:orm)
-  models = [context[:models]].compact.flatten # the flatten thing: if you have --models=post, it would be just a string
-  controllers = [context[:controllers]].compact.flatten
+  models  = context[:models] || Array.new
+  controllers = context[:controllers] || Array.new
   context.merge!(models: models, controllers: controllers)
 end

data/stubs/project/content/{Gemfile.rbt → Gemfile}

@@ -8,72 +8,22 @@
 # http://yehudakatz.com/2009/11/03/using-the-new-gem-bundler-today
 # http://www.engineyard.com/blog/2009/using-the-rubygems-bundler-for-your-app
 
-# === Shared Gems === #
 # Specify a dependency on rango. When the bundler downloads gems,
 # it will download rango as well as all of rango' dependencies
 gem "rango"#, git: "git://github.com/botanicus/rango.git"
-gem "rack"#, git: "git://github.com/rack/rack.git"
-
-# router
-<% case @router %>
-<% when "usher" %>
 gem "usher"#, git: "git://github.com/joshbuddy/usher.git"
-<% when "rack-mount" %>
-gem "rack-mount"#, git: "git://github.com/josh/rack-mount.git"
-<% when "rack-router" %>
-gem "rack-router"#, git: "git://github.com/carllerche/rack-router.git"
-<% end %>
-
-# template engine
-<% case @template_engine %>
-<% when "haml" %>
+gem "rack"#, git: "git://github.com/rack/rack.git"
 gem "haml"#, git: "git://github.com/nex3/haml.git"
-<% when "erubis" %>
-gem "erubis"#, git: "git://github.com/genki/erubis.git"
-<% end %>
 
-# ORM
-<% case @orm %>
-<% when "datamapper" %>
+gem "dm_sqlite3"#, git: "git://github.com/datamapper/do.git"
 gem "dm-core"#, git: "git://github.com/datamapper/dm-core.git"
 gem "dm-timestamps"#, git: "git://github.com/datamapper/dm-more.git"
 
-<% when "sequel" %>
-gem "sequel"#, git: "git://github.com/jeremyevans/sequel.git"
-
-<% end %>
-# TODO: don't load them
-#gem "thin"#, git: "git://github.com/macournoyer/thin.git" # there seems to be some problems with latest thin
-#gem "unicorn"#, git: "git://repo.or.cz/unicorn.git"
-gem "racksh", require_as: nil#, git: "git://github.com/sickill/racksh.git"
-<% if @warden %>
-gem "warden"
-<% end %>
-
-# === Environment-Specific Setup === #
-only(:development) do
-  gem "shotgun", require_as: nil#, git: "git://github.com/rtomayko/shotgun.git"
-end
-
-except(:stage, :production) do
-  <% case @orm %>
-  <% when "datamapper" %>
-  gem "do_sqlite3"#, git: "git://github.com/datamapper/do.git"
-  <% end %>
-end
-
-only(:stage, :production) do
-  <% case @orm %>
-  <% when "datamapper" %>
-  gem "do_mysql"#, git: "git://github.com/datamapper/do.git"
-  <% else %>
-  # TODO: db adapters etc
-  <% end %>
-end
+#gem "sequel"#, git: "git://github.com/jeremyevans/sequel.git"
 
 only(:test) do
   gem "rspec"#, git: "git://github.com/dchelimsky/rspec.git"
-  gem "rack-test", require_as: "rack/test"#, git: "git://github.com/brynary/rack-test.git"
+  gem "rack-test"#, git: "git://github.com/brynary/rack-test.git"
   gem "webrat"#, git: "git://github.com/brynary/webrat.git"
 end
 
@@ -84,7 +34,6 @@ only(:cucumber) do
   gem "cucumber"#, git: "git://github.com/aslakhellesoy/cucumber.git"
 end
 
-# === Bundler Setup === #
 # Specify where the bundled gems should be stashed. This directory will
 # be a gem repository where all gems are downloaded to and installed to.
 #

data/stubs/project/content/Rakefile

@@ -0,0 +1,9 @@
+# encoding: utf-8
+
+desc "Boot environment"
+task :environment do
+  require_relative "init"
+end
+
+load "pupu/tasks/pupu.rake"
+load "rango/orm/adapters/datamapper/tasks.rake"

data/stubs/project/content/config.ru.rbt

@@ -1,12 +1,10 @@
-<%= shebang "./init.rb", %w[-p 4000 -s webrick] %>
+<%= shebang "rackup", ["-s", "thin", "-p", 4000] %>
 # encoding: utf-8
 
-# Load init.rb even if config.ru is just loaded 
-# This comes handy in Passenger etc, but it's still
-# useful to have config.ru as an executable, because
-# it's easy to have default arguments for bin/rackup
-require_relative "init.rb" unless $0.eql?(__FILE__)
-<% if @warden %>
+# TODO: how to change environment from CLI?
+require_relative "init"
+
+use Rango::Middlewares::Basic
 
 # warden authentication
 # wiki.github.com/hassox/warden/setup
@@ -34,29 +32,3 @@ Warden::Strategies.add(:password) do
     User.new # TODO
   end
 end
-<% end %>
-
-Rango::Router.use(:<%= @router.to_sym %>)
-
-<% case @router %>
-<% when "usher" %>
-# http://github.com/joshbuddy/usher
-Project.router = Usher::Interface.for(:rack) do
-  get("/").to(<%= @name.camel_case %>::ShowCase.dispatcher(:index)).name(:showcase)
-end
-<% when "rack-mount" %>
-# http://github.com/josh/rack-mount
-Project.router = Rack::Mount::RouteSet.new do |set|
-  # add_route takes a rack application and conditions to match with
-  # conditions may be strings or regexps
-  # See Rack::Mount::RouteSet#add_route for more options.
-  set.add_route <%= @name.camel_case %>::ShowCase.dispatcher(:index), method: "get", path: "/"
-end
-<% when "rack-router" %>
-# TODO: routes
-<% when "urlmap" %>
-# TODO: routes
-<% end %>
-
-use Rango::Middlewares::Basic
-run Project.router

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

@@ -1,13 +1,9 @@
-<%= shebang "ruby1.9", ["--disable-gems"] %>
+<%= shebang %>
 # encoding: utf-8
 
-# This file should set Rango environment
-# You can run your scripts with ./init.rb my-script.rb
-# See http://wiki.github.com/botanicus/rango/rango-boot-process
-
 # bundler
 begin
-  require_relative "gems/environment.rb"
+  require_relative "gems/environment"
 rescue LoadError => exception
   abort "LoadError during loading gems/environment: #{exception.message}\nRun gem bundle to fix it."
 end
@@ -18,32 +14,10 @@ require_relative "settings_local"
 
 require "rango"
 
-environment = ENV["RANGO_ENV"] || (RANGO_ENV if defined?(RANGO_ENV)) || "development"
-Rango.boot(environment: environment)
-
-Rango.logger.info("Loading dependencies for #{Rango.environment}")
-Bundler.require_env(Rango.environment)
-
-# register applications
-require_relative "<%= @name %>/init.rb"
+Rango.boot
 
 # database connection
 # DataMapper.setup(:default, "sqlite3::memory")
 
 # 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
-# ./init.rb: start webserver
-if ARGV.length > 0 && $0.eql?(__FILE__)
-  # config.ru
-  if ARGV.last.split(".").last.eql?("ru")
-    if Rango.development?
-      load_relative "bin/shotgun"
-    else
-      load_relative "bin/rackup"
-    end
-  else
-    load ARGV.shift
-  end
-end