staticmatic 0.11.0.alpha.10 → 0.11.0
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.
- data/VERSION.yml +0 -1
- data/lib/staticmatic/base.rb +1 -1
- data/lib/staticmatic/compass.rb +1 -1
- data/lib/staticmatic/compass/app_integration.rb +1 -4
- data/lib/staticmatic/compass/configuration_defaults.rb +8 -3
- data/spec/compass_integration_spec.rb +2 -2
- data/spec/sandbox/test_site/site/images/grid.png +0 -0
- data/spec/sandbox/test_site/src/stylesheets/application.sass +1 -1
- metadata +7 -10
data/VERSION.yml
CHANGED
data/lib/staticmatic/base.rb
CHANGED
|
@@ -97,7 +97,7 @@ module StaticMatic
|
|
|
97
97
|
compass_config_path = File.join(@base_dir, "config", "compass.rb")
|
|
98
98
|
|
|
99
99
|
if File.exists?(compass_config_path)
|
|
100
|
-
Compass.add_configuration(compass_config_path)
|
|
100
|
+
Compass.add_configuration(compass_config_path)
|
|
101
101
|
end
|
|
102
102
|
|
|
103
103
|
configuration.sass_options.merge!(Compass.configuration.to_sass_engine_options)
|
data/lib/staticmatic/compass.rb
CHANGED
|
@@ -5,15 +5,12 @@ module Compass
|
|
|
5
5
|
|
|
6
6
|
extend self
|
|
7
7
|
|
|
8
|
-
|
|
9
|
-
|
|
10
8
|
def installer(*args)
|
|
11
9
|
Installer.new(*args)
|
|
12
10
|
end
|
|
13
11
|
|
|
14
12
|
def configuration
|
|
15
|
-
Compass::Configuration::Data.new('staticmatic').
|
|
16
|
-
extend(ConfigurationDefaults)
|
|
13
|
+
Compass::Configuration::Data.new('staticmatic').extend(ConfigurationDefaults)
|
|
17
14
|
end
|
|
18
15
|
|
|
19
16
|
end
|
|
@@ -5,7 +5,11 @@ module Compass
|
|
|
5
5
|
def project_type_without_default
|
|
6
6
|
:staticmatic
|
|
7
7
|
end
|
|
8
|
-
|
|
8
|
+
|
|
9
|
+
def http_path
|
|
10
|
+
"/"
|
|
11
|
+
end
|
|
12
|
+
|
|
9
13
|
def sass_dir_without_default
|
|
10
14
|
"src/stylesheets"
|
|
11
15
|
end
|
|
@@ -21,12 +25,13 @@ module Compass
|
|
|
21
25
|
def images_dir_without_default
|
|
22
26
|
"site/images"
|
|
23
27
|
end
|
|
28
|
+
|
|
24
29
|
def default_http_images_path
|
|
25
|
-
"
|
|
30
|
+
"images"
|
|
26
31
|
end
|
|
27
32
|
|
|
28
33
|
def default_http_javascripts_path
|
|
29
|
-
"
|
|
34
|
+
"javascripts"
|
|
30
35
|
end
|
|
31
36
|
|
|
32
37
|
def default_cache_dir
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
require File.dirname(__FILE__) + "/spec_helper"
|
|
2
2
|
|
|
3
3
|
describe "Compass integration" do
|
|
4
|
-
context "with the default staticmatic
|
|
4
|
+
context "with the default staticmatic configuration" do
|
|
5
5
|
before do
|
|
6
6
|
setup_staticmatic
|
|
7
7
|
end
|
|
@@ -11,7 +11,7 @@ describe "Compass integration" do
|
|
|
11
11
|
Compass.configuration.sass_dir.should == File.join("src", "stylesheets")
|
|
12
12
|
Compass.configuration.css_dir.should == File.join("site", "stylesheets")
|
|
13
13
|
Compass.configuration.images_dir.should == File.join("site", "images")
|
|
14
|
-
Compass.configuration.http_images_path.should == "
|
|
14
|
+
Compass.configuration.http_images_path.should == "images"
|
|
15
15
|
end
|
|
16
16
|
end
|
|
17
17
|
|
|
File without changes
|
metadata
CHANGED
|
@@ -1,14 +1,12 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: staticmatic
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
prerelease:
|
|
4
|
+
prerelease: false
|
|
5
5
|
segments:
|
|
6
6
|
- 0
|
|
7
7
|
- 11
|
|
8
8
|
- 0
|
|
9
|
-
|
|
10
|
-
- 10
|
|
11
|
-
version: 0.11.0.alpha.10
|
|
9
|
+
version: 0.11.0
|
|
12
10
|
platform: ruby
|
|
13
11
|
authors:
|
|
14
12
|
- Stephen Bartholomew
|
|
@@ -16,7 +14,7 @@ autorequire:
|
|
|
16
14
|
bindir: bin
|
|
17
15
|
cert_chain: []
|
|
18
16
|
|
|
19
|
-
date: 2010-
|
|
17
|
+
date: 2010-11-15 00:00:00 +00:00
|
|
20
18
|
default_executable: staticmatic
|
|
21
19
|
dependencies:
|
|
22
20
|
- !ruby/object:Gem::Dependency
|
|
@@ -113,6 +111,7 @@ files:
|
|
|
113
111
|
- spec/rescue_spec.rb
|
|
114
112
|
- spec/sandbox/test_site/config/compass.rb
|
|
115
113
|
- spec/sandbox/test_site/config/site.rb
|
|
114
|
+
- spec/sandbox/test_site/site/images/grid.png
|
|
116
115
|
- spec/sandbox/test_site/site/index
|
|
117
116
|
- spec/sandbox/test_site/site/layout_test
|
|
118
117
|
- spec/sandbox/test_site/site/sub_folder/another_sub_folder/index.html
|
|
@@ -165,13 +164,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
|
165
164
|
version: "0"
|
|
166
165
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
167
166
|
requirements:
|
|
168
|
-
- - "
|
|
167
|
+
- - ">="
|
|
169
168
|
- !ruby/object:Gem::Version
|
|
170
169
|
segments:
|
|
171
|
-
-
|
|
172
|
-
|
|
173
|
-
- 1
|
|
174
|
-
version: 1.3.1
|
|
170
|
+
- 0
|
|
171
|
+
version: "0"
|
|
175
172
|
requirements: []
|
|
176
173
|
|
|
177
174
|
rubyforge_project: staticmatic
|