web-app-theme 0.7.0 → 0.8.0

data/features/theme_generator.feature

@@ -5,38 +5,35 @@ Feature: Layout generation
   # script/generate theme
   Scenario: Generate a layout    
     Given I have a new rails app
-    And I have no layouts
-    And I have no stylesheets
-    When I generate a theme
-    Then I should have a layout named "application.html.erb"
-    And I should have a stylesheet named "web_app_theme.css"
-    And I should have a stylesheet named "web_app_theme_override.css"
-    And I should have a stylesheet named "themes/default/style.css"
-    And I should have an image named "web-app-theme/cross.png"
-    And I should have an image named "web-app-theme/key.png"
-    And I should have an image named "web-app-theme/tick.png"
-    And I should have an image named "web-app-theme/application_edit.png"
+    And   I have no layouts
+    And   I have no stylesheets
+    When  I generate a theme
+    Then  I should have a layout named "application.html.erb"
+    And   I should have a stylesheet named "web_app_theme.css"
+    And   The stylesheet "web_app_theme.css" should contain "web-app-theme/themes/default/"
   
   # script/generate theme admin
   Scenario: Generate a layout with a name
     Given I have a new rails app
-    And I have no layouts
-    And I generate a theme with name "admin"
-    Then I should have a layout named "admin.html.erb"
+    And   I have no layouts
+    And   I generate a theme with name "admin"
+    Then  I should have a layout named "admin.html.erb"
+    And   I should have a stylesheet named "web_app_theme.css"
+    And   The stylesheet "web_app_theme.css" should contain "web-app-theme/themes/default/"
   
   # script/generate theme --theme="drastic-dark"
   Scenario: Generate a layout choosing a theme
     Given I have a new rails app
     And I have no stylesheets
     And I generate a theme choosing the "drastic-dark" theme
-    Then I should have a stylesheet named "themes/drastic-dark/style.css"
+    Then The stylesheet "web_app_theme.css" should contain "web-app-theme/themes/drastic-dark/"
   
   # script/generate theme --theme=bec --no_layout
   Scenario: Generate only stylesheets without layout
     Given I have a new rails app
     And I have no layouts
     And I generate a theme without layout choosing the "bec" theme
-    Then I should have a stylesheet named "themes/bec/style.css"
+    Then The stylesheet "web_app_theme.css" should contain "web-app-theme/themes/bec/"
     But I should not have any layouts
   
   # script/generate theme --app_name="My New Application"
@@ -44,7 +41,7 @@ Feature: Layout generation
     Given I have a new rails app
     And I have no layouts
     And I generate a theme with application name "My New Application"
-    Then the layout "application.html.erb" should have "My New Application" as page title
+    Then The layout "application.html.erb" should contain "My New Application"
   
   # script/generate theme --type=sign
   Scenario: Generate layout for signin and signup
@@ -52,4 +49,4 @@ Feature: Layout generation
     And I have no layouts
     And I generate a theme for signin and signup
     Then I should have a layout named "sign.html.erb"
-    And I should have a layout named "sign.html.erb" with just a box
+    And I should have a layout named "sign.html.erb"

data/features/themed_generator.feature

@@ -5,8 +5,8 @@ Feature: Theme generation
 	# script/generate themed posts
 	Scenario: Creating CRUD views with controller path
 		Given I have a new rails app
-		And a model "Post"
-		When I generate views for controller "posts"
+                And I have a model named "post"
+                When I run the themed generator for the "posts" controller
 		Then I should have a view named "posts/index.html.erb"
 		And I should have a view named "posts/new.html.erb"
 		And I should have a view named "posts/show.html.erb"
@@ -15,8 +15,8 @@ Feature: Theme generation
 	# script/generate themed items Post
 	Scenario: Creating CRUD views with controller path and model name
 		Given I have a new rails app
