web-app-theme 0.7.0 → 0.8.0

data/README.md

@@ -8,6 +8,13 @@ it wants to be an idea to start developing a complete web application layout.
 Installation
 ------------
 
+####Rails >= 3.1.0
+For this version, all the stylesheets are stored inside the gems assets path. They don't need to be copied to the to the application, unless you want to customize them (using the web_app_theme:assets generator). There only css file generated when you run the theme generator is the web_app_theme.css that includes the theme of your choice.
+Add to your gemfile:
+
+    gem 'web-app-theme', '~> 3.1.0'
+
+####Other versions
 You can use web-app-theme >= 0.6.2 with Rails 3. If you want to use it with rails 2, use web-app-theme 0.5.3
 Specify the web-app-theme gem in your Gemfile, only for :development and :test
 
@@ -49,6 +56,15 @@ If you need a layout for login and signup pages, you can use the `--type` option
 
     rails g web_app_theme:theme sign --layout-type=sign
 
+### Assets Generator
+
+Used to copy a theme of your choice from the gem to your application, without parameters it will copy the 'default' theme
+  
+  rails g web_app_theme:assets --theme=red
+
+This will copy the theme files on your app/assets/stylesheets/web-app-theme path.
+Also this will copy theme's images to app/assets/images/web-app-theme path
+
 ### Themed Generator
 
 Start creating your controllers manually or with a scaffold, and then use the `themed generator` to overwrite the previously generated views.
@@ -156,4 +172,4 @@ Credits
 -------
 
 * Icons: FAMFAMFAM Silk icons <http://www.famfamfam.com/lab/icons/silk/>
-* Buttons: Particletree - Rediscovering the Button Element <http://particletree.com/features/rediscovering-the-button-element/>
+* Buttons: Particletree - Rediscovering the Button Element <http://particletree.com/features/rediscovering-the-button-element/>

data/Rakefile

@@ -1,25 +1,23 @@
-require "rubygems"
-# require "cucumber/rake/task"
-# require "spec/rake/spectask"
-# 
-# Cucumber::Rake::Task.new
-
-# Spec::Rake::SpecTask.new do |t|
-#   t.spec_files = FileList['test/**/*_spec.rb']
-# end
-
-# task :default => [:spec, :cucumber]
-
+#!/usr/bin/env rake
 begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "web-app-theme"
-    gemspec.summary = "Web app theme generator"
-    gemspec.description = "Web app theme generator for rails projects"
-    gemspec.email = "andrea@gravityblast.com"
-    gemspec.homepage = "http://github.com/pilu/web-app-theme"
-    gemspec.authors = ["Andrea Franz"]
-  end
+  require 'bundler/setup'
 rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
-end
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
+begin
+  require 'rdoc/task'
+rescue LoadError
+  require 'rdoc/rdoc'
+  require 'rake/rdoctask'
+  RDoc::Task = Rake::RDocTask
+end
+
+RDoc::Task.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'TestingGem'
+  rdoc.options << '--line-numbers'
+  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+Bundler::GemHelper.install_tasks

data/features/assets_generator.feature

@@ -0,0 +1,18 @@
+Feature: Layout generation
+  In order to customize my great application layout
+  I should be able to copy web-app-theme default's styles to my application assets path 
+  
+  # script/generate theme
+  Scenario: Generate assets
+    Given I have a new rails app
+    When I generate assets 
+    Then I should have a stylesheet named "web-app-theme/base.css"
+    And  I should have a stylesheet named "web-app-theme/themes/default/style.css"
+
+  # script/generate theme
+  Scenario: Generate assets with --theme=red
+    Given I have a new rails app
+    And I have no stylesheets
+    When I generate assets choosing the "red" theme 
+    Then I should have a stylesheet named "web-app-theme/base.css"
+    And  I should have a stylesheet named "web-app-theme/themes/red/style.css"

data/features/step_definitions/assets_step.rb

@@ -0,0 +1,11 @@
+Given /^I generate assets$/ do
+  steps %Q{
+    And I run `rails generate web_app_theme:assets`
+  }
+end
+
+Given /^I generate assets choosing the "([^\"]*)" theme$/ do |theme_name|
+  steps %Q{
+    And I run `rails generate web_app_theme:assets --theme=#{theme_name}`
+  }
+end

data/features/step_definitions/common_steps.rb

