From 70d08a992c81fcda793fe8b110b557963d9810f9 Mon Sep 17 00:00:00 2001
From: Pablo Olmos de Aguilera <pablo@glatelier.org>
Date: Sat, 11 Jun 2011 23:44:58 -0400
Subject: [PATCH 1/8] Add a template with the new syntax

---
 .../layout/templates/stylesheet.css.scss      | 67 +++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 lib/generators/nifty/layout/templates/stylesheet.css.scss

diff --git a/lib/generators/nifty/layout/templates/stylesheet.css.scss b/lib/generators/nifty/layout/templates/stylesheet.css.scss
new file mode 100644
index 0000000..c020093
--- /dev/null
+++ b/lib/generators/nifty/layout/templates/stylesheet.css.scss
@@ -0,0 +1,67 @@
+$primary_color: #4b7399;
+
+body {
+  background-color: $primary_color;
+  font: {
+    family: Verdana, Helvetica, Arial;
+    size: 14px; }; }
+
+a {
+  color: blue;
+  img {
+    border: none; } }
+
+.clear {
+  clear: both;
+  height: 0;
+  overflow: hidden; }
+
+#container {
+  width: 75%;
+  margin: 0 auto;
+  background: white;
+  padding: 20px 40px;
+  border: solid 1px black;
+  margin-top: 20px; }
+
+#flash_notice,
+#flash_error {
+  padding: 5px 8px;
+  margin: 10px 0; }
+
+#flash_notice {
+  background-color: #ccffcc;
+  border: solid 1px #66cc66; }
+
+#flash_error {
+  background-color: #ffcccc;
+  border: solid 1px #cc6666; }
+
+.fieldWithErrors {
+  display: inline; }
+
+#errorExplanation {
+  width: 400px;
+  border: 2px solid #cf0000;
+  padding: 0;
+  padding-bottom: 12px;
+  margin-bottom: 20px;
+  background-color: #f0f0f0;
+  h2 {
+    text-align: left;
+    padding: 5px 5px 5px 15px;
+    margin: 0;
+    font: {
+      weight: bold;
+      size: 12px; };
+    background-color: #cc0000;
+    color: white; }
+  p {
+    color: #333333;
+    margin-bottom: 0;
+    padding: 8px; }
+  ul {
+    margin: 2px 24px;
+    li {
+      font-size: 12px;
+      list-style: disc; } } }

From 7778493cc4b4f1c1ffb3c1482444e76f68b6ffd0 Mon Sep 17 00:00:00 2001
From: Pablo Olmos de Aguilera <pablo@glatelier.org>
Date: Sat, 11 Jun 2011 23:54:31 -0400
Subject: [PATCH 2/8] Change the stylesheet directory to be compatible with the
 new Rails 3.1 structure

---
 lib/generators/nifty/layout/USAGE               | 4 ++--
 lib/generators/nifty/layout/layout_generator.rb | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/generators/nifty/layout/USAGE b/lib/generators/nifty/layout/USAGE
index f94af0d..09b640d 100644
--- a/lib/generators/nifty/layout/USAGE
+++ b/lib/generators/nifty/layout/USAGE
@@ -14,12 +14,12 @@ Examples:
     rails generate nifty:layout
 
         Layout:     app/views/layouts/application.html.erb
-        Stylesheet: public/stylesheets/application.css
+        Stylesheet: app/assets/stylesheets/application.css
         Helper:     app/helpers/layout_helper.rb
 
 
     rails generate nifty:layout admin
 
         Layout:     app/views/layouts/admin.html.erb
-        Stylesheet: public/stylesheets/admin.css
+        Stylesheet: app/assets/stylesheets/admin.css
         Helper:     app/helpers/layout_helper.rb
diff --git a/lib/generators/nifty/layout/layout_generator.rb b/lib/generators/nifty/layout/layout_generator.rb
index abed99a..f5cf62f 100644
--- a/lib/generators/nifty/layout/layout_generator.rb
+++ b/lib/generators/nifty/layout/layout_generator.rb
@@ -10,10 +10,10 @@ class LayoutGenerator < Base
       def create_layout
         if options.haml?
           template 'layout.html.haml', "app/views/layouts/#{file_name}.html.haml"
