rails_dash 0.0.2 → 0.0.3

data/README.rdoc

@@ -23,7 +23,7 @@ To generate a resource do:
 = Customize
 
 To protect the dash directory edit authorize filter in:
-  app/controller/dash_controller.rb
+  app/controllers/dash_controller.rb
 
 To change the behavior of a resource:
   app/controllers/dash/model_controller.rb
@@ -36,3 +36,6 @@ To change the resource form edit:
 
 To change the resource grid edit:
   app/views/dash/model/index.html.html
+
+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/controllers/rails_dash/base_controller.rb

@@ -3,8 +3,6 @@ module RailsDash
 
     before_filter :year
 
-    layout 'dash'
-
     protected
 
     def year

data/app/controllers/rails_dash/crud_controller.rb

@@ -5,20 +5,20 @@ module RailsDash
 
     def index
       @meta_title = @title = "#{@model.model_name.human :count => 2}"
-      @records = @model.list(page, filter)
+      @records = @model.filter(filter).page(page)
     end
 
     def new
-      @meta_title = @title = "#{t('global.add')} #{@model.model_name.human}"
+      @meta_title = @title = "#{t('dash.grid.add')} #{@model.model_name.human}"
       @record = @model.new
       render :form
     end
     
     def create
-      @meta_title = @title = "#{t('global.add')} #{@model.model_name.human}"
+      @meta_title = @title = "#{t('dash.grid.add')} #{@model.model_name.human}"
       @record = @model.new(params[param])
       if @record.save
-        redirect_with_flash(index_path, :success, t('flash.success.add'), params)
+        redirect_with_flash(index_path, :success, t('dash.flash.success.add'), params)
       else
         flash_errors @record
         render :form
@@ -26,16 +26,16 @@ module RailsDash
     end
 
     def show
-      @meta_title = @title = "#{t('global.view')} #{@model.model_name.human}"
+      @meta_title = @title = "#{t('dash.grid.edit')} #{@model.model_name.human}"
       @record = @model.find(params[:id])
       render :form
     end
 
     def update
-      @meta_title = @title = "#{t('global.view')} #{@model.model_name.human}"
+      @meta_title = @title = "#{t('dash.grid.edit')} #{@model.model_name.human}"
       @record = @model.find(params[:id])
       if @record.update_attributes(params[param])
-        redirect_with_flash index_path, :success, t('flash.success.edit'), params
+        redirect_with_flash index_path, :success, t('dash.flash.success.edit'), params
       else
         flash_errors @record
         render :form
@@ -44,7 +44,7 @@ module RailsDash
 
     def destroy
       @model.destroy params[:id]
-      redirect_with_flash index_path, :success, t('flash.success.delete')
+      redirect_with_flash index_path, :success, t('dash.flash.success.destroy')
     end  
     
     protected

data/config/locales/en.yml

@@ -0,0 +1,24 @@
+en:
+  dash:
+    flash:
+      success:
+        add: "Record added successfully."
+        edit: "Record edited successfully."
+        destroy: "Record destroyed successfully."
+    menu:
+      home: "Home"
+    session:
+      logout: "Logout"
+    footer:
+      copyright: "Dash © %{year}"
+    grid:
+      filter: "Filter"
+      actions: "Actions"
+      add: "Add"
+      edit: "Edit"
+      destroy: "Destroy"
+    pager:
+      first: "First"
+      previous: "Previous"
+      next: "Next"
+      last: "Last"

data/config/locales/es.yml

@@ -0,0 +1,24 @@
+es:
+  dash:
+    flash:
+      success:
+        add: "Registro agregado correctamente."
+        edit: "Registro editado correctamente."
+        destroy: "Registro eliminiado correctamente."
+    menu:
+      home: "Inicio"
+    session:
+      logout: "Salir"
+    footer:
+      copyright: "Panel © %{year}"
+    grid:
+      filter: "Filtrar"
+      actions: "Acciones"
+      add: "Agregar"
+      edit: "Editar"
+      destroy: "Eliminar"
+    pager:
+      first: "Primero"
+      previous: "Anterior"
+      next: "Siguiente"
+      last: "Último"

data/lib/generators/dash/resource_generator.rb

@@ -4,8 +4,22 @@ module Dash
     source_root File.expand_path('../templates', __FILE__)
 
     def add_route