-		And a model "Post"
-		When I generate views for controller "items" and model "Post"
+		And I have a model named "post"
+                When I run the themed generator for the "items" controller with the model "post"
 		Then I should have a view named "items/index.html.erb"
 		And I should have a view named "items/new.html.erb"
 		And I should have a view named "items/show.html.erb"
@@ -25,8 +25,8 @@ Feature: Theme generation
   # script/generate themed admin/items Post
 	Scenario: Creating CRUD views with controller path "admin/items" and model name
 		Given I have a new rails app
-		And a model "Post"
-		When I generate views for controller "admin/items" and model "Post"
+		And I have a model named "post"
+                When I run the themed generator for the "admin/items" controller with the model "post"
 		Then I should have a view named "admin/items/index.html.erb"
 		And I should have a view named "admin/items/new.html.erb"
 		And I should have a view named "admin/items/show.html.erb"
@@ -35,8 +35,8 @@ Feature: Theme generation
 	# script/generate themed admin/gallery_pictures
 	Scenario: Creating CRUD views with controller path "admin/gallery_pictures"
 		Given I have a new rails app
-		And a model "GalleryPicture"
-		When I generate views for controller "admin/gallery_pictures"
+                And I have a model named "GalleryPicture"
+                When I run the themed generator for the "admin/gallery_pictures" controller
 		Then I should have a view named "admin/gallery_pictures/index.html.erb"
 		And I should have a view named "admin/gallery_pictures/new.html.erb"
 		And I should have a view named "admin/gallery_pictures/show.html.erb"
@@ -45,8 +45,8 @@ Feature: Theme generation
 	# script/generate themed homes --type=text
 	Scenario: Creating text theme
 	  Given I have a new rails app
-	  When I generate text views for "homes"
+          When I run the themed generator for the "homes" controller with the option --"themed_type"="text"
 	  Then I should have a view named "homes/show.html.erb"
 	  And I should have a view named "homes/_sidebar.html.erb"
 	  
-	  
+	  

data/lib/generators/web_app_theme/assets/assets_generator.rb

@@ -0,0 +1,17 @@
+module WebAppTheme
+    class AssetsGenerator < Rails::Generators::Base
+      desc "Copy the --theme stylesheets to your rails application assets path, so you can customize them"
+      source_root File.expand_path('../../../../../app/assets/', __FILE__)
+      class_option :theme,        :type => :string,   :default => :default,   :desc => 'Specify the layout theme to be copied'
+
+      def copy_stylesheets
+        copy_file "stylesheets/web-app-theme/base.css"                , "app/assets/stylesheets/web-app-theme/base.css"
+        directory "stylesheets/web-app-theme/themes/#{options.theme}" , "app/assets/stylesheets/web-app-theme/themes/#{options.theme}"
+      end
+
+      def copy_images
+        directory "images/web-app-theme/themes/#{options.theme}"      , "app/assets/images/web-app-theme/themes/#{options.theme}"
+      end
+
+    end
+  end

data/lib/generators/web_app_theme/theme/templates/layout_admin.html.erb

@@ -2,7 +2,7 @@
 <html>
 <head>
   <title><%= options.app_name %></title>
-  <%%= stylesheet_link_tag "web-app-theme/base", "web-app-theme/themes/<%= options.theme %>/style", "web-app-theme/override", :cache => true %>
+  <%%= stylesheet_link_tag 'web_app_theme' %>
   <%%= javascript_include_tag :defaults, :cache => true %>
   <%%= csrf_meta_tag %>
 </head>

data/lib/generators/web_app_theme/theme/templates/layout_sign.html.erb

@@ -2,7 +2,7 @@
 <html>
 <head>
   <title><%= options.app_name %></title>
-  <%%= stylesheet_link_tag "web-app-theme/base", "web-app-theme/themes/<%= options.theme %>/style", "web-app-theme/override", :cache => true %>
+  <%%= stylesheet_link_tag "web_app_theme" %>
   <%%= csrf_meta_tag %>
 </head>
 <body>

data/lib/generators/web_app_theme/theme/templates/web_app_theme.css.erb

@@ -0,0 +1,9 @@
+/* 
+ * This css will include all web-app-theme css you need
+ *
+ *= require web-app-theme/base
+ *= require web-app-theme/themes/<%= options.theme %>/style.css
+ *= require_self
+ */
+
+/* Write here your css for overriding the theme's rules */

data/lib/generators/web_app_theme/theme/theme_generator.rb

@@ -1,5 +1,6 @@
 module WebAppTheme
   class ThemeGenerator < Rails::Generators::Base
+    desc "Installs the application layout and creates the web_app_theme.css"
     source_root File.expand_path('../templates', __FILE__)
     
     argument :layout_name, :type => :string, :default => 'application'
@@ -20,30 +21,13 @@ module WebAppTheme
         generate_haml_layout(admin_layout_name)        
       end                  
     end
-
-    def copy_base_stylesheets
-      copy_file "#{stylesheets_path}/base.css",     "public/stylesheets/web-app-theme/base.css"
-      copy_file "#{stylesheets_path}/override.css", "public/stylesheets/web-app-theme/override.css"
-    end
-    
-    def copy_theme_stylesheets
-      directory "#{stylesheets_path}/themes/#{options.theme}", "public/stylesheets/web-app-theme/themes/#{options.theme}"
-    end
     
-    def copy_images
-      directory "#{images_path}", "public/images/web-app-theme"
+    def copy_theme_stylesheet 
+      template "web_app_theme.css.erb", "app/assets/stylesheets/web_app_theme.css"
     end
     
   protected
   
-    def stylesheets_path
-      "../../../../../stylesheets"
-    end
-    
-    def images_path
-      "../../../../../images"
-    end
-    
     def generate_haml_layout(admin_layout_name)
       require 'haml'
       Dir.mktmpdir('web-app-theme-haml') do |haml_root|

data/lib/web-app-theme.rb

@@ -0,0 +1,5 @@
+module WebAppTheme
+  class Engine < Rails::Engine
+
+  end
+end

data/lib/web-app-theme/version.rb

@@ -0,0 +1,3 @@
+module WebAppTheme
+  VERSION = "0.8.0"
+end

data/spec/dummy/Rakefile

@@ -0,0 +1,7 @@
+#!/usr/bin/env rake
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+
+Dummy::Application.load_tasks

data/spec/dummy/app/assets/javascripts/application.js

@@ -0,0 +1,9 @@
+// This is a manifest file that'll be compiled into including all the files listed below.
+// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
+// be included in the compiled file accessible from http://example.com/assets/application.js
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+//= require jquery
+//= require jquery_ujs
+//= require_tree .

data/spec/dummy/app/assets/javascripts/testing.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

data/spec/dummy/app/assets/stylesheets/web_app_theme.css

@@ -0,0 +1,7 @@
+/* 
+ * This css will include all web-app-theme css you need
+ *
+ *= require web-app-theme/base
+ *= require web-app-theme/themes/default/style.css
+ *
+ */

data/spec/dummy/app/controllers/application_controller.rb

@@ -0,0 +1,3 @@
+class ApplicationController < ActionController::Base
+  protect_from_forgery
+end

data/spec/dummy/app/controllers/testing_controller.rb

@@ -0,0 +1,5 @@
+class TestingController < ApplicationController
+  def index
+  end
+
+end

data/spec/dummy/app/helpers/application_helper.rb

@@ -0,0 +1,2 @@
+module ApplicationHelper
+end

data/spec/dummy/app/helpers/testing_helper.rb

@@ -0,0 +1,2 @@
+module TestingHelper
+end

data/spec/dummy/app/models/post.rb

@@ -0,0 +1,2 @@
+class Post < ActiveRecord::Base
+end

