themes_for_rails 0.4.0 → 0.4.1

data/Gemfile.lock

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

data/README.textile

@@ -117,7 +117,7 @@ theme_stylesheet_path
 
 h2. Generators
 
-For now, it only creates the theme folder.
+For now, it only creates the theme folder and add the "themes_for_rails" route in the routes.rb.
 
 <pre>
 rails generate themes_for_rails:install  
@@ -235,6 +235,9 @@ rake
 h2. Authors and contributors
 
 * lucasefe
+* jbarreneche
+* kule
+* matheusmoreira
 
 h2. Last but not least
 

data/lib/generators/themes_for_rails/install_generator.rb

@@ -6,6 +6,11 @@ module ThemesForRails
       def create_themes_folder
         empty_directory(File.join(Rails.root, 'themes'))
       end
+      
+      def add_themes_for_rails_routes
+        route "themes_for_rails"
+      end
+      
     end
   end
 end

data/lib/themes_for_rails.rb

@@ -7,9 +7,10 @@ module ThemesForRails
       @config
     end
     
-    def available_themes
-      Dir.glob(File.join(config.base_dir, config.themes_dir, "*"))
+    def available_themes(&block)
+      Dir.glob(File.join(config.base_dir, config.themes_dir, "*"), &block) 
     end
+    alias each_theme_dir available_themes
     
     def available_theme_names
       available_themes.map {|theme| File.basename(theme) } 
@@ -37,11 +38,6 @@ module ThemesForRails
       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/lib/themes_for_rails/common_methods.rb

@@ -7,7 +7,7 @@ module ThemesForRails
       @cached_theme_name ||= begin
         case @theme_name
         when Symbol then 
-          self.respond_to?(@theme_name) ? self.send(@theme_name) : @theme_name.to_s
+          self.respond_to?(@theme_name, true) ? self.send(@theme_name) : @theme_name.to_s
         when String then @theme_name
         else
           nil
@@ -18,10 +18,10 @@ module ThemesForRails
       @theme_name = name
     end
     def set_theme(name)
-      self.theme_name = name    
+      self.theme_name = name
       if valid_theme?
-        add_theme_view_path 
-      end    
+        add_theme_view_path
+      end
     end
   public
     def valid_theme?
@@ -38,11 +38,11 @@ module ThemesForRails
     def public_theme_path
       theme_path("/")
     end
-    def theme_path(base = ::Rails.root)
+    def theme_path(base = ThemesForRails.config.base_dir)
       theme_path_for(theme_name, base)
     end
-    def theme_path_for(name, base = ::Rails.root)
-      File.join(base, "themes", name)
+    def theme_path_for(name, base = ThemesForRails.config.base_dir, theme_dir = ThemesForRails.config.themes_dir)
+      File.join(base, theme_dir, name)
     end
   end
 end

data/lib/themes_for_rails/version.rb

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

data/lib/themes_for_rails/view_helpers.rb

@@ -1,8 +1,8 @@
 module ThemesForRails
   module ViewHelpers
-    
+
     extend ActiveSupport::Concern
-  
+
     included do
       include ThemesForRails::CommonMethods
     end
@@ -16,20 +16,20 @@ module ThemesForRails
       def current_theme_image_path(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
 
-      def theme_image_tag(source)
-        image_tag(theme_image_path(source))
+      def theme_image_tag(source, options = {})
+        image_tag(theme_image_path(source), options)
       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) }

data/test/common_methods_test.rb

@@ -0,0 +1,22 @@
+require File.expand_path("test/test_helper.rb")
+
+class ThemesForRailsTest < Test::Unit::TestCase
+  setup do
+    @common = Object.new
+    @common.extend ThemesForRails::CommonMethods
+    @common.theme_name = "awesome"
+    ThemesForRails.config.clear
+  end
+  should 'use config base_dir to build theme path' do
+    ThemesForRails.config.base_dir ='some_path'
+    assert_match /some_path/, @common.theme_path
+  end
+  should 'use config themes_dir to build theme path' do
+    ThemesForRails.config.themes_dir ='skinner'
+    assert_match /skinner/, @common.theme_path
+  end
+  should 'use config base_dir to build theme path for theme' do
+    ThemesForRails.config.base_dir ='some_path'
+    assert_match /some_path/, @common.theme_path_for('doodley')
+  end
+end

