themes_for_rails 0.4.3 → 0.5.0.pre

data/lib/themes_for_rails/version.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module ThemesForRails
-  VERSION = "0.4.3"
+  VERSION = "0.5.0.pre"
 end

data/test/lib/{controller_methods_test.rb → action_controller_test.rb}

@@ -2,11 +2,15 @@
 require File.expand_path("test/test_helper.rb")
 
 class MyController < ActionController::Base
+
   def hello
     render :text => "Just a test"
   end
+
 end
+
 class CustomThemeController < ActionController::Base
+
   def hello
     render :text => "Just a test"
   end
@@ -14,8 +18,11 @@ class CustomThemeController < ActionController::Base
   def theme_selector
     'custom'
   end
+
 end
+
 class PrivateCustomThemeController < ActionController::Base
+
   def hello
     render :text => "Just a test"
   end
@@ -25,34 +32,41 @@ class PrivateCustomThemeController < ActionController::Base
   def private_theme_selector
     'private_custom'
   end
+
 end
 
 class ActionMailerInclusionTest < Test::Unit::TestCase
-  should "include the ControllerMethods module" do
-    assert ActionMailer::Base.included_modules.include?(ThemesForRails::ControllerMethods)
+
+  should "include the ActionController module" do
+    assert ActionMailer::Base.included_modules.include?(ThemesForRails::ActionController)
   end
+
 end
 
 class ActionControllerInclusionTest < Test::Unit::TestCase
-  should "include the ControllerMethods module" do
-    assert ActionController::Base.included_modules.include?(ThemesForRails::ControllerMethods)
+  should "include the ActionController module" do
+    assert ActionController::Base.included_modules.include?(ThemesForRails::ActionController)
   end
 end
 
 class ApplicationControllerInclusionTest < Test::Unit::TestCase
-  should "include the ControllerMethods module" do
-    assert ApplicationController.included_modules.include?(ThemesForRails::ControllerMethods)
+  should "include the ActionController module" do
+    assert ApplicationController.included_modules.include?(ThemesForRails::ActionController)
   end
 end
 
 module ThemesForRails
-  class ControllerMethodsTest < ActionController::TestCase  
+  class ActionControllerTest < ::ActionController::TestCase  
     context "at class level" do
+      
       should "respond_to theme" do
         assert ApplicationController.respond_to?(:theme)
       end
+
       context "setting the theme with a String" do
+        
         tests MyController
+        
         should "set the selected theme for all actions" do
           MyController.theme 'default'
           @controller.expects(:set_theme).with('default')
@@ -60,16 +74,22 @@ module ThemesForRails
           get :hello
         end        
       end
+      
       context "setting the theme with a Symbol" do
+        
         tests CustomThemeController
+        
         should "call the selected private method" do
           CustomThemeController.theme :theme_selector
           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
@@ -77,44 +97,74 @@ module ThemesForRails
         end
       end
     end
+
     context "at instance level" do
+
       tests ApplicationController
+
       should "respond_to theme" do
         assert @controller.respond_to?(:theme)
       end
+
       should "should store the theme's name" do
         @controller.theme 'default'
         assert_equal @controller.theme_name, 'default'
       end
+
       context "when a theme has been set" do
+        
         tests ApplicationController
+
         should "add the theme's view path to the front of the general view paths" do
           antes = @controller.view_paths.size
           @controller.theme 'default'  
           assert_equal antes + 1, @controller.view_paths.size
         end
+        
         should "have a proper view path" do
           @controller.theme 'default'
           view_path = @controller.view_paths.first
-          theme_path = File.expand_path(File.join("test", "dummy_app", "themes", "default", "views"))
-          assert_equal view_path.to_s, theme_path
+          theme_view_path = File.expand_path(File.join("test", "dummy_app", "themes", "default", "views"))
+          assert_equal view_path.to_s, theme_view_path
         end
+
       end
     end
     context "using url helpers" do
+
       tests ApplicationController
+      
       should "provide url method to access a given stylesheet file in the current theme" do
         @controller.theme 'default'
         assert_equal @controller.send(:current_theme_stylesheet_path, "style"), "/themes/default/stylesheets/style.css"
       end
+      
       should "provide url method to access a given javascript file in the current theme" do
         @controller.theme 'default'
         assert_equal @controller.send(:current_theme_javascript_path, "app"), "/themes/default/javascripts/app.js"
       end
+      
       should "provide url method to access a given image file in the current theme" do
         @controller.theme 'default'
         assert_equal @controller.send(:current_theme_image_path, "logo.png"), "/themes/default/images/logo.png"
       end
+
+      context "with multiple dots" do
+
+        tests ApplicationController
+
+        should "provide url method to access a given stylesheet file in the current theme" do
+          @controller.theme 'default'
+          assert_equal @controller.send(:current_theme_stylesheet_path, "style.compact"), "/themes/default/stylesheets/style.compact.css"
+        end
+        
+        should "provide url method to access a given javascript file in the current theme" do
+          @controller.theme 'default'
+          assert_equal @controller.send(:current_theme_javascript_path, "app.min"), "/themes/default/javascripts/app.min.js"
+        end
+        
+      end
+
     end
   end
 end

data/test/lib/{mailer_methods_test.rb → action_mailer_test.rb}

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require File.expand_path("test/test_helper.rb")
 
 THEME = 'pink'
@@ -15,7 +16,7 @@ class Notifier < ActionMailer::Base
 end
 
 module ThemesForRails
-  class MailerMethodsTest < ActionController::TestCase
+  class ActionMailerTest < ::ActionController::TestCase
 
     should "set theme using mail headers" do
       Notifier.any_instance.expects(:theme).with("purple")

data/test/lib/action_view_test.rb

@@ -0,0 +1,54 @@
+# encoding: utf-8
+require File.expand_path("test/test_helper.rb")
+
+class ViewHelpersTest < ::ActionController::IntegrationTest
+  
+  include ::ThemesForRails::ActionView
+  include ::ActionView::Helpers::AssetTagHelper
+  include ::ERB::Util
+  include ::ActionView::Helpers::TagHelper    
+  include ::ActionView::Helpers::FormTagHelper 
+  def theme_name
+    'default'
+  end
+
+  def config
+    @config ||= stub({:perform_caching => false, :asset_path => "/assets", :asset_host => ''})
+  end
+end
+
+module ThemesForRails
+  class CommonViewHelpersTest < ViewHelpersTest
+    
+    should "provide path helpers for a given theme name" do
+      
+      assert_equal "/themes/sometheme/stylesheets/style.css", theme_stylesheet_path('style', "sometheme")
+      assert_equal "/themes/sometheme/javascripts/app.js", theme_javascript_path('app', "sometheme")
+      assert_equal "/themes/sometheme/images/logo.png", theme_image_path('logo.png', "sometheme")
+      
+    end
+
+    should "provide path helpers for a given theme name with dots" do
+      
+      assert_equal "/themes/some.theme/stylesheets/style.css", theme_stylesheet_path('style', "some.theme")
+      assert_equal "/themes/some.theme/javascripts/app.js", theme_javascript_path('app', "some.theme")
+      assert_equal "/themes/some.theme/images/logo.png", theme_image_path('logo.png', "some.theme")
+      
+    end
+    
+    should 'delegate to stylesheet_link_tag' do
+      assert_match /media=.screen/, theme_stylesheet_link_tag('cuac.css')
+    end
+
+    should 'delegate options (lazy testing, I know)' do
+      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
+
+    should 'delegate options in image_submit_tag' do
+      assert_match /class=.search_button/, theme_image_submit_tag('image.png', :class => 'search_button')
+    end
+  end
+end

data/test/lib/assets_controller_test.rb

@@ -1,16 +1,20 @@
-require "test_helper"
+# encoding: utf-8
+require File.expand_path("test/test_helper.rb")
 
 module ThemesForRails
-  class AssetsControllerTest < ActionController::TestCase  
+  class AssetsControllerTest < ::ActionController::TestCase  
     tests ThemesForRails::AssetsController
+    
     should "respond to stylesheets" do
       assert @controller.respond_to?(:stylesheets)
     end
+
     should "respond with the right stylesheet file when requested" do
       get 'stylesheets', { :theme => 'default', :asset => 'style.css'}
       assert_response :success
       assert_equal @response.content_type, 'text/css'
     end
+    
     should "not be success when the stylesheet file is not found" do
       get 'stylesheets', { :theme => 'default', :asset => 'oldstyle.css'}
       assert_response :missing
@@ -20,16 +24,19 @@ module ThemesForRails
     should "respond to javascripts" do
       assert @controller.respond_to?(:javascripts)
     end
