tipsy 0.0.3 → 0.0.4

data/lib/tipsy/handler/asset.rb

@@ -73,15 +73,14 @@ module Tipsy
           compass_config = ::Compass::Configuration::Data.new("project")
           compass_config.project_type     = :stand_alone
           compass_config.project_path     = Tipsy.root
-          compass_config.images_dir       = File.join('assets', 'images')
-          compass_config.sass_dir         = File.join('assets', 'stylesheets')
-          compass_config.http_images_path = "/#{File.basename(Tipsy::Site.images_path)}"
-          compass_config.relative_assets  = false
-          compass_config.line_comments    = false
+
+          Tipsy::Site.compass.keys.each do |setting|
+            compass_config.send("#{setting.to_s}=", Tipsy::Site.compass[setting])
+          end
 
           Compass.add_project_configuration(compass_config)
           ::Sass::Plugin.engine_options.merge!(Compass.sass_engine_options)
-          
+
         rescue LoadError
           require 'tipsy/helpers/sass'
         end

data/lib/tipsy/helpers/rendering.rb

@@ -1,6 +1,7 @@
 module Tipsy
   module Helpers
     module Rendering
+      include Tipsy::Helpers::Capture
       
       def render(options = {})
         options.symbolize_keys!
@@ -26,8 +27,8 @@ module Tipsy
         
         unless render_path.nil?
           local_vars = options.delete(:locals) || {}
-          results    = Tilt[render_path].new(render_path, nil)
-          return results.render(self, local_vars)
+          results    = Tilt[render_path].new(render_path, nil, :outvar => "_inline_template")
+          return capture{ results.render(self, local_vars).to_s }
         end
         
         raise "Missing #{ partial ? 'partial' : 'template' } #{to_render}."

data/lib/tipsy/helpers/tag.rb

@@ -8,8 +8,8 @@ module Tipsy
       end
       
       def content_tag(name, content = nil, html_attrs = {}, &capt)
-        buffer = "<#{name}#{make_attributes(html_attrs)}>"
-        content = capture(&capt) if block_given?
+        buffer  = "<#{name}#{make_attributes(html_attrs)}>"
+        content = capture(&capt) if block_given? and content.nil?
         "<#{name}#{make_attributes(html_attrs)}>#{content}</#{name}>"
       end
       

data/lib/tipsy/runner.rb

@@ -25,7 +25,7 @@ module Tipsy
       require 'tipsy/server'
       require 'tipsy/view'
       require 'rack'
-      
+
       app = Rack::Builder.new {
         use Rack::Reloader
         use Rack::ShowStatus

data/lib/tipsy/site.rb

@@ -5,7 +5,7 @@ module Tipsy
   class Site
     include ActiveSupport::Configurable
     config_accessor :asset_path, :compile_to, :css_path, :javascripts_path, :images_path, :fonts_path,
-                    :public_path, :load_paths, :compile_to, :compile
+                    :public_path, :load_paths, :compile_to, :compile, :compass
     ##
     # Site configuration options
     # 
@@ -46,13 +46,26 @@ module Tipsy
     config.compile.enable_rewrite = true
     config.compile.rewrite_mode   = :htaccess
 
+    config.compass                  = ::ActiveSupport::OrderedOptions.new
+    config.compass.images_path      = File.join('assets', 'images')
+    config.compass.sass_dir         = File.join('assets', 'stylesheets')
+    config.compass.http_images_path = "/#{File.basename(config.images_path)}"
+    config.compass.relative_assets  = false
+    config.compass.line_comments    = false
+      
+
     def self.configure!
       @_callbacks = { :before => [], :after => [] }
       local_config = File.join(Tipsy.root, 'config.rb')
       if File.exists?(local_config)
-        class_eval(File.open(local_config).readlines.join("\n"))
+        bind = binding
+        self.class_exec do
+          File.open(local_config).each do |line|
+            next if line.to_s[0] == "#" || line.to_s.strip.blank?
+            eval("config."+ line.to_s, bind, local_config)
+          end
+        end
       end
-      
     end
     
     ##
@@ -79,8 +92,7 @@ module Tipsy
     end
     
     
-    def initialize
-      @_callbacks = {}
+    def initialize      
     end
           
   end

data/lib/tipsy/version.rb

@@ -1,3 +1,3 @@
 module Tipsy
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/tipsy/view/context.rb

@@ -4,8 +4,7 @@ module Tipsy
     # All views are rendered within a context object. This object handles
     # transitioning data between templates and layouts.
     # 
-    class Context
-      include Tipsy::Helpers
+    class Context      
       attr_reader :request, :template, :layout, :virtual_path, :lookup_context
       
       def initialize(request, template, path, lookup)
@@ -15,6 +14,9 @@ module Tipsy
         @virtual_path   = path
         @lookup_context = lookup
         @output_buffer  = nil
+        self.class_eval do
+          include Tipsy::Helpers
+        end
       end
       
       def layout(set = nil)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tipsy
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70121952819080 !ruby/object:Gem::Requirement
+  requirement: &70264932961280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70121952819080
+  version_requirements: *70264932961280
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70121952807700 !ruby/object:Gem::Requirement
+  requirement: &70264932960720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70121952807700
+  version_requirements: *70264932960720
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70121952807120 !ruby/object:Gem::Requirement
+  requirement: &70264932949400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70121952807120
+  version_requirements: *70264932949400
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70121952806540 !ruby/object:Gem::Requirement
+  requirement: &70264932948880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70121952806540
+  version_requirements: *70264932948880
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70121952806020 !ruby/object:Gem::Requirement
+  requirement: &70264932948300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70121952806020
+  version_requirements: *70264932948300
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70121952805500 !ruby/object:Gem::Requirement
+  requirement: &70264932947720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70121952805500
+  version_requirements: *70264932947720
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &70121952804900 !ruby/object:Gem::Requirement
+  requirement: &70264932947120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70121952804900
+  version_requirements: *70264932947120
 - !ruby/object:Gem::Dependency
   name: hike
-  requirement: &70121952804320 !ruby/object:Gem::Requirement
+  requirement: &70264932946540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70121952804320
+  version_requirements: *70264932946540
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &70121952803760 !ruby/object:Gem::Requirement
+  requirement: &70264932945980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '2.7'
   type: :runtime
   prerelease: false
-  version_requirements: *70121952803760
+  version_requirements: *70264932945980
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70121952803200 !ruby/object:Gem::Requirement
+  requirement: &70264932945420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,7 +120,7 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *70121952803200
+  version_requirements: *70264932945420
 description: Tipsy is a mini Rack application for working with static websites using
   Tilt, and Sprockets.
 email: