RubyGems - themes_for_rails - Versions diffs - 0.2.2 → 0.2.4 - Mend

themes_for_rails 0.2.2 → 0.2.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (21) hide show

data/Gemfile.lock +1 -1
data/README.textile +15 -0
data/REVIEW_NOTES +0 -0
data/RMU_REVIEW +26 -0
data/TODO.textile +3 -0
data/index.html +49 -0
data/index.rss +16 -0
data/lib/themes_for_rails/assets_controller.rb +8 -6
data/lib/themes_for_rails/common_methods.rb +1 -1
data/lib/themes_for_rails/routes.rb +3 -3
data/lib/themes_for_rails/url_helpers.rb +3 -3
data/lib/themes_for_rails/version.rb +1 -1
data/lib/themes_for_rails/view_helpers.rb +3 -4
data/test/assets_controller_test.rb +13 -6
data/test/controller_methods_test.rb +2 -2
data/test/dummy_app/config/environments/test.rb +0 -1
data/test/dummy_app/themes/default/images/nested/logo.png +0 -0
data/test/routes_test.rb +12 -6
data/test/themes_for_rails_test.rb +1 -1
data/themes_for_rails.gemspec +8 -2
metadata +9 -3

data/Gemfile.lock CHANGED

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

data/README.textile CHANGED

@@ -143,6 +143,21 @@ KillerApp::Application.configure do
 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.
+You can do two things:
+comment out this line in your production.rb file:
+config.action_dispatch.x_sendfile_header = "X-Sendfile"
+or
+configure your web server to use it. :)
 h2. Documentation
 "Read it here":http://rubydoc.info/github/lucasefe/themes_for_rails/master/frames

data/REVIEW_NOTES ADDED

File without changes

data/RMU_REVIEW ADDED

@@ -0,0 +1,26 @@
+- Setup
+Add themes_for_rails to your Gemfile.
+gem 'themes_for_rails'
+Add themes_for_rails to your config/routes.rb
+Then follow the instructions provided in the README file.
+- Accomplishments
+I've accomplished several things:
+* I got the chance to know a lot about the Raisl 3 public API. I have worked a lot on hooking the themes support cleanly, and not using monkey patching.
+* I also learned about testing with the minimal. In this project I am not using rspec, but test_unit, so this was different from what I was used to.
+* This time, I build the library step by step, one part at a time, which was pretty different from what I did with the twitter lib. Progressively built. I required to do design first and then coding. Leasson learned.
+* Finally, coding style. Use vertical spaces.
+---NOTE---
+More information reading the specs, or the README.

data/TODO.textile ADDED

@@ -0,0 +1,3 @@
+- Allow to change the way the view path is added. Before or after.
+- Research how to integrate SASS to this scheme.

data/index.html ADDED

@@ -0,0 +1,49 @@
+<!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 ADDED

@@ -0,0 +1,16 @@
+<?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>

data/lib/themes_for_rails/assets_controller.rb CHANGED

@@ -5,13 +5,17 @@ module ThemesForRails
     include ThemesForRails::CommonMethods
     include ThemesForRails::UrlHelpers
     def stylesheets
-      render_asset theme_stylesheet_path_for(params[:theme], params[:asset]), 'text/css'
+      filename = File.basename(params[:asset], File.extname(params[:asset]))
+      render_asset theme_stylesheet_path_for(params[:theme], filename), 'text/css'
     end
     def javascripts
-      render_asset theme_javascript_path_for(params[:theme], params[:asset]), 'text/javascript'
+      filename = File.basename(params[:asset], File.extname(params[:asset]))
+      render_asset theme_javascript_path_for(params[:theme], filename), 'text/javascript'
     end
     def images
-      render_asset theme_image_path_for(params[:theme], params[:asset], params[:extension]), "image/#{params[:extension]}"
+      extension = File.extname(params[:asset])
+      filename = params[:asset].gsub(extension, '')
+      render_asset theme_image_path_for(params[:theme], filename, extension), "image/#{extension.gsub('.', '')}"
     end
   private
     def render_asset(asset, mime_type)
@@ -28,9 +32,7 @@ module ThemesForRails
     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 = nil)
-      extension ||= "png"
-      extension = ".#{extension}"
+    def theme_image_path_for(name, asset, extension = ".png")
       File.join(theme_path_for(name), 'images', "#{asset}#{extension}")
     end
   end

data/lib/themes_for_rails/common_methods.rb CHANGED

@@ -33,7 +33,7 @@ module ThemesForRails
     end
     # will add the view path for a given theme name
     def add_theme_view_path_for(name)
-      self.view_paths << ActionView::FileSystemResolver.new(view_path_for(name))
+      self.view_paths.insert 0, ActionView::FileSystemResolver.new(view_path_for(name))
     end
     def public_theme_path
       theme_path("/")

data/lib/themes_for_rails/routes.rb CHANGED

@@ -1,9 +1,9 @@
 module ThemesForRails
   module Routes
     def themes_for_rails
-      match 'themes/:theme/stylesheets/:asset(.:extension)' => 'themes_for_rails/assets#stylesheets', :as => :base_theme_stylesheet
-      match 'themes/:theme/javascripts/:asset(.:extension)' => 'themes_for_rails/assets#javascripts', :as => :base_theme_javascript
-      match 'themes/:theme/images/:asset(.:extension)' => 'themes_for_rails/assets#images', :as => :base_theme_image
+      match 'themes/:theme/stylesheets/*asset' => 'themes_for_rails/assets#stylesheets', :as => :base_theme_stylesheet
+      match 'themes/:theme/javascripts/*asset' => 'themes_for_rails/assets#javascripts', :as => :base_theme_javascript
+      match 'themes/:theme/images/*asset' => 'themes_for_rails/assets#images', :as => :base_theme_image
     end
   end
 end

data/lib/themes_for_rails/url_helpers.rb CHANGED

@@ -9,14 +9,14 @@ module ThemesForRails
     end
     module InstanceMethods
       def current_theme_stylesheet_path(asset)
-        base_theme_stylesheet_path(:theme => self.theme_name, :asset => asset, :extension => 'css')
+        base_theme_stylesheet_path(:theme => self.theme_name, :asset => "#{asset}.css")
       end
       def current_theme_javascript_path(asset)
-        base_theme_javascript_path(:theme => self.theme_name, :asset => asset, :extension => 'js')
+        base_theme_javascript_path(:theme => self.theme_name, :asset => "#{asset}.js")
       end
       def current_theme_image_path(asset)
         image, extension = asset.split(".")
-        base_theme_image_path(:theme => self.theme_name, :asset => image, :extension => extension)
+        base_theme_image_path(:theme => self.theme_name, :asset => "#{image}.#{extension}")
       end
     end
   end

data/lib/themes_for_rails/version.rb CHANGED

@@ -1,3 +1,3 @@
 module ThemesForRails
-  VERSION = "0.2.2"
+  VERSION = "0.2.4"
 end

data/lib/themes_for_rails/view_helpers.rb CHANGED

@@ -6,14 +6,13 @@ module ThemesForRails
     end
     module InstanceMethods
       def current_theme_stylesheet_path(asset)
-        base_theme_stylesheet_path(:theme => self.theme_name, :asset => asset, :extension => 'css')
+        base_theme_stylesheet_path(:theme => self.theme_name, :asset => "#{asset}.js")
       end
       def current_theme_javascript_path(asset)
-        base_theme_javascript_path(:theme => self.theme_name, :asset => asset, :extension => 'js')
+        base_theme_javascript_path(:theme => self.theme_name, :asset => "#{asset}.js")
       end
       def current_theme_image_path(asset)
-        image, extension = asset.split(".")
-        self.base_theme_image_path(:theme => self.theme_name, :asset => image, :extension => extension)
+        self.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

data/test/assets_controller_test.rb CHANGED

@@ -7,25 +7,26 @@ module ThemesForRails
       assert @controller.respond_to?(:stylesheets)
     end
     should "respond with the right stylesheet file when requested" do
-      get 'stylesheets', { :theme => 'default', :asset => 'style', :extension => 'css'}
+      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', :extension => 'css'}
+      get 'stylesheets', { :theme => 'default', :asset => 'oldstyle.css'}
       assert_response :missing
     end
     # javascripts
     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', :extension => 'js'}
+      get 'javascripts', { :theme => 'default', :asset => 'app.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', :extension => 'js'}
+      get 'javascripts', { :theme => 'default', :asset => 'oldapp.js'}
       assert_response :missing
     end
@@ -34,13 +35,19 @@ module ThemesForRails
       assert @controller.respond_to?(:images)
     end
     should "respond with the right image file when requested" do
-      get 'images', { :theme => 'default', :asset => 'logo', :extension => 'png'}
+      get 'images', { :theme => 'default', :asset => 'logo.png'}
       assert_response :success
       assert_equal @response.content_type, 'image/png'
     end
     should "not be success when the image file is not found" do
