rango 0.0.3 → 0.0.4

data/lib/rango/rack/middlewares/email_obfuscator.rb

@@ -0,0 +1,25 @@
+# encoding: utf-8
+
+# TODO: it can be in rack-contrib
+module Rango
+  module Middlewares
+    class EmailObfuscator
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        status, headers, body = @app.call(env)
+        if headers["Content-Type"] == "text/html"
+          body = self.substitute(body)
+        end
+        [status, headers, body]
+      end
+
+      # TODO: is it OK everywhere? E. g. <script> or <style>
+      def substitute(body)
+        body.map { |chunk| chunk.gsub!("@", "&#x40;") }
+      end
+    end
+  end
+end

data/lib/rango/rack/middlewares/encoding.rb

@@ -1,7 +1,7 @@
-# coding: utf-8
+# encoding: utf-8
 
 # rack seems to have problems with encoding, so this middleware enforce UTF-8 for all the strings in rack env
-class Rango
+module Rango
   module Middlewares
     class Encoding
       def initialize(app, encoding = ::Encoding.default_external)

data/lib/rango/rack/middlewares/static.rb

@@ -1,49 +1,53 @@
+# encoding: utf-8
+
 # stolen from rails
 require 'rack/utils'
 
-class Rango
-  class Static
-    FILE_METHODS = %w(GET HEAD).freeze
+module Rango
+  module Middlewares
+    class Static
+      FILE_METHODS = %w(GET HEAD).freeze
 
-    # @since 0.0.2
-    def initialize(app)
-      @app = app
-      @file_server = ::Rack::File.new(Project.settings.media_root)
-    end
+      # @since 0.0.2
+      def initialize(app)
+        @app = app
+        @file_server = ::Rack::File.new(Project.settings.media_root)
+      end
 