+
     should "respond with the right javascript file when requested" do
       get 'javascripts', { :theme => 'default', :asset => 'app.js'}
       assert_response :success
       assert_equal @response.content_type, 'text/javascript'
     end
+
     should "respond with the right javascript file when requested (including multiple dot on the filename)" do
       get 'javascripts', { :theme => 'default', :asset => 'app.min.js'}
       assert_response :success
       assert_equal @response.content_type, 'text/javascript'
     end
+
     should "not be success when the javascript file is not found" do
       get 'javascripts', { :theme => 'default', :asset => 'oldapp.js'}
       assert_response :missing
@@ -39,11 +46,13 @@ module ThemesForRails
     should "respond to images" do
       assert @controller.respond_to?(:images)
     end
+
     should "respond with the right image file when requested" do
       get 'images', { :theme => 'default', :asset => 'logo.png'}
       assert_response :success
       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'}
       assert_response :missing

data/test/lib/common_methods_test.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require File.expand_path("test/test_helper.rb")
 
 class ThemesForRailsTest < Test::Unit::TestCase
@@ -7,16 +8,21 @@ class ThemesForRailsTest < Test::Unit::TestCase
     @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
+    ThemesForRails.config.base_dir = '/some_path'
+    assert_match /some_path/, @common.theme_view_path
   end
-  should 'use config themes_dir to build theme path' do
-    ThemesForRails.config.themes_dir ='skinner'
-    assert_match /skinner/, @common.theme_path
+
+  should 'use config views_dir to build theme path' do
+    ThemesForRails.config.views_dir =':root/skinner/:name/views'
+    assert_match /skinner/, @common.theme_view_path_for('awesome')
+    assert_match /skinner/, @common.theme_view_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')
+    assert_match /some_path/, @common.theme_view_path_for('doodley')
   end
+
 end

data/test/lib/config_test.rb

@@ -1,4 +1,5 @@
-require 'test_helper'
+# encoding: utf-8
+require File.expand_path("test/test_helper.rb")
 
 class ThemesForRailsTest < Test::Unit::TestCase
   
@@ -12,7 +13,7 @@ class ThemesForRailsTest < Test::Unit::TestCase
   
   should 'change the directory to views' do
     ThemesForRails.config do |config|
-      config.themes_dir = 'another_themes'
+      config.themes_dir = ':root/another_themes'
     end
     
     assert_equal ['another_default'], ThemesForRails.available_theme_names

data/test/lib/integration_test.rb

@@ -0,0 +1,12 @@
+# encoding: utf-8
+require File.expand_path("test/test_helper.rb")
+
+class ThemesForRailsIntegrationTest < ::ActionController::IntegrationTest
+
+  should "work with Rails 3.0 default configuration" do
+    asset_path = "/themes/default/stylesheets/style.css"
+    get asset_path
+    assert_equal 200, status
+    assert_equal asset_path, path
+  end
+end

data/test/lib/routes_test.rb

@@ -1,7 +1,8 @@
-require "test_helper"
+# encoding: utf-8
+require File.expand_path("test/test_helper.rb")
 
 module ThemesForRails
