rails_dash 0.0.6 → 0.1.0

data/README.rdoc

@@ -1,5 +1,7 @@
 === NOTE: There are some incompatibilities between versions before 0.0.5, we're trying to improve this from version 0.0.5 and above
 
+=== NOTE: From version 0.1.0 and above erb will be use and no abstract class will be use 
+
 ---
 
 {<img src="https://codeclimate.com/github/mattways/rails_dash.png" />}[https://codeclimate.com/github/mattways/rails_dash] {<img src="https://travis-ci.org/mattways/rails_dash.png?branch=master" alt="Build Status" />}[https://travis-ci.org/mattways/rails_dash] {<img src="https://gemnasium.com/mattways/rails_dash.png" alt="Dependency Status" />}[https://gemnasium.com/mattways/rails_dash]
@@ -33,13 +35,13 @@ To change the behavior of a resource:
   app/controllers/dash/model_controller.rb
 
 To change the layout edit:
-  app/views/layouts/dash.html.haml
+  app/views/layouts/dash.html.erb
 
 To change the resource form edit:
-  app/views/dash/model/form.html.haml
+  app/views/dash/model/form.html.erb
 
 To change the resource grid edit:
-  app/views/dash/model/index.html.html
+  app/views/dash/model/index.html.erb
 
 To change the records in the grid and the filter behavior edit the filter scope in your resource model:
   app/models/model.rb

data/app/assets/stylesheets/rails_dash/content.scss

@@ -0,0 +1,5 @@
+
+#content {
+  padding: 40px 0 100px 0;
+}
+

data/app/assets/stylesheets/rails_dash/flash.scss

@@ -0,0 +1,24 @@
+
+#flash {
+  margin: 20px auto 5px auto;
+  padding-top: 5px;
+  font-size: 14px;
+  
+  p {
+    margin-bottom: 5px;
+    padding: 8px 24px;
+
+    &.success {
+      color: #4f8a10;
+      border: 1px solid #629827;
+      background: #dff2bf;
+    }
+
+    &.error {
+      color: #d8000c;
+      border: 1px solid #d8000c;
+      background: #ffbaba;
+    }
+  }
+}
+

data/app/assets/stylesheets/rails_dash/footer.scss

@@ -0,0 +1,16 @@
+
+#footer {
+  background: #272728;
+  height: 48px;
+  
+  * {
+    font-size: 10px;
+    line-height: 48px;
+  }
+    
+  #copyright {
+    float: left;
+    color: #b6b8bb;
+  }
+}
+

data/app/assets/stylesheets/rails_dash/forms.scss

@@ -0,0 +1,79 @@
+
+form {
+  margin: auto;
+  width: 452px;
+
+  a {
+    font-size: 13px;
+  }
+
+  fieldset {
+    border: none;
+      
+    legend {
+      float: left;
+      width: 100%;
+      text-align: right;
+      font-size: 14px;
+      padding-bottom: 6px;
+      margin: 15px 0 18px 0;
+      border-bottom: 1px dashed #d1d2d1;
+    }
+  }
+  
+  li {
+    width: 100%;
+    display: inline-block;
+    margin-bottom: 20px;
+
+    &.actions {
+      width: 100%;
+      margin-top: 18px;
+      text-align: right;
+      
+      button {
+        cursor: pointer;
+        border: none;
+        padding: 10px 22px;
+        background: #237b42;
+        color: #fff;
+        font-size: 12px;
+        text-transform: uppercase;
+
+        &:hover {
+          background: #4d4c4c;
+        }
+      }
+    }
+
+    label {
+      display: block;
+      font-size: 11px;
+      color: #908c8c;
+      padding-left: 12px;
+      margin-bottom: 5px;
+    }
+
+    input[type="text"],input[type="password"],textarea {
+      border: 1px solid #e8e8e8;
+      width: 416px;
+      padding: 9px 18px;
+      background: url(shadow.gif) top repeat-x;
+    }
+
+    input[type="text"],input[type="password"] {
+      height: 22px;
+    }
+
+    textarea {
+      resize: none;
+      height: 148px;
+      overflow: auto;
+    }
+      
+    img {
+      border: 1px solid #e8e8e8;
+    }
+  }
+}
+

data/app/assets/stylesheets/rails_dash/grid.scss

