compass-rails 2.0.4 → 2.0.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: aea54e61ee5ba66c77fb1551ac1d84e80f223873
4
- data.tar.gz: d7f0097bac198b698810651cb965368961f229b6
3
+ metadata.gz: 7e22b7b8fa47ae1f434e67a5df4072339d0d35cb
4
+ data.tar.gz: d56d0e16a200bc8fdd45dd82eaf7fa4a573adbae
5
5
  SHA512:
6
- metadata.gz: 98f86f7f3febe3e167f2d61f5d76637c685a30cc1b640a5b89df9d13ddf29b54f3d4b6859ee2664e96f90380cb05d6d2ee431eef84bcb71da93236e484e3d3a8
7
- data.tar.gz: 3cb173724d727cd77c63294d28cedf7f87260866a4fc3891bc0dab725d10d0d65c9071769b6252c2e5f24382e0da29d4943807ffb6110e96a566815bdf1f82c2
6
+ metadata.gz: ef6b6a3aa8254ef499dd9ae778fbef9009faf64711187dffafc53d513447883731e0b1ce338af06f3d6345e40e4b46ee8b4db12641d04023a02c540a8480d6ed
7
+ data.tar.gz: cb3124eae3b8a7977d2c50c532f277a7573ca0de55d8990034c98d57045eee34b74cfa3bfbb9fb582f6081094a5305f4e556b963a91334744677f136be7051b0
data/README.md CHANGED
@@ -72,7 +72,7 @@ For example, if you want to use susy.
72
72
  ```ruby
73
73
  # Gemfile
74
74
  gem 'compass-rails'
75
- gem 'compass-susy-plugin'
75
+ gem 'susy'
76
76
  ```
77
77
 
78
78
  then run:
@@ -18,5 +18,5 @@ Gem::Specification.new do |gem|
18
18
 
19
19
  gem.add_dependency 'compass', '~> 1.0.0'
20
20
  gem.add_dependency 'sprockets', '< 2.13'
21
- gem.add_dependency 'sass-rails', '<= 5.0.1'
21
+ gem.add_dependency 'sass-rails', '< 5.1'
22
22
  end
@@ -9,10 +9,6 @@ gem "guard-test"
9
9
  gem "rails", "3.1.3"
10
10
  gem "sass-rails"
11
11
 
12
- group :assets do
13
- gem "compass-blueprint"
14
- end
15
-
16
12
  group :test do
17
13
  gem "mocha"
18
14
  gem "appraisal"
@@ -9,10 +9,6 @@ gem "guard-test"
9
9
  gem "rails", "~> 3.2"
10
10
  gem "sass-rails"
11
11
 
12
- group :assets do
13
- gem "compass-blueprint"
14
- end
15
-
16
12
  group :test do
17
13
  gem "mocha"
18
14
  gem "appraisal"
@@ -9,10 +9,6 @@ gem "guard-test"
9
9
  gem "rails", "~> 4.0.0"
10
10
  gem "sass-rails"
11
11
 
12
- group :assets do
13
- gem "compass-blueprint"
14
- end
15
-
16
12
  group :test do
17
13
  gem "mocha"
18
14
  gem "appraisal"
@@ -9,10 +9,6 @@ gem "guard-test"
9
9
  gem "rails", "~> 4.2.0"
10
10
  gem "sass-rails", "~> 5.0"
11
11
 
12
- group :assets do
13
- gem "compass-blueprint"
14
- end
15
-
16
12
  group :test do
17
13
  gem "mocha"
18
14
  gem "appraisal"
@@ -4,7 +4,6 @@ require "compass-rails/configuration"
4
4
 
5
5
  module CompassRails
6
6
 
7
- RAILS_4 = %r{^4.[0|1|2]}
8
7
  RAILS_32 = %r{^3.2}
9
8
  RAILS_31 = %r{^3.1}
10
9
 
@@ -66,11 +65,6 @@ module CompassRails
66
65
  version_match RAILS_32
67
66
  end
68
67
 
69
- def rails4?
70
- return false unless defined?(::Rails)
71
- version_match RAILS_4
72
- end
73
-
74
68
  def version_match(version)
75
69
  !(rails_version =~ version).nil?
76
70
  end
@@ -55,19 +55,29 @@ klass.class_eval do
55
55
  private
56
56
 
57
57
  def sass_importer_artiy
58
- @sass_importer_artiy ||= self.class.parent::SassImporter.instance_method(:initialize).arity
58
+ @sass_importer_artiy ||= sass_importer_class.instance_method(:initialize).arity
59
59
  end
60
60
 
61
-
62
61
  def sass_importer(context, path)
63
62
  case sass_importer_artiy.abs
64
63
  when 1
65
- self.class.parent::SassImporter.new(path)
64
+ sass_importer_class.new(path)
66
65
  else
67
- self.class.parent::SassImporter.new(context, path)
66
+ sass_importer_class.new(context, path)
68
67
  end
69
68
  end
70
69
 
70
+ # if using haml-rails, self.class.parent = Haml::Filters (which doesn't have an implementation)
71
+ def sass_importer_class
72
+ @sass_importer_class ||= if defined?(self.class.parent::SassImporter)
73
+ self.class.parent::SassImporter
74
+ elsif defined?(Sass::Rails::SassTemplate)
75
+ Sass::Rails::SassImporter
76
+ else
77
+ Sprockets::SassImporter
78
+ end
79
+ end
80
+
71
81
  def sprockets_cache_store
72
82
  case Rails.application.config.assets.cache_store
73
83
  when :null_store
@@ -1,9 +1,7 @@
1
1
  if defined?(::Rails)
2
2
  if CompassRails.rails31? || CompassRails.rails32?
3
3
  require "compass-rails/railties/3_1"
4
- elsif CompassRails.rails4?
5
- require "compass-rails/railties/4_0"
6
4
  else
7
- $stderr.puts "Unsupported rails environment for compass"
5
+ require "compass-rails/railties/4_0"
8
6
  end
9
7
  end
@@ -1,5 +1,5 @@
1
1
  module CompassRails
2
2
  unless defined?(::CompassRails::VERSION)
3
- VERSION = "2.0.4"
3
+ VERSION = "2.0.5"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: compass-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.4
4
+ version: 2.0.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Scott Davis
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2015-01-09 00:00:00.000000000 Z
13
+ date: 2015-08-15 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: compass
@@ -44,16 +44,16 @@ dependencies:
44
44
  name: sass-rails
45
45
  requirement: !ruby/object:Gem::Requirement
46
46
  requirements:
47
- - - "<="
47
+ - - "<"
48
48
  - !ruby/object:Gem::Version
49
- version: 5.0.1
49
+ version: '5.1'
50
50
  type: :runtime
51
51
  prerelease: false
52
52
  version_requirements: !ruby/object:Gem::Requirement
53
53
  requirements:
54
- - - "<="
54
+ - - "<"
55
55
  - !ruby/object:Gem::Version
56
- version: 5.0.1
56
+ version: '5.1'
57
57
  description: Integrate Compass into Rails 3.0 and up.
58
58
  email:
59
59
  - jetviper21@gmail.com