-  class RoutingTest < ActionController::TestCase  
+  class RoutingTest < ::ActionController::TestCase  
     should "recognize stylesheets route" do
       assert_generates('/themes/default/stylesheets/app.css', { 
         :controller => 'themes_for_rails/assets', 

data/test/lib/themes_for_rails_test.rb

@@ -1,4 +1,5 @@
-require "test_helper"
+# encoding: utf-8
+require File.expand_path("test/test_helper.rb")
 
 class ThemesForRailsTest < Test::Unit::TestCase
   
@@ -7,7 +8,7 @@ class ThemesForRailsTest < Test::Unit::TestCase
   end
   
   should 'use config for each_theme_dir' do
-    ThemesForRails.config.themes_dir = 'another_themes'
+    ThemesForRails.config.themes_dir = ':root/another_themes'
     assert_equal %w(another_default), ThemesForRails.each_theme_dir.map {|theme| File.basename(theme) }
   end
   

data/test/support/extensions.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'active_support/test_case'
 
 class ActiveSupport::TestCase

data/test/test_helper.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 ENV["RAILS_ENV"] = "test"
 
 $:.unshift File.dirname(__FILE__)

data/themes_for_rails.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "test-unit"
   gem.add_development_dependency "contest"
   gem.add_development_dependency "mocha"
+  gem.add_development_dependency('rails', ["= 3.0.11"])
 end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: themes_for_rails
 version: !ruby/object:Gem::Version
-  version: 0.4.3
-  prerelease: 
+  version: 0.5.0.pre
+  prerelease: 6
 platform: ruby
 authors:
 - Lucas Florio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-27 00:00:00.000000000 Z
+date: 2012-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70284078427120 !ruby/object:Gem::Requirement
+  requirement: &2153226820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70284078427120
+  version_requirements: *2153226820
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70284078426700 !ruby/object:Gem::Requirement
+  requirement: &2153226400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70284078426700
+  version_requirements: *2153226400
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &70284078426220 !ruby/object:Gem::Requirement
+  requirement: &2153225940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70284078426220
+  version_requirements: *2153225940
 - !ruby/object:Gem::Dependency
   name: contest
-  requirement: &70284078425800 !ruby/object:Gem::Requirement
+  requirement: &2153225520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70284078425800
+  version_requirements: *2153225520
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70284078425380 !ruby/object:Gem::Requirement
+  requirement: &2153225100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70284078425380
+  version_requirements: *2153225100
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: &2153224580 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 3.0.11
+  type: :development
+  prerelease: false
+  version_requirements: *2153224580
 description: It allows an application to have many different ways of rendering static
   assets and dynamic views.
 email:
@@ -77,14 +88,16 @@ files:
 - .gitignore
 - .rspec
 - .rvmrc
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.textile
-- REVIEW_NOTES
-- RMU_REVIEW
 - Rakefile
-- TODO.textile
+- doc/README.textile
+- doc/REVIEW_NOTES
+- doc/RMU_REVIEW
+- doc/TODO.textile
 - 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
@@ -93,16 +106,17 @@ files:
 - lib/generators/themes_for_rails/theme_generator.rb
 - lib/tasks/themes_for_rails.rake
 - lib/themes_for_rails.rb
+- lib/themes_for_rails/action_controller.rb
+- lib/themes_for_rails/action_mailer.rb
+- lib/themes_for_rails/action_view.rb
 - lib/themes_for_rails/assets_controller.rb
 - lib/themes_for_rails/common_methods.rb
 - lib/themes_for_rails/config.rb
-- lib/themes_for_rails/controller_methods.rb
-- lib/themes_for_rails/mailer_methods.rb
+- lib/themes_for_rails/interpolation.rb
 - lib/themes_for_rails/railtie.rb
 - lib/themes_for_rails/routes.rb
 - lib/themes_for_rails/url_helpers.rb
 - lib/themes_for_rails/version.rb
-- lib/themes_for_rails/view_helpers.rb
 - test/dummy_app/.gitignore
 - test/dummy_app/Gemfile
 - test/dummy_app/Rakefile
@@ -158,14 +172,15 @@ files:
 - test/dummy_app/themes/default/stylesheets/style2.css
 - test/dummy_app/themes/default/views/layouts/default.html.erb
 - test/dummy_app/themes/default/views/products/index.html.erb
+- test/lib/action_controller_test.rb
+- test/lib/action_mailer_test.rb
+- test/lib/action_view_test.rb
 - test/lib/assets_controller_test.rb
 - test/lib/common_methods_test.rb
 - test/lib/config_test.rb
-- test/lib/controller_methods_test.rb
-- test/lib/mailer_methods_test.rb
+- test/lib/integration_test.rb
 - test/lib/routes_test.rb
 - test/lib/themes_for_rails_test.rb
-- test/lib/view_helpers_test.rb
 - test/support/extensions.rb
 - test/test_helper.rb
 - themes_for_rails.gemspec
@@ -184,12 +199,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Theme Support for Rails 3
@@ -249,13 +264,14 @@ test_files:
 - test/dummy_app/themes/default/stylesheets/style2.css
 - test/dummy_app/themes/default/views/layouts/default.html.erb
 - test/dummy_app/themes/default/views/products/index.html.erb
+- test/lib/action_controller_test.rb
+- test/lib/action_mailer_test.rb
+- test/lib/action_view_test.rb
 - test/lib/assets_controller_test.rb
 - test/lib/common_methods_test.rb
 - test/lib/config_test.rb
-- test/lib/controller_methods_test.rb
-- test/lib/mailer_methods_test.rb
+- test/lib/integration_test.rb
 - test/lib/routes_test.rb
 - test/lib/themes_for_rails_test.rb
-- test/lib/view_helpers_test.rb
 - test/support/extensions.rb
 - test/test_helper.rb