compass-rails4 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d5f44af415e24ca4e7e9910cc8029b39eb5c19a
-  data.tar.gz: 72e11724e86e814f53244976d9840cada95cb2b9
+  metadata.gz: 6778afbb41a33d51640d074c78c33440c3fb4545
+  data.tar.gz: d9bbe1a401afef11c2119ee8d97e1682d35cbe96
 SHA512:
-  metadata.gz: 18b9e656b02c272e77f1066e962460902ec1a64fd6860ec2f30356839aecde476264909e50e50755e4495e44f1e74e4ff7b086b0356b1d509a4cdcb85cc0a605
-  data.tar.gz: 36b3100a75f3cfec7c00c5fd0bd894f8915fc1b4b342593a1dfefccb31afc087064532f5445588d54c0d4988c5fae79912d9a87e5ba4849b05028314fa49b40c
+  metadata.gz: 85cf11031a3532cb25403ae7c5bfe7748da0b8730c87b3404eff1222e6f863ab1d380320569f044805f8a1135643b5a4d4af9e29985ac93cf56380584865fa74
+  data.tar.gz: d76cafb6137238646f6d5bea19d1822670646a8decaea56727df3bfa4916567863fc3df97a34fc8e8e1f44d6c183dbd52edf3cc8eec15de511f0452953b9e881

data/Gemfile.lock

@@ -1,28 +1,29 @@
 PATH
   remote: .
   specs:
-    compass-rails4 (0.0.1)
+    compass-rails4 (0.1.0)
       compass (~> 0.13.alpha.12)
       railties (~> 4.0.0)
+      sprockets (<= 2.11.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (4.0.2)
-      activesupport (= 4.0.2)
+    actionpack (4.0.3)
+      activesupport (= 4.0.3)
       builder (~> 3.1.0)
       erubis (~> 2.7.0)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    activesupport (4.0.2)
+    activesupport (4.0.3)
       i18n (~> 0.6, >= 0.6.4)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    atomic (1.1.14)
+    atomic (1.1.15)
     builder (3.1.4)
-    chunky_png (1.2.9)
+    chunky_png (1.3.0)
     compass (0.13.alpha.12)
       chunky_png (~> 1.2)
       json
@@ -30,6 +31,7 @@ GEM
       sass (~> 3.3.0.rc.1)
     erubis (2.7.0)
     ffi (1.9.3)
+    hike (1.2.3)
     i18n (0.6.9)
     json (1.8.1)
     listen (1.1.6)
@@ -37,26 +39,31 @@ GEM
       rb-inotify (>= 0.9)
       rb-kqueue (>= 0.2)
     minitest (4.7.5)
-    multi_json (1.8.2)
+    multi_json (1.8.4)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    railties (4.0.2)
-      actionpack (= 4.0.2)
-      activesupport (= 4.0.2)
+    railties (4.0.3)
+      actionpack (= 4.0.3)
+      activesupport (= 4.0.3)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.1.1)
     rb-fsevent (0.9.4)
     rb-inotify (0.9.3)
       ffi (>= 0.5.0)
-    rb-kqueue (0.2.0)
+    rb-kqueue (0.2.2)
       ffi (>= 0.5.0)
-    sass (3.3.0.rc.2)
-      listen (~> 1.1.0)
+    sass (3.3.2)
+    sprockets (2.10.1)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
     thor (0.18.1)
-    thread_safe (0.1.3)
-      atomic
+    thread_safe (0.2.0)
+      atomic (>= 1.1.7, < 2)
+    tilt (1.4.1)
     tzinfo (0.3.38)
 
 PLATFORMS

data/compass-rails4.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'compass', '~> 0.13.alpha.12'
   spec.add_dependency 'railties', '~> 4.0.0'
+  spec.add_dependency 'sprockets', '<= 2.11.0'
 
   spec.add_development_dependency 'rake'
 end

data/lib/compass-rails4/configuration.rb

