marilyn 0.0.2 → 0.0.3

data/lib/generators/marilyn/fish/app/assets/stylesheets/application.css

@@ -0,0 +1,8 @@
+/*
+ * This is a manifest file that'll automatically include all the stylesheets available in this directory
+ * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
+ * the top of the compiled file, but it's generally better to create a new file per style scope.
+ *= require reset
+ *= require_self
+ *= require_tree .
+*/

data/lib/generators/marilyn/fish/app/assets/stylesheets/reset.css

@@ -0,0 +1,250 @@
+html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+abbr, address, cite, code, del, dfn, em, img, ins, kbd, q, samp,
+small, strong, sub, sup, var, b, i, dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, figcaption, figure, footer, header, hgroup,
+menu, nav, section, summary, time, mark, audio, video {
+	margin: 0;
+	padding: 0;
+	border: 0;
+	outline: 0;
+	font-size: 100%;
+	vertical-align: baseline;
+	background: transparent;
+}
+
+article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section {
+	display: block;
+}
+
+nav ul {
+	list-style: none;
+}
+
+blockquote, q {
+	quotes: none;
+}
+
+blockquote:before, blockquote:after,
+q:before, q:after {
+	content: '';
+	content: none;
+}
+
+a {
+	margin: 0;
+	padding: 0;
+	font-size: 100%;
+	vertical-align: baseline;
+	background: transparent;
+}
+
+ins {
+	background-color: #ff9;
+	color: #000;
+	text-decoration: none;
+}
+
+mark {
+	background-color: #ff9;
+	color: #000;
+	font-style: italic;
+	font-weight: bold;
+}
+
+del {
+	text-decoration: line-through;
+}
+
+abbr[title], dfn[title] {
+	border-bottom: 1px dotted;
+	cursor: help;
+}
+
+table {
+	border-collapse: collapse;
+	border-spacing: 0;
+}
+
+hr {
+	display: block;
+	height: 1px;
+	border: 0;
+	border-top: 1px solid #ccc;
+	margin: 1em 0;
+	padding: 0;
+}
+
+input, select {
+	vertical-align: middle;
+}
+
+pre, code, kbd, samp {
+	font-family: monospace, sans-serif;
+}
+
+h1, h2, h3, h4, h5, h6 {
+	font-weight: normal;
+}
+
+html {
+	overflow-y: scroll;
+}
+
+ul, ol {
+	margin-left: 1.25em;
+}
+
+ol {
+	list-style-type: decimal;
+}
+
+a:active {
+	outline: none;
+}
+
+nav ul, nav li {
+	margin: 0;
+}
+
+small {
+	font-size: 85%;
+}
+
+strong, th {
+	font-weight: bold;
+}
+
+td, td img {
+	vertical-align: top;
+}
+
+sub {
+	vertical-align: sub;
+	font-size: smaller;
+}
+
+sup {
+	vertical-align: super;
+	font-size: smaller;
+}
+
+pre {
+	padding: 15px;
+	white-space: pre;
+	white-space: pre-wrap;
+	white-space: pre-line;
+	word-wrap: break-word;
+}
+
+textarea {
+	overflow: auto;
+}
+
+.ie6 legend, .ie7 legend {
+	margin-left: -7px;
+}
+
+input[type="radio"] {
+	margin-right: 2px;
+	vertical-align: text-bottom;
+}
+
+input[type="checkbox"] {
+	margin-right: 2px;
+	vertical-align: bottom;
+}
+
+.ie7 input[type="checkbox"] {
+	vertical-align: baseline;
+}
+
+.ie6 input {
+	vertical-align: text-bottom;
+}
+
+label, input[type="button"], input[type="submit"], button {
+	cursor: pointer;
+}
+
+button, input, select, textarea {
+	margin: 0;
+}
+
+input:valid, textarea:valid {
+}
+
+input:invalid, textarea:invalid {
+	border-radius: 1px;
+	-moz-box-shadow: 0 0 5px red;
+	-webkit-box-shadow: 0 0 5px red;
+	box-shadow: 0 0 5px red;
+}
+
+.no-boxshadow input:invalid,
+.no-boxshadow textarea:invalid {
+	background-color: #f0dddd;
+}
+
+button {
+	width: auto;
+	overflow: visible;
+}
+
+.ie7 img {
+	-ms-interpolation-mode: bicubic;
+}
+
+.g-ir {
+	display: block;
+	text-indent: -999em;
+	overflow: hidden;
+	background-repeat: no-repeat;
+	text-align: left;
+	direction: ltr;
+}
+
+.g-hidden {
+	display: none;
+	visibility: hidden;
+}
+
+.g-visuallyhidden {
+	position: absolute !important;
+	clip: rect(1px 1px 1px 1px);
+	clip: rect(1px, 1px, 1px, 1px);
+}
+
+.g-invisible {
+	visibility: hidden;
+}
+
+.g-clearfix:before, .g-clearfix:after {
+	content: "\0020";
+	display: block;
+	height: 0;
+	visibility: hidden;
+}
+
+.g-clearfix:after {
+	clear: both;
+}
+
+.g-clearfix {
+	zoom: 1;
+}
+
+.g-clear {
+	clear: both;
+	display: block;
+	height: 0;
+	visibility: hidden;
+	width: 100%;
+}
+
+/* Overrides extra padding in Firefox */
+button::-moz-focus-inner,
+input[type="submit"]::-moz-focus-inner {
+	padding: 0;
+	border: none;
+}

