fir 0.0.11 → 0.1.2

data/example/helpers/price_helper.rb

@@ -0,0 +1,7 @@
+module PriceHelper
+	def number_to_price(num)
+		dollars = num.to_i
+		cents = (num - dollars) * 100
+		"$#{dollars}.#{cents}"
+	end
+end

data/example/pages/products/mouse-trap.html.erb

@@ -2,6 +2,8 @@
 
 <p><%= link_to 'Back to products', '/products' %></p>
 
+<p><%= number_to_price(2.50) %></p>
+
 <p>Catch those varmints!</p>
 
 <p>Released: May 12th 1964 (<%= Date.today.year - 1964 %> years ago)</p>

data/example/public/cache/products/mouse-trap.html

@@ -43,6 +43,8 @@
 
 <p><a href="/products">Back to products</a></p>
 
+<p>$2.50.0</p>
+
 <p>Catch those varmints!</p>
 
 <p>Released: May 12th 1964 (46 years ago)</p>

data/lib/fir.rb

@@ -1,3 +1,4 @@
+require 'active_support'
 require 'rack'
 require 'ostruct'
 require 'yaml'

data/lib/fir/boot.rb

@@ -7,6 +7,7 @@ module Fir
 			# directory fixes that.
 			Dir.chdir(FIR_ROOT)
 			::Fir.validate_config
+			::Fir.load_support_files
 			#use ::Rack::Reloader # Only when developing the Fir gem
 			use ::Rack::ContentLength
 			use ::Fir::Static

data/lib/fir/util.rb

@@ -27,6 +27,19 @@ module Fir
 		crypted_password
 	end
 	
+	def self.load_support_files
+		Dir.glob(File.join(FIR_ROOT, 'helpers', '*.rb')).each do |helper_file|
+			require File.expand_path(helper_file)
+			mod_name = File.basename(helper_file, File.extname(helper_file)).classify
+			begin
+				mod = Object.const_get(mod_name)
+			rescue NameError
+				raise "Expected helpers/#{helper_file} to define #{mod_name}"
+			end
+			ErbAdapter.send(:include, mod)
+		end
+	end
+	
 	def self.sanitize_page(page)
 		page.gsub('../', '')
 	end

data/spec/fir_spec.rb

@@ -43,6 +43,11 @@ describe 'Fir' do
 		last_response.should contain('Sorry, there is nothing at this address.')
 	end
 	
+	it 'uses site-specific helpers' do
+		get '/products/mouse-trap' 
+		last_response.should contain('$2.50')
+	end
+	
 	context 'with caching on' do
 		before :each do
 			Fir.config.perform_caching = true

data/spec/spec_helper.rb

@@ -7,6 +7,7 @@ require 'spec/autorun'
 require 'rack/test'
 require 'webrat'
 require 'rake'
+require 'net/http'
 
 Dir[File.expand_path(File.join(File.dirname(__FILE__),'support','**','*.rb'))].each {|f| require f}
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fir
 version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: false
   segments: 
   - 0
-  - 0
-  - 11
-  version: 0.0.11
+  - 1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - jarrett
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-22 00:00:00 -05:00
+date: 2010-05-22 00:00:00 -05:00
 default_executable: fir
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 2
@@ -35,9 +38,11 @@ dependencies:
   name: webrat
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         - 7
@@ -49,9 +54,11 @@ dependencies:
   name: rack-test
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 0
         - 5
@@ -63,9 +70,11 @@ dependencies:
   name: testunitxml
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 17
         segments: 
         - 0
         - 1
@@ -77,9 +86,11 @@ dependencies:
   name: activesupport
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 9
         segments: 
         - 2
         - 3
@@ -91,9 +102,11 @@ dependencies:
   name: rack
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 1
         - 0
@@ -105,9 +118,11 @@ dependencies:
   name: builder
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 2
         - 1
@@ -119,9 +134,11 @@ dependencies:
   name: maruku
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 0
         - 6
@@ -145,6 +162,7 @@ files:
 - example/config.rb
 - example/config.ru
 - example/deploy.yml
+- example/helpers/price_helper.rb
 - example/layouts/application.html.erb
 - example/menus.yml
 - example/pages.yml
@@ -192,6 +210,17 @@ files:
 - skeleton/tmp/restart.txt
 - LICENSE
 - README.markdown
+- spec/admin_spec.rb
+- spec/fir_spec.rb
+- spec/generator_spec.rb
+- spec/rack_integration_spec.rb
+- spec/spec_helper.rb
+- spec/support/cache_testing.rb
+- spec/support/file_matchers.rb
+- spec/support/server_matchers.rb
+- spec/support/server_testing.rb
+- spec/support/test_app_setup.rb
+- spec/tasks_spec.rb
 has_rdoc: true
 homepage: http://github.com/jarrett/fir
 licenses: []
@@ -202,23 +231,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A minimalist Ruby framework for small, static sites