@@ -0,0 +1,65 @@
+
+#options {
+  display: inline-block;
+  width: 100%;
+  margin: 0 0 27px 0;
+
+  #search {
+    float: left;
+
+    input {
+      border: none;
+      float: left;
+      width: 158px;
+      line-height: 34px;
+      height: 32px;
+      padding: 0 36px 0 15px;
+      color: #adaeae;
+      background: url(filter.png);
+    }
+  }
+
+  a {
+    float: right;
+    margin-top: 0;
+  }
+}
+
+table {
+  border-collapse: collapse;
+  width: 100%;
+ 
+  th,td {
+    text-align: left;
+    color: #787878;
+    font-size: 12px;
+    padding: 0 15px;
+  }
+
+  th {
+    line-height: 32px;
+    height: 32px;
+    border: 1px solid #d2d3d3;
+    background: #e7e9e8;
+    font-weight: normal;
+  }
+
+  td {
+    line-height: 50px;
+    height: 50px;
+    border-bottom: 1px solid #eee;
+
+    img {
+      display: block;
+    }
+
+    &.actions {
+      width: 120px;
+
+      a {
+        margin-right: 5px;
+      }
+    }
+  }
+}
+

data/app/assets/stylesheets/rails_dash/header.scss

@@ -0,0 +1,19 @@
+
+#header {
+  background: #e7e9e8;
+  height: 61px;
+  padding-top: 30px;
+
+  h1 {
+    float: left;
+    color: #878787;
+    font-size: 29px;
+    line-height: 29px;
+    text-transform: uppercase;
+  }
+
+  form {
+    float: right;
+  }
+}
+

data/app/assets/stylesheets/rails_dash/index.css

@@ -0,0 +1,3 @@
+/*
+ *= require_directory .
+ */

data/app/assets/stylesheets/rails_dash/navigation.scss

@@ -0,0 +1,35 @@
+
+#navigation {
+  width: 100%;
+  height: 48px;
+  background: #4d4c4c;
+
+  * {
+    color: #fff;
+    font-size: 12px;
+    line-height: 48px;
+  }
+
+  a:hover {
+    color: #5d8869;
+  }
+
+  #menu {
+    float: left;
+
+    li {
+      float: left;
+      margin-right: 30px;
+    }
+  }
+
+  #session {
+    float: right;
+
+    * {
+      float: left;
+      margin-left: 30px;
+    }
+  }
+}
+

data/app/assets/stylesheets/rails_dash/page.scss

@@ -0,0 +1,9 @@
+
+#page {
+  width: 100%;
+  min-height: 100%;
+  height: auto !important;
+  height: 100%;
+  margin-bottom: -48px;
+}
+

data/app/assets/stylesheets/rails_dash/pager.scss

@@ -0,0 +1,36 @@
+
+#pager {
+  margin-top: 24px;
+  width: 100%;
+  text-align: right;
+  
+  * {
+    font-size: 12px;
+    color: #908c8c;
+  }
+    
+  a:hover,.current {
+    color: #237b42;
+  }
+    
+  .page {
+    margin: 0 3px;
+  }
+      
+  .first,.previous {
+    margin-right: 3px;
+  }
+    
+  .previous {
+    margin-right: 6px;
+  }
+    
+  .next,.last {
+    margin-left: 3px;
+  }
+    
+  .next {
+    margin-left: 6px;
+  }
+}
+

data/app/assets/stylesheets/rails_dash/style.scss

@@ -0,0 +1,53 @@
+
+* {
+  margin: 0;
+  padding: 0;
+}
+  
+html,body {
+  height: 100%;
+}
+
+body,input,textarea,select {
+  font-family: Armata;
+  color: #787878;
+}
+
+ul,li {
+  list-style: none;
+}
+
+a {
+  color: #5d8869;
+  cursor: pointer;
+  text-decoration: none;
+}
+
+.hidden-text {
+  overflow: hidden;
+  text-indent: -9999px;
+}
+
+.holder {
+  margin: auto;
+  width: 980px;
+}
+
+.button {
+  display: block;
+}
+  
+.action {
+  height: 32px;
+  padding: 0 20px;
+  background: #f1f3f2;
+  font-size: 11px;
+  line-height: 32px;
+  color: #797878;
+  text-transform: uppercase;
+  
+  &:hover {
+    background: #dbdddc;
+  }
+}
+

data/app/helpers/rails_dash/application_helper.rb

@@ -1,12 +1,8 @@
 module RailsDash
   module ApplicationHelper
 
-    def options(add_button=true)
-      render :partial => 'rails_dash/shared/options', :locals => { :add_button => add_button }
-    end
-
-    def pager(collection)
-      render :partial => 'rails_dash/shared/pager', :locals => { :collection => collection }
+    def header(new_path=nil)
+      render partial: 'rails_dash/header', locals: { new_path: new_path }
     end
 
   end

data/app/views/rails_dash/_header.html.erb

@@ -0,0 +1,8 @@
+<div id="options">
+  <%= form_tag request.fullpath, method: 'get', id: 'search' do %>
+    <%= text_field_tag :q, params[:q], placeholder: t('dash.grid.filter') %>
+  <% end %>
+  <% if new_path %>
+    <%= link_to t('dash.grid.create'), new_path, class: 'button action' %>
+  <% end %>
+</div>

data/config/locales/en.yml