data/lib/generators/marilyn/fish/app/views/layouts/application.html.erb

@@ -2,9 +2,11 @@
 <html>
 <head>
   <title><%= yield(:title).blank? ? '' : "#{yield(:title)} :: " %><%= t('site_name') %></title>
-  <%= stylesheet_link_tag :all %>
-  <%= javascript_include_tag :defaults %>
+  <%= stylesheet_link_tag :application %>
+  <%= javascript_include_tag :application %>
   <%= csrf_meta_tag %>
+
+  <%= yield(:head) %>
 </head>
 <body>
 

data/lib/generators/marilyn/fish/db/migrate/add_default_user.rb

@@ -0,0 +1,18 @@
+class AddDefaultUser < ActiveRecord::Migration
+  DEFAULT_ADMIN_EMAIL = 'admin@black-sheep.ru'
+  DEFAULT_ADMIN_PASSWORD = 'admin_,tt'
+
+  def self.up
+    return if User.find_by_email(DEFAULT_ADMIN_EMAIL)
+
+    admin = User.create(:email => DEFAULT_ADMIN_EMAIL,
+                        :password => DEFAULT_ADMIN_PASSWORD)
+    admin.save
+  end
+
+  def self.down
+    admin = User.find_by_email(DEFAULT_ADMIN_EMAIL)
+    admin.delete if admin
+  end
+
+end

data/lib/generators/marilyn/fish/fish_generator.rb

@@ -1,6 +1,6 @@
 require 'rails/generators/base'
 require 'devise'
-require 'jquery-rails'
+#require 'jquery-rails'
 
 module Marilyn
   module Generators
@@ -26,7 +26,7 @@ module Marilyn
         copy_file('app/views/shared/_error_messages.html.erb')
       end
 
-      def replace_locales
+      def copy_locales
         en_locale_file = 'config/locales/en.yml'
         copy_file(en_locale_file, :force => force_change?(en_locale_file))
         copy_file('config/locales/ru.yml')
@@ -37,6 +37,12 @@ module Marilyn
         invoke('marilyn:stars_form')
       end
 
+      def copy_reset_css
+        application_css_file = 'app/assets/stylesheets/application.css'
+        copy_file(application_css_file, :force => force_change?(application_css_file))
+        copy_file('app/assets/stylesheets/reset.css')
+      end
+
       def invoke_welcome_controller_generator
         log :invoke, 'marilyn:welcome'
         invoke('marilyn:welcome')
@@ -46,17 +52,32 @@ module Marilyn
         install_gem_into_gemfile('russian')
       end
 
-      def invoke_jquery_rails
-        log :invoke, 'jquery:install'
-        invoke('jquery:install', [], :ui => true)
-        install_gem_into_gemfile('jquery-rails')
-      end
+      #def invoke_jquery_rails
+      #  log :invoke, 'jquery:install'
+      #  invoke('jquery:install', [], :ui => true)
+      #  install_gem_into_gemfile('jquery-rails')
+      #end
 
