rails_dash 0.0.4 → 0.0.5

data/app/controllers/rails_dash/base_controller.rb

@@ -1,21 +1,7 @@
 module RailsDash
-  class BaseController < ActionController::Base
-
-    before_filter :year
-
-    protected
-
-    def year
-      @year = Time.now.year
-    end
-
-    def page
-      params[:p].present? ? params[:p].to_i : 1
-    end
-
-    def filter
-      params[:q]
-    end
+  class BaseController < ::ApplicationController
+    
+    helper RailsDash::ApplicationHelper
 
   end
 end

data/app/controllers/rails_dash/crud_controller.rb

@@ -5,7 +5,7 @@ module RailsDash
 
     def index
       @meta_title = @title = "#{@model.model_name.human :count => 2}"
-      @records = @model.filter(filter).page(page)
+      @records = @model.filter(params[:q]).page(params[:p].present? ? params[:p].to_i : 1).per(15)
     end
 
     def new
@@ -54,7 +54,7 @@ module RailsDash
     end
 
     def index_path
-      send "dash_#{@model.name.tableize}_path"
+      main_app.url_for(:controller => "dash/#{@model.name.tableize}", :action => 'index')
     end
 
     def param

data/app/helpers/rails_dash/application_helper.rb

@@ -0,0 +1,13 @@
+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 }
+    end
+
+  end
+end

data/{lib/generators/dash/templates/filter.erb → app/views/rails_dash/shared/_options.html.haml}

@@ -1,5 +1,6 @@
 #options
   = form_tag request.fullpath, :method => 'get', :id => 'search' do
     = 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('dash.grid.add')
+  - if add_button
+    %a.button.action{ :href => main_app.url_for([:new, :dash, @model.name.underscore.to_sym]) }
+      = t('dash.grid.add')

data/lib/generators/dash/install_generator.rb

@@ -8,8 +8,6 @@ module 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 'filter.erb', 'app/views/dash/shared/_filter.html.haml'
-      template 'pager.erb', 'app/views/dash/shared/_pager.html.haml'
     end
 
   end

data/lib/generators/dash/resource_generator.rb

@@ -11,14 +11,14 @@ module Dash
     
     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}%\") }"
+        "\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 => url_for([:dash, :#{table_name}]), :title => #{singular_name.camelize}.model_name.human(:count => 2) }\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"
       end
     end

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

@@ -1,4 +1,4 @@
-= form_for [:dash, @record] do |f|
+= form_for @record, :url => main_app.url_for([:dash, @record]) do |f|
   %ul
     %li.actions
       = f.submit

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

@@ -1,4 +1,4 @@
-= render :partial => 'dash/shared/filter'
+= options(true)
 %table{ :cellpadding => '0', :cellspacing => '0' }
   %tr
     %th 
@@ -14,6 +14,8 @@
       %td
         = l(record.created_at)
       %td.actions
-        = 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 }
+        %a{ :href => main_app.url_for([:dash, record]) }
+          = t('dash.grid.edit')
+        %a{ :href => main_app.url_for([:dash, record]), :'data-method' => 'delete' }
+          = t('dash.grid.destroy')
+= pager(@records)

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

@@ -37,4 +37,4 @@
       #footer
         .holder
           %p#copyright
-            = t('dash.footer.copyright', :year => @year)
+            = t('dash.footer.copyright', :year => Time.now.year)

data/lib/rails_dash/version.rb

@@ -1,5 +1,5 @@
 module RailsDash
   
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 
 end

data/test/dummy/app/controllers/statics_controller.rb

@@ -0,0 +1,6 @@
+class StaticsController < ApplicationController
+
+  def home
+  end
+
+end

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

@@ -1,15 +1,7 @@
 class Photo < ActiveRecord::Base
 
-  scope :filter, lambda { |filter| where('', :filter => "%#{filter}%") }
+  scope :filter, lambda { |filter| where('LOWER(name) LIKE :filter', :filter => "%#{filter.present? ? filter.downcase : ''}%") }
 
   attr_accessible :name
 
-  class << self
-    
-    def list(page, filter)    
-      where('LOWER(name) LIKE :filter', :filter => "%#{filter}%").page(page) 
-    end      
-    
-  end
-  
 end

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

@@ -1,4 +1,6 @@
-= form_for [:dash, @record] do |f|
+= form_for @record, :url => main_app.url_for([:dash, @record]) do |f|
   %ul
+    %li
+      = f.text_field :name
     %li.actions
       = f.submit

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

@@ -1,8 +1,10 @@
-= render :partial => 'dash/shared/filter'
+= options(true)
 %table{ :cellpadding => '0', :cellspacing => '0' }
   %tr
     %th 
       = '#'
+    %th
+      = @model.human_attribute_name('name')
     %th
       = @model.human_attribute_name('created_at')     
     %th.actions
@@ -11,9 +13,13 @@
     %tr
       %td
         = record.id
+      %td
+        = record.name
       %td
         = l(record.created_at)
       %td.actions
-        = 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 }
+        %a{ :href => main_app.url_for([:dash, record]) }
+          = t('dash.grid.edit')
+        %a{ :href => main_app.url_for([:dash, record]), :'data-method' => 'delete' }
+          = t('dash.grid.destroy')
+= pager(@records)

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

@@ -15,7 +15,7 @@
                   %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) }
+                  %a{ :href => main_app.url_for(:controller => 'dash/photos', :action => 'index'), :title => Photo.model_name.human(:count => 2) }
                     = Photo.model_name.human(:count => 2)
             #session
               %a.button{ :href => '#', :title => t('dash.session.logout') }
@@ -40,4 +40,4 @@
       #footer
         .holder
           %p#copyright
-            = t('dash.footer.copyright', :year => @year)
+            = t('dash.footer.copyright', :year => Time.now.year)

data/test/dummy/app/views/statics/home.html.haml

@@ -0,0 +1,4 @@
+%h1
+  Home
+%a{ :href => other_path }
+  Other

data/test/dummy/app/views/statics/other.html.haml

@@ -0,0 +1,4 @@
+%h1
+  Other
+%a{ :href => home_path }
+  Home

data/test/dummy/config/routes.rb

@@ -8,4 +8,8 @@ Rails.application.routes.draw do
 
   mount RailsDash::Engine => '/dash'
 
+  root :to => 'statics#home', :as => 'home'
+
+  get 'other' => 'statics#other', :as => 'other'
+
 end