themes_for_rails 0.3.1 → 0.4.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    themes_for_rails (0.3.0)
+    themes_for_rails (0.3.1)
 
 GEM
   remote: http://rubygems.org/

data/README.textile

@@ -120,13 +120,13 @@ h2. Generators
 For now, it only creates the theme folder.
 
 <pre>
-rails generate theme_for_rails:install  
+rails generate themes_for_rails:install  
 </pre>
 
 Inside the themes folder, it create a structure for my_theme.
 
 <pre>
-rails generate theme_for_rails:theme my_theme  
+rails generate themes_for_rails:theme my_theme  
 </pre>
 
 h2. Changing things
@@ -155,6 +155,22 @@ KillerApp::Application.configure do
 end
 </pre>
 
+h2. Sass support
+
+ThemesForRails will automatically add the themes paths to Sass, if sass is available. 
+
+For instance, everything you put inside themes/my_theme/stylesheets/sass will get compiled into themes/my_theme/stylesheets (duh, right?)
+
+To bypass sass configuration, do this:
+<pre>
+KillerApp::Application.configure do
+  #
+  
+  config.themes_for_rails.use_sass = false
+
+  #...
+end
+</pre>
 
 h2. Another way to change things
 
@@ -219,3 +235,9 @@ rake
 h2. Authors and contributors
 
 * lucasefe
+
+h2. Last but not least
+
+If you are using this gem, please, take a minute to recommend me at Working With Rails. 
+
+<a href="http://www.workingwithrails.com/recommendation/new/person/7277-lucas-florio"><img alt="Recommend Me" src="http://workingwithrails.com/images/tools/compact-small.jpg" /></a>

data/lib/generators/{theme_for_rails → themes_for_rails}/install_generator.rb

@@ -1,4 +1,4 @@
-module ThemeForRails
+module ThemesForRails
   module Generators
     class InstallGenerator < Rails::Generators::Base
       desc "Creates a ThemeForRails basic structure."

data/lib/generators/{theme_for_rails → themes_for_rails}/theme_generator.rb

@@ -1,4 +1,4 @@
-module ThemeForRails
+module ThemesForRails
   module Generators
     class ThemeGenerator < Rails::Generators::NamedBase
       source_root File.expand_path("../templates", __FILE__)

data/lib/themes_for_rails/assets_controller.rb

@@ -7,26 +7,27 @@ module ThemesForRails
     include ThemesForRails::UrlHelpers
     
     def stylesheets
-      filename, extension = extract_filename_and_extension_from(params[:asset])
-      render_asset theme_stylesheet_path_for(params[:theme], filename), 'text/css'
+      render_asset asset_path_for(params[:asset], 'stylesheets'), mime_type_from(params[:asset])
     end
     
     def javascripts
-      filename, extension = extract_filename_and_extension_from(params[:asset])
-      render_asset theme_javascript_path_for(params[:theme], filename), 'text/javascript'
+      render_asset asset_path_for(params[:asset], 'javascripts'), mime_type_from(params[:asset])  
     end
     
     def images
-      filename, extension = extract_filename_and_extension_from(params[:asset])
-      render_asset theme_image_path_for(params[:theme], filename, extension), "image/#{extension.gsub('.', '')}"
+      render_asset asset_path_for(params[:asset], 'images'), mime_type_from(params[:asset])  
     end
     
   private
   
+    def asset_path_for(asset_url, asset_prefix)
+      File.join(theme_path_for(params[:theme]), asset_prefix, params[:asset])
+    end
+    
     def extract_filename_and_extension_from(asset)
       extension = File.extname(asset)
       filename = params[:asset].gsub(extension, '')
-      return filename, extension
+      return filename, extension[1..-1]
     end
     
     def render_asset(asset, mime_type)
@@ -36,16 +37,16 @@ module ThemesForRails
         send_file asset, :type => mime_type
       end
     end
