tkh_content 0.0.3.1 → 0.1

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 
 
+## 0.1
+
+* Reverted pages show route to that one of a normal resource
+* Added a belongs_to author association with migration and everything
+* Added a migration to add a parent_id page attribute in preparation to menu building
+* Improved pages index view with more info
+* Removed erroneous instruction from README file
+
+
 ## 0.0.3.1
 
 * Debugged the special page show route. It has to come last in order not to conflict with other routes

data/README.md

@@ -26,21 +26,34 @@ Then execute:
 
     $ bundle
 
-Import migration
+Import migrations and needed files
 
 		$ rake tkh_content:install
 
-Run the migration
+Run the migrations
 
 		$ rake db:migrate
 		
-Add these 3 lines to the bottom of your routes file, just before the final end statement
+And then of course restart your server!
 
-		scope "(:locale)", locale: /#{I18n.available_locales.join("|")}/ do
-		  resources :pages, only: :show, path: ''
-		end
+		$ rails s
 
-And then of course restart your server!
+
+## Upgrading
+
+Update the gem:
+
+    $ bundle update tkh_content
+
+Update files, migrations, etc. This is only needed with a new minor version number ( second level from left )
+
+		$ rake tkh_content:update
+		
+Run migrations if there are new ones
+
+		$ rake db:migrate
+
+Start your server!
 
 		$ rails s
 

data/app/controllers/pages_controller.rb

@@ -25,6 +25,7 @@ class PagesController < ApplicationController
 
   def create
     @page = Page.new(params[:page])
+    @page.author_id = current_user.id
     if @page.save
       redirect_to @page, notice: t('pages.create.notice')
     else
@@ -35,7 +36,7 @@ class PagesController < ApplicationController
   def update
     @page = Page.find(params[:id])
     if @page.update_attributes(params[:page])
-      redirect_to url_for(action: :show, id: @page), notice: t('pages.update.notice')
+      redirect_to @page, notice: t('pages.update.notice')
     else
       render action: "edit", warning: t('pages.update.warning'), layout: 'admin'
     end

data/app/models/page.rb

@@ -5,11 +5,14 @@ end
 
 class Page < ActiveRecord::Base
   
+  belongs_to :author, class_name: 'User', foreign_key: 'author_id'
+  
   attr_accessible :body, :description, :title, :blog_post, :for_blog
   
   validates_presence_of :title
   validates_presence_of :description
   validates_presence_of :body
+  validates_presence_of :author_id
   
   translates :title, :description, :body
     

data/app/views/pages/index.html.erb

@@ -5,7 +5,9 @@
   <tr>
 	    <th><%= t 'activerecord.attributes.pages.title' %></th>
 	    <th><%= t 'activerecord.attributes.pages.description' %></th>
+			<th><%= t 'pages.author'.capitalize %></th>
 			<th><%= t 'activerecord.attributes.pages.for_blog' %>?</th>
+			<th><%= t 'pages.published'.capitalize %></th>
 	    <th>Actions</th>
 	  </tr>
 	</thead>
@@ -13,9 +15,11 @@
 	<tbody>
 		<% @pages.each do |page| %>
 		  <tr>
-		    <td><%= link_to page.title, page.to_param %></td>
+		    <td><%= link_to page.title, page %></td>
 		    <td><%= truncate page.description, length: 55, separator: ' ...' %></td>
+				<td><%= page.author.name %></td>
 				<td><%= page.for_blog? ? '✓' : 'X' %></td>
+				<td><%= page.published_at ? '✓ ' + l( page.published_at.to_date, format: :long) : 'X' %></td>
 		    <td><%= link_to t('edit'), edit_page_path(page), class: 'btn btn-mini' %>
 					<%= link_to t('delete'), page, method: :delete, data: { confirm: t('are_you_sure') }, class: 'btn btn-mini btn-danger' %></td>
 		  </tr>

data/config/routes.rb

@@ -1,13 +1,5 @@
 Rails.application.routes.draw do
   scope "(:locale)", locale: /#{I18n.available_locales.join("|")}/ do
-    resources :pages, except: :show
+    resources :pages
   end
-end
-
-
-# this is a bit funky
-# These 3 lines must be copied by hand to the bottom of the routes file and un-commented
-
-# scope "(:locale)", locale: /#{I18n.available_locales.join("|")}/ do
-#   resources :pages, only: :show, path: ''
-# end
+end

data/lib/generators/tkh_content/create_or_update_locales/templates/en.yml

@@ -21,7 +21,10 @@ en:
   sections: 'sections'
   
   pages:
+    author: 'author'
     create_new: 'create new page'
+    published: 'published?'
+    
     create:
       notice: 'The page was successfully created.'
       warning: 'There was a problem saving the page'

data/lib/generators/tkh_content/create_or_update_locales/templates/es.yml

@@ -8,15 +8,18 @@ es:
   sections: 'secciones'
   
   activerecord: 
-      attributes:
-        pages:
-          title: "título"
-          description: "descripción"
-          body: "parte principal"
-          para el blog: 'contraseña'
+    attributes:
+      pages:
+        title: "título"
+        description: "descripción"
+        body: "parte principal"
+        para el blog: 'contraseña'
 
   pages:
+    author: 'autor'
     create_new: 'crear una nueva página'