-      def invoke_devise
+      def install_devise
         log :invoke, 'devise'
         invoke('devise:install')
         invoke('devise', ['User'])
         install_gem_into_gemfile('devise')
+
+        last_line_regexp = /config\.assets\.debug = true\n/
+        inject_into_file('config/environments/development.rb', action_mailer_str('localhost:3000'),
+                         :after => last_line_regexp)
+
+        last_line_regexp = /config\.active_support\.deprecation = :notify\n/
+        inject_into_file('config/environments/production.rb', action_mailer_str('black-sheep.ru'),
+                         :after => last_line_regexp)
+      end
+
+      def copy_default_user_migration
+        migration_path = 'db/migrate/'
+        migration_file = 'add_default_user.rb'
+        copy_file("#{migration_path}#{migration_file}",
+                  "#{migration_path}#{Time.now.strftime('%Y%m%d%H%M%S')}_#{migration_file}")
       end
 
       def invoke_cancan_ability
@@ -81,6 +102,10 @@ module Marilyn
         marilyn_gem_regexp = /gem..marilyn..*\n/
         inject_into_file('Gemfile', "gem '#{gem_name}'\n", :after => marilyn_gem_regexp)
       end
+
+      def action_mailer_str(host)
+        "\n  config.action_mailer.default_url_options = { :host => '#{host}' }\n"
+      end
     end
   end
 end

data/lib/generators/marilyn/fish/lib/templates/erb/controller/view.html.erb

@@ -0,0 +1,4 @@
+<%%= title(t('<%= class_name.underscore %>.<%= action %>.title')) %>
+
+<h1><%= class_name %>#<%= @action %></h1>
+<p>Find me in <%= @path %></p>

data/lib/marilyn/version.rb

@@ -1,3 +1,3 @@
 module Marilyn
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/marilyn.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'cancan'
   s.add_dependency 'devise'
-  s.add_dependency 'jquery-rails'
-  s.add_dependency 'railties', '>= 3.0.0'
+  #s.add_dependency 'jquery-rails'
+  s.add_dependency 'railties', '>= 3.1.0'
 
   # specify any dependencies here; for example:
   # s.add_development_dependency "rspec"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: marilyn
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Gleb Averchuk
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-24 00:00:00 Z
+date: 2011-09-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cancan
@@ -46,7 +46,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: jquery-rails
+  name: railties
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -55,26 +55,12 @@ dependencies:
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: railties
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
         - 3
+        - 1
         - 0
-        - 0
-        version: 3.0.0
+        version: 3.1.0
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id003
 description: Provides a good templates for the generators instead of the Rails standard, as well as some minimal required files.
 email: 
 - altermn@gmail.com
@@ -91,12 +77,16 @@ files:
 - Rakefile
 - lib/generators/marilyn/email_validator/email_validator_generator.rb
 - lib/generators/marilyn/email_validator/lib/email_format_validator.rb
+- lib/generators/marilyn/fish/app/assets/stylesheets/application.css
+- lib/generators/marilyn/fish/app/assets/stylesheets/reset.css
 - lib/generators/marilyn/fish/app/helpers/application_helper.rb
 - lib/generators/marilyn/fish/app/views/layouts/application.html.erb
 - lib/generators/marilyn/fish/app/views/shared/_error_messages.html.erb
 - lib/generators/marilyn/fish/config/locales/en.yml
 - lib/generators/marilyn/fish/config/locales/ru.yml
+- lib/generators/marilyn/fish/db/migrate/add_default_user.rb
 - lib/generators/marilyn/fish/fish_generator.rb
+- lib/generators/marilyn/fish/lib/templates/erb/controller/view.html.erb
 - lib/generators/marilyn/fish/lib/templates/erb/scaffold/_form.html.erb
 - lib/generators/marilyn/fish/lib/templates/erb/scaffold/edit.html.erb
 - lib/generators/marilyn/fish/lib/templates/erb/scaffold/index.html.erb