-    # @since 0.0.2
-    def call(env)
-      path        = env['PATH_INFO'].chomp('/')
-      method      = env['REQUEST_METHOD']
-
-      prefix = Project.settings.media_prefix.chomp("/")
-      prefix_regexp = Regexp.new(%r[^#{prefix}/])
-      if path.match(prefix_regexp) && FILE_METHODS.include?(method)
-        if file_exist?(path)
-          return @file_server.call(env)
-          # else
-          # cached_path = directory_exist?(path) ? "#{path}/index" : path
-          # cached_path += ::ActionController::Base.page_cache_extension
-          #
-          # if file_exist?(cached_path)
-          #   env['PATH_INFO'] = cached_path
-          #   return @file_server.call(env)
-          # end
+      # @since 0.0.2
+      def call(env)
+        path        = env['PATH_INFO'].chomp('/')
+        method      = env['REQUEST_METHOD']
+
+        prefix = Project.settings.media_prefix.chomp("/")
+        prefix_regexp = Regexp.new(%r[^#{prefix}/])
+        if path.match(prefix_regexp) && FILE_METHODS.include?(method)
+          if file_exist?(path)
+            return @file_server.call(env)
+            # else
+            # cached_path = directory_exist?(path) ? "#{path}/index" : path
+            # cached_path += ::ActionController::Base.page_cache_extension
+            #
+            # if file_exist?(cached_path)
+            #   env['PATH_INFO'] = cached_path
+            #   return @file_server.call(env)
+            # end
+          end
         end
-      end
 
-      @app.call(env)
-    end
+        @app.call(env)
+      end
 
-    private
-    def file_exist?(path)
-      full_path = File.join(@file_server.root, ::Rack::Utils.unescape(path))
-      File.file?(full_path) && File.readable?(full_path)
-    end
+      private
+      def file_exist?(path)
+        full_path = File.join(@file_server.root, ::Rack::Utils.unescape(path))
+        File.file?(full_path) && File.readable?(full_path)
+      end
 
-    def directory_exist?(path)
-      full_path = File.join(@file_server.root, ::Rack::Utils.unescape(path))
-      Dir.exist?(full_path) && File.readable?(full_path)
+      def directory_exist?(path)
+        full_path = File.join(@file_server.root, ::Rack::Utils.unescape(path))
+        Dir.exist?(full_path) && File.readable?(full_path)
+      end
     end
   end
 end

data/lib/rango/rack/request.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 
 # Rack env keys (localhost, url /test):
 # SERVER_SOFTWARE: thin 1.0.0 codename That's What She Said
@@ -36,7 +36,7 @@
 # http://rack.rubyforge.org/doc/
 # http://rack.rubyforge.org/doc/classes/Rack/Request.html
 
-class Rango
+module Rango
   module Session
   end
 

data/lib/rango/rango.rb

@@ -1,11 +1,17 @@
-# coding: utf-8
+# encoding: utf-8
 
 Rango.import("exceptions")
 Rango.import("loggers/logger")
 Rango.import("bundling/dependency")
+Rango.import("rack/middlewares/basic")
+Rango.import("project")
 
-class Rango
+module Rango
   class << self
+    # @since 0.0.1
+    # @return [String] Returns current environment name. Possibilities are +development+ or +production+.
+    attribute :environment, "development"
+
     # @since 0.0.2
     # @example
     #   Rango.path
@@ -27,15 +33,16 @@ class Rango
 
     # @since 0.0.1
     # @example
-    #   Rango.boot(flat: true)
+    #   Rango.boot # require init.rb
+    #   Rango.boot { require_relative "config/init.rb" } # custom boot
     # @param [Hash] options You can specify flat: true for sinatra-like flat application.
     # @return [Boolean] Returns true if boot succeed or false if not. If ARGV includes "-i", IRB interactive session will start.
-    def boot(options = Hash.new)
-      Rango.flat = true if options[:flat]
-      if options[:force]
-        Rango.import!("boot")
-      else
-        Rango.import("boot")
+    def boot(options = Hash.new, &block)
+      Rango.import!("boot")
+      block.call if block_given?
+      self.bootloaders.each do |name, bootloader|
+        logger.debug "Calling bootloader #{name}"
+        bootloader.call
       end
     end
 
@@ -44,14 +51,9 @@ class Rango
       self.boot(options.merge(force: true))
     end
 
-    # @since 0.0.2
-    def app
-      # $DEBUG = Project.settings.debug # It looks terrible, but rack works with it
-      Rango.import("rack/dispatcher")
-      return Rango::Dispatcher.app
-    rescue Exception => exception
-      Rango.logger.exception(exception)
-      return false
+    attribute :bootloaders, Hash.new
+    def after_boot(name, &block)
+      self.bootloaders[name] = block
     end
 
     # Start IRB interactive session
@@ -59,17 +61,28 @@ class Rango
     def interactive
       require "irb"
       try_require "irb/completion" # some people can have ruby compliled without readline
-      ARGV.clear # otherwise irb will read it
+      ARGV.delete("-i") # otherwise irb will read it
       IRB.start
     end
 
     # @since 0.0.1
     # @return [Boolean] If application is flat or not.
     questionable :flat, false
-    questionable :debug, true
 
-    # Rango.template("404.html")
-    def template(basename)
+    def debug=(boolean)
+      $DEBUG = boolean
+    end
+
+    def debug?
+      $DEBUG
+    end
+
+    def testing=(boolean)
+      $TESTING = boolean
+    end
+
+    def testing?
+      $TESTING
     end
   end
 end

data/lib/rango/router.rb

@@ -0,0 +1,17 @@
+# encoding: utf-8
+
+module Rango
+  class Router
+    @@routers = Hash.new unless defined?(@@routers)
+    def self.implement(router, &block)
+      @@routers[router] = block
+    end
+
+    def self.use(router)
+      require_relative "router/adapters/#{router}"
+      Rango.logger.debug("Using router #{router}")
+      define_method(:set_rack_env, @@routers[router])
+      @@router = router
+    end
+  end
+end

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

@@ -0,0 +1,8 @@
+# encoding: utf-8
+
+require "rack/router"
+
+Rango::Router.implement(:rack_router) do |env|
+  env["rango.router.params"] = env["rack_router.params"]
+  env["rango.router.app"] = self
+end

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

@@ -0,0 +1,10 @@
+# encoding: utf-8
+
+# Rack::URLMap is very easy router included directly in rack distribution
+# You can't use stuff like "posts/:id" there, so env["rango.router.params"]
+# allways will be just empty hash
+
+Rango::Router.implement(:urlmap) do |env|
+  env["rango.router.params"] = Hash.new
+  env["rango.router.app"] = self
+end

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

@@ -0,0 +1,8 @@
+# encoding: utf-8
+
+require "usher"
+
+Rango::Router.implement(:usher) do |env|
+  env["rango.router.params"] = env["usher.params"]
+  env["rango.router.app"] = self
+end

data/lib/rango/router/specification.txt

@@ -5,12 +5,7 @@ Rango doesn't have its own router, so you can use what you like or write your ow
 env["rango.router.params"]
 env["rango.router.app"]
 
-=== Strategies variables ===
-You can define what variables you like, the only rule there is that you must stay in namespace of your strategy.
-
-env["rango.controller.name"]
-env["rango.controller.action"]
-
 === Available routers ===
 Rack::URLMap
 rack-router
+Usher

data/lib/rango/settings.rb

@@ -1,6 +1,6 @@
-# coding: utf-8
+# encoding: utf-8
 
-class Rango
+module Rango
   module Settings
     class Settings
       # @since 0.0.1

data/lib/rango/settings/erubis.rb

@@ -1,6 +1,6 @@
-# coding: utf-8
+# encoding: utf-8
 
-class Rango
+module Rango
   module Settings
     class Erubis < Settings
       # @since 0.0.2

data/lib/rango/settings/framework.rb

@@ -1,6 +1,6 @@
-# coding: utf-8
+# encoding: utf-8
 
-class Rango
+module Rango
   module Settings
     class Framework < Settings
       # @since 0.0.1
@@ -13,7 +13,11 @@ class Rango
 
       # @since 0.0.1
       # @return [String] Path to your +media+ directory.
-      hattribute :media_root, lambda { Project.path.join("media").to_s }
+      hattribute :media_root, lambda { get_media_root }
+      def get_media_root
+        path = File.join(Project.root, "media")
+        return path if Dir.exist?(path)
+      end
 
       # @since 0.0.2
       # @return [String] rango-project.org/media/javascripts/mootools-core.js

data/lib/rango/settings/haml.rb

@@ -1,11 +1,11 @@
-# coding: utf-8
+# encoding: utf-8
 
-class Rango
+module Rango
   module Settings
     class Haml < Settings
       # @since 0.0.2
       # Determines the output format. The default is :xhtml. Other options are :html4 and :html5, which are identical to :xhtml except there are no self-closing tags, XML prolog is ignored and correct DOCTYPEs are generated.
-      hattribute :format, :xhtml
+      hattribute :format, :xhtml # TODO: take from Project.settings.template.format
 
       # @since 0.0.2
       # Sets whether or not to escape HTML-sensitive characters in script. If this is true, = behaves like &=; otherwise, it behaves like !=. Note that if this is set, != should be used for yielding to subtemplates and rendering partials. Defaults to false.

data/lib/rango/settings/template.rb

@@ -0,0 +1,17 @@
+# encoding: utf-8
+
+module Rango
+  module Settings
+    class Template < Settings
+      # @since 0.0.3
+      hattribute :caching, Rango.debug?
+
+      # @since 0.0.3
+      # useful for helpers
+      hattribute :format, :html
+
+      # @since 0.0.3
+      hattribute :format_version, 5
+    end
+  end
+end

data/lib/rango/support/cucumber/steps/given_steps.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 
 Given /^user is at ([^\s]+)$/ do |url|
   request(url)

data/lib/rango/support/cucumber/steps/then_steps.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 
 # HTTP 200
 Then "it should respond successfuly" do

data/lib/rango/support/cucumber/steps/when_steps.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 
 # Roles:
 #   - user (general user)

data/lib/rango/tasks/bundle.thor

@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 
 require "rango/ext/thor"
 

data/lib/rango/tasks/stats.thor

@@ -0,0 +1 @@
+# encoding: utf-8

data/lib/rango/templates/adapter.rb

@@ -1,11 +1,11 @@
-# coding: utf-8
+# encoding: utf-8
 
-class Rango
+module Rango
   module Templates
     class << self
       # @since 0.0.2
       def engine(name)
-        Rango::Templates.const_get(name.capitalize)
+        Rango::Templates.const_get(name.capitalize + "Adapter")
       end
     end
 

data/lib/rango/templates/adapters/erb.rb

@@ -1,19 +1,37 @@
-# coding: utf-8
+# encoding: utf-8
+
+# This adapter is intended just for little applications which we like to have without external applications or for testing. For normal application it's much better to use Erubis, which is much faster and has more useful features.
+
+# Does NOT support:
+#   - caching
+#   - autoescaping
+#   - contexts
 
 require "erb"
 Rango.import("templates/adapter")
 
-class Rango
+module Rango
   module Templates
-    class Erb < ::Rango::Templates::Adapter
+    class ErbAdapter < Adapter
+      # @since 0.0.3
+      def initialize
+        not_implemented("cache files") if Project.settings.template.caching
+        not_implemented("autoescape")  if Project.settings.template.autoescaping
+      end
+
       # @since 0.0.2
       def render(io, context)
-        ::ERB.new(io.read).result(context.binding)
+        ERB.new(io.read).result(context.binding)
+      end
+
+      private
+      def not_implemented(feature)
+        raise NotImplementedError, "ErbAdapter don't know how to #{feature}"
       end
     end
   end
 
-  class Controller
+  module ControllerMixin
     # ==== Parameters
     # *args:: Arguments to pass to the block.
     # &block:: The template block to call.