less-rails 2.2.4 → 2.2.5

data/.travis.yml

@@ -10,3 +10,4 @@ before_install:
 gemfile:
   - Gemfile.rails-3.1
   - Gemfile.rails-3.2
+  - Gemfile.rails-edge

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+2.2.5 - 10/28/2012
+
+* Real Rails 4 compatability thanks to @yalab
+
+
 2.2.4 - 10/20/2012
 
 * Rails 4 compatability with Sprockets vs app.assets.

data/Gemfile

@@ -1 +1 @@
-eval File.read('Gemfile.rails-3.2')
+eval File.read('Gemfile.rails-edge')

data/Gemfile.rails-edge

@@ -0,0 +1,7 @@
+eval File.read 'Gemfile.common'
+
+gem 'rails',           github: 'rails/rails'
+gem 'journey',         github: 'rails/journey'
+gem 'arel',            github: 'rails/arel'
+gem 'sprockets-rails', github: 'rails/sprockets-rails'
+gem 'activerecord-deprecated_finders', github: 'rails/activerecord-deprecated_finders'

data/lib/less/rails/helpers.rb

@@ -31,8 +31,8 @@ module Less
         Less.register_rails_helper('javascript-url')  { |tree, cxt| javascript_url   unquote(cxt.toCSS()) }
         Less.register_rails_helper('stylesheet-path') { |tree, cxt| stylesheet_path  unquote(cxt.toCSS()) }
         Less.register_rails_helper('stylesheet-url')  { |tree, cxt| stylesheet_url   unquote(cxt.toCSS()) }
-        Less.register_rails_helper('font-path')       { |tree, cxt| asset_path       unquote(cxt.toCSS()) }
-        Less.register_rails_helper('font-url')        { |tree, cxt| asset_url        unquote(cxt.toCSS()) }
+        Less.register_rails_helper('font-path')       { |tree, cxt| font_path        unquote(cxt.toCSS()) }
+        Less.register_rails_helper('font-url')        { |tree, cxt| font_url         unquote(cxt.toCSS()) }
         Less.register_rails_helper('asset-data-url')  { |tree, cxt| asset_data_url   unquote(cxt.toCSS()) }
       end
       
@@ -89,7 +89,22 @@ module Less
         def stylesheet_url(stylesheet)
           "url(#{scope.stylesheet_path(stylesheet)})"
         end
+
+        def font_path(font)
+          if scope.respond_to?(:font_path)
+            scope.font_path(font).inspect
+          else
+            asset_path(font)
+          end
+        end
         
+        def font_url(font)
+          if scope.respond_to?(:font_path)
+            "url(#{scope.font_path(font)})"
+          else
+            asset_url(font)
+          end
+        end
         
         private
         
@@ -98,7 +113,11 @@ module Less
         end
         
         def public_path(asset)
-          scope.asset_paths.compute_public_path asset, ::Rails.application.config.assets.prefix
+          if scope.respond_to?(:asset_paths)
+            scope.asset_paths.compute_public_path asset, ::Rails.application.config.assets.prefix
+          else
+            scope.path_to_asset(asset)
+          end
         end
         
         def context_asset_data_uri(path)

data/lib/less/rails/version.rb

@@ -1,5 +1,5 @@
 module Less
   module Rails
-    VERSION = "2.2.4"
+    VERSION = "2.2.5"
   end
 end

data/test/cases/helpers_spec.rb

@@ -15,12 +15,21 @@ class HelpersSpec < Less::Rails::Spec
     line_for_helper('video-url').must_equal   "video-url: url(/videos/rails.mp4);"
     line_for_helper('audio-path').must_equal  'audio-path: "/audios/rails.mp3";'
     line_for_helper('audio-url').must_equal   "audio-url: url(/audios/rails.mp3);"
-    line_for_helper('javascript-path').must_equal  'javascript-path: "/assets/rails.js";'
-    line_for_helper('javascript-url').must_equal   "javascript-url: url(/assets/rails.js);"
-    line_for_helper('stylesheet-path').must_equal  'stylesheet-path: "/assets/rails.css";'
-    line_for_helper('stylesheet-url').must_equal   "stylesheet-url: url(/assets/rails.css);"
-    line_for_helper('font-path').must_equal  'font-path: "/assets/rails.ttf";'
-    line_for_helper('font-url').must_equal   "font-url: url(/assets/rails.ttf);"
+    if Rails::VERSION::MAJOR < 4
+      line_for_helper('javascript-path').must_equal  'javascript-path: "/assets/rails.js";'
+      line_for_helper('javascript-url').must_equal   "javascript-url: url(/assets/rails.js);"
+      line_for_helper('stylesheet-path').must_equal  'stylesheet-path: "/assets/rails.css";'
+      line_for_helper('stylesheet-url').must_equal   "stylesheet-url: url(/assets/rails.css);"
+      line_for_helper('font-path').must_equal        'font-path: "/assets/rails.ttf";'
+      line_for_helper('font-url').must_equal         "font-url: url(/assets/rails.ttf);"
+    else
+      line_for_helper('javascript-path').must_equal  'javascript-path: "/javascripts/rails.js";'
+      line_for_helper('javascript-url').must_equal   "javascript-url: url(/javascripts/rails.js);"
+      line_for_helper('stylesheet-path').must_equal  'stylesheet-path: "/stylesheets/rails.css";'
+      line_for_helper('stylesheet-url').must_equal   "stylesheet-url: url(/stylesheets/rails.css);"
+      line_for_helper('font-path').must_equal        'font-path: "/fonts/rails.ttf";'
+      line_for_helper('font-url').must_equal         "font-url: url(/fonts/rails.ttf);"
+    end
   end
   
   it 'parses data urls ' do

data/test/dummy_app/init.rb

@@ -11,6 +11,7 @@ module Dummy
     config.active_support.deprecation = :stderr
     config.cache_store = :memory_store
     config.consider_all_requests_local = true
+    config.eager_load = false
     
     config.assets.enabled = true
     config.assets.cache_store = [:file_store, "#{config.root}/tmp/cache/assets/"]

data/test/spec_helper.rb

@@ -55,7 +55,13 @@ module Less
       
       def reset_caches
         dummy_assets.version = SecureRandom.hex(32)
-        dummy_assets.cache.clear
+        cache = dummy_assets.cache
+        if cache.is_a? Sprockets::Cache::FileStore
+          path = cache.instance_variable_get(:@root)
+          cache = Sprockets::Cache::FileStore.new(path)
+        else
+          cache.clear
+        end
       end
       
       def prepare_cache_dir

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: less-rails
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-21 00:00:00.000000000 Z
+date: 2012-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: less
@@ -106,6 +106,7 @@ files:
 - Gemfile.common
 - Gemfile.rails-3.1
 - Gemfile.rails-3.2
+- Gemfile.rails-edge
 - Guardfile
 - MIT-LICENSE
 - README.md