compass-connector 0.5.2 → 0.6

data/lib/compass-connector.rb

@@ -1,63 +1,69 @@
 require 'compass'
+
 require 'json'
+require 'base64'
 
 require 'compass-connector/importer'
 
 module CompassConnector
 
+  class FakeFile < File
+    def initialize(data)
+      path = "/tmp/"+data["hash"]+"."+data["ext"]
+      super path, "w+b"
+      write(Base64.decode64(data["data"]))
+      rewind()
+      File.utime(Time.new, Time.at(data["mtime"]), path)
+    end
+    
+    def self.from_response(response)
+      if response
+        FakeFile.new(response)
+      end
+    end
+    
+  end
+  
   class Resolver
     
     @process = nil
     
     private_class_method
       def self.resolver(method, *args)
-        if @process == nil
-          cmd = ENV["COMPASS_CONNECTOR"]
-          if cmd == nil
-            raise Compass::Error, "You have to define COMPASS_CONNECTOR env variable"
-          end
-          @process = IO.popen(cmd, "r+")
-        end
-        
         data_in = JSON::dump({'method' => method, 'args' => args})
-        #$stdout.puts "Process input: " + data_in
-        @process << data_in << "\n"
-        out = @process.gets
-        #$stdout.puts "Process output: " + out
+        STDOUT.puts data_in << "\n"
+        STDOUT.flush
+        out = STDIN.gets
         ret = JSON::load(out)
         if ret.kind_of?(Hash) and ret.has_key?("error")
-          raise Compass::Error, "Remote process error: " + ret["error"]
+          raise "Remote process error: " + ret["error"]
         end
         return ret
       end
     
-    
-    def self.find_scss(uri)
-      resolver("find_scss", uri)
-    end
-    def self.list_main_files()
-      resolver("list_main_files")
+    def self.find_import(uri)
+      FakeFile.from_response(resolver("find_import", uri))
     end
     def self.image_url(path)
       resolver("get_image_url", path)
     end
-    def self.find_image(path)
-      resolver("find_image", path)
+    def self.get_image(path)
+      FakeFile.from_response(resolver("get_file", path, "image"))
     end
     def self.generated_image_url(path)
       resolver("get_generated_image_url", path)
     end
-    def self.find_generated_image(path)
-      resolver("find_generated_image", path)
+    def self.get_generated_image(path)
+      FakeFile.from_response(resolver("get_file", path, "generated_image"))
     end
     def self.find_sprites_matching(uri)
       resolver("find_sprites_matching", uri)
     end
     def self.find_sprite(file)
-      resolver("find_sprite", file)
+      FakeFile.from_response(resolver("get_file", file, "sprite"))
     end
-    def self.find_font(path)
-      resolver("find_font", path)
+    def self.get_font(path)
+      FakeFile.from_response(resolver("get_file", path, "font"))
     end
     def self.font_url(path)
       resolver("get_font_url", path)
@@ -65,6 +71,15 @@ module CompassConnector
     def self.stylesheet_url(path)
       resolver("get_stylesheet_url", path)
     end
+    def self.put_sprite(filename, f)
+      resolver("put_file", filename, "sprite", Base64.encode64(f.read))
+    end
+    def self.put_output_css(filename, data)
+      resolver("put_file", filename, "css", Base64.encode64(data))
+    end
+    def self.get_output_css(filename)
+      FakeFile.from_response(resolver("get_file", filename, "out_stylesheet"))
+    end
     
     def self.configuration()
       resolver("get_configuration")
@@ -75,10 +90,12 @@ module CompassConnector
 end
 
 require 'compass-connector/configuration'
+require 'compass-connector/patches/actions'
 require 'compass-connector/patches/compiler'
 require 'compass-connector/patches/urls'
 require 'compass-connector/patches/sprite_image'
 require 'compass-connector/patches/sprite_map'
+require 'compass-connector/patches/sprite_methods'
 require 'compass-connector/patches/sprite_importer'
 require 'compass-connector/patches/image_size'
 require 'compass-connector/patches/inline_images'

data/lib/compass-connector/importer.rb

@@ -8,13 +8,11 @@ module CompassConnector
     end
     
     def find(uri, options)
-      f = CompassConnector::Resolver.find_scss(uri)
+      f = CompassConnector::Resolver.find_import(uri)
       
       if f