-    
-    # Physical paths
-    def theme_stylesheet_path_for(name, asset)
-      File.join(theme_path_for(name), 'stylesheets', "#{asset}.css")
-    end
-    def theme_javascript_path_for(name, asset)
-      File.join(theme_path_for(name), 'javascripts', "#{asset}.js")
-    end
-    def theme_image_path_for(name, asset, extension = ".png")
-      File.join(theme_path_for(name), 'images', "#{asset}#{extension}")
+  
+    def mime_type_from(asset_path)
+      extension = extract_filename_and_extension_from(asset_path).last
+      if extension == 'css'
+        "text/css"
+      elsif extension == 'js'
+        'text/javascript'
+      else
+        "image/#{extension}"
+      end
     end
   end
 end

data/lib/themes_for_rails/config.rb

@@ -2,8 +2,10 @@ module ThemesForRails
   class Config
 
     attr_writer :base_dir, :themes_dir
+    attr_accessor :use_sass
     
     def initialize(&block)
+      @use_sass = true
       yield if block_given?
     end
     
@@ -20,5 +22,12 @@ module ThemesForRails
       @themes_dir = nil
     end
 
+    def use_sass?
+      @use_sass and sass_is_available?
+    end
+
+    def sass_is_available?
+      !!defined?Sass::Plugin
+    end
   end  
 end

data/lib/themes_for_rails/railtie.rb

@@ -8,7 +8,12 @@ module ThemesForRails
       ThemesForRails::Railtie.config.themes_for_rails.each do |key, value|
         ThemesForRails.config.send "#{key}=".to_sym, value
       end
+      
+      # Adding theme stylesheets path to sass, automatically. 
+      ThemesForRails.add_themes_path_to_sass if ThemesForRails.config.use_sass?
+      
     end
+    
     rake_tasks do
       load "tasks/themes_for_rails.rake"
     end

data/lib/themes_for_rails/version.rb

@@ -1,3 +1,3 @@
 module ThemesForRails
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/lib/themes_for_rails/view_helpers.rb

@@ -1,6 +1,8 @@
 module ThemesForRails
   module ViewHelpers
+    
     extend ActiveSupport::Concern
+  
     included do
       include ThemesForRails::CommonMethods
     end
@@ -12,8 +14,9 @@ module ThemesForRails
         base_theme_javascript_path(:theme => self.theme_name, :asset => "#{asset}.js")
       end
       def current_theme_image_path(asset)
-        self.base_theme_image_path(:theme => self.theme_name, :asset => asset)
+        base_theme_image_path(:theme => self.theme_name, :asset => asset)
       end
+      
       alias_method :theme_image_path, :current_theme_image_path
       alias_method :theme_javascript_path, :current_theme_javascript_path
       alias_method :theme_stylesheet_path, :current_theme_stylesheet_path
@@ -21,13 +24,17 @@ module ThemesForRails
       def theme_image_tag(source)
         image_tag(theme_image_path(source))
       end
+      
       def theme_javascript_include_tag(*files)
         files.collect! {|file| theme_javascript_path(file) }
         javascript_include_tag *files
       end
+      
       def theme_stylesheet_link_tag(*files)
+        options = files.extract_options!
         files.collect! {|file| theme_stylesheet_path(file) }
-        stylesheet_link_tag *files
+        files << options
+        stylesheet_link_tag(*files)
       end
     end
   end

data/lib/themes_for_rails.rb

@@ -14,7 +14,34 @@ module ThemesForRails
     def available_theme_names
       available_themes.map {|theme| File.basename(theme) } 
     end
+    
+    def add_themes_path_to_sass
+      if ThemesForRails.config.sass_is_available?
+        each_theme_dir do |dir|
+          if File.directory?(dir) # Need to get rid of the '.' and '..'
+
+            sass_dir = "#{dir}/stylesheets/sass"
+            css_dir = "#{dir}/stylesheets"
 