data/spec/dummy/app/views/articles/_form.html.erb

@@ -0,0 +1,8 @@
+        
+<div class="group navform wat-cf">
+  <button class="button" type="submit">
+    <%= image_tag("web-app-theme/icons/tick.png", :alt => "#{t("web-app-theme.save", :default => "Save")}") %> <%= t("web-app-theme.save", :default => "Save") %>
+  </button>
+  <span class="text_button_padding"><%= t("web-app-theme.or", :default => "or") %></span>
+	<%= link_to t("web-app-theme.cancel", :default => "Cancel"), articles_path, :class => "text_button_padding link_button" %>
+</div>

data/spec/dummy/app/views/articles/_sidebar.html.erb

@@ -0,0 +1,13 @@
+<div class="block notice">
+  <h3>Simple Block</h3>
+  <div class="content">
+    <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>
+  </div>
+</div>
+<div class="block">
+  <h3>Links</h3>
+  <ul class="navigation">
+    <li><a href="#">Link 1</a></li>
+    <li><a href="#">Link 2</a></li>
+  </ul>
+</div>

data/spec/dummy/app/views/articles/edit.html.erb

@@ -0,0 +1,19 @@
+<div class="block">
+  <div class="secondary-navigation">
+    <ul class="wat-cf">
+      <li class="first"><%= link_to "#{t("web-app-theme.list", :default => "List")}", articles_path  %></li>
+      <li><%= link_to "#{t("web-app-theme.new", :default => "New")}", new_article_path %></li>
+      <li class="active"><%= link_to "#{t("web-app-theme.edit", :default => "Edit")}", edit_article_path %></li>
+    </ul>
+  </div>          
+  <div class="content">            
+    <h2 class="title"><%= t("web-app-theme.edit", :default => "Edit") %> Post</h2>
+    <div class="inner">
+      <%= form_for @post, :url => article_path(@post), :html => { :class => :form } do |f| -%>
+        <%= render :partial => "form", :locals => {:f => f} %>
+      <% end -%>
+    </div>
+  </div>
+</div>
+
+<% content_for :sidebar, render(:partial => 'sidebar') -%>

data/spec/dummy/app/views/articles/index.html.erb

@@ -0,0 +1,42 @@
+<div class="block">
+  <div class="secondary-navigation">
+    <ul class="wat-cf">
+      <li class="first active"><%= link_to "#{t("web-app-theme.list", :default => "List")}", articles_path  %></li>
+      <li><%= link_to "#{t("web-app-theme.new", :default => "New")}", new_article_path %></li>
+    </ul>
+  </div>          
+  <div class="content">          
+    <h2 class="title"><%= t("web-app-theme.all", :default => "All")  %> Posts</h2>
+    <div class="inner">
+      <table class="table">
+        <tr>             
+          <th class="first">ID</th>
+                    <th><%= t("web-app-theme.created_at", :default => "Created at")  %></th>
+          <th class="last">&nbsp;</th>
+        </tr>
+        <% @posts.each do |post| -%>
+        <tr class="<%= cycle("odd", "even") %>">
+          <td>
+            <%= post.id %>
+          </td>
+                    <td>
+            <%= post.created_at %>
+          </td>
+          <td class="last">
+            <%= link_to "#{t("web-app-theme.show", :default => "Show")}", article_path(post) %> |
+            <%= link_to "#{t("web-app-theme.edit", :default => "Edit")}", edit_article_path(post) %> |
+            <%= link_to "#{t("web-app-theme.delete", :default => "Delete")}", article_path(post), :method => :delete, :confirm => "#{t("web-app-theme.confirm", :default => "Are you sure?")}" %>
+          </td>
+        </tr>          
+        <% end -%>
+      </table>
+      <div class="actions-bar wat-cf">
+        <div class="actions">
+        </div>
+        
+      </div>
+    </div>
+  </div>
+</div>
+
+<% content_for :sidebar, render(:partial => 'sidebar') -%>

data/spec/dummy/app/views/articles/new.html.erb

@@ -0,0 +1,18 @@
+<div class="block">
+  <div class="secondary-navigation">
+    <ul class="wat-cf">
+      <li class="first"><%= link_to "#{t("web-app-theme.list", :default => "List")}", articles_path  %></li>
+      <li class="active"><%= link_to "#{t("web-app-theme.new", :default => "New")}", new_article_path %></li>
+    </ul>
+  </div>          
+  <div class="content">            
+    <h2 class="title"><%= t("web-app-theme.new", :default => "New")%>  Post</h2>
+    <div class="inner">
+      <%= form_for :post, :url => articles_path, :html => { :class => :form } do |f| -%>
+        <%= render :partial => "form", :locals => {:f => f} %>
+      <% end -%>
+    </div>
+  </div>
+</div>
+
+<% content_for :sidebar, render(:partial => 'sidebar') -%>

data/spec/dummy/app/views/articles/show.html.erb

@@ -0,0 +1,19 @@
+<div class="block">
+  <div class="secondary-navigation">
+    <ul class="wat-cf">
+      <li class="first"><%= link_to "#{t("web-app-theme.list", :default => "List")}", articles_path  %></li>
+      <li><%= link_to "#{t("web-app-theme.new", :default => "New")}", new_article_path %></li>
+      <li class="active"><%= link_to "#{t("web-app-theme.show", :default => "Show")}", article_path %></li>
+    </ul>
+  </div>          
+  <div class="content">
+    <div class="inner">
+            <div class="wat-cf">
+        <%= link_to image_tag("web-app-theme/icons/application_edit.png", :alt => "#{t("web-app-theme.edit", :default=> "Edit")}") + " " + t("web-app-theme.edit", :default=> "Edit"), edit_article_path(@post), :class => "button" %> 
+        <%= link_to image_tag("web-app-theme/icons/cross.png", :alt => "#{t("web-app-theme.delete", :default=> "Delete")}") + " " + t("web-app-theme.delete", :default => "Delete"), article_path(@post), :method => "delete", :class => "button", :confirm => "#{t("web-app-theme.confirm", :default => "Are you sure?")}" %>
+      </div>      
+    </div>
+  </div>
+</div>
+
+<% content_for :sidebar, render(:partial => 'sidebar') -%>

data/spec/dummy/app/views/layouts/application.html.erb

@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Web App</title>
+  <%= stylesheet_link_tag 'web_app_theme' %>
+  <%= javascript_include_tag :defaults, :cache => true %>
+  <%= csrf_meta_tag %>
+</head>
+<body>
+  <div id="container">
+    <div id="header">
+      <h1><a href="/">Web App</a></h1>
+      <div id="user-navigation">
+        <ul class="wat-cf">
+          <li><a href="#"><%= t("web-app-theme.profile", :default => "Profile") %></a></li>
+          <li><a href="#"><%= t("web-app-theme.settings", :default => "Settings") %></a></li>
+          <li><a href="/logout" class="logout"><%= t("web-app-theme.logout", :default => "Logout") %></a></li>
+        </ul>
+      </div>
+      <div id="main-navigation">
+        <ul class="wat-cf"></ul>
+      </div>
+    </div>    
+    <div id="wrapper" class="wat-cf">
+      <div class="flash">
+        <% flash.each do |type, message| -%>
+          <div class="message <%= type %>">
+            <p><%= message %></p>
+          </div>
+        <% end -%>
+      </div>
+      <div id="main">
+        <%= yield %>
+        <div id="footer">
+          <div class="block">
+            <p>Copyright &copy; <%= Time.now.year %> Web App.</p>
+          </div>      
+        </div>
+      </div>
+      <div id="sidebar">
+        <%= yield :sidebar %>
+      </div>
+    </div>    
+  </div>
+</body>
+</html>