compass-connector 0.6 → 0.7

data/lib/compass-connector.rb

@@ -27,6 +27,7 @@ module CompassConnector
   class Resolver
     
     @process = nil
+    @api_version = 1
     
     private_class_method
       def self.resolver(method, *args)
@@ -41,47 +42,119 @@ module CompassConnector
         return ret
       end
     
+    def self.get_path_mode(path)
+      if path =~ /^@/
+        return "app"
+      end
+      if path =~ %r!^(([a-z0-9]+:/)?/)!
+        return "absolute"
+      end
+      "vendor"
+    end
+    
+    def self.get_mode_and_path(path, required_mode=nil, type=nil)
+      mode = self.get_path_mode(path)
+      if required_mode and required_mode != mode
+        raise "Path mode "+required_mode+" is required for "+path+", "+mode+" detected"
+      end
+      if mode == "app"
+        path = path[1..-1]
+      end
+      
+      return mode, path
+    end
+    
+    def self.get_url(path, type, required_mode=nil)
+      mode, path = self.get_mode_and_path(path, required_mode, type)
+      
+      if mode == "absolute"
+        path
+      else
+        resolver("get_url", path, type, mode)
+      end
+    end
+    
+    def self.get_file(path, type, required_mode=nil)
+      mode, path = self.get_mode_and_path(path, required_mode, type)
+      
+      FakeFile.from_response(resolver("get_file", path, type, mode))
+    end
+      
     def self.find_import(uri)
-      FakeFile.from_response(resolver("find_import", uri))
+      
+      mode, path = self.get_mode_and_path(uri, "app")
+      
+      base = File.dirname(path)
+      file = File.basename(path, ".scss")
+      
+      if base == "."
+        base = ""
+      else
+        base += "/"
+      end
+      
+      f = self.get_file("@"+base+file+".scss", "scss", "app")
+      #request partial if import not found
+      if not f
+        f = self.get_file("@"+base+"_"+file+".scss", "scss", "app")
+      end
+      f
     end
+    
+    def self.check_api_version()
+      v = resolver("api_version")
+      if @api_version != v
+        raise "Need connector api v#{@api_version}, v#{v or 0} provided"
+      end
+    end
+    
     def self.image_url(path)
-      resolver("get_image_url", path)
+      self.get_url(path, "image")
     end
     def self.get_image(path)
-      FakeFile.from_response(resolver("get_file", path, "image"))
+      self.get_file(path,"image")
     end
     def self.generated_image_url(path)
-      resolver("get_generated_image_url", path)
+      self.get_url(path, "generated_image")
     end
     def self.get_generated_image(path)
-      FakeFile.from_response(resolver("get_file", path, "generated_image"))
+      self.get_file(path, "generated_image")
+    end
+    def self.get_generated_sprite(path)
+      path = path.gsub(/^\//, "")
+      self.get_file(path, "generated_image")
     end
     def self.find_sprites_matching(uri)
-      resolver("find_sprites_matching", uri)
+      mode, path = self.get_mode_and_path(uri)
+      resolver("find_sprites_matching", path, mode)
     end
     def self.find_sprite(file)
-      FakeFile.from_response(resolver("get_file", file, "sprite"))
+      self.get_file(file, "image")
     end
-    def self.get_font(path)
-      FakeFile.from_response(resolver("get_file", path, "font"))
+    def self.get_font(file)
+      self.get_file(file, "font")
     end
     def self.font_url(path)
-      resolver("get_font_url", path)
+      self.get_url(path, "font")
     end
     def self.stylesheet_url(path)
-      resolver("get_stylesheet_url", path)
+      self.get_url(path, "css")
     end
     def self.put_sprite(filename, f)
-      resolver("put_file", filename, "sprite", Base64.encode64(f.read))
+      filename = filename.gsub(/^\//, "")
+      mode, path = self.get_mode_and_path(filename)
+      resolver("put_file", path, "generated_image", Base64.encode64(f.read), mode)
     end
     def self.put_output_css(filename, data)
-      resolver("put_file", filename, "css", Base64.encode64(data))
+      mode, path = self.get_mode_and_path(filename,"app")
+      resolver("put_file", path, "out_css", Base64.encode64(data), mode)
     end
     def self.get_output_css(filename)
-      FakeFile.from_response(resolver("get_file", filename, "out_stylesheet"))
+      self.get_file(filename, "out_css", "app")
     end
     
     def self.configuration()
+      self.check_api_version()
       resolver("get_configuration")
     end
   

data/lib/compass-connector/patches/sprite_methods.rb

@@ -5,10 +5,10 @@ module Compass
   module SassExtensions
     module Sprites
       module SpriteMethods
-
+        
         def tmp_filename
           fname = File.join(Compass.configuration.generated_images_path, name_and_hash)
-          f = CompassConnector::Resolver.get_generated_image(fname)
+          f = CompassConnector::Resolver.get_generated_sprite(fname)
           f && f.to_path || nil
         end
         

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: compass-connector
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: '0.7'
   prerelease: 
 platform: ruby
 authors: