rango 0.1.1 → 0.1.1.1

data/CHANGELOG

@@ -18,7 +18,7 @@
   * [FEATURE] Hooks for Rendering
   * [SPECS]   Integration with RunCodeRun.com
   * [SPECS]   All specs passing
-	* SimpleTemplater, RubyExts & CLI
+  * SimpleTemplater, RubyExts & CLI
   * [FEATURE] Bundler Support
   * [FEATURE] Generic view
   * [FEATURE] Project generator
@@ -27,5 +27,9 @@
 = Version 0.1.1
   * Tilt support
   * Removed old merb-helpers
-  * Templates are rendered in separate namespace
   * 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

data/Rakefile

@@ -1,79 +1,12 @@
-#!/usr/bin/env rake1.9
 # encoding: utf-8
 
 # http://support.runcoderun.com/faqs/builds/how-do-i-run-rake-with-trace-enabled
 Rake.application.options.trace = true
 
-task :setup => ["submodules:init"]
+# default task for RunCodeRun.com
+task :default => ["submodules:init", :spec]
 
-namespace :submodules do
-  desc "Init submodules"
-  task :init do
-    sh "git submodule init"
-  end
-
-  desc "Update submodules"
-  task :update do
-    Dir["vendor/*"].each do |path|
-      if File.directory?(path) && File.directory?(File.join(path, ".git"))
-        Dir.chdir(path) do
-          puts "=> #{path}"
-          puts %x[git reset --hard]
-          puts %x[git fetch]
-          puts %x[git reset origin/master --hard]
-          puts
-        end
-      end
-    end
-  end
-end
-
-task :gem do
-  sh "gem build rango.gemspec"
-end
-
-namespace :gem do
-  task :prerelease do
-    require_relative "lib/rango"
-    gemspec = Dir["*.gemspec"].first
-    content = File.read(gemspec)
-    prename = "#{gemspec.split(".").first}.pre.gemspec"
-    version = Rango::VERSION.sub(/^(\d+)\.(\d+)\.\d+$/) { "#$1.#{$1.to_i + 1}" }
-    File.open(prename, "w") do |file|
-      file.puts(content.gsub(/(\w+::VERSION)/, "'#{version}.pre'"))
-    end
-    sh "gem build #{prename}"
-    rm prename
-  end
-end
-
-desc "Release new version of rango"
-task release: ["release:tag", "release:gemcutter"]
-
-namespace :release do
-  desc "Create Git tag"
-  task :tag do
-    require_relative "lib/rango"
-    puts "Creating new git tag #{Rango::VERSION} and pushing it online ..."
-    sh "git tag -a -m 'Version #{Rango::VERSION}' #{Rango::VERSION}"
-    sh "git push --tags"
-    puts "Tag #{Rango::VERSION} was created and pushed to GitHub."
-  end
-
-  desc "Push gem to Gemcutter"
-  task :gemcutter do
-    puts "Pushing to Gemcutter ..."
-    sh "gem push #{Dir["*.gem"].last}"
-  end
-  
-  desc "Create and push prerelease gem"
-  task :pre => ["gem:prerelease", :gemcutter]
-end
-
-desc "Run specs"
-task :default => :setup do
-  rubylib = (ENV["RUBYLIB"] || String.new).split(":")
-  libdirs = Dir["vendor/*/lib"]
-  ENV["RUBYLIB"] = (libdirs + rubylib).join(":")
-  exec "./script/spec --options spec/spec.opts spec"
+# load tasks
+Dir["tasks/*.rake"].each do |taskfile|
+  load taskfile
 end

data/lib/rango.rb

@@ -19,7 +19,7 @@ end
 Encoding.default_internal = "utf-8"
 
 module Rango
-  VERSION ||= "0.1.1"
+  VERSION ||= "0.1.1.1"
   extend ApplicationMixin
 
   def self.root

data/lib/rango/controller.rb

@@ -2,113 +2,54 @@
 
 # http://wiki.github.com/botanicus/rango/controllers
 
-require "rango/mixins/render"
+require "rango/router"
 require "rango/exceptions"
-require "rango/project"
 require "rango/rack/request"
-require "rango/router"
-require "rango/templates/template"
 
 module Rango
   class Controller
