pinion 0.1.1 → 0.1.2

data/lib/pinion/conversion.rb

@@ -1,4 +1,5 @@
 require "pinion/error"
+require "set"
 
 module Pinion
   # A conversion describes how to convert certain types of files and create asset links for them.
@@ -7,6 +8,7 @@ module Pinion
     @@conversions = {}
     def self.[](from_and_to) @@conversions[from_and_to] end
     def self.conversions_for(to) @@conversions.values.select { |c| c.to_type == to } end
+    def self.add_watch_directory(path) @@conversions.values.each { |c| c.add_watch_directory(path) } end
     def self.create(from_and_to, &block)
       unless from_and_to.is_a?(Hash) && from_and_to.size == 1
         raise Error, "Unexpected argument to Conversion.create: #{from_and_to.inspect}"
@@ -24,11 +26,14 @@ module Pinion
       @to_type = to_type
       @gem_required = nil
       @conversion_fn = nil
+      @watch_fn = Proc.new {} # Don't do anything by default
+      @environment = {}
     end
 
     # DSL methods
     def require_gem(gem_name) @gem_required = gem_name end
     def render(&block) @conversion_fn = block end
+    def watch(&block) @watch_fn = block end
 
     # Instance methods
     def signature() { @from_type => @to_type } end
@@ -40,7 +45,8 @@ module Pinion
         raise Error, "No known content-type for #{@to_type}."
       end
     end
-    def convert(file_contents) @conversion_fn.call(file_contents) end
+    def convert(file_contents) @conversion_fn.call(file_contents, @environment) end
+    def add_watch_directory(path) @watch_fn.call(path, @environment) end
     def require_dependency
       return unless @gem_required
       begin
@@ -63,12 +69,26 @@ module Pinion
   # Define built-in conversions
   Conversion.create :scss => :css do
     require_gem "sass"
-    render { |file_contents|  Sass::Engine.new(file_contents, :syntax => :scss).render }
+    render do |file_contents, environment|
+      load_paths = environment[:load_paths].to_a || []
+      Sass::Engine.new(file_contents, :syntax => :scss, :load_paths => load_paths).render
+    end
+    watch do |path, environment|
+      environment[:load_paths] ||= Set.new
+      environment[:load_paths] << path
+    end
   end
 
   Conversion.create :sass => :css do
     require_gem "sass"
-    render { |file_contents| Sass::Engine.new(file_contents, :syntax => :sass).render }
+    render do |file_contents, environment|
+      load_paths = environment[:load_paths].to_a || []
+      Sass::Engine.new(file_contents, :syntax => :sass, :load_paths => load_paths).render
+    end
+    watch do |path, environment|
+      environment[:load_paths] ||= Set.new
+      environment[:load_paths] << path
+    end
   end
 
   Conversion.create :coffee => :js do

data/lib/pinion/server.rb

@@ -7,7 +7,6 @@ require "set"
 
 module Pinion
   class Server
-    #CachedFile = Struct.new :from_path, :to_path, :compiled_contents, :mtime
     Asset = Struct.new :from_path, :to_path, :from_type, :to_type, :compiled_contents, :length, :mtime,
                        :content_type
     Watch = Struct.new :path, :from_type, :to_type, :conversion
@@ -18,6 +17,7 @@ module Pinion
       @watches = []
       @cached_assets = {}
       @conversions_used = Set.new
+      @file_server = Rack::File.new(Dir.pwd)
     end
 
     def convert(from_and_to, &block)
@@ -43,6 +43,7 @@ module Pinion
     def watch(path)
       raise Error, "#{path} is not a directory." unless File.directory? path
       @watch_directories << path
+      Conversion.add_watch_directory path
     end
 
     # Boilerplate mostly stolen from sprockets
@@ -54,10 +55,20 @@ module Pinion
       env["rack.session.options"] ||= {}
       env["rack.session.options"].merge! :defer => true, :skip => true
 
-      path = env["PATH_INFO"].to_s.sub(%r[^/], "")
+      root = env["SCRIPT_NAME"]
+      path = Rack::Utils.unescape(env["PATH_INFO"].to_s).sub(%r[^/], "")
 
       if path.include? ".."
-        return with_content_length([403, { "Content-Type" => "text/plain" }, ["Forbidden"]])
+        return [403, { "Content-Type" => "text/plain", "Content-Length" => "9" }, ["Forbidden"]]
+      end
+
+      real_file = get_real_file(path)
+      if real_file
+        # Total hack; this is probably a big misuse of Rack::File but I don't want to have to reproduce a lot
+        # of its logic
+        # TODO: Fix this
+        env["PATH_INFO"] = real_file
+        return @file_server.call(env)
       end
 
       asset = get_asset(path)
@@ -72,7 +83,7 @@ module Pinion
         return [200, headers, []] if env["REQUEST_METHOD"] == "HEAD"
         [200, headers, asset.compiled_contents]
       else
-        with_content_length([404, { "Content-Type" => "text/plain" }, ["Not found"]])
+        [404, { "Content-Type" => "text/plain", "Content-Length" => "9" }, ["Not found"]]
       end
     rescue Exception => e
       # TODO: logging
@@ -84,6 +95,14 @@ module Pinion
 
     private
 
+    def get_real_file(path)
+      @watch_directories.each do |directory|
+        file = File.join(directory, path)
+        return file if File.file? file
+      end
+      nil
+    end
+
     def get_asset(to_path)
       asset = @cached_assets[to_path]
       if asset

data/lib/pinion/version.rb

@@ -1,3 +1,3 @@
 module Pinion
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pinion
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-27 00:00:00.000000000Z
+date: 2012-03-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &11163920 !ruby/object:Gem::Requirement
+  requirement: &70301404900360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *11163920
+  version_requirements: *70301404900360
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &11161740 !ruby/object:Gem::Requirement
+  requirement: &70301404899940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11161740
+  version_requirements: *70301404899940
 description: ! 'Pinion is a Rack application that you can use to compile and serve
   assets (such as Javascript and CSS).
 
@@ -61,12 +61,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3405067065911020567
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3405067065911020567
 requirements: []
 rubyforge_project: pinion
 rubygems_version: 1.8.10