@@ -1 +1,66 @@
-require "compass-rails4/configuration/default"
+module CompassRails4
+  module Configuration
+    module AssetPipeline
+
+      def default_images_dir
+        File.join("app", "assets", "images")
+      end
+
+      def default_fonts_dir
+        File.join("app", "assets", "fonts")
+      end
+
+      def default_javascripts_dir
+        File.join("app", "assets", "javascripts")
+      end
+
+      def default_sass_dir
+        File.join("app", "assets", "stylesheets")
+      end
+
+      def default_css_dir
+        File.join('public', CompassRails4.prefix)
+      end
+
+      def default_http_path
+        File.join(CompassRails4.prefix)
+      end
+
+      def default_http_generated_images_path
+        default_http_path
+      end
+
+      def default_http_images_path
+        default_http_path
+      end
+
+      def default_http_javascripts_path
+        default_http_path
+      end
+
+      def default_http_fonts_path
+        default_http_path
+      end
+
+      def default_http_stylesheets_path
+        default_http_path
+      end
+
+      def default_preferred_syntax
+        CompassRails4.sass_config.preferred_syntax rescue nil
+      end
+
+      def default_sprite_load_path
+        CompassRails4.sprockets.paths
+      end
+
+      def default_project_path
+        project_path = CompassRails4.root
+      end
+
+      def default_environment
+        CompassRails4.env
+      end
+    end
+  end
+end

data/lib/compass-rails4/patches.rb

@@ -10,7 +10,7 @@ module Sass::Script::Functions
 
   def cachebust_generated_images
     generated_images_path = CompassRails4.root.join(Compass.configuration.generated_images_dir).to_s
-    sprockets_entries = CompassRails4.sprockets.send(:trail).index.instance_variable_get(:@entries)
+    sprockets_entries = CompassRails4.sprockets.send(:trail).instance_variable_get(:@entries)
     sprockets_entries.delete(generated_images_path) if sprockets_entries.has_key? generated_images_path
   end
 

data/lib/compass-rails4/railtie.rb

@@ -33,6 +33,34 @@ class Rails::Railtie::Configuration
       end
       data.project_type = :rails # Forcing this makes sure all the rails defaults will be loaded.
 
+      data.on_sprite_saved do |filename|
+        if CompassRails4.rails_config.assets.digest && # if digesting is enabled
+            caller.grep(%r{/sprockets/rails/task.rb}).any? && #OMG HAX - check if we're being precompiled
+            Compass.configuration.generated_images_path[Compass.configuration.images_path.to_s] # if the generated images path is not in the assets images directory, we don't have to do these backflips
+
+          # Clear entries in Hike::Index for this sprite's directory.
+          # This makes sure the asset can be found by find_assets
+          CompassRails4.sprockets.send(:trail).instance_variable_get(:@entries).delete(File.dirname(filename))
+
+          pathname      = Pathname.new(filename)
+          logical_path  = pathname.relative_path_from(Pathname.new(Compass.configuration.images_path))
+          asset         = CompassRails4.sprockets.find_asset(logical_path)
+          target        = File.join(Rails.public_path, CompassRails4.prefix, asset.digest_path)
+
+          # Adds the asset to the manifest file.
+          manifest = ActionView::Base.assets_manifest
+          manifest.assets[logical_path.to_s] = asset.digest_path
+
+          # Adds the fingerprinted asset to the public directory
+          FileUtils.mkdir_p File.dirname(target)
+
+          logger = CompassRails4.sprockets.logger
+          logger.info("Writing #{target}") if logger
+
+          asset.write_to target
+        end
+      end
+
       Compass.add_configuration(:rails)
       Compass.add_configuration(data)
 

data/lib/compass-rails4/version.rb

@@ -1,5 +1,5 @@
 module CompassRails4
   unless defined?(::CompassRails4::VERSION)
-    VERSION = "0.0.1" #based on 1.1.3
+    VERSION = "0.1.0" #based on 1.1.7
   end
 end

data/lib/compass-rails4.rb

@@ -75,11 +75,7 @@ module CompassRails4
     def configuration
       load_rails
       config = Compass::Configuration::Data.new('rails')
-      config.extend(Configuration::Default)
-      if asset_pipeline_enabled?
-        require "compass-rails4/configuration/asset_pipeline"
-        config.extend(Configuration::AssetPipeline)
-      end
+      config.extend(Configuration::AssetPipeline)
       config
     end
 