-      gsub_file 'config/routes.rb', /namespace :dash(.*)/ do |match|
-        "#{match}\n\n    resources :#{table_name}"
+      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}%\") }"
+      end
+    end
+
+    def add_menu
+      insert_into_file 'app/views/layouts/dash.html.haml', :before => /(.*)#session(.*)/ do
+        "#{' ' * 16}%li\n" +
+        "#{' ' * 18}%a{ :href => url_for([:dash, :#{table_name}]), :title => #{singular_name.camelize}.model_name.human(:count => 2) }\n" +
+        "#{' ' * 20}= #{singular_name.camelize}.model_name.human(:count => 2)\n"
       end
     end
 

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

@@ -1,5 +1,5 @@
 #options
   = form_tag request.fullpath, :method => 'get', :id => 'search' do
-    = text_field_tag :q, (params[:q].present? ? params[:q] : t('layouts.dash.options.search_text')), :onblur => "if (this.value == '') {this.value = '#{t('layouts.dash.options.search_text')}';}", :onfocus => "if (this.value == '#{t('layouts.dash.options.search_text')}') {this.value = '';}"
+    = text_field_tag :q, (params[:q].present? ? params[:q] : t('dash.grid.filter')), :onblur => "if (this.value == '') {this.value = '#{t('dash.grid.filter')}';}", :onfocus => "if (this.value == '#{t('dash.grid.filter')}') {this.value = '';}"
   %a.button.action{ :href => url_for([:new, :dash, @model.name.underscore.to_sym]) }
-    = t('global.add')
+    = t('dash.grid.add')

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

@@ -6,7 +6,7 @@
     %th
       = @model.human_attribute_name('created_at')     
     %th.actions
-      = t('global.actions')
+      = t('dash.grid.actions')
   - @records.each do |record|
     %tr
       %td
@@ -14,6 +14,6 @@
       %td
         = l(record.created_at)
       %td.actions
-        = link_to(t('global.edit'), [:dash, record])
-        = link_to(t('global.destroy'), [:dash, record], :method => :delete)
+        = link_to(t('dash.grid.edit'), [:dash, record])
+        = link_to(t('dash.grid.destroy'), [:dash, record], :method => :delete)
 = render :partial => 'dash/shared/pager', :locals => { :collection => @records }

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

@@ -2,7 +2,7 @@
 %html{:xmlns => 'http://www.w3.org/1999/xhtml', :'xml:lang' => I18n.locale, :lang => I18n.locale}
   %head
     %title= @meta_title
-    = stylesheet_link_tag 'rails_dash/application', :media => 'all'
+    = stylesheet_link_tag 'railsdash/application', :media => 'all'
     = javascript_include_tag 'application'
     = csrf_meta_tags
     %body
@@ -12,11 +12,11 @@
             #menu
               %ul
                 %li
-                  %a{ :href => rails_dash.root_path, :title => t('layouts.dash.menu.home') }
-                    = t('layouts.dash.menu.home')
+                  %a{ :href => rails_dash.root_path, :title => t('dash.menu.home') }
+                    = t('dash.menu.home')
             #session
-              %a.button{ :href => '#', :title => t('layouts.dash.session.logout') }
-                = t('layouts.dash.session.logout')
+              %a.button{ :href => '#', :title => t('dash.session.logout') }
+                = t('dash.session.logout')
         - if @title
           #header        
             .holder
@@ -37,4 +37,4 @@
       #footer
         .holder
           %p#copyright
-            = t('layouts.dash.footer.copyright', :year => @year)
+            = t('dash.footer.copyright', :year => @year)

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

@@ -3,10 +3,10 @@
   #pager
     - if pager.has_first_page?
       %a.first{ :href => pager.first_page_path }
-        = t('global.first')
+        = t('dash.pager.first')
     - if pager.has_previous_page?
       %a.previous{ :href => pager.previous_page_path }
-        = t('global.previous')
+        = t('dash.pager.previous')
     - if pager.navigation.has_less_pages?
       %span.ellipsis ...
     - for page in pager.navigation.pages
@@ -20,7 +20,7 @@
       %span.ellipsis ...
     - if pager.has_next_page?
       %a.next{ :href => pager.next_page_path }