-      get 'images', { :theme => 'default', :asset => 'i_am_not_here', :extension => 'jpg'}
+      get 'images', { :theme => 'default', :asset => 'i_am_not_here.jpg'}
       assert_response :missing
     end
+    should "respond with a nested asset" do
+      get 'images', { :theme => 'default', :asset => 'nested/logo.png'}
+      assert_response :success
+      assert_equal @response.content_type, 'image/png'
+    end
   end
 end

data/test/controller_methods_test.rb CHANGED

@@ -46,14 +46,14 @@ module ThemesForRails
       end
       context "when a theme has been set" do
         tests ApplicationController
-        should "add the theme's view path to the list of general view paths" do
+        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.last
+          view_path = @controller.view_paths.first
           theme_path = File.join(File.expand_path(File.dirname(__FILE__)), "dummy_app", "themes", "default", "views")
           assert_equal view_path.to_s, theme_path
         end

data/test/dummy_app/config/environments/test.rb CHANGED

@@ -1,5 +1,4 @@
 DummyApp::Application.configure do
-  config.themes_for_rails.base_dir = File.join(Rails.root, "themes")
   # Settings specified here will take precedence over those in config/environment.rb
   # The test environment is used exclusively to run your application's

data/test/dummy_app/themes/default/images/nested/logo.png ADDED

File without changes

data/test/routes_test.rb CHANGED

@@ -7,8 +7,7 @@ module ThemesForRails
         :controller => 'themes_for_rails/assets',
         :action => 'stylesheets',
         :theme => 'default',
-        :asset => 'app',
-        :extension => 'css'
+        :asset => 'app.css'
       })
     end
     should "recognize javascripts route" do
@@ -16,8 +15,7 @@ module ThemesForRails
         :controller => 'themes_for_rails/assets',
         :action => 'javascripts',
         :theme => 'default',
-        :asset => 'app',
-        :extension => 'js'
+        :asset => 'app.js'
       })
     end
     should "recognize images route" do
@@ -25,8 +23,16 @@ module ThemesForRails
         :controller => 'themes_for_rails/assets',
         :action => 'images',
         :theme => 'default',
-        :asset => 'logo',
-        :extension => 'png'
+        :asset => 'logo.png'
+      })
+    end
+    should "recognize nested route" do
+      assert_generates('/themes/default/images/nested/logo.png', {
+        :controller => 'themes_for_rails/assets',
+        :action => 'images',
+        :theme => 'default',
+        :asset => 'nested/logo.png'
       })
     end
   end

data/test/themes_for_rails_test.rb CHANGED

@@ -2,6 +2,6 @@ require "test_helper"
 class ThemesForRailsTest < Test::Unit::TestCase
   should 'know the available themes' do
-    assert_equal ThemesForRails.available_theme_names, ['default']
+    assert_equal ['default'], ThemesForRails.available_theme_names
   end
 end

data/themes_for_rails.gemspec CHANGED

@@ -5,11 +5,11 @@
 Gem::Specification.new do |s|
   s.name = %q{themes_for_rails}
-  s.version = "0.2.2"
+  s.version = "0.2.4"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lucas Florio"]
-  s.date = %q{2010-09-16}
+  s.date = %q{2010-10-06}
   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 = [
@@ -21,7 +21,12 @@ Gem::Specification.new do |s|
      "Gemfile",
      "Gemfile.lock",
      "README.textile",
+     "REVIEW_NOTES",
+     "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",
@@ -80,6 +85,7 @@ Gem::Specification.new do |s|
      "test/dummy_app/public/stylesheets/.gitkeep",
      "test/dummy_app/script/rails",
      "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/style.css",
      "test/dummy_app/themes/default/stylesheets/style2.css",

metadata CHANGED

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments:
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 4
+  version: 0.2.4
 platform: ruby
 authors:
 - Lucas Florio
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-09-16 00:00:00 -03:00
+date: 2010-10-06 00:00:00 -03:00
 default_executable:
 dependencies: []
@@ -32,7 +32,12 @@ files:
 - Gemfile
 - Gemfile.lock
 - README.textile
+- REVIEW_NOTES
+- 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
@@ -91,6 +96,7 @@ files:
 - test/dummy_app/public/stylesheets/.gitkeep
 - test/dummy_app/script/rails
 - 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/style.css
 - test/dummy_app/themes/default/stylesheets/style2.css