-    include Rango::Helpers
-    include Rango::RenderMixin
-
-    class << self
-      # @since 0.0.2
-      attribute :before_filters, Hash.new
-
-      # @since 0.0.2
-      attribute :after_filters,  Hash.new
-
-      def inherited(subclass)
-        inherit_filters(subclass, :before)
-        inherit_filters(subclass, :after)
-        inherit_filters(subclass, :before_render)
-        inherit_filters(subclass, :after_render)
-        inherit_filters(subclass, :before_display)
-        inherit_filters(subclass, :after_display)
-      end
-
-      def inherit_filters(subclass, name)
-        subclass.send("#{name}_filters=", self.send("#{name}_filters").dup)
-      end
-
-      # before :login
-      # before :login, actions: [:send]
-      # @since 0.0.2
-      def before(action = nil, options = Hash.new, &block)
-        self.before_filters[action || block] = options
-      end
-
-      # @since 0.0.2
-      def after(action = nil, options = Hash.new, &block)
-        self.after_filters[action || block] = options
-      end
-
-      attribute :before_render_filters, Array.new
-      attribute :after_render_filters, Array.new
-
-      attribute :before_display_filters, Array.new
-      attribute :after_display_filters, Array.new
-
-      # [master] Change Merb::Controller to respond to #call and return a Rack Array. (wycats)http://rubyurl.com/BhoY
-      # @since 0.0.2
-      def call(env)
-        Rango::Router.set_rack_env(env) # See rango/router/adapters/*
-        request = Rango::Request.new(env)
-        options = env["rango.router.params"] || raise("rango.router.params property has to be setup at least to empty hash")
-        method = env["rango.controller.action"].to_sym
-        controller = self.new(env, options.merge(request.params))
-        begin
-          unless controller.respond_to?(method) # TODO: what about method_missing?
-            raise NotFound, "Controller #{self.name} doesn't have method #{method}"
-          end
-          controller.run_filters(:before, method.to_sym)
-          # If you don't care about arguments or if you prefer usage of params.
-          if controller.method(method).arity.eql?(0)
-            Rango.logger.debug("Calling method #{self.name}##{method} without arguments")
-            controller.response.body = controller.method(method).call
-          else
-            args = controller.params.values
-            Rango.logger.debug("Calling method #{self.name}##{method} with arguments #{args.inspect}")
-            controller.response.body = controller.method(method).call(*args)
-          end
-          controller.run_filters(:after, method)
-          return controller.response.finish
-        rescue HttpError => exception
-          controller.rescue_http_error(exception)
+    # [master] Change Merb::Controller to respond to #call and return a Rack Array. (wycats)http://rubyurl.com/BhoY
+    # @since 0.0.2
+    def self.call(env)
+      Rango::Router.set_rack_env(env)
+      request = Rango::Request.new(env)
+      options = env["rango.router.params"] || raise("rango.router.params property has to be setup at least to empty hash")
+      method = env["rango.controller.action"].to_sym
+      controller = self.new(env, options.merge(request.params))
+      begin
+        unless controller.respond_to?(method) # TODO: what about method_missing?
+          raise NotFound, "Controller #{self.name} doesn't have method #{method}"
         end
-      end
-
-      # @experimental
-      def route_to(env, action, params = Hash.new)
-        env["rango.controller"] = self
-        env["rango.controller.action"] = action
-        env["rango.router.params"] = params
-        env["rango.action"] = action
-        Rango::Router::Dispatcher.route_to(env, self)
-      end
-
-      # for routers
-      def dispatcher(action)
-        lambda do |env|
-          Rango.logger.info("Dispatching to #{self}##{action} [#{env["REQUEST_METHOD"]} #{env["PATH_INFO"]}]")
-          env["rango.controller.action"] = action
-          return self.call(env)
+        controller.run_filters(:before, method.to_sym)
+        # If you don't care about arguments or if you prefer usage of params.
+        if controller.method(method).arity.eql?(0)
+          Rango.logger.debug("Calling method #{self.name}##{method} without arguments")
+          controller.response.body = controller.method(method).call
+        else
+          args = controller.params.values
+          Rango.logger.debug("Calling method #{self.name}##{method} with arguments #{args.inspect}")
+          controller.response.body = controller.method(method).call(*args)
         end
+        controller.run_filters(:after, method)
+        return controller.response.finish
+      rescue HttpError => exception
+        controller.rescue_http_error(exception)
       end
+    end
 