-        = t('global.next')    
+        = t('dash.pager.next')    
     - if pager.has_last_page?
       %a.last{ :href => pager.last_page_path }
-        = t('global.last')
+        = t('dash.pager.last')

data/lib/rails_dash/version.rb

@@ -1,5 +1,5 @@
 module RailsDash
   
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 
 end

data/test/dummy/app/models/photo.rb

@@ -1,5 +1,7 @@
 class Photo < ActiveRecord::Base
 
+  scope :filter, lambda { |filter| where('', :filter => "%#{filter}%") }
+
   attr_accessible :name
 
   class << self

data/test/dummy/app/views/dash/photos/index.html.haml

@@ -6,7 +6,7 @@
     %th
       = @model.human_attribute_name('created_at')     
     %th.actions
-      = t('global.actions')
+      = t('dash.grid.actions')
   - @records.each do |record|
     %tr
       %td
@@ -14,6 +14,6 @@
       %td
         = l(record.created_at)
       %td.actions
-        = link_to(t('global.edit'), [:dash, record])
-        = link_to(t('global.destroy'), [:dash, record], :method => :delete)
+        = link_to(t('dash.grid.edit'), [:dash, record])
+        = link_to(t('dash.grid.destroy'), [:dash, record], :method => :delete)
 = render :partial => 'dash/shared/pager', :locals => { :collection => @records }

data/test/dummy/app/views/dash/shared/_filter.html.haml

@@ -1,5 +1,5 @@
 #options
   = form_tag request.fullpath, :method => 'get', :id => 'search' do
-    = text_field_tag :q, (params[:q].present? ? params[:q] : t('layouts.dash.options.search_text')), :onblur => "if (this.value == '') {this.value = '#{t('layouts.dash.options.search_text')}';}", :onfocus => "if (this.value == '#{t('layouts.dash.options.search_text')}') {this.value = '';}"
+    = text_field_tag :q, (params[:q].present? ? params[:q] : t('dash.grid.filter')), :onblur => "if (this.value == '') {this.value = '#{t('dash.grid.filter')}';}", :onfocus => "if (this.value == '#{t('dash.grid.filter')}') {this.value = '';}"
   %a.button.action{ :href => url_for([:new, :dash, @model.name.underscore.to_sym]) }
-    = t('global.add')
+    = t('dash.grid.add')

data/test/dummy/app/views/dash/shared/_pager.html.haml

@@ -3,10 +3,10 @@
   #pager
     - if pager.has_first_page?
       %a.first{ :href => pager.first_page_path }
-        = t('global.first')
+        = t('dash.pager.first')
     - if pager.has_previous_page?
       %a.previous{ :href => pager.previous_page_path }
-        = t('global.previous')
+        = t('dash.pager.previous')
     - if pager.navigation.has_less_pages?
       %span.ellipsis ...
     - for page in pager.navigation.pages
@@ -20,7 +20,7 @@
       %span.ellipsis ...
     - if pager.has_next_page?
       %a.next{ :href => pager.next_page_path }
-        = t('global.next')    
+        = t('dash.pager.next')    
     - if pager.has_last_page?
       %a.last{ :href => pager.last_page_path }
-        = t('global.last')
+        = t('dash.pager.last')

data/test/dummy/app/views/layouts/dash.html.haml

@@ -12,11 +12,14 @@
             #menu
               %ul
                 %li
-                  %a{ :href => rails_dash.root_path, :title => t('layouts.dash.menu.home') }
-                    = t('layouts.dash.menu.home')
+                  %a{ :href => rails_dash.root_path, :title => t('dash.menu.home') }
+                    = t('dash.menu.home')
+                %li
+                  %a{ :href => url_for([:dash, :photos]), :title => Photo.model_name.human(:count => 2) }
+                    = Photo.model_name.human(:count => 2)
             #session
-              %a.button{ :href => '#', :title => t('layouts.dash.session.logout') }
-                = t('layouts.dash.session.logout')
+              %a.button{ :href => '#', :title => t('dash.session.logout') }
+                = t('dash.session.logout')
         - if @title
           #header        
             .holder
@@ -37,4 +40,4 @@
       #footer
         .holder
           %p#copyright
-            = t('layouts.dash.footer.copyright', :year => @year)
+            = t('dash.footer.copyright', :year => @year)