+            unless already_configured_in_sass?(sass_dir)
+              Sass::Plugin.add_template_location sass_dir, css_dir 
+            end
+          end
+        end 
+      else
+        raise "Sass is not available. What are you trying to do?"
+      end
+    end
+    
+    def already_configured_in_sass?(sass_dir)
+      Sass::Plugin.template_location_array.map(&:first).include?(sass_dir)
+    end
+    
+    def each_theme_dir
+      Dir.glob(File.join(Rails.root, config.themes_dir, "*")) do |theme_dir|
+        yield(theme_dir) if block_given?
+      end
+    end
   end
 end
 

data/test/assets_controller_test.rb

@@ -37,7 +37,7 @@ module ThemesForRails
     should "respond with the right image file when requested" do
       get 'images', { :theme => 'default', :asset => 'logo.png'}
       assert_response :success
-      assert_equal @response.content_type, 'image/png'
+      assert_equal  'image/png', @response.content_type
     end
     should "not be success when the image file is not found" do
       get 'images', { :theme => 'default', :asset => 'i_am_not_here.jpg'}
@@ -47,6 +47,12 @@ module ThemesForRails
     should "respond with a nested asset" do
       get 'images', { :theme => 'default', :asset => 'nested/logo.png'}
       assert_response :success
+      assert_equal 'image/png', @response.content_type
+    end
+    
+    should "respond with properly even when requesting an image inside the stylesheets folder" do
+      get 'stylesheets', { :theme => 'default', :asset => 'images/logo.png'}
+      assert_response :success
       assert_equal @response.content_type, 'image/png'
     end
   end

data/test/support/extensions.rb

@@ -1,9 +1,11 @@
 require 'active_support/test_case'
 
 class ActiveSupport::TestCase
+  
   def assert_named_route(result, name)
     assert_equal result, @routes.url_helpers.send(name)
   end
+  
   def assert_send_file(result)
     assert(@response.body.is_a? Proc)
     require 'stringio'
@@ -13,4 +15,5 @@ class ActiveSupport::TestCase
     puts "OUT: #{output.output}"
     assert_equal(result, output.string)
   end
+  
 end

data/test/view_helpers_test.rb

@@ -0,0 +1,27 @@
+require "test_helper"
+
+module ThemesForRails
+  class ViewHelpersTest < ActionController::IntegrationTest
+    include ThemesForRails::ViewHelpers
+    
+    include ActionView::Helpers::AssetTagHelper
+    include ERB::Util
+    include ActionView::Helpers::TagHelper
+    
+    def theme_name
+      'default'
+    end
+    
+    def config
+      @config ||= stub({:perform_caching => false, :asset_path => "/assets", :asset_host => ''})
+    end
+    
+    should 'delegate to stylesheet_link_tag' do
+      assert theme_stylesheet_link_tag('cuac.css').include?('media="screen"')
+    end
+        
+    should 'delegate options (lazy testing, I know)' do
+      assert theme_stylesheet_link_tag('cuac.css', :media => 'print').include?('media="print"')
+    end
+  end
+end