@@ -139,13 +135,6 @@ module CompassRails4
       config
     end
 
-  def asset_pipeline_enabled?
-    return false unless rails_loaded?
-    return false if !rails_config.respond_to?(:assets)
-
-    rails_config.assets.enabled != false
-  end
-
   private
 
     # sets the sass config value only if the corresponding compass-based setting

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: compass-rails4
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Tomas Brazys
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
+date: 2014-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: compass
@@ -38,6 +38,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: sprockets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - <=
+      - !ruby/object:Gem::Version
+        version: 2.11.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - <=
+      - !ruby/object:Gem::Version
+        version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -67,8 +81,6 @@ files:
 - compass-rails4.gemspec
 - lib/compass-rails4.rb
 - lib/compass-rails4/configuration.rb
-- lib/compass-rails4/configuration/asset_pipeline.rb
-- lib/compass-rails4/configuration/default.rb
 - lib/compass-rails4/patches.rb
 - lib/compass-rails4/patches/compass.rb
 - lib/compass-rails4/patches/sass_importer.rb

data/lib/compass-rails4/configuration/asset_pipeline.rb

@@ -1,51 +0,0 @@
-module CompassRails4
-  module Configuration
-    module AssetPipeline
-
-      def default_images_dir
-        File.join("app", "assets", "images")
-      end
-
-      def default_fonts_dir
-        File.join("app", "assets", "fonts")
-      end
-
-      def default_javascripts_dir
-        File.join("app", "assets", "javascripts")
-      end
-
-      def default_css_dir
-        File.join('public', CompassRails4.prefix)
-      end
-
-      def default_http_path
-        File.join(CompassRails4.prefix)
-      end
-
-      def default_http_images_path
-        "#{top_level.http_path}"
-      end
-
-      def default_http_javascripts_path
-        "#{top_level.http_path}"
-      end
-
-      def default_http_fonts_path
-        "#{top_level.http_path}"
-      end
-
-      def default_http_stylesheets_path
-        "#{top_level.http_path}"
-      end
-
-      def default_preferred_syntax
-        CompassRails4.sass_config.preferred_syntax rescue nil
-      end
-
-      def default_sprite_load_path
-        CompassRails4.sprockets.paths
-      end
-
-    end
-  end
-end

data/lib/compass-rails4/configuration/default.rb

@@ -1,75 +0,0 @@
-module CompassRails4
-  module Configuration
-    module Default
-
-      def project_type_without_default
-        :rails
-      end
-
-      def default_sass_dir
-        File.join("app", "assets", "stylesheets")
-      end
-
-      def default_css_dir
-        File.join("public", "stylesheets")
-      end
-
-      def default_images_dir
-        File.join("public", "images")
-      end
-
-      def default_fonts_dir
-        File.join("public", "fonts")
-      end
-
-      def default_javascripts_dir
-        File.join("public", "javascripts")
-      end
-
-      def default_http_images_path
-        # Relies on the fact that this will be loaded after the "normal"
-        # defaults, so that method_missing finds http_root_relative
-        http_root_relative "images"
-      end
-
-      def default_http_generated_images_path
-        # Relies on the fact that this will be loaded after the "normal"
-        # defaults, so that method_missing finds http_root_relative
-        http_root_relative "images"
-      end
-
-      def default_http_javascripts_path
-        http_root_relative "javascripts"
-      end
-
-      def default_http_fonts_path
-        http_root_relative "fonts"
-      end
-
-      def default_http_stylesheets_path
-        http_root_relative "stylesheets"
-      end
-
-      def default_extensions_dir
-        File.join("vendor", "plugins", "compass_extensions")
-      end
-
-      def default_cache_dir
-        File.join("tmp", "sass-cache")
-      end
-
-      def default_project_path
-        project_path = CompassRails4.root
-      end
-
-      def default_http_path
-        "/" # XXX Where is/was this stored in the Rails config?
-      end
-
-      def default_environment
-        CompassRails4.env
-      end
-
-    end
-  end
-end