-      # @since 0.0.2
-      def get_filters(type)
-        self.send("#{type}_filters")
+    # for routers
+    def self.dispatcher(action)
+      lambda do |env|
+        Rango.logger.info("Dispatching to #{self}##{action} [#{env["REQUEST_METHOD"]} #{env["PATH_INFO"]}]")
+        env["rango.controller.action"] = action
+        return self.call(env)
       end
     end
 
     # @since 0.0.1
     # @return [RubyExts::Logger] Logger for logging project related stuff.
     # @see RubyExts::Logger
-    attribute :logger, Project.logger
+    attribute :logger, Rango.logger
     attribute :status
     attribute :headers, Hash.new
 
@@ -120,27 +61,9 @@ module Rango
     # @return [Hash] Hash with params from request. For example <code>{messages: {success: "You're logged in"}, post: {id: 2}}</code>
     attr_accessor :params
 
-    # The rails-style flash messages
-    # @since 0.0.2
-    def message
-      @message ||= (request.GET[:msg] || Hash.new)
-    end
-
-    def render(template, locals = Hash.new)
-      super template, self.locals.merge!(locals)
-    end
-
     # @since 0.0.2
     def redirect(url, options = Hash.new)
       self.status = 302
-
-      # for example ?msg[error]=foo
-      [:error, :success, :notice].each do |type|
-        if msg = (options[type] || message[type])
-          url.concat("?msg[#{type}]=#{msg}")
-        end
-      end
-
       self.headers["Location"] = URI.escape(url)
       return String.new
     end
@@ -155,10 +78,6 @@ module Rango
     end
     attr_reader :session
 
-    def route_to(action, params = Hash.new)
-      self.class.route_to(request.env, action, params)
-    end
-
     # redefine this method for your controller if you want to provide custom error pages
     # returns response array for rack
     # if you need to change just body of error message, define render_http_error method
@@ -171,24 +90,5 @@ module Rango
         [status, headers, body]
       end
     end
-
-    # @since 0.0.2
-    def run_filters(name, method)
-      # Rango.logger.debug(self.class.instance_variables)
-      # Rango.logger.inspect(name: name, method: method)
-      self.class.get_filters(name).each do |filter_method, options|
-        unless options[:except] && options[:except].include?(method)
-          if filter_method.is_a?(Symbol) && self.respond_to?(filter_method)
-            Rango.logger.info("Calling filter #{filter_method} for controller #{self}")
-            self.send(filter_method)
-          elsif filter_method.respond_to?(:call)
-            Rango.logger.info("Calling filter #{filter_method.inspect} for controller #{self}")
-            self.instance_eval(&filter_method)
-          else
-            Rango.logger.error("Filter #{filter_method} doesn't exists!")
-          end
-        end
-      end
-    end
   end
 end

data/lib/rango/mixins/filters.rb

@@ -0,0 +1,70 @@
+# encoding: utf-8
+
+module Rango
+  module FiltersMixin
+    def self.included(controller)
+      controller.extend(ClassMethods)
+    end
+
+    # @since 0.0.2
+    def run_filters(name, method)
+      # Rango.logger.debug(self.class.instance_variables)
+      # Rango.logger.inspect(name: name, method: method)
+      self.class.get_filters(name).each do |filter_method, options|
+        unless options[:except] && options[:except].include?(method)
+          if filter_method.is_a?(Symbol) && self.respond_to?(filter_method)
+            Rango.logger.info("Calling filter #{filter_method} for controller #{self}")
+            self.send(filter_method)
+          elsif filter_method.respond_to?(:call)
+            Rango.logger.info("Calling filter #{filter_method.inspect} for controller #{self}")
+            self.instance_eval(&filter_method)
+          else
+            Rango.logger.error("Filter #{filter_method} doesn't exists!")
+          end
+        end
+      end
+    end
+    
+    module ClassMethods
+      def inherited(subclass)
+        inherit_filters(subclass, :before)
+        inherit_filters(subclass, :after)
+        inherit_filters(subclass, :before_render)
+        inherit_filters(subclass, :after_render)
+        inherit_filters(subclass, :before_display)
+        inherit_filters(subclass, :after_display)
+      end
+
+      def inherit_filters(subclass, name)
+        subclass.send("#{name}_filters=", self.send("#{name}_filters").dup)
+      end
+
+      # before :login
+      # before :login, actions: [:send]
+      # @since 0.0.2
+      def before(action = nil, options = Hash.new, &block)
+        self.before_filters[action || block] = options
+      end
+
+      # @since 0.0.2
+      def after(action = nil, options = Hash.new, &block)
+        self.after_filters[action || block] = options
+      end
+
+      # @since 0.0.2
+      def get_filters(type)
+        self.send("#{type}_filters")
+      end
+
+      # @since 0.0.2
+      attribute :before_filters, Hash.new
+      attribute :after_filters,  Hash.new
+
+      attribute :before_render_filters, Array.new
+      attribute :after_render_filters, Array.new
+
+      attribute :before_display_filters, Array.new
+      attribute :after_display_filters, Array.new
+    end
+  end  
+end