@@ -2,8 +2,8 @@ en:
   dash:
     flash:
       success:
-        add: "Record added successfully."
-        edit: "Record edited successfully."
+        create: "Record added successfully."
+        update: "Record edited successfully."
         destroy: "Record destroyed successfully."
     menu:
       home: "Home"
@@ -14,11 +14,6 @@ en:
     grid:
       filter: "Filter"
       actions: "Actions"
-      add: "Add"
-      edit: "Edit"
+      create: "Add"
+      update: "Edit"
       destroy: "Destroy"
-    pager:
-      first: "First"
-      previous: "Previous"
-      next: "Next"
-      last: "Last"

data/config/locales/es.yml

@@ -2,8 +2,8 @@ es:
   dash:
     flash:
       success:
-        add: "Registro agregado correctamente."
-        edit: "Registro editado correctamente."
+        create: "Registro agregado correctamente."
+        update: "Registro editado correctamente."
         destroy: "Registro eliminiado correctamente."
     menu:
       home: "Inicio"
@@ -14,11 +14,6 @@ es:
     grid:
       filter: "Filtrar"
       actions: "Acciones"
-      add: "Agregar"
-      edit: "Editar"
+      create: "Agregar"
+      update: "Editar"
       destroy: "Eliminar"
-    pager:
-      first: "Primero"
-      previous: "Anterior"
-      next: "Siguiente"
-      last: "Último"

data/lib/generators/dash/install_generator.rb

@@ -4,10 +4,8 @@ module Dash
     source_root File.expand_path('../templates', __FILE__)
 
     def install
-      route "mount RailsDash::Engine => '/dash'"
-      route "namespace :dash do\n\n  end"
-      template 'dash.erb', 'app/controllers/dash_controller.rb'
-      template 'layout.erb', 'app/views/layouts/dash.html.haml'
+      template 'dash_controller.rb', 'app/controllers/dash_controller.rb'
+      copy_file 'dash.html.erb', 'app/views/layouts/dash.html.erb'
     end
 
   end

data/lib/generators/dash/resource_generator.rb

@@ -2,31 +2,22 @@ module Dash
   class ResourceGenerator < Rails::Generators::NamedBase
     
     source_root File.expand_path('../templates', __FILE__)
-
-    def add_route
-      insert_into_file 'config/routes.rb', :after => /namespace :dash(.*)/ do
-        "\n\n    resources :#{table_name}"
-      end
-    end
     
     def add_scope
-      insert_into_file "app/models/#{singular_name}.rb", :after => /class #{singular_name.camelize}(.*)/ do
-        "\n\n  scope :filter, lambda { |filter| where('', :filter => \"%\#{filter.present? ? filter.downcase : ''}%\") }"
-      end
-    end
-
-    def add_menu
-      insert_into_file 'app/views/layouts/dash.html.haml', :before => /(.*)#session(.*)/ do
-        "#{' ' * 16}%li\n" +
-        "#{' ' * 18}%a{ :href => main_app.url_for(:controller => 'dash/#{table_name}', :action => 'index'), :title => #{singular_name.camelize}.model_name.human(:count => 2) }\n" +
-        "#{' ' * 20}= #{singular_name.camelize}.model_name.human(:count => 2)\n"
+      insert_into_file "app/models/#{singular_name}.rb", after: /class #{singular_name.camelize}(.*)/ do
+        "\n\n  scope :filter, lambda { |filter| where('', filter: \"%\#{filter.to_s.downcase}%\") }"
       end
     end
 
     def create_templates
-      template 'resource.erb', "app/controllers/dash/#{table_name}_controller.rb"
-      template 'form.erb', "app/views/dash/#{table_name}/form.html.haml"
-      template 'index.erb', "app/views/dash/#{table_name}/index.html.haml"
+      @param_singular = ":#{singular_name}"
+      @param_plural = ":#{plural_name}"
+      @instance_singular = "@#{singular_name}"
+      @instance_plural = "@#{plural_name}"
+      @index_path = "dash_#{index_helper}_path"
+      template 'resource_controller.rb', "app/controllers/dash/#{table_name}_controller.rb"
+      template 'form.html.erb', "app/views/dash/#{table_name}/form.html.erb"
+      template 'index.html.erb', "app/views/dash/#{table_name}/index.html.erb"
     end
 
   end

data/lib/generators/dash/templates/dash.html.erb