@@ -0,0 +1,82 @@
+Given /^I have a new rails app$/ do
+  random = Random.rand(20)
+  steps %Q{
+    Given I run `rails new test_app#{random}`
+    And I cd to "test_app#{random}"
+    And a file named "Gemfile" with:
+    """
+      source 'http://rubygems.org'
+      gem 'rails', '3.1.0.rc6'
+      gem 'web-app-theme', :path => '../../../'
+    """
+    And I run `bundle install`
+  }
+end
+
+Then /^I should have a stylesheet named "([^"]*)"$/ do |css_file_name|
+  steps %Q{
+    When I run `ls -R app/assets/stylesheets`
+    Then the output should contain "#{css_file_name}"
+  }
+end
+
+Then /^I should have an image named "([^"]*)"$/ do |image_name|
+  steps %Q{
+    When I run `ls -R app/assets/images`
+    Then the output should contain "#{image_name}"
+  }
+end
+
+Then /^I should have a view named "([^"]*)"$/ do |view_name|
+  steps %Q{
+    When I run `ls -R app/views`
+    Then the output should contain "#{view_name}"
+  }
+end
+
+Then /^I should have a layout named "([^"]*)"$/ do |layout_name|
+  steps %Q{
+    When I run `ls -R app/views/layouts`
+    Then the output should contain "#{layout_name}"
+  }
+end
+
+Given /^I have no stylesheets$/ do
+  steps %Q{
+    And I run `rm -r app/assets/stylesheets/*`
+  }
+end
+
+Given /^I have no layouts$/ do
+  steps %Q{
+    And I run `rm -r app/views/layouts/*`
+  }
+end
+
+Given /^I have a model named "([^"]*)"$/ do |model_name|
+  steps %Q{
+    Given I run `rails g model #{model_name}`
+    Given I run `bundle exec rake db:migrate RAILS_ENV=test`
+  }
+end
+
+Then /^The stylesheet "([^"]*)" should contain "([^"]*)"$/ do |css_file, patern|
+  steps %Q{
+    When I run `cat app/assets/stylesheets/#{css_file}`
+    Then the output should contain "#{patern}"
+  }
+end
+
+Then /^The layout "([^"]*)" should contain "([^"]*)"$/ do |layout_file, patern|
+  steps %Q{
+    When I run `cat app/views/layouts/#{layout_file}`
+    Then the output should contain "#{patern}"
+  }
+end
+
+Then /^I should not have any layouts$/ do
+  steps %Q{
+    Then the file "application.html.erb" should not exist
+    Then the file "application.html.haml" should not exist
+  }
+end

data/features/step_definitions/theme_steps.rb

@@ -0,0 +1,35 @@
+Given /^I generate a theme$/ do
+  steps %Q{
+    And I run `rails g web_app_theme:theme`
+  }
+end
+
+Given /^I generate a theme with name "(.*)"$/ do |name|
+  steps %Q{
+    And I run `rails g web_app_theme:theme #{name}`
+  }
+end
+
+Given /^I generate a theme choosing the "(.*)" theme$/ do |theme_name|
+  steps %Q{
+    And I run `rails g web_app_theme:theme --theme=#{theme_name}`
+  }
+end
+
+Given /^I generate a theme without layout choosing the "(.*)" theme$/ do |theme_name|
+  steps %Q{
+    And I run `rails g web_app_theme:theme --theme=#{theme_name} --no_layout`
+  }
+end
+
+Given /^I generate a theme with application name "(.*)"$/ do |app_name|
+  steps %Q{
+    And I run `rails g web_app_theme:theme --app_name=#{app_name}`
+  }
+end
+
+Given /^I generate a theme for signin and signup$/ do
+  steps %Q{
+    And I run `rails g web_app_theme:theme --layout_type=sign`
+  }
+end

data/features/step_definitions/themed_steps.rb

@@ -1,19 +1,17 @@
-Given /^a model "([^\"]*)"$/ do |model_name|
-  generate_model(model_name)  
+Given /^I run the themed generator for the "([^\"]*)" controller$/ do |controller_name|
+  steps %Q{
+    And I run `rails g web_app_theme:themed #{controller_name}`
+  }
 end
 
-Given /^I generate views for controller "([^\"]*)"$/ do |controller_path|
-  generate_views(controller_path)
+When /I run the themed generator for the "([^\"]*)" controller with the model "([^\"]*)"/ do |controller_name, model_name|
+  steps %Q{
+    And I run `rails g web_app_theme:themed #{controller_name} #{model_name}`
+  }
 end
 
-When /^I generate views for controller "([^\"]*)" and model "([^\"]*)"$/ do |controller_path, model_name|
-  generate_views(controller_path, model_name)
+Given /^I run the themed generator for the "([^\"]*)" controller with the option --"([^\"]*)"="([^\"]*)"$/ do |controller_name, option, value|
+  steps %Q{
+    And I run `rails g web_app_theme:themed #{controller_name} --#{option}=#{value}`
+  }
 end
-
-When /^I generate text views for "([^\"]*)"/ do |controller_path|
-  generate_views(controller_path, :themed_type => :text)
-end
-
-Then /^I should have a view named "([^\"]*)"$/ do |view_path|
-  view_exists?(view_path).should be_true
-end

data/features/support/env.rb

@@ -1,86 +1,13 @@
-$:.unshift(File.dirname(__FILE__) + "/../../rails_generators")
-require "rubygems"
-require "rails_generator"
-require 'rails_generator/scripts/generate'
-require "fileutils"
-require "theme/theme_generator"
+ENV["RAILS_ENV"] ||= "test"
+require File.expand_path("../../../spec/dummy/config/environment.rb",  __FILE__)
+ENV["RAILS_ROOT"] ||= File.dirname(__FILE__) + "../../../spec/dummy"
 
-web_app_theme_root  = File.join(File.dirname(__FILE__), "/../../")
-tmp_rails_app_name  = "tmp_rails_app"
-tmp_rails_app_root  = File.join(web_app_theme_root, tmp_rails_app_name)
+require 'cucumber/rails'
+require 'aruba/cucumber'
 
-Rails::Generator::Base.append_sources(Rails::Generator::PathSource.new(:plugin, "#{web_app_theme_root}/rails_generators/"))
-
-module GeneratorHelpers
-  def generate_rails_app
-    FileUtils.mkdir(File.join(@app_root))
-  end    
-  
-  def remove_layouts
-    FileUtils.rm_rf(File.join(@app_root, "app", "views", "layouts"))
-  end
-  
-  def remove_stylesheets
-    FileUtils.rm_rf(File.join(@app_root, "public", "stylesheets"))
-  end
-  
-  def generate(*args)
-    options = !args.empty? && args.last.is_a?(Hash) ? args.pop : {}
-    options.merge!({:destination => @app_root, :quiet => true})    
-    Rails::Generator::Scripts::Generate.new.run(args, options)
-  end
-  
-  def generate_layout(*args)
-    generate(:theme, *args)
-  end
-  
-  def generate_views(*args)
-    generate(:themed, *args)
-  end
-  
-  def generate_model(model_name)
-    Object.const_get(model_name)
-  rescue NameError
-    Object.const_set(model_name, Class.new)
-    klass = Object.const_get(model_name)
-    def klass.columns; []; end
-  end
-  
-  def layouts_count
-    Dir[File.join(@app_root, "app", "views", "layouts", "**", "*.erb")].size
-  end
-  
-  def layout_exists?(filename)
-    File.exists?(File.join(@app_root, "app", "views", "layouts", filename))
-  end
-  
-  def view_exists?(view_path)
-    File.exists?(File.join(@app_root, "app", "views", view_path))
-  end
-  
-  def image_exists?(image_path)
-    File.exists?(File.join(@app_root, "public", "images", image_path))
-  end
-  
-  def stylesheet_exists?(relative_path)
-    File.exists?(File.join(@app_root, "public", "stylesheets", relative_path)).should be_true
-  end
-  
-  def layout_title(layout)
-    File.open(File.join(@app_root, "app", "views", "layouts", layout), "r").read.match(/<title>([^<]*)<\/title>/)[1]
-  end
-  
-  def layout_with_box?(layout)
-    File.open(File.join(@app_root, "app", "views", "layouts", layout), "r").read =~ %r|<div id="box">|
-  end
-end
 
 Before do
-  @app_root = tmp_rails_app_root  
-end
-
-After do
-  FileUtils.rm_rf(tmp_rails_app_root)
+  @aruba_timeout_seconds = 60
 end
 
-World(GeneratorHelpers)
+#require File.expand_path("../../step_definitions/common_steps", __FILE__)