data/lib/rango/mixins/message.rb

@@ -0,0 +1,26 @@
+# encoding: utf-8
+
+module Rango
+  module MessageMixin
+    # The rails-style flash messages
+    # @since 0.0.2
+    def message
+      @message ||= (request.GET[:msg] || Hash.new)
+    end
+    
+    # @since 0.0.2
+    def redirect(url, options = Hash.new)
+      self.status = 302
+
+      # for example ?msg[error]=foo
+      [:error, :success, :notice].each do |type|
+        if msg = (options[type] || message[type])
+          url.concat("?msg[#{type}]=#{msg}")
+        end
+      end
+
+      self.headers["Location"] = URI.escape(url)
+      return String.new
+    end
+  end
+end

data/lib/rango/mixins/rendering.rb

@@ -0,0 +1,41 @@
+# encoding: utf-8
+
+module Rango
+  module ExplicitRendering
+    def render(template, locals = Hash.new)
+      super(template, self.locals.merge!(locals))
+    end
+    
+    #   def show
+    #     # you can't use @explicit
+    #     post = Post.get(params[:id])
+    #     render "post.html", post: post
+    #   end
+    # end
+    #
+    # Context for rendering templates
+    # This context will be extended by same crucial methods from template mixin
+    # We are in context of current controller by default
+    def context
+      Object.new.extend(Rango::Helpers)
+    end
+
+    # def show
+    #   locals[:post] = Post.get(params[:id])
+    #   render "show.html", locals
+    # end
+    def locals
+      @locals ||= {message: self.message}
+    end
+  end
+
+  module ImplicitRendering
+    def context
+      self
+    end
+
+    def render(template)
+      super template
+    end
+  end
+end

data/lib/rango/settings/haml.rb

@@ -36,6 +36,11 @@ module Rango
       # @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?  }
+
+      # @since 0.1.1
+      # You don't have to explicitly specify attributes which are same for all the tags of same
+      # kind in your markup over and over if you just specify them as an options for the engine
+      hattribute :default_attributes, {script: {type: "text/javascript"}, form: {method: "POST"}}
     end
   end
 end

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

@@ -58,7 +58,7 @@ module Erubis
         end
       end
       #rest = $' || input                        # ruby1.8
-      rest = pos == 0 ? input : input[pos..-1]   # ruby1.9
+      rest = pos == 0 ? input : input[pos..-1]   # ruby
       add_text(src, rest)
     end
   end

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

@@ -0,0 +1,34 @@
+# 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
+  class Engine
+    alias_method :__initialize__, :initialize
+    def initialize(template, options = Hash.new)
+      __initialize__(template, options)
+      @options[:default_attributes] = Hash.new
+      # symbolize keys
+      @options[:default_attributes] = @options[:default_attributes].inject(Hash.new) do |options, pair|
+        options.merge(pair.first.to_sym => pair.last)
+      end
+    end
+  end
+
+  module Precompiler
+    alias_method :__prerender_tag__, :prerender_tag
+    def prerender_tag(name, self_close, attributes)
+      # merge given attributes with default attributes from options
+      if default_attributes = @options[:default_attributes][name.to_sym]
+        attributes = default_attributes.merge(attributes)
+      end
+      __prerender_tag__(name, self_close, attributes)
+    end
+  end
+end

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

@@ -9,8 +9,18 @@ module Tilt
     chainable do
       def initialize_engine
         super
-        require "rango/templates/erubis"
+        require "rango/templates/exts/erubis"
       end
     end
   end
-end
+
+  HamlTemplate.class_eval do
+    extend RubyExts::Chainable
+    chainable do
+      def initialize_engine
+        super
+        require "rango/templates/exts/haml"
+      end
+    end
+  end
+end

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

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

data/stubs/project/content/Gemfile.rbt