-          copy_file 'stylesheet.sass', "public/stylesheets/sass/#{file_name}.sass"
+          copy_file 'stylesheet.sass', "app/assets/stylesheets/#{file_name}.sass"
         else
           template 'layout.html.erb', "app/views/layouts/#{file_name}.html.erb"
-          copy_file 'stylesheet.css', "public/stylesheets/#{file_name}.css"
+          copy_file 'stylesheet.css', "app/assets/stylesheets/#{file_name}.css"
         end
         copy_file 'layout_helper.rb', 'app/helpers/layout_helper.rb'
         copy_file 'error_messages_helper.rb', 'app/helpers/error_messages_helper.rb'

From 1efc2c0b6274dd51a6f094e624fe52c3ff51961c Mon Sep 17 00:00:00 2001
From: Pablo Olmos de Aguilera <pablo@glatelier.org>
Date: Sat, 18 Jun 2011 18:24:41 -0400
Subject: [PATCH 3/8] Modify cucumber features to reflect the new estructure

---
 features/nifty_layout.feature     | 18 +++++++++++++-----
 lib/generators/nifty/layout/USAGE |  4 ++--
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/features/nifty_layout.feature b/features/nifty_layout.feature
index eea37f8..00a629b 100644
--- a/features/nifty_layout.feature
+++ b/features/nifty_layout.feature
@@ -10,11 +10,19 @@ Feature: Nifty Layout Generator
     Then I should see "h(page_title" in file "app/helpers/layout_helper.rb"
     And I should see file "app/helpers/layout_helper.rb"
     And I should see file "app/helpers/error_messages_helper.rb"
-    And I should see file "public/stylesheets/application.css"
+    And I should see file "app/assets/stylesheets/application.css"
 
-  Scenario: Generate named layout with haml and sass
+  Scenario Outline: Generate named layout with haml
     Given a new Rails app
-    When I run "rails g nifty:layout FooBar --haml -f"
-    Then I should see "stylesheet_link_tag "foo_bar"" in file "app/views/layouts/foo_bar.html.haml"
-    And I should see file "public/stylesheets/sass/foo_bar.sass"
+    When I run "rails g nifty:layout FooBar --<option> -f"
+    Then I should see "stylesheet_link_tag "foo_bar" in file "app/views/layouts/foo_bar.html.haml"
+    And I should see file "app/assets/stylesheets/foo_bar.<sass_version>"
     And I should see file "app/helpers/layout_helper.rb"
+
+    Scenarios: and sass
+      | option | sass_version |
+      | haml   | sass         |
+
+    Scenarios: and scss
+      | option | sass_version |
+      | scss   | css.scss     |
diff --git a/lib/generators/nifty/layout/USAGE b/lib/generators/nifty/layout/USAGE
index 09b640d..5e40b26 100644
--- a/lib/generators/nifty/layout/USAGE
+++ b/lib/generators/nifty/layout/USAGE
@@ -3,8 +3,8 @@ Description:
   helper which will give some structure to a starting Rails app.
 
   The generator takes one argument which will be the name of the
-	layout and stylesheet files. If no argument is passed then it defaults
-	to "application".
+  layout and stylesheet files. If no argument is passed then it defaults
+  to "application".
 
   The helper module includes some methods which can be called in any
   template or partial to set variables to be used in the layout, such as

From 498f01ce79df09dd775496cd9c740576be700226 Mon Sep 17 00:00:00 2001
From: Pablo Olmos de Aguilera <pablo@glatelier.org>
Date: Sat, 18 Jun 2011 18:28:44 -0400
Subject: [PATCH 4/8] Add scss syntax option and modify directory estructure

---
 lib/generators/nifty/layout/layout_generator.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/generators/nifty/layout/layout_generator.rb b/lib/generators/nifty/layout/layout_generator.rb
index f5cf62f..d1922f3 100644
--- a/lib/generators/nifty/layout/layout_generator.rb
+++ b/lib/generators/nifty/layout/layout_generator.rb
@@ -6,11 +6,15 @@ class LayoutGenerator < Base
       argument :layout_name, :type => :string, :default => 'application', :banner => 'layout_name'
 
       class_option :haml, :desc => 'Generate HAML for view, and SASS for stylesheet.', :type => :boolean
+      class_option :scss, :desc => 'Generate HAML for view, and SCSS for stylesheet.', :type => :boolean
 
       def create_layout
         if options.haml?
           template 'layout.html.haml', "app/views/layouts/#{file_name}.html.haml"
           copy_file 'stylesheet.sass', "app/assets/stylesheets/#{file_name}.sass"
+        elsif options.scss?
+          template 'layout.html.haml', "app/views/layouts/#{file_name}.html.haml"
+          copy_file 'stylesheet.css.scss', "app/assets/stylesheets/#{file_name}.css.scss"
         else
           template 'layout.html.erb', "app/views/layouts/#{file_name}.html.erb"
           copy_file 'stylesheet.css', "app/assets/stylesheets/#{file_name}.css"

From 3b6a027aa50b046c63703327d39fade3edab3c6e Mon Sep 17 00:00:00 2001
From: Pablo Olmos de Aguilera <pablo@glatelier.org>
Date: Sat, 18 Jun 2011 21:48:08 -0400
Subject: [PATCH 5/8] Clean up to nifty_layout cucumber feature

---
 features/nifty_layout.feature | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/features/nifty_layout.feature b/features/nifty_layout.feature
index 00a629b..5709ee3 100644
--- a/features/nifty_layout.feature
+++ b/features/nifty_layout.feature
@@ -8,9 +8,10 @@ Feature: Nifty Layout Generator
     When I run "rails g nifty:layout -f"
     Then I should see "stylesheet_link_tag "application"" in file "app/views/layouts/application.html.erb"
     Then I should see "h(page_title" in file "app/helpers/layout_helper.rb"
-    And I should see file "app/helpers/layout_helper.rb"
-    And I should see file "app/helpers/error_messages_helper.rb"
-    And I should see file "app/assets/stylesheets/application.css"
+    And I should see the following files
+      | app/helpers/layout_helper.rb            |
+      | app/helpers/error_messages_helper.rb    |
+      | app/assets/stylesheets/application.css  |
 
   Scenario Outline: Generate named layout with haml
     Given a new Rails app

From c54c47eb53bc96aacdcfb94a8e4b6fd1ee62cfe1 Mon Sep 17 00:00:00 2001
From: Igor Bozato <igor.hrk@gmail.com>
Date: Fri, 24 Jun 2011 16:24:31 -0700
Subject: [PATCH 6/8] Just keep it readable

---
 .../layout/templates/stylesheet.css.scss      | 40 +++++++++++++------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/lib/generators/nifty/layout/templates/stylesheet.css.scss b/lib/generators/nifty/layout/templates/stylesheet.css.scss
index c020093..e130599 100644
--- a/lib/generators/nifty/layout/templates/stylesheet.css.scss
+++ b/lib/generators/nifty/layout/templates/stylesheet.css.scss
@@ -4,17 +4,22 @@ body {
   background-color: $primary_color;
   font: {
     family: Verdana, Helvetica, Arial;
-    size: 14px; }; }
+    size: 14px; 
+  }; 
+}
 
 a {
   color: blue;
   img {
-    border: none; } }
+    border: none; 
+  } 
+}
 
 .clear {
   clear: both;
   height: 0;
-  overflow: hidden; }
+  overflow: hidden; 
+}
 
 #container {
   width: 75%;
@@ -22,23 +27,28 @@ a {
   background: white;
   padding: 20px 40px;
   border: solid 1px black;
-  margin-top: 20px; }
+  margin-top: 20px; 
+}
 
 #flash_notice,
 #flash_error {
   padding: 5px 8px;
-  margin: 10px 0; }
+  margin: 10px 0; 
+}
 
 #flash_notice {
   background-color: #ccffcc;
-  border: solid 1px #66cc66; }
+  border: solid 1px #66cc66; 
+}
 
 #flash_error {
   background-color: #ffcccc;
-  border: solid 1px #cc6666; }
+  border: solid 1px #cc6666; 
+}
 
 .fieldWithErrors {
-  display: inline; }
+  display: inline; 
+}
 
 #errorExplanation {
   width: 400px;
@@ -53,15 +63,21 @@ a {
     margin: 0;
     font: {
       weight: bold;
-      size: 12px; };
+      size: 12px; 
+    };
     background-color: #cc0000;
