astaire 0.2.0 → 0.3.0

data/LICENSE

@@ -19,3 +19,25 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+Copyright (c) 2007, 2008, 2009 Blake Mizerany
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -65,8 +65,22 @@ It is possible to name actions such that regular URL helpers can generate them.
 
     end
 
+Astaire supports inline templates in the same style as Sinatra. For example:
+
+    class MyController < ActionController::Base
+
+      get "/hello" do
+        render :greetings
+      end
+
+    end
+
+    __END__
+
+    @@ greetings.html.erb
+    Greetings to you.
+
 ### TODO
 
 I guess, at this point I'm just putting what I have into the wild. Next
-steps will be determined by feedback that I get. One thing that I would
-like to add is Sinatra's inline template feature.
+steps will be determined by feedback that I get.

data/lib/astaire.rb

@@ -3,6 +3,80 @@ require 'action_controller'
 require 'astaire/railtie' if defined?(Rails)
 
 module Astaire
+  # Thanks Sinatra
+  CALLERS_TO_IGNORE = [
+    /\/astaire(\/(railtie))?\.rb$/, # all astaire code
+    /lib\/tilt.*\.rb$/,    # all tilt code
+    /\(.*\)/,              # generated code
+    /custom_require\.rb$/, # rubygems require hacks
+    /active_support/,      # active_support require hacks
+  ]
+
+  # add rubinius (and hopefully other VM impls) ignore patterns ...
+  CALLERS_TO_IGNORE.concat(RUBY_IGNORE_CALLERS) if defined?(RUBY_IGNORE_CALLERS)
+
+  class InlineTemplates < ActionView::PathResolver
+    def initialize
+      super
+      @templates = {}
+    end
+
+    def add_controller(controller)
+      file = caller_files.first
+
+      begin
+        app, data =
+          ::IO.read(file).gsub("\r\n", "\n").split(/^__END__$/, 2)
+      rescue Errno::ENOENT
+        app, data = nil
+      end
+
+      if data
+        lines = app.count("\n") + 1
+        template = nil
+        data.each_line do |line|
+          lines += 1
+          if line =~ /^@@\s*(.*)/
+            template = ''
+            @templates["#{controller.controller_path}/#{$1}"] =
+              [template, file, lines]
+          elsif template
+            template << line
+          end
+        end
+      end
+    end
+
+    def query(path, exts, formats)
+      query = Regexp.escape(path)
+      exts.each do |ext|
+        query << '(' << ext.map {|e| e && Regexp.escape(".#{e}") }.join('|') << '|)'
+      end
+
+      templates = []
+      @templates.select { |k,v| k =~ /^#{query}$/ }.each do |path, (source, file, lines)|
+        handler, format = extract_handler_and_format(path, formats)
+        templates << ActionView::Template.new(source, path, handler,
+          :virtual_path => path, :format => format)
+      end
+
+      templates.sort_by {|t| -t.identifier.match(/^#{query}$/).captures.reject(&:blank?).size }
+    end
+
+    # Like Kernel#caller but excluding certain magic entries and without
+    # line / method information; the resulting array contains filenames only.
+    def caller_files
+      caller_locations.
+        map { |file,line| file }
+    end
+
+    def caller_locations
+      caller(1).
+        map    { |line| line.split(/:(?=\d|in )/)[0,2] }.
+        reject { |file,line| CALLERS_TO_IGNORE.any? { |pattern| file =~ pattern } }
+    end
+  end
+
   module DSL
     extend ActiveSupport::Concern
 
@@ -15,8 +89,15 @@ module Astaire
       class_attribute :_astaire_helpers
       self._astaire_helpers = url_helper_module
 
+      class_attribute :_inline_resolver
+      self._inline_resolver = InlineTemplates.new
+
+      _inline_resolver.add_controller(self)
+
       include _astaire_helpers
       helper _astaire_helpers
+
+      append_view_path _inline_resolver
     end
 
     module ClassMethods
@@ -36,6 +117,11 @@ module Astaire
         R
       end
 
+      def inherited(klass)
+        super
+        _inline_resolver.add_controller(klass)
+      end
+
     private
 
       def map_astaire_action(method, path, opts, blk)

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Carl Lerche
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-03 00:00:00 -07:00
+date: 2010-05-06 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency