themes_for_rails 0.2.5 → 0.3.0

data/.gitignore

@@ -1,3 +1,4 @@
 .bundle
 pkg
-tmp
+tmp
+.DS_Store

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    themes_for_rails (0.2.3)
+    themes_for_rails (0.2.5)
 
 GEM
   remote: http://rubygems.org/
@@ -42,24 +42,25 @@ GEM
       abstract (>= 1.0.0)
     gemcutter (0.6.1)
     git (1.2.5)
-    i18n (0.4.1)
+    i18n (0.4.2)
     jeweler (1.4.0)
       gemcutter (>= 0.1.0)
       git (>= 1.2.5)
       rubyforge (>= 2.0.0)
     json_pure (1.4.6)
-    mail (2.2.5)
+    mail (2.2.9)
       activesupport (>= 2.3.6)
-      mime-types
-      treetop (>= 1.4.5)
+      i18n (~> 0.4.1)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
     mime-types (1.16)
-    mocha (0.9.8)
+    mocha (0.9.9)
       rake
     polyglot (0.3.1)
     rack (1.2.1)
     rack-mount (0.6.13)
       rack (>= 1.0.0)
-    rack-test (0.5.4)
+    rack-test (0.5.6)
       rack (>= 1.0)
     rails (3.0.0)
       actionmailer (= 3.0.0)
@@ -75,21 +76,23 @@ GEM
       rake (>= 0.8.4)
       thor (~> 0.14.0)
     rake (0.8.7)
-    rspec (2.0.0.beta.20)
-      rspec-core (= 2.0.0.beta.20)
-      rspec-expectations (= 2.0.0.beta.20)
-      rspec-mocks (= 2.0.0.beta.20)
-    rspec-core (2.0.0.beta.20)
-    rspec-expectations (2.0.0.beta.20)
+    rspec (2.0.1)
+      rspec-core (~> 2.0.1)
+      rspec-expectations (~> 2.0.1)
+      rspec-mocks (~> 2.0.1)
+    rspec-core (2.0.1)
+    rspec-expectations (2.0.1)
       diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0.beta.20)
-    rspec-rails (2.0.0.beta.20)
-      rspec (= 2.0.0.beta.20)
+    rspec-mocks (2.0.1)
+      rspec-core (~> 2.0.1)
+      rspec-expectations (~> 2.0.1)
+    rspec-rails (2.0.1)
+      rspec (~> 2.0.0)
     rubyforge (2.0.4)
       json_pure (>= 1.1.7)
     sqlite3-ruby (1.3.1)
     test-unit (2.1.1)
-    thor (0.14.0)
+    thor (0.14.3)
     treetop (1.4.8)
       polyglot (>= 0.3.1)
     tzinfo (0.3.23)

data/README.textile

@@ -143,6 +143,34 @@ KillerApp::Application.configure do
 end
 </pre>
 
+Thanks to matheusca, now you can change the name of the theme's dir.
+
+<pre>
+KillerApp::Application.configure do
+  #
+  
+  config.themes_for_rails.themes_dir = "another_themes"
+
+  #...
+end
+</pre>
+
+
+h2. Another way to change things
+
+If you don't like this approach and prefer something more like an initializer file, you could create one an put something like this. 
+
+<pre>
+# Rails.root/config/initializers/themes_for_rails.rb (for instance)
+ThemesForRails.config do |config|
+  #
+  config.themes_dir = 'another_themes'
+  # ...
+end
+</pre>
+
+
+
 h2. Notes and Warnings.
 
 If you are running an app in production mode, and you get the static files with no content, is because you don't have X-senfile enabled at your web server. 

data/lib/themes_for_rails.rb

@@ -1,19 +1,25 @@
 module ThemesForRails
   class << self
-    attr_writer :base_dir
-    def base_dir
-      @base_dir ||= Rails.root
+
+    def config
+      @config ||= ThemesForRails::Config.new
+      yield(@config) if block_given?
+      @config
     end
+    
     def available_themes
-      Dir.glob("#{base_dir}/themes/*")
+      Dir.glob(File.join(config.base_dir, config.themes_dir, "*"))
     end
+    
     def available_theme_names
-      @available_theme_names ||= available_themes.map {|theme| File.basename(theme) } 
+      available_themes.map {|theme| File.basename(theme) } 
     end
+
   end
 end
 
 require 'active_support/dependencies'
+require 'themes_for_rails/config'
 require 'themes_for_rails/common_methods'
 require 'themes_for_rails/url_helpers'
 require 'themes_for_rails/view_helpers'

data/lib/themes_for_rails/assets_controller.rb

@@ -2,22 +2,33 @@ require "action_controller/metal"
 
 module ThemesForRails
   class AssetsController < ActionController::Base
+    
     include ThemesForRails::CommonMethods
     include ThemesForRails::UrlHelpers
+    
     def stylesheets
-      filename = File.basename(params[:asset], File.extname(params[:asset]))
+      filename, extension = extract_filename_and_extension_from(params[:asset])
       render_asset theme_stylesheet_path_for(params[:theme], filename), 'text/css'
     end
+    
     def javascripts
-      filename = File.basename(params[:asset], File.extname(params[:asset]))
+      filename, extension = extract_filename_and_extension_from(params[:asset])
       render_asset theme_javascript_path_for(params[:theme], filename), 'text/javascript'
     end
+    
     def images
-      extension = File.extname(params[:asset])
-      filename = params[:asset].gsub(extension, '')
+      filename, extension = extract_filename_and_extension_from(params[:asset])
       render_asset theme_image_path_for(params[:theme], filename, extension), "image/#{extension.gsub('.', '')}"
     end
+    
   private
+  
+    def extract_filename_and_extension_from(asset)
+      extension = File.extname(asset)
+      filename = params[:asset].gsub(extension, '')
+      return filename, extension
+    end
+    
     def render_asset(asset, mime_type)
       unless File.exists?(asset)
         render :text => 'not found', :status => 404
@@ -25,6 +36,7 @@ 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")

data/lib/themes_for_rails/config.rb

@@ -0,0 +1,24 @@
+module ThemesForRails
+  class Config
+
+    attr_writer :base_dir, :themes_dir
+    
+    def initialize(&block)
+      yield if block_given?
+    end
+    
+    def base_dir
+      @base_dir ||= Rails.root
+    end
+    
+    def themes_dir
+      @themes_dir ||= "themes"
+    end
+    
+    def clear
+      @base_dir = nil
+      @themes_dir = nil
+    end
+
+  end  
+end

data/lib/themes_for_rails/railtie.rb

@@ -6,7 +6,7 @@ module ThemesForRails
 
     config.to_prepare do
       ThemesForRails::Railtie.config.themes_for_rails.each do |key, value|
-        ThemesForRails.send "#{key}=".to_sym, value
+        ThemesForRails.config.send "#{key}=".to_sym, value
       end
     end
     rake_tasks do

data/lib/themes_for_rails/version.rb

@@ -1,3 +1,3 @@
 module ThemesForRails
-  VERSION = "0.2.5"
+  VERSION = "0.3.0"
 end

data/test/config_test.rb

@@ -0,0 +1,25 @@
+require 'test_helper'
+
+class ThemesForRailsTest < Test::Unit::TestCase
+  
+  should 'change the base directory' do
+    ThemesForRails.config do |config|
+      config.base_dir = 'empty_themes'
+    end
+    
+    assert_equal [], ThemesForRails.available_theme_names
+  end
+  
+  should 'change the directory to views' do
+    ThemesForRails.config do |config|
+      config.themes_dir = 'another_themes'
+    end
+    
+    assert_equal ['another_default'], ThemesForRails.available_theme_names
+  end
+  
+  teardown do
+    ThemesForRails.config.clear
+  end
+  
+end

data/test/dummy_app/another_themes/another_default/javascripts/app.js

@@ -0,0 +1 @@
+//js

data/test/dummy_app/another_themes/another_default/stylesheets/style2.css

@@ -0,0 +1,3 @@
+a {
+  color: green;
+}

data/test/dummy_app/another_themes/another_default/views/layouts/default.html.erb

@@ -0,0 +1,10 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+  <head>
+    <title>App!</title>
+  </head>
+  <body>
+    
+  </body>
+</html>

data/test/themes_for_rails_test.rb

@@ -4,4 +4,5 @@ class ThemesForRailsTest < Test::Unit::TestCase
   should 'know the available themes' do
     assert_equal ['default'], ThemesForRails.available_theme_names
   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.2.5"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lucas Florio"]
