tipsy 0.0.7 → 0.0.8

data/lib/templates/site/helpers/site_helper.rb

@@ -0,0 +1,2 @@
+module SiteHelper
+end

data/lib/templates/site/layouts/default.html.erb

@@ -35,7 +35,7 @@
 
 		</footer>
 	</div>
-	<%= javascript_include_tag "//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js" %>
+	<%= javascript_include_tag "//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js" %>
 	<%= javascript_include_tag 'site' %>
 </body>
 </html>

data/lib/tipsy/helpers/tag.rb

@@ -27,8 +27,9 @@ module Tipsy
       
       private
       
-      def make_attributes(hash)
+      def make_attributes(hash = {})
         attrs = []
+        hash ||= {}
         hash.each_pair do |key, value|
           attrs << "#{key}=#{value.inspect}"
         end

data/lib/tipsy/runner.rb

@@ -27,12 +27,25 @@ module Tipsy
       require 'rack'
       
       conf = Tipsy::Site.config
-      require 'rack-legacy' if conf.enable_php
+      missing_legacy_message = "Rack::Legacy could not be loaded. Add it to your gemfile or set conf.enable_php to false in config.rb"
+      
+      if conf.enable_php
+        begin
+          require 'rack-legacy' 
+        rescue LoadError
+          puts missing_legacy_message
+        end
+      end
       
       app = Rack::Builder.new {
         use Rack::Reloader
         use Rack::ShowStatus
-        (use Rack::Legacy::Php, Tipsy::Site.config.public_path) if conf.enable_php
+        if conf.enable_php
+          begin
+            use Rack::Legacy::Php, Tipsy::Site.config.public_path
+          rescue
+          end
+        end
         use Rack::ShowExceptions
         use Tipsy::Handler::StaticHandler, :root => conf.public_path, :urls => %w[/]
         run Rack::Cascade.new([

data/lib/tipsy/server.rb

@@ -31,7 +31,7 @@ module Tipsy
             exit(0)
           rescue LoadError
             handler = Rack::Handler.get('webrick')
-            handler.run app, server_opts do |server|
+            handler.run app, options do |server|
               puts "Running Tipsy with Webrick. To use Mongrel or Thin (recommended), add them to your Gemfile"
               trap("INT"){ server.shutdown }
             end

data/lib/tipsy/version.rb

@@ -1,3 +1,3 @@
 module Tipsy
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tipsy
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-08 00:00:00.000000000Z
+date: 2012-01-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70194631990440 !ruby/object:Gem::Requirement
+  requirement: &70107775393640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70194631990440
+  version_requirements: *70107775393640
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70194631989920 !ruby/object:Gem::Requirement
+  requirement: &70107775393140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70194631989920
+  version_requirements: *70107775393140
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70194631989460 !ruby/object:Gem::Requirement
+  requirement: &70107775341020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70194631989460
+  version_requirements: *70107775341020
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70194631988940 !ruby/object:Gem::Requirement
+  requirement: &70107775340440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70194631988940
+  version_requirements: *70107775340440
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70194631988480 !ruby/object:Gem::Requirement
+  requirement: &70107775339860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70194631988480
+  version_requirements: *70107775339860
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70194631988000 !ruby/object:Gem::Requirement
+  requirement: &70107775339280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70194631988000
+  version_requirements: *70107775339280
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &70194631983360 !ruby/object:Gem::Requirement
+  requirement: &70107775338700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70194631983360
+  version_requirements: *70107775338700
 - !ruby/object:Gem::Dependency
   name: hike
-  requirement: &70194631982780 !ruby/object:Gem::Requirement
+  requirement: &70107775338120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70194631982780
+  version_requirements: *70107775338120
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &70194631982280 !ruby/object:Gem::Requirement
+  requirement: &70107775337540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '2.7'
   type: :runtime
   prerelease: false
-  version_requirements: *70194631982280
+  version_requirements: *70107775337540
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70194631981720 !ruby/object:Gem::Requirement
+  requirement: &70107775336960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,7 +120,7 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *70194631981720
+  version_requirements: *70107775336960
 description: Tipsy is a mini Rack application for working with static websites using
   Tilt, and Sprockets.
 email:
@@ -141,6 +141,7 @@ files:
 - lib/templates/site/assets/stylesheets/screen.css.scss
 - lib/templates/site/config.rb
 - lib/templates/site/deploy.yml
+- lib/templates/site/helpers/site_helper.rb
 - lib/templates/site/layouts/default.html.erb
 - lib/templates/site/public/.gitkeep
 - lib/templates/site/views/index.html.erb