blossom 0.1.4 → 0.2.0

data/bin/blossom

@@ -37,8 +37,6 @@ if ARGV.empty?
   puts usage
 elsif ARGV[0].start_with? "-"
   case ARGV[0]
-  when "--version", "-v"
-    puts Blossom::VERSION
   when "--help", "-h", "-?"
     puts usage
   else
@@ -93,12 +91,7 @@ run Blossom __FILE__
     make_file "Gemfile", <<"^D"
 source :rubygems
 
-gem "blossom", "~> #{Blossom::VERSION}"
-
-# Uncomment the following if you want to use CoffeeScript.
-# (See further instructions in #{name}.js.)
-#
-# gem "rack-coffee"
+gem "blossom"
 ^D
 
     mkdir "public"
@@ -144,17 +137,7 @@ h1
 # end
 ^D
 
-    make_file "#{name}.js", <<"^D"
-// If you do not want to use CoffeeScript, you can delete this comment.
-// If you do, first install the CoffeeScript compiler and Rack::Coffee:
-//
-//    $ npm install -g coffee-script
-//    $ sudo gem install rack-coffee
-//    $ echo 'gem "rack-coffee"' >> Gemfile
-//    $ bundle
-//
-// Then simply delete this file and create #{name}.coffee instead.
-^D
+    make_file "#{name}.js", ''
 
     run "bundle --local"
     run "git init"

data/lib/blossom.rb

@@ -1,19 +1,11 @@
-require "blossom/version"
-
 require "sass"
 require "compass"
 
 require "haml"
 require "rack"
-require "rack/normalize-domain"
 require "sinatra/base"
 require "yaml"
 
-begin
-  require "rack/coffee"
-rescue LoadError
-end
-
 module Blossom
   def self.fail(message)
     info "Error: #{message}"
@@ -54,18 +46,8 @@ class Blossom::Application < Rack::Builder
       :sass_dir          => ""
   end
 
-  def coffee_options
-    return \
-      :cache   => @config.cache_content?,
-      :static  => false,
-      :ttl     => @config.content_max_age,
-      :urls    => "/"
-  end
-
   def haml_options
-    return \
-      :format        => :html5,
-      :attr_wrapper  => '"'
+    return :format => :html5, :attr_wrapper => '"'
   end
 
   def sass_options
@@ -125,29 +107,9 @@ class Blossom::Application < Rack::Builder
   end
 
   def build_rack!
-    use_rack_normalize_domain!
-    use_rack_coffee!
     run sinatra_app
   end
 
-  def use_rack_normalize_domain!
-    if @config.strip_www?
-      use Rack::NormalizeDomain
-      Blossom.info "Normalizing domains by removing initial www."
-    else
-      Blossom.info "Not normalizing domains."
-    end
-  end
-
-  def use_rack_coffee!
-    if defined? Rack::Coffee
-      use Rack::Coffee, coffee_options
-      Blossom.info "Using CoffeeScript."
-    else
-      Blossom.info "Not using CoffeeScript."
-    end
-  end
-
   def sinatra_app
     app = Sinatra.new
     app.set :blossom, self
@@ -160,6 +122,7 @@ class Blossom::Application < Rack::Builder
 
     app.set :haml, haml_options
     app.set :sass, sass_options
+    app.set :scss, sass_options
 
     if custom_sinatra_code
       app.class_eval(custom_sinatra_code)
@@ -171,20 +134,18 @@ class Blossom::Application < Rack::Builder
 
     app.register do
       def path_exists? suffix
-        condition do
+        condition {
           basename = File.basename(request.path_info)
           File.exist? File.join(settings.root, "#{basename}.#{suffix}")
-        end
+        }
       end
   
-      def file_exists? *suffixes
-        condition do
-          suffixes.any? { |suffix|
-            basename = File.basename(request.path_info)
-            barename = basename.sub(/\.[^.]*$/, '')
-            File.exist? File.join(settings.root, "#{barename}.#{suffix}")
-          }
-        end
+      def file_exists? suffix
+        condition {
+          basename = File.basename(request.path_info)
+          barename = basename.sub(/\.[^.]*$/, '')
+          File.exist? File.join(settings.root, "#{barename}.#{suffix}")
+        }
       end
     end
 
@@ -194,7 +155,12 @@ class Blossom::Application < Rack::Builder
       end
     end
 
-    app.get "/:name.css", :file_exists? => [:scss, :sass] do
+    app.get "/:name.css", :file_exists? => :scss do
+      content_type :css
+      scss params[:name].to_sym
+    end
+
+    app.get "/:name.css", :file_exists? => :sass do
       content_type :css
       sass params[:name].to_sym
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blossom
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,23 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: sass
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,15 +42,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: compass
+  name: sass
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,15 +58,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: rack-normalize-domain
+  name: compass
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: '0.12'
 description: 
 email: daniel@gointeractive.se
 executables:
@@ -100,7 +84,6 @@ extra_rdoc_files: []
 files:
 - bin/blossom
 - lib/blossom.rb
-- lib/blossom/version.rb
 homepage: http://github.com/dbrock/blossom
 licenses: []
 post_install_message: 

data/lib/blossom/version.rb

@@ -1,3 +0,0 @@
-module Blossom
-  VERSION = "0.1.4"
-end