-  s.date = %q{2010-10-09}
+  s.date = %q{2010-11-01}
   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 = [
@@ -25,8 +25,6 @@ Gem::Specification.new do |s|
      "RMU_REVIEW",
      "Rakefile",
      "TODO.textile",
-     "index.html",
-     "index.rss",
      "init.rb",
      "lib/generators/theme_for_rails/install_generator.rb",
      "lib/generators/theme_for_rails/templates/theme/images/.gitkeep",
@@ -38,6 +36,7 @@ Gem::Specification.new do |s|
      "lib/themes_for_rails.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/railtie.rb",
      "lib/themes_for_rails/routes.rb",
@@ -45,10 +44,18 @@ Gem::Specification.new do |s|
      "lib/themes_for_rails/version.rb",
      "lib/themes_for_rails/view_helpers.rb",
      "test/assets_controller_test.rb",
+     "test/config_test.rb",
      "test/controller_methods_test.rb",
      "test/dummy_app/.gitignore",
      "test/dummy_app/Gemfile",
      "test/dummy_app/Rakefile",
+     "test/dummy_app/another_themes/another_default/images/logo.png",
+     "test/dummy_app/another_themes/another_default/images/nested/logo.png",
+     "test/dummy_app/another_themes/another_default/javascripts/app.js",
+     "test/dummy_app/another_themes/another_default/stylesheets/style.css",
+     "test/dummy_app/another_themes/another_default/stylesheets/style2.css",
+     "test/dummy_app/another_themes/another_default/views/layouts/default.html.erb",
+     "test/dummy_app/another_themes/another_default/views/products/index.html.erb",
      "test/dummy_app/app/controllers/application_controller.rb",
      "test/dummy_app/app/helpers/application_helper.rb",
      "test/dummy_app/app/views/layouts/application.html.erb",
@@ -68,6 +75,7 @@ Gem::Specification.new do |s|
      "test/dummy_app/config/locales/en.yml",
      "test/dummy_app/config/routes.rb",
      "test/dummy_app/db/seeds.rb",
+     "test/dummy_app/empty_themes/.gitkeep",
      "test/dummy_app/lib/tasks/.gitkeep",
      "test/dummy_app/public/404.html",
      "test/dummy_app/public/422.html",
@@ -104,6 +112,7 @@ Gem::Specification.new do |s|
   s.summary = %q{Themes support for rails (3)}
   s.test_files = [
     "test/assets_controller_test.rb",
+     "test/config_test.rb",
      "test/controller_methods_test.rb",
      "test/dummy_app/app/controllers/application_controller.rb",
      "test/dummy_app/app/helpers/application_helper.rb",

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 5
-  version: 0.2.5
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Lucas Florio
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-09 00:00:00 -03:00
+date: 2010-11-01 00:00:00 -03:00
 default_executable: 
 dependencies: []
 
@@ -36,8 +36,6 @@ files:
 - RMU_REVIEW
 - Rakefile
 - TODO.textile
-- index.html
-- index.rss
 - init.rb
 - lib/generators/theme_for_rails/install_generator.rb
 - lib/generators/theme_for_rails/templates/theme/images/.gitkeep
@@ -49,6 +47,7 @@ files:
 - lib/themes_for_rails.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/railtie.rb
 - lib/themes_for_rails/routes.rb
@@ -56,10 +55,18 @@ files:
 - lib/themes_for_rails/version.rb
 - lib/themes_for_rails/view_helpers.rb
 - test/assets_controller_test.rb
+- test/config_test.rb
 - test/controller_methods_test.rb
 - test/dummy_app/.gitignore
 - test/dummy_app/Gemfile
 - test/dummy_app/Rakefile
+- test/dummy_app/another_themes/another_default/images/logo.png
+- test/dummy_app/another_themes/another_default/images/nested/logo.png
+- test/dummy_app/another_themes/another_default/javascripts/app.js
+- test/dummy_app/another_themes/another_default/stylesheets/style.css
+- test/dummy_app/another_themes/another_default/stylesheets/style2.css
+- test/dummy_app/another_themes/another_default/views/layouts/default.html.erb
+- test/dummy_app/another_themes/another_default/views/products/index.html.erb
 - test/dummy_app/app/controllers/application_controller.rb
 - test/dummy_app/app/helpers/application_helper.rb
 - test/dummy_app/app/views/layouts/application.html.erb
@@ -79,6 +86,7 @@ files:
 - test/dummy_app/config/locales/en.yml
 - test/dummy_app/config/routes.rb
 - test/dummy_app/db/seeds.rb
+- test/dummy_app/empty_themes/.gitkeep
 - test/dummy_app/lib/tasks/.gitkeep
 - test/dummy_app/public/404.html
 - test/dummy_app/public/422.html
@@ -141,6 +149,7 @@ specification_version: 3
 summary: Themes support for rails (3)
 test_files: 
 - test/assets_controller_test.rb
+- test/config_test.rb
 - test/controller_methods_test.rb
 - test/dummy_app/app/controllers/application_controller.rb
 - test/dummy_app/app/helpers/application_helper.rb

data/index.html

@@ -1,49 +0,0 @@
-
-<!DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Transitional//EN http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd> 
-<html xmlns=http://www.w3.org/1999/xhtml>
-<head>
-<title>Lucas Florio's Git Achievements</title>
-<link rel="alternate" type="application/rss+xml" title"rss feed" href="index.rss"/>
-<link rel="stylesheet" type="text/css" href="style.css"/>
-</head>
-<body>
-
-<h2>Lucas Florio's Git Achievements</h2>
-Unlocked        7/       0 <a href="http://github.com/icefox/git-achievements">Git Achievements</a> for 30 points<br>
-<ul>
-<li><div class="title">Apprentice Architect (Level 1)</div>  <div class="info">Created a new repository with <a href="http://www.kernel.org/pub/software/scm/git/docs/git-init.html">git-init</a>.</div></li>
-<li><div class="title">Apprentice Author (Level 1)</div>  <div class="info">Made 2^Level commits using <a href="http://www.kernel.org/pub/software/scm/git/docs/git-commit.html">git-commit</a>.</div></li>
-<li><div class="title">Apprentice Goldsmith (Level 1)</div>  <div class="info">Reviewed patches before committing with <a href="http://www.kernel.org/pub/software/scm/git/docs/git-diff.html">git-diff</a> --cached.</div></li>
-<li><div class="title">Apprentice Goldsmith (Level 2)</div>  <div class="info">Reviewed patches before committing with <a href="http://www.kernel.org/pub/software/scm/git/docs/git-diff.html">git-diff</a> --cached.</div></li>
-<li><div class="title">Apprentice Goldsmith (Level 3)</div>  <div class="info">Reviewed patches before committing with <a href="http://www.kernel.org/pub/software/scm/git/docs/git-diff.html">git-diff</a> --cached.</div></li>
-<li><div class="title">Apprentice Socialite (Level 1)</div>  <div class="info">pushed a branch to a remote repository using <a href="http://www.kernel.org/pub/software/scm/git/docs/git-push.html">git-push</a></div></li>
-<li><div class="title">Apprentice Stone Mason (Level 1)</div>  <div class="info">Added files to the index area for inclusion in the next commit with <a href="http://www.kernel.org/pub/software/scm/git/docs/git-add.html">git-add</a></div></li>
-<li><div class="title">Garage Inventor</div>  <div class="info">Used a custom alias for a Git command</div></li>
-<li><div class="title">Goldsmith (Level 4)</div>  <div class="info">Reviewed patches before committing with <a href="http://www.kernel.org/pub/software/scm/git/docs/git-diff.html">git-diff</a> --cached.</div></li>
-<li><div class="title">Goldsmith (Level 5)</div>  <div class="info">Reviewed patches before committing with <a href="http://www.kernel.org/pub/software/scm/git/docs/git-diff.html">git-diff</a> --cached.</div></li>
-<li><div class="title">Student</div>  <div class="info">Accessed the documentation for a command with <a href="http://www.kernel.org/pub/software/scm/git/docs/git-.html">git-</a>[command] --help</div></li>
-</ul>
-Git commands sorted by usage:
-<pre style="text-align: left">
-  70 rev-parse
-  62 diff
-   7 st
-   5 achievements
-   2 push
-   2 init
-   2 ci
-   2 add
-   1 pull
-</pre>
-<script type="text/javascript">
-function showLocked() {
-    document.getElementById('locked').style.visibility = 'visible';
-    document.getElementById('showlocked').style.visibility = 'hidden';
-}
-</script>
-<a id="showlocked" href="javascript:showLocked()" >Show locked Achievements</a>
-<div id="locked">
-There are        0 Achievements. Some achievements can be leveled up depending on the number of times it is used (Used 2 times = level 1, 4 = level 2, 8 = level 3, 16 = level 4, 32 = level 5, etc)
-<ul>
-</ul></div>
-</body></html>

data/index.rss

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><rss version="2.0"><channel>
-<title>Lucas Florio's Git Achievements</title>
-<description></description>
-<link></link>
-<item><title>Apprentice Socialite (Level 1)</title><description>pushed a branch to a remote repository using git push</description></item>
-<item><title>Goldsmith (Level 5)</title><description>Reviewed patches before committing with git diff --cached.</description></item>
-<item><title>Apprentice Author (Level 1)</title><description>Made 2^Level commits using git commit.</description></item>
-<item><title>Apprentice Stone Mason (Level 1)</title><description>Added files to the index area for inclusion in the next commit with git add</description></item>
-<item><title>Goldsmith (Level 4)</title><description>Reviewed patches before committing with git diff --cached.</description></item>
-<item><title>Apprentice Architect (Level 1)</title><description>Created a new repository with git init.</description></item>
-<item><title>Garage Inventor</title><description>Used a custom alias for a Git command</description></item>
-<item><title>Apprentice Goldsmith (Level 3)</title><description>Reviewed patches before committing with git diff --cached.</description></item>
-<item><title>Apprentice Goldsmith (Level 2)</title><description>Reviewed patches before committing with git diff --cached.</description></item>
-<item><title>Apprentice Goldsmith (Level 1)</title><description>Reviewed patches before committing with git diff --cached.</description></item>
-<item><title>Student</title><description>Accessed the documentation for a command with git [command] --help</description></item>
-</channel></rss>