-        f = f.to_s
-        syntax = (f =~ /\.(s[ac]ss)$/) && $1.to_sym || :sass
-        opts = options.merge(:syntax => syntax, :importer => self, :filename => f)
-        return Sass::Engine.new(open(f).read, opts)
+        opts = options.merge(:syntax => :scss, :importer => self, :filename => uri)
+        return Sass::Engine.new(f.read, opts)
       end
       
       nil
@@ -25,9 +23,6 @@ module CompassConnector
     end
     
     def mtime(name, options)
-      file, s = find_real_file(name)
-      File.mtime(file) if file
-    rescue Errno::ENOENT
       nil
     end
     

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

@@ -0,0 +1,28 @@
+module Compass
+  module Actions
+
+    # Write a file given the file contents as a string
+    def write_file(file_name, contents, options = nil, binary = false)
+      options[:force] = false
+      options ||= self.options if self.respond_to?(:options)
+      skip_write = options[:dry_run]
+      contents = process_erb(contents, options[:erb]) if options[:erb]
+      old_file = CompassConnector::Resolver.get_output_css(file_name)
+      if old_file != nil
+        existing_contents = old_file.read()
+        if existing_contents == contents
+          log_action :identical, basename(file_name), options
+          skip_write = true
+        else options[:force]
+          log_action :overwrite, basename(file_name), options
+        end
+      else
+        log_action :create, basename(file_name), options
+      end
+      if not skip_write
+        CompassConnector::Resolver.put_output_css(file_name, contents)
+      end
+    end
+    
+  end
+end

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

@@ -10,14 +10,12 @@ module Compass
       exclude_partials = options.fetch(:exclude_partials, true)
       
       if self.options[:sass_files] != nil
-        @sass_files = self.options[:sass_files]
-      else
         @sass_files = []
-        out = CompassConnector::Resolver.list_main_files
-        out.to_enum.each do |item|
-          @sass_files << item.to_s
-        end
-        
+        self.options[:sass_files].each { |f|
+          @sass_files << shorten_path(f)
+        }
+      else
+        raise "Cannot compile project, only single files are supported"
       end
       
       @sass_files
@@ -27,12 +25,26 @@ module Compass
       sass_file[0..-6].sub(/\.css$/,'')
     end
     
+    def shorten_path(path)
+      if path.start_with?(Dir.pwd)
+        path[Dir.pwd.length+1..-1]
+      else
+        path
+      end
+    end
+    
     # A sass engine for compiling a single file.
     def engine(sass_filename, css_filename)
-      sass_filename = CompassConnector::Resolver.find_scss(sass_filename).to_s
+      sass_filename = shorten_path(sass_filename)
+      css_filename = corresponding_css_file(sass_filename)
+      
+      sass_file = CompassConnector::Resolver.find_import(sass_filename)
+      if not sass_file
+        raise "File '#{sass_filename}' was not found"
+      end
       syntax = (sass_filename =~ /\.(s[ac]ss)$/) && $1.to_sym || :sass
       opts = sass_options.merge(:filename => sass_filename, :css_filename => css_filename, :syntax => syntax)
-      Sass::Engine.new(open(sass_filename).read, opts)
+      Sass::Engine.new(sass_file.read, opts)
     end
     
     def sass_options
@@ -44,11 +56,7 @@ module Compass
     end
     
     def corresponding_css_file(sass_file)
-      if sass_file.start_with? from
-        sass_file = sass_file[from.length+1 .. -1]
-      end
-      
-     "#{to}/#{stylesheet_name(sass_file)}.css"
+     "#{stylesheet_name(sass_file)}.css"
     end
   end
 end

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

@@ -2,6 +2,6 @@ require "compass/sass_extensions/functions/image_size"
 
 module Compass::SassExtensions::Functions::ImageSize
       def real_path(image_file)
-        CompassConnector::Resolver.find_image(image_file)
+        file = CompassConnector::Resolver.get_image(image_file)
       end
 end

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

@@ -4,8 +4,8 @@ module Compass::SassExtensions::Functions::InlineImage
 
   def inline_image(path, mime_type = nil)
     path = path.value
-    real_path = CompassConnector::Resolver.find_image(path)
-    inline_image_string(data(real_path), compute_mime_type(path, mime_type))
+    my_file = CompassConnector::Resolver.get_image(path)
+    inline_image_string(data(my_file.to_path), compute_mime_type(path, mime_type))
   end
 
   def inline_font_files(*args)