@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<html lang="<%= I18n.locale %>">
+<head>
+  <title><%= @meta_title %></title>
+  <meta charset="utf-8" />
+  <%= google_fonts_link_tag 'Armata' %>
+  <%= stylesheet_link_tag 'rails_dash', :media => 'all' %>
+  <%= javascript_include_tag 'application' %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+  <div id="page">
+    <div id="navigation">
+      <div class="holder">
+        <ul id="menu">
+          <li><%= link_to t('dash.menu.home'), '#' %></li>
+        </ul>
+        <div id="session">
+          <%= link_to t('dash.session.logout'), '#', :class => 'button' %>
+        </div>
+      </div>
+    </div>
+    <% if @title.present? %>
+      <div id="header">
+        <div class="holder">
+          <h1><%= @title %></h1>
+        </div>
+      </div>
+    <% end %>
+    <% unless flash.empty? %>
+      <div id="flash" class="flash holder">
+        <% [:error, :success].each do |type| %>
+          <% if flash.key? type %>
+            <% flash[type].each do |message| %>
+              <p class="<%= type %>"><%= message.capitalize %></p>
+            <% end %>
+          <% end %>
+        <% end %>
+      </div>
+    <% end %>
+    <div id="content" class="holder"><%= yield %></div>
+  </div>
+  <div id="footer">
+    <div class="holder">
+      <p id="copyright"><%= t 'dash.footer.copyright', :year => Time.now.year %></p>
+    </div>
+  </div>
+</body>
+</html>

data/lib/generators/dash/templates/dash_controller.rb

@@ -0,0 +1,11 @@
+class DashController < ApplicationController
+  helper RailsDash::ApplicationHelper
+
+  before_filter :authorize
+
+  protected
+
+  def authorize
+  end
+
+end

data/lib/generators/dash/templates/form.html.erb

@@ -0,0 +1,7 @@
+<%%= form_for [:dash, <%= @instance_singular %>] do |f| %>
+  <ul>
+    <li class="actions">
+      <%%= f.submit %>
+    </li>
+  </ul>
+<%% end %>

data/lib/generators/dash/templates/index.html.erb

@@ -0,0 +1,19 @@
+<%%= header new_dash_<%= singular_name %>_path %>
+<table cellpadding="0" cellspacing="0">
+  <tr>
+    <th>#</th>
+    <th><%%= <%= class_name %>.human_attribute_name :created_at %></th>
+    <th class="actions"><%%= t 'dash.grid.actions' %></th>
+  </tr>
+  <%% <%= @instance_plural %>.each do |<%= singular_name %>| %>
+    <tr>
+      <td><%%= <%= singular_name %>.id %></td>
+      <td><%%= l <%= singular_name %>.created_at %></td>
+      <td class="actions">
+        <%%= link_to t('dash.grid.update'), [:dash, <%= singular_name %>] %>
+        <%%= link_to t('dash.grid.destroy'), [:dash, <%= singular_name %>], method: 'delete' %>
+      </td>
+    </tr>
+  <%% end %>
+</table>
+<%%= pager <%= @instance_plural %> %>

data/lib/generators/dash/templates/resource_controller.rb

@@ -0,0 +1,49 @@
+module Dash
+  class <%= plural_name.camelize %>Controller < DashController
+
+    def index
+      @meta_title = @title = <%= class_name %>.model_name.human(count: 2)
+      <%= @instance_plural %> = <%= class_name %>.filter(params[:q]).page(params[:p].present? ? params[:p].to_i : 1).per(15)
+    end
+
+    def new
+      @meta_title = @title = "#{t('dash.grid.create')} #{<%= class_name %>.model_name.human}"
+      <%= @instance_singular %> = <%= class_name %>.new
+      render :form
+    end
+    
+    def create
+      @meta_title = @title = "#{t('dash.grid.create')} #{<%= class_name %>.model_name.human}"
+      <%= @instance_singular %> = <%= class_name %>.new(params[<%= @param_singular %>])
+      if <%= @instance_singular %>.save
+        redirect_with_flash <%= @index_path %>, :success, t('dash.flash.success.create'), params
+      else
+        flash_errors <%= @instance_singular %>
+        render :form
+      end
+    end
+
+    def show
+      @meta_title = @title = "#{t('dash.grid.update')} #{<%= class_name %>.model_name.human}"
+      <%= @instance_singular %> = <%= class_name %>.find(params[:id])
+      render :form
+    end
+
+    def update
+      @meta_title = @title = "#{t('dash.grid.update')} #{<%= class_name %>.model_name.human}"
+      <%= @instance_singular %> = <%= class_name %>.find(params[:id])
+      if <%= @instance_singular %>.update_attributes(params[<%= @param_singular %>])
+        redirect_with_flash <%= @index_path %>, :success, t('dash.flash.success.update'), params
+      else
+        flash_errors <%= @instance_singular %>
+        render :form
+      end
+    end
+
+    def destroy
+      <%= class_name %>.destroy params[:id]
+      redirect_with_flash <%= @index_path %>, :success, t('dash.flash.success.destroy')
+    end  
+
+  end
+end

data/lib/rails_dash/version.rb

@@ -1,5 +1,5 @@
 module RailsDash
   
-  VERSION = '0.0.6'
+  VERSION = '0.1.0'
 
 end