@@ -43,9 +43,8 @@ gem "dm-aggregates"#, git: "git://github.com/datamapper/dm-more.git" # for count
 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 "thin", require_as: nil#, git: "git://github.com/macournoyer/thin.git" # there seems to be some problems with latest thin
+#gem "unicorn", require_as: nil#, git: "git://repo.or.cz/unicorn.git"
 gem "racksh", require_as: nil#, git: "git://github.com/sickill/racksh.git"
 <% if @warden %>
 gem "warden"

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

@@ -1,4 +1,4 @@
-<%= shebang "./init.rb", %w[-p 4000 -s webrick] %>
+<%= shebang "./init.rb", %w[-p 4000 -s thin] %>
 # encoding: utf-8
 
 require "rango/rack/middlewares/basic"

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

@@ -1,4 +1,4 @@
-<%= shebang "ruby1.9", ["--disable-gems"] %>
+<%= shebang "ruby", ["--disable-gems"] %>
 # encoding: utf-8
 
 # This file should set Rango environment
@@ -17,6 +17,7 @@ require_relative "settings"
 require_relative "settings_local"
 
 require "rango"
+require "rango/helpers"
 require "rango/environments"
 
 # http://wiki.github.com/botanicus/rango/environments-support

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rango
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.1.1
 platform: ruby
 authors: 
 - "Jakub \xC5\xA0\xC5\xA5astn\xC3\xBD aka Botanicus"
@@ -37,7 +37,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 0.0.2.1
     version: 
@@ -57,7 +57,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 0.0.1.2
     version: 
@@ -104,8 +104,11 @@ files:
 - lib/rango/mini.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/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
@@ -135,17 +138,12 @@ files:
 - lib/rango/support/cucumber/steps/when_steps.rb
 - lib/rango/tasks/spec.rake
 - lib/rango/templates/exts/erubis.rb
+- lib/rango/templates/exts/haml.rb
 - lib/rango/templates/exts/tilt.rb
 - lib/rango/templates/helpers.rb
 - lib/rango/templates/template.rb
 - lib/rango/utils.rb
 - lib/rango.rb
-- spec/rango/bundling/dependency_spec.rb
-- spec/rango/bundling/strategies/copy_spec.rb
-- spec/rango/bundling/strategies/gem_spec.rb
-- spec/rango/bundling/strategies/git_spec.rb
-- spec/rango/bundling/strategies/hg_spec.rb
-- spec/rango/bundling/strategy_spec.rb
 - spec/rango/contrib/pagination/adapters/datamapper_spec.rb
 - spec/rango/contrib/pagination/helpers_spec.rb
 - spec/rango/contrib/pagination/page_spec.rb
@@ -156,18 +154,21 @@ files:
 - spec/rango/environments_spec.rb
 - spec/rango/exceptions_spec.rb
 - spec/rango/forms/form_spec.rb
+- spec/rango/gv/static_spec.rb
 - spec/rango/gv_spec.rb
 - spec/rango/helpers/assets_spec.rb
 - spec/rango/helpers/general_spec.rb
 - spec/rango/helpers/syntax_spec.rb
 - spec/rango/helpers_spec.rb
 - spec/rango/loggers/fireruby_spec.rb
-- spec/rango/loggers/logger_spec.rb
 - spec/rango/mini_spec.rb
 - spec/rango/mixins/application_spec.rb
 - spec/rango/mixins/configurable_spec.rb
+- spec/rango/mixins/filters_spec.rb
 - spec/rango/mixins/http_caching_spec.rb
+- spec/rango/mixins/message_spec.rb
 - spec/rango/mixins/render_spec.rb
+- spec/rango/mixins/rendering_spec.rb
 - spec/rango/orm/adapter_spec.rb
 - spec/rango/orm/adapters/datamapper_spec.rb
 - spec/rango/orm/adapters/sequel_spec.rb
@@ -179,6 +180,7 @@ files:
 - spec/rango/rack/middlewares/encoding_spec.rb
 - spec/rango/rack/middlewares/static_spec.rb
 - spec/rango/rack/request_spec.rb
+- spec/rango/router/adapters/rack_mount_spec.rb
 - spec/rango/router/adapters/rack_router_spec.rb
 - spec/rango/router/adapters/urlmap_spec.rb
 - spec/rango/router/adapters/usher_spec.rb
@@ -191,6 +193,10 @@ 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/erubis_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_spec.rb