@@ -13,7 +13,7 @@ module Compass::SassExtensions::Functions::InlineImage
     files = []
     while args.size > 0
       path = args.shift.value
-      real_path = CompassConnector::Resolver.find_font(path)
+      real_path = CompassConnector::Resolver.get_font(path)
       url = inline_image_string(data(real_path), compute_mime_type(path))
       files << "#{url} format('#{args.shift}')"
     end

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

@@ -5,7 +5,7 @@ module Compass
     module Sprites
       class Image
         def find_file
-          CompassConnector::Resolver.find_sprite(relative_file).to_s
+          CompassConnector::Resolver.find_sprite(relative_file)
         end
       end
     end

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

@@ -0,0 +1,49 @@
+require "compass/sass_extensions/sprites/sprite_methods"
+require "tempfile"
+
+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 && f.to_path || nil
+        end
+        
+        def generation_required?
+          !(tmp_filename && File.exists?(tmp_filename)) || outdated?
+        end
+        
+        def outdated?
+          if tmp_filename && File.exists?(tmp_filename)
+            return @images.any? {|image|
+              image.mtime.to_i > self.mtime.to_i
+          }
+          end
+          true
+        end
+        
+        def mtime
+          @mtime ||= File.mtime(tmp_filename)
+        end
+        
+        def save!
+          f=Tempfile.new("sprite")
+          engine.save(f.to_path)
+          f.rewind
+          saved = CompassConnector::Resolver.put_sprite(filename, f)
+          f.close!
+          
+          #saved = true engine.save(filename)
+          log :create, filename
+          Compass.configuration.run_sprite_saved(filename)
+          @mtime = nil if saved
+          saved
+        end
+        
+      end
+    end
+  end
+end

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

@@ -3,16 +3,17 @@ require 'compass/sass_extensions/functions/urls'
 module Compass::SassExtensions::Functions::Urls
   module ImageUrl
     def image_url(path, only_path = Sass::Script::Bool.new(false), cache_buster = Sass::Script::Bool.new(true))
-      path = path.value
+      org_path = path.value
       
-      real_path = CompassConnector::Resolver.find_image(path)
-      path = CompassConnector::Resolver.image_url(path)
+      path = CompassConnector::Resolver.image_url(org_path)
       
       # Compute and append the cache buster if there is one.
       if cache_buster.to_bool
         if cache_buster.is_a?(Sass::Script::String)
           path += "?#{cache_buster.value}"
         else
+          data = CompassConnector::Resolver.get_image(org_path)
+          real_path = data.to_path
           path = cache_busted_path(path, real_path)
         end
       end
@@ -52,16 +53,16 @@ module Compass::SassExtensions::Functions::Urls
   end
   module GeneratedImageUrl
     def generated_image_url(path, cache_buster = Sass::Script::Bool.new(false))
-      path = path.value # get to the string value of the literal.
+      org_path = path.value # get to the string value of the literal.
       
-      real_path = CompassConnector::Resolver.find_generated_image(path)
-      path = CompassConnector::Resolver.generated_image_url(path)
+      path = CompassConnector::Resolver.generated_image_url(org_path)
       
       # Compute and append the cache buster if there is one.
       if cache_buster.to_bool
         if cache_buster.is_a?(Sass::Script::String)
           path += "?#{cache_buster.value}"
         else
+          real_path = CompassConnector::Resolver.get_generated_image(org_path).to_path
           path = cache_busted_path(path, real_path)
         end
       end
@@ -69,4 +70,4 @@ module Compass::SassExtensions::Functions::Urls
       clean_url(path)
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: compass-connector
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: '0.6'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-08 00:00:00.000000000 Z
+date: 2013-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: compass
@@ -37,9 +37,11 @@ files:
 - lib/compass-connector/configuration.rb
 - lib/compass-connector/importer.rb
 - lib/compass-connector/patches/compiler.rb
+- lib/compass-connector/patches/actions.rb
 - lib/compass-connector/patches/sprite_map.rb
 - lib/compass-connector/patches/inline_images.rb
 - lib/compass-connector/patches/sprite_importer.rb
+- lib/compass-connector/patches/sprite_methods.rb
 - lib/compass-connector/patches/urls.rb
 - lib/compass-connector/patches/sprite_image.rb
 - lib/compass-connector/patches/image_size.rb