data/test/controller_methods_test.rb

@@ -1,4 +1,4 @@
-require "test_helper"
+require File.expand_path("test/test_helper.rb")
 
 class MyController < ActionController::Base
   def hello
@@ -9,6 +9,21 @@ class CustomThemeController < ActionController::Base
   def hello
     render :text => "Just a test"
   end
+  
+  def theme_selector
+    'custom'
+  end
+end
+class PrivateCustomThemeController < ActionController::Base
+  def hello
+    render :text => "Just a test"
+  end
+
+  private
+  
+  def private_theme_selector
+    'private_custom'
+  end
 end
 
 class ActionMailerInclusionTest < Test::Unit::TestCase
@@ -46,11 +61,18 @@ module ThemesForRails
       end
       context "setting the theme with a Symbol" do
         tests CustomThemeController
-        should "call the selected method" do
-          @controller.expects(:theme_selector).returns('custom')
+        should "call the selected private method" do
           CustomThemeController.theme :theme_selector
-          assert_equal nil, @controller.theme_name
           get :hello
+          assert_equal 'custom', @controller.theme_name
+        end
+      end
+      context "setting the theme with a Symbol (private)" do
+        tests PrivateCustomThemeController
+        should "call the selected private method" do
+          PrivateCustomThemeController.theme :private_theme_selector
+          get :hello
+          assert_equal 'private_custom', @controller.theme_name
         end
       end
     end

data/test/themes_for_rails_test.rb

@@ -4,5 +4,11 @@ class ThemesForRailsTest < Test::Unit::TestCase
   should 'know the available themes' do
     assert_equal ['default'], ThemesForRails.available_theme_names
   end
-  
+  should 'use config for each_theme_dir' do
+    ThemesForRails.config.base_dir = Rails.root + 'app'
+    assert_equal ['app_theme'], ThemesForRails.each_theme_dir.map {|f| File.basename(f) }
+  end
+  teardown do
+    ThemesForRails.config.clear
+  end
 end

data/test/view_helpers_test.rb

@@ -3,25 +3,28 @@ 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"')
+      assert_match /media=.screen/, theme_stylesheet_link_tag('cuac.css')
     end
-        
+
     should 'delegate options (lazy testing, I know)' do
-      assert theme_stylesheet_link_tag('cuac.css', :media => 'print').include?('media="print"')
+      assert_match /media=.print/, theme_stylesheet_link_tag('cuac.css', :media => 'print')
+    end
+    should 'delegate options in image_tag' do
+      assert_match /width=.40/, theme_image_tag('image.css', :size => '40x50')
     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.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lucas Florio"]
-  s.date = %q{2011-01-14}
+  s.date = %q{2011-02-02}
   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 = [
@@ -44,6 +44,7 @@ Gem::Specification.new do |s|
      "lib/themes_for_rails/version.rb",
      "lib/themes_for_rails/view_helpers.rb",
      "test/assets_controller_test.rb",
+     "test/common_methods_test.rb",
      "test/config_test.rb",
      "test/controller_methods_test.rb",
      "test/dummy_app/.gitignore",
@@ -114,6 +115,7 @@ Gem::Specification.new do |s|
   s.summary = %q{Themes support for rails (3)}
   s.test_files = [
     "test/assets_controller_test.rb",
+     "test/common_methods_test.rb",
      "test/config_test.rb",
      "test/controller_methods_test.rb",
      "test/dummy_app/app/controllers/application_controller.rb",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Lucas Florio
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-14 00:00:00 -03:00
+date: 2011-02-02 00:00:00 -03:00
 default_executable: 
 dependencies: []
 
@@ -55,6 +55,7 @@ files:
 - lib/themes_for_rails/version.rb
 - lib/themes_for_rails/view_helpers.rb
 - test/assets_controller_test.rb
+- test/common_methods_test.rb
 - test/config_test.rb
 - test/controller_methods_test.rb
 - test/dummy_app/.gitignore
@@ -151,6 +152,7 @@ specification_version: 3
 summary: Themes support for rails (3)
 test_files: 
 - test/assets_controller_test.rb
+- test/common_methods_test.rb
 - test/config_test.rb
 - test/controller_methods_test.rb
 - test/dummy_app/app/controllers/application_controller.rb