+    published: '¿publicado?'
+    
     create:
       notice: 'La página se ha creado correctamente'
       warning: 'Hubo un problema al guardar la página'

data/lib/generators/tkh_content/create_or_update_locales/templates/fr.yml

@@ -187,15 +187,18 @@ fr:
   sections: 'sections'
   
   activerecord: 
-      attributes:
-        pages:
-          title: "titre"
-          description: "description"
-          body: "texte principal"
-          para el blog: 'pour le blog'
+    attributes:
+      pages:
+        title: "titre"
+        description: "description"
+        body: "texte principal"
+        para el blog: 'pour le blog'
   
   pages:
+    author: 'auteur'
     create_new: 'créer une nouvelle page'
+    published: 'publiée ?'
+    
     create:
       notice: 'La page a été créée.'
       warning: "Il y'a eu un problem et la page n'a pas été sauvegardée"

data/lib/generators/tkh_content/{create_migration/create_migration_generator.rb → create_or_update_migrations/create_or_update_migrations_generator.rb}

@@ -2,10 +2,10 @@ require 'rails/generators/migration'
  
 module TkhContent
   module Generators
-    class CreateMigrationGenerator < ::Rails::Generators::Base
+    class CreateOrUpdateMigrationsGenerator < ::Rails::Generators::Base
       include Rails::Generators::Migration
       source_root File.expand_path('../templates', __FILE__)
-      desc "add the migration"
+      desc "create or update page migrations"
       def self.next_migration_number(path)
         unless @prev_migration_nr
           @prev_migration_nr = Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
@@ -16,8 +16,10 @@ module TkhContent
       end
  
       def copy_migrations
-        puts 'creating user migration'
+        puts 'creating or updating page migrations'
         migration_template "create_pages.rb", "db/migrate/create_pages.rb"
+        migration_template "add_author_to_pages.rb", "db/migrate/add_author_to_pages.rb"
+        migration_template "add_parent_id_to_pages.rb", "db/migrate/add_parent_id_to_pages.rb"
       end
  
     end

data/lib/generators/tkh_content/create_or_update_migrations/templates/add_author_to_pages.rb

@@ -0,0 +1,6 @@
+class AddAuthorToPages < ActiveRecord::Migration
+  def change
+    add_column :pages, :author_id, :integer
+    add_index :pages, :author_id
+  end
+end

data/lib/generators/tkh_content/create_or_update_migrations/templates/add_parent_id_to_pages.rb

@@ -0,0 +1,6 @@
+class AddParentIdToPages < ActiveRecord::Migration
+  def change
+    add_column :pages, :parent_id, :integer
+    add_index :pages, :parent_id
+  end
+end

data/lib/tasks/tkh_content_tasks.rake

@@ -1,14 +1,14 @@
 namespace :tkh_content do
   desc "Create migrations, locale, and other files"
   task :install do
-    system 'rails g tkh_content:create_migration'
+    system 'rails g tkh_content:create_or_update_migrations'
     system 'rails g tkh_content:create_or_update_locales -f'
     system 'rails g tkh_content:create_or_update_files -f'
   end
   
   desc "Update files. Skip existing migrations and blog layout. Force overwrite locales"
   task :update do
-    system 'rails g tkh_content:create_migration -s'
+    system 'rails g tkh_content:create_or_update_migrations -s'
     system 'rails g tkh_content:create_or_update_locales -f'
     system 'rails g tkh_content:create_or_update_files -s'
   end

data/lib/tkh_content/version.rb

@@ -1,3 +1,3 @@
 module TkhContent
-  VERSION = "0.0.3.1"
+  VERSION = "0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tkh_content
 version: !ruby/object:Gem::Version
-  version: 0.0.3.1
+  version: '0.1'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-04 00:00:00.000000000 Z
+date: 2012-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -107,14 +107,16 @@ files:
 - app/views/pages/show.html.erb
 - app/views/shared/_admin_sidebar.html.erb
 - config/routes.rb
-- lib/generators/tkh_content/create_migration/create_migration_generator.rb
-- lib/generators/tkh_content/create_migration/templates/create_pages.rb
 - lib/generators/tkh_content/create_or_update_files/create_or_update_files_generator.rb
 - lib/generators/tkh_content/create_or_update_files/templates/blog.html.erb
 - lib/generators/tkh_content/create_or_update_locales/create_or_update_locales_generator.rb
 - lib/generators/tkh_content/create_or_update_locales/templates/en.yml
 - lib/generators/tkh_content/create_or_update_locales/templates/es.yml
 - lib/generators/tkh_content/create_or_update_locales/templates/fr.yml
+- lib/generators/tkh_content/create_or_update_migrations/create_or_update_migrations_generator.rb
+- lib/generators/tkh_content/create_or_update_migrations/templates/add_author_to_pages.rb
+- lib/generators/tkh_content/create_or_update_migrations/templates/add_parent_id_to_pages.rb
+- lib/generators/tkh_content/create_or_update_migrations/templates/create_pages.rb
 - lib/tasks/tkh_content_tasks.rake
 - lib/tkh_content/version.rb
 - lib/tkh_content.rb
@@ -166,7 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -675212526871244421
+      hash: -3666386950165349341
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -175,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -675212526871244421
+      hash: -3666386950165349341
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23