-    color: white; }
+    color: white; 
+  }
   p {
     color: #333333;
     margin-bottom: 0;
-    padding: 8px; }
+    padding: 8px; 
+  }
   ul {
     margin: 2px 24px;
     li {
       font-size: 12px;
-      list-style: disc; } } }
+      list-style: disc; 
+    }
+  } 
+}
\ No newline at end of file

From 38099697704b6eb8cade9fb901acfde2ad6381a8 Mon Sep 17 00:00:00 2001
From: Maciej Litwiniuk <maciej@galdomedia.pl>
Date: Wed, 20 Jul 2011 17:48:34 +0200
Subject: [PATCH 7/8] copies assets to Rails 3.1 specific directory (if on
 Rails 3.1), does not overwrite application.css on Rails 3.1

---
 lib/generators/nifty/layout/layout_generator.rb | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/generators/nifty/layout/layout_generator.rb b/lib/generators/nifty/layout/layout_generator.rb
index d1922f3..64d66bb 100644
--- a/lib/generators/nifty/layout/layout_generator.rb
+++ b/lib/generators/nifty/layout/layout_generator.rb
@@ -9,15 +9,22 @@ class LayoutGenerator < Base
       class_option :scss, :desc => 'Generate HAML for view, and SCSS for stylesheet.', :type => :boolean
 
       def create_layout
+        style_name = file_name
+        style_path = 'public'
+        if (Rails.version =~ /^3\.1/) != nil
+          # For Rails 3.1 and its assets pipeline we don't want to overwrite application.css
+          style_name = 'nifty_layout' if file_name == 'application'
+          style_path = 'app/assets'
+        end
         if options.haml?
           template 'layout.html.haml', "app/views/layouts/#{file_name}.html.haml"
-          copy_file 'stylesheet.sass', "app/assets/stylesheets/#{file_name}.sass"
+          copy_file 'stylesheet.sass', "#{style_path}/stylesheets/#{style_name}.sass"
         elsif options.scss?
           template 'layout.html.haml', "app/views/layouts/#{file_name}.html.haml"
-          copy_file 'stylesheet.css.scss', "app/assets/stylesheets/#{file_name}.css.scss"
+          copy_file 'stylesheet.css.scss', "#{style_path}/stylesheets/#{style_name}.css.scss"
         else
           template 'layout.html.erb', "app/views/layouts/#{file_name}.html.erb"
-          copy_file 'stylesheet.css', "app/assets/stylesheets/#{file_name}.css"
+          copy_file 'stylesheet.css', "#{style_path}/stylesheets/#{style_name}.css"
         end
         copy_file 'layout_helper.rb', 'app/helpers/layout_helper.rb'
         copy_file 'error_messages_helper.rb', 'app/helpers/error_messages_helper.rb'

From 8ee7978d0bf1bc114b4d4ece089e428a49052066 Mon Sep 17 00:00:00 2001
From: Pablo Olmos de Aguilera Corradini <pablo@glatelier.org>
Date: Sat, 3 Sep 2011 16:39:15 -0300
Subject: [PATCH 8/8] Add the corresponding feature to the change in the
 directory structure

I tried to keep both versions (3.0.x and 3.1.x) on different gemsets
using rvm, but for some reason I couldn't. They kept going back to the main
gemset and being installed there. So, if Rails >=3.1.0 isn't installed
the nifty_layout_3.1 feature is going to fail.
---
 features/nifty_layout.feature                 | 15 +++++-----
 features/nifty_layout_3.1.feature             | 30 +++++++++++++++++++
 .../step_definitions/rails_setup_steps.rb     | 15 +++++++---
 3 files changed, 49 insertions(+), 11 deletions(-)
 create mode 100644 features/nifty_layout_3.1.feature

diff --git a/features/nifty_layout.feature b/features/nifty_layout.feature
index 5709ee3..5fe241e 100644
--- a/features/nifty_layout.feature
+++ b/features/nifty_layout.feature
@@ -3,27 +3,28 @@ Feature: Nifty Layout Generator
   As a rails developer
   I want to generate a simple layout
 
+  Background: Create a new rails app
+    Given a new Rails 3.0.x app
+
   Scenario: Generate normal application layout
