prologue 0.1.0 → 0.1.1

data/README.md

@@ -29,6 +29,13 @@ Everything is configured and ready to rock your next Rails 3 project.  We hope i
     prologue new my_app --no-admin
 
 
+### Testing generated app
+
+    rake spec
+    rake cucumber
+    bundle exec autotest
+
+
 ### Issues
 
 Please report issues to the [Prologue issue tracker](http://github.com/quickleft/prologue/issues/).

data/lib/prologue/version.rb

@@ -1,3 +1,3 @@
 module Prologue
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/templates/admin/layout.rb

@@ -31,8 +31,6 @@ end
 create_file 'app/views/admin/shared/_footer.html.haml' do
 <<-FILE
 %footer#main_admin_footer
-  %a{:href => "http://quickleft.com"}
-    #{app_name.humanize}
 FILE
 end
 

data/templates/admin/users.rb

@@ -10,8 +10,7 @@ end
 
 inject_into_file 'app/controllers/admin/users_controller.rb', :after => "def index\n" do
 <<-'FILE'
-    @sortable = SortIndex::Sortable.new(params, INDEX_SORT)
-    @users = User.paginate :page => params[:page], :order => @sortable.order, :per_page => 2
+    @users = User.paginate :page => params[:page], :per_page => 50
 FILE
 end
 
@@ -57,18 +56,7 @@ gsub_file 'app/controllers/admin/users_controller.rb', /ApplicationController/,
 inject_into_file 'app/controllers/admin/users_controller.rb', :after => "class Admin::UsersController < Admin::BaseController\n" do
 <<-'FILE'
   before_filter :find_user, :only => [:edit, :update, :destroy]
-  
-  INDEX_SORT = SortIndex::Config.new(
-    {'name' => 'name'},
-    {
-      'email' => 'email',
-      'login' => 'login',
-      'roles_mask' => 'roles_mask',
-      'last_login_at' => 'last_login_at'
-    }
-    #, optionally SortIndex::SORT_KEY_ASC
-  )
-  
+    
   def find_user
     @user = User.find(params[:id])
   end
@@ -117,8 +105,8 @@ create_file 'app/views/admin/users/index.html.haml' do
   %table
     %thead
       %tr
-        %th= @sortable.header_link('name', 'Name')
-        %th= @sortable.header_link('email', 'Email')
+        %th Name
+        %th Email
         %th
         %th
     %tbody
@@ -129,7 +117,7 @@ create_file 'app/views/admin/users/index.html.haml' do
           %td= link_to "Edit", edit_admin_user_path(user), :class => 'edit_link'
           %td
             - if user.id != current_user.id
-              = link_to "Delete", admin_user_path(user), :confirm => t('forms.confirm'), :method => :delete, :class => 'delete_link'
+              = link_to "Delete", admin_user_path(user), :confirm => 'Are you sure?', :method => :delete, :class => 'delete_link'
             - else
               That's you!
   = will_paginate @users

data/templates/application_layout.rb

@@ -23,8 +23,6 @@ end
 create_file 'app/views/shared/_footer.html.haml' do
 <<-FILE
 %footer#main_footer
-  %a{:href => "http://quickleft.com"}
-    #{app_name.humanize}
 FILE
 end
 

data/templates/bootstrap.rb

@@ -42,9 +42,6 @@ apply File.expand_path("../friendly_id.rb", __FILE__)
 # Apply Devise?
 apply File.expand_path("../devise.rb", __FILE__) if ENV['PROLOGUE_AUTH']
 
-# Apply sorter helper
-apply File.expand_path("../sorter_lib.rb", __FILE__)
-
 # Apply admin
 apply File.expand_path("../admin.rb", __FILE__) if ENV['PROLOGUE_ADMIN']
 

data/templates/db.rb

@@ -1 +1,2 @@
-run 'rake db:migrate'
+run 'rake db:migrate'
+run 'rake db:test:prepare'

data/templates/devise.rb

@@ -86,7 +86,10 @@ gsub_file devise_migration, /# add_index :users, :confirmation_token,   :unique
 
 append_file 'db/seeds.rb' do
 <<-FILE
-User.create! :name => '#{ENV['PROLOGUE_USER_NAME']}', :email => '#{ENV['PROLOGUE_USER_EMAIL']}', :password => '#{ENV['PROLOGUE_USER_PASSWORD']}', :password_confirmation => '#{ENV['PROLOGUE_USER_PASSWORD']}'
+# Setup initial user so we can get in
+user = User.create! :name => '#{ENV['PROLOGUE_USER_NAME']}', :email => '#{ENV['PROLOGUE_USER_EMAIL']}', :password => '#{ENV['PROLOGUE_USER_PASSWORD']}', :password_confirmation => '#{ENV['PROLOGUE_USER_PASSWORD']}'
+user.confirmed_at = user.confirmation_sent_at
+user.save
 FILE
 end
 

data/templates/gemfile.rb

@@ -21,6 +21,7 @@ gem "mocha", :group => [:test]
 gem "factory_girl_rails", :group => [:test, :cucumber]
 gem "faker", :group => [:test]
 gem "autotest", :group => [:test]
+gem "autotest-rails", :group => [:test]
 gem "thin", :group => [:test, :cucumber, :development]
 gem "cucumber", :git => "git://github.com/aslakhellesoy/cucumber.git", :group => [:cucumber]
 gem "database_cleaner", :git => "git://github.com/bmabey/database_cleaner.git", :group => [:test, :cucumber]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Quick Left
@@ -150,7 +150,6 @@ files:
 - templates/rails_clean.rb
 - templates/rspec_clean.rb
 - templates/sass.rb
-- templates/sorter_lib.rb
 - templates/test_suite.rb
 has_rdoc: true
 homepage: http://github.com/quickleft/prologue
@@ -185,6 +184,6 @@ rubyforge_project: prologue
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: prologue-0.1.0
+summary: prologue-0.1.1
 test_files: []
 

data/templates/sorter_lib.rb

@@ -1,97 +0,0 @@
-create_file 'lib/sort_index.rb' do
-<<-'FILE'
-module SortIndex
-
-  SORT_KEY_ASC = 'asc'
-  SORT_KEY_DESC = 'desc'
-
-  SORT_DIRECTION_MAP = { 
-    SORT_KEY_DESC => 'DESC', 
-    SORT_KEY_ASC => 'ASC' 
-  }
-
-  class Config
-    attr_accessor :columns
-    attr_accessor :default_direction
-    
-    def default
-      return @default
-    end
-
-    def initialize(default, columns, default_direction = nil)
-      @columns = columns
-      @default_direction = default_direction || SORT_KEY_DESC
-      
-      raise "default only supports 1 pair" if default.length != 1
-      default.each_pair { |key, value|
-        @default = value
-        @columns[key] = value
-      }
-    end
-  end
-
-  class Sortable 
-
-    def initialize(params, config, index_url = nil)
-      @config = config
-      @params = params
-      @index_url = index_url || params[:controller]
-      
-      # sets up for building the sql order by
-      @sort_direction = SORT_DIRECTION_MAP[@params[:sort_direction]] || @config.default_direction
-      @sort_by = @config.columns[@params[:sort_by]] || @config.default
-    end
-
-    def order
-      specified_sort_by || "#{@sort_by} #{@sort_direction}"
-    end
-
-    def header_link(sort_key, display, sortable = true, element_id = '')
-      
-      if @config.columns[sort_key].nil? and sortable then
-        raise "Sort key of '#{sort_key}' not found. Check your controllers SortIndex::Config variable" 
-      end
-      
-      id_attr = ""
-      if element_id != '' then
-        id_attr = "id=\"#{element_id}\""
-      end
-      
-      class_attr = ""
-      if @config.columns[sort_key] == @sort_by then
-        class_attr = " class='current-sort-#{@sort_direction.downcase}'"
-      end
-      
-      a_href = "<a#{class_attr} href=\"/#{@index_url}?sort_by=#{sort_key}&amp;sort_direction=#{next_direction}\" title=\"#{display}\" #{id_attr}>#{display}</a>"
-      if sortable == false then
-        a_href = "<span>#{display}</span>"
-      end
-      
-      return "#{a_href}".html_safe
-    end
-
-    def next_direction
-      sort_direction = SORT_KEY_ASC
-      if (@params[:sort_direction].nil?) then
-        sort_direction = (@sort_direction == SORT_KEY_ASC) ? SORT_KEY_DESC : SORT_KEY_ASC
-      elsif (@params[:sort_direction] == SORT_KEY_ASC) then
-        sort_direction = SORT_KEY_DESC
-      end
-      return sort_direction
-    end
-
-    def specified_sort_by
-      sort = @config.columns[@params[:sort_by]]
-      return nil if sort.nil?
-      return sort.split(',').map {|order_criteria| "#{order_criteria} #{@sort_direction}"}.join(',')
-    end
-  end
-end
-FILE
-end
-
-inject_into_file 'config/application.rb', :after => "# Custom directories with classes and modules you want to be autoloadable.\n" do
-<<-'FILE'
-    config.autoload_paths += %W(#{config.root}/lib)
-FILE
-end