data/themes_for_rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{themes_for_rails}
-  s.version = "0.3.1"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lucas Florio"]
-  s.date = %q{2010-12-23}
+  s.date = %q{2011-01-14}
   s.description = %q{It allows an application to have many different ways of rendering static assets and dynamic views. }
   s.email = %q{lucasefe@gmail.com}
   s.extra_rdoc_files = [
@@ -26,12 +26,12 @@ Gem::Specification.new do |s|
      "Rakefile",
      "TODO.textile",
      "init.rb",
-     "lib/generators/theme_for_rails/install_generator.rb",
-     "lib/generators/theme_for_rails/templates/theme/images/.gitkeep",
-     "lib/generators/theme_for_rails/templates/theme/javascripts/.gitkeep",
-     "lib/generators/theme_for_rails/templates/theme/stylesheets/.gitkeep",
-     "lib/generators/theme_for_rails/templates/theme/views/layouts/.gitkeep",
-     "lib/generators/theme_for_rails/theme_generator.rb",
+     "lib/generators/themes_for_rails/install_generator.rb",
+     "lib/generators/themes_for_rails/templates/theme/images/.gitkeep",
+     "lib/generators/themes_for_rails/templates/theme/javascripts/.gitkeep",
+     "lib/generators/themes_for_rails/templates/theme/stylesheets/.gitkeep",
+     "lib/generators/themes_for_rails/templates/theme/views/layouts/.gitkeep",
+     "lib/generators/themes_for_rails/theme_generator.rb",
      "lib/tasks/themes_for_rails.rake",
      "lib/themes_for_rails.rb",
      "lib/themes_for_rails/assets_controller.rb",
@@ -95,6 +95,7 @@ Gem::Specification.new do |s|
      "test/dummy_app/themes/default/images/logo.png",
      "test/dummy_app/themes/default/images/nested/logo.png",
      "test/dummy_app/themes/default/javascripts/app.js",
+     "test/dummy_app/themes/default/stylesheets/images/logo.png",
      "test/dummy_app/themes/default/stylesheets/style.css",
      "test/dummy_app/themes/default/stylesheets/style2.css",
      "test/dummy_app/themes/default/views/layouts/default.html.erb",
@@ -103,6 +104,7 @@ Gem::Specification.new do |s|
      "test/support/extensions.rb",
      "test/test_helper.rb",
      "test/themes_for_rails_test.rb",
+     "test/view_helpers_test.rb",
      "themes_for_rails.gemspec"
   ]
   s.homepage = %q{http://github.com/lucasefe/themes_for_rails}
@@ -132,7 +134,8 @@ Gem::Specification.new do |s|
      "test/routes_test.rb",
      "test/support/extensions.rb",
      "test/test_helper.rb",
-     "test/themes_for_rails_test.rb"
+     "test/themes_for_rails_test.rb",
+     "test/view_helpers_test.rb"
   ]
 
   if s.respond_to? :specification_version then

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 1
-  version: 0.3.1
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Lucas Florio
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-23 00:00:00 -03:00
+date: 2011-01-14 00:00:00 -03:00
 default_executable: 
 dependencies: []
 
@@ -37,12 +37,12 @@ files:
 - Rakefile
 - TODO.textile
 - init.rb
-- lib/generators/theme_for_rails/install_generator.rb
-- lib/generators/theme_for_rails/templates/theme/images/.gitkeep
-- lib/generators/theme_for_rails/templates/theme/javascripts/.gitkeep
-- lib/generators/theme_for_rails/templates/theme/stylesheets/.gitkeep
-- lib/generators/theme_for_rails/templates/theme/views/layouts/.gitkeep
-- lib/generators/theme_for_rails/theme_generator.rb
+- lib/generators/themes_for_rails/install_generator.rb
+- lib/generators/themes_for_rails/templates/theme/images/.gitkeep
+- lib/generators/themes_for_rails/templates/theme/javascripts/.gitkeep
+- lib/generators/themes_for_rails/templates/theme/stylesheets/.gitkeep
+- lib/generators/themes_for_rails/templates/theme/views/layouts/.gitkeep
+- lib/generators/themes_for_rails/theme_generator.rb
 - lib/tasks/themes_for_rails.rake
 - lib/themes_for_rails.rb
 - lib/themes_for_rails/assets_controller.rb
@@ -106,6 +106,7 @@ files:
 - test/dummy_app/themes/default/images/logo.png
 - test/dummy_app/themes/default/images/nested/logo.png
 - test/dummy_app/themes/default/javascripts/app.js
+- test/dummy_app/themes/default/stylesheets/images/logo.png
 - test/dummy_app/themes/default/stylesheets/style.css
 - test/dummy_app/themes/default/stylesheets/style2.css
 - test/dummy_app/themes/default/views/layouts/default.html.erb
@@ -114,6 +115,7 @@ files:
 - test/support/extensions.rb
 - test/test_helper.rb
 - test/themes_for_rails_test.rb
+- test/view_helpers_test.rb
 - themes_for_rails.gemspec
 has_rdoc: true
 homepage: http://github.com/lucasefe/themes_for_rails
@@ -170,3 +172,4 @@ test_files:
 - test/support/extensions.rb
 - test/test_helper.rb
 - test/themes_for_rails_test.rb
+- test/view_helpers_test.rb