-    Given a new Rails app
     When I run "rails g nifty:layout -f"
     Then I should see "stylesheet_link_tag "application"" in file "app/views/layouts/application.html.erb"
     Then I should see "h(page_title" in file "app/helpers/layout_helper.rb"
     And I should see the following files
       | app/helpers/layout_helper.rb            |
       | app/helpers/error_messages_helper.rb    |
-      | app/assets/stylesheets/application.css  |
+      | public/stylesheets/application.css      |
 
-  Scenario Outline: Generate named layout with haml
-    Given a new Rails app
+  Scenario Outline: Generate named layout with haml...
     When I run "rails g nifty:layout FooBar --<option> -f"
     Then I should see "stylesheet_link_tag "foo_bar" in file "app/views/layouts/foo_bar.html.haml"
-    And I should see file "app/assets/stylesheets/foo_bar.<sass_version>"
+    And I should see file "public/stylesheets/foo_bar.<sass_version>"
     And I should see file "app/helpers/layout_helper.rb"
 
-    Scenarios: and sass
+    Scenarios: ...and sass
       | option | sass_version |
       | haml   | sass         |
 
-    Scenarios: and scss
+    Scenarios: ...and scss
       | option | sass_version |
       | scss   | css.scss     |
diff --git a/features/nifty_layout_3.1.feature b/features/nifty_layout_3.1.feature
new file mode 100644
index 0000000..eed6822
--- /dev/null
+++ b/features/nifty_layout_3.1.feature
@@ -0,0 +1,30 @@
+Feature: Nifty Layout Generator
+  In order to have a layout
+  As a rails developer
+  I want to generate a simple layout
+
+  Background: Create a new rails app
+    Given a new Rails 3.1.x app
+
+  Scenario: Generate normal application layout
+    When I run "rails g nifty:layout -f"
+    Then I should see "stylesheet_link_tag "application"" in file "app/views/layouts/application.html.erb"
+    Then I should see "h(page_title" in file "app/helpers/layout_helper.rb"
+    And I should see the following files
+      | app/helpers/layout_helper.rb            |
+      | app/helpers/error_messages_helper.rb    |
+      | app/assets/stylesheets/application.css  |
+
+  Scenario Outline: Generate named layout with haml...
+    When I run "rails g nifty:layout FooBar --<option> -f"
+    Then I should see "stylesheet_link_tag "foo_bar" in file "app/views/layouts/foo_bar.html.haml"
+    And I should see file "app/assets/stylesheets/foo_bar.<sass_version>"
+    And I should see file "app/helpers/layout_helper.rb"
+
+    Scenarios: ...and sass
+      | option | sass_version |
+      | haml   | sass         |
+
+    Scenarios: ...and scss
+      | option | sass_version |
+      | scss   | css.scss     |
diff --git a/features/step_definitions/rails_setup_steps.rb b/features/step_definitions/rails_setup_steps.rb
index 9745819..57ac07f 100644
--- a/features/step_definitions/rails_setup_steps.rb
+++ b/features/step_definitions/rails_setup_steps.rb
@@ -1,6 +1,13 @@
 Given /^a new Rails app$/ do
-  FileUtils.mkdir_p("tmp")
-  system("rails new tmp/rails_app").should be_true
-  system("ln -s ../../../lib/generators tmp/rails_app/lib/generators").should be_true
-  @current_directory = File.expand_path("tmp/rails_app")
+#  FileUtils.mkdir_p("tmp")
+  system("rails new tmp/rails_app/any_version").should be_true
+  FileUtils.ln_s("../../../../lib/generators", "tmp/rails_app/any_version/lib/generators").should be_true
+  @current_directory = File.expand_path("tmp/rails_app/any_version")
+end
+
+Given /^a new Rails (\d+)\.(\d+)\.x app$/ do |major, minor|
+#  FileUtils.mkdir_p("tmp")
+  system("rails _#{major}.#{minor}_ new tmp/rails_app/version_#{major}.#{minor}.x").should be_true
+  FileUtils.ln_s("../../../../lib/generators", "tmp/rails_app/version_#{major}.#{minor}.x/lib/generators").should be_true
+  @current_directory = File.expand_path("tmp/rails_app/version_#{major}.#{minor}.x")
 end