Sass

AlexVangelov · Feb 16, 2012 · fafebf9 · fafebf9
1 parent 36b1951
commit fafebf9
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 39 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1 @@
-sencha-touch-rails-1.0.0.gem
+sencha-touch-rails-*.gem
diff --git a/.gitignore~ b/.gitignore~
@@ -0,0 +1 @@
+sencha-touch-rails-1.0.0.gem
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## 1.0.1 (17 Feb 2012)
 
-  - Sass
+  	- Sass
 
 ## 1.0.0 (16 Feb 2012)
 

diff --git a/Gemfile b/Gemfile
@@ -6,4 +6,6 @@ gemspec
 # gem "rails", :git => "git://github.com/rails/rails.git"
 gem "rack"
 gem "sprockets"
+gem "compass"
+gem "sass"
 gem "i18n"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,17 +1,13 @@
 PATH
   remote: .
   specs:
-    sencha-touch-rails (1.0.0)
-      compass (~> 0.11.7)
-      railties (~> 3.2)
+    sencha-touch-rails (1.0.1)
+      railties (>= 3.2.1, < 5.0)
       thor (~> 0.14)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.1)
-      actionpack (= 3.2.1)
-      mail (~> 2.4.0)
     actionpack (3.2.1)
       activemodel (= 3.2.1)
       activesupport (= 3.2.1)
@@ -25,18 +21,9 @@ GEM
     activemodel (3.2.1)
       activesupport (= 3.2.1)
       builder (~> 3.0.0)
-    activerecord (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-      arel (~> 3.0.0)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
     activesupport (3.2.1)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    arel (3.0.0)
     builder (3.0.0)
     chunky_png (1.2.5)
     compass (0.11.7)
@@ -49,28 +36,14 @@ GEM
     i18n (0.6.0)
     journey (1.0.1)
     json (1.6.5)
-    mail (2.4.1)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.17.2)
     multi_json (1.0.4)
-    polyglot (0.3.3)
     rack (1.4.1)
     rack-cache (1.1)
       rack (>= 0.4)
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.2.1)
-      actionmailer (= 3.2.1)
-      actionpack (= 3.2.1)
-      activerecord (= 3.2.1)
-      activeresource (= 3.2.1)
-      activesupport (= 3.2.1)
-      bundler (~> 1.0)
-      railties (= 3.2.1)
     railties (3.2.1)
       actionpack (= 3.2.1)
       activesupport (= 3.2.1)
@@ -88,18 +61,14 @@ GEM
       tilt (~> 1.1, != 1.3.0)
     thor (0.14.6)
     tilt (1.3.3)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
+  compass
   i18n
   rack
-  rails (~> 3.0)
+  sass
   sencha-touch-rails!
   sprockets
diff --git a/lib/sencha-touch-rails.rb b/lib/sencha-touch-rails.rb
@@ -1 +1,8 @@
-require 'sencha-touch/rails'
+require 'sencha-touch/rails'
+require 'sass'
+
+Sass::Engine::DEFAULT_OPTIONS[:load_paths].tap do |load_paths|
+  load_paths ||= []
+  load_paths << "#{Gem.loaded_specs['compass'].full_gem_path}/frameworks/compass/stylesheets"
+  load_paths << "#{Gem.loaded_specs['compass'].full_gem_path}/frameworks/blueprint/stylesheets" 
+end
diff --git a/sencha-touch-rails.gemspec b/sencha-touch-rails.gemspec
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "sencha-touch-rails"
 
-  s.add_dependency "railties", ">= 3.2.0.beta", "< 5.0"
+  s.add_dependency "railties", ">= 3.2.1", "< 5.0"
   s.add_dependency "thor",     "~> 0.14"
 
   s.files        = `git ls-files`.split("\n")