beef-articles 0.4.5 → 0.4.6

data/VERSION

@@ -1 +1 @@
-0.4.5
+0.4.6

data/app/controllers/admin/articles_controller.rb

@@ -85,13 +85,9 @@ class Admin::ArticlesController < Admin::BaseController
   end
   
   def preview
-    unless params[:id].nil?
-      @article = Article.find(params[:id])
-      @article.attributes = params[:article]
-    else
-      @article = Article.new(params[:article])
-    end
-
-    session[:article_preview] = @article.attributes
+    preview_params = params[:news_article]
+    article = Article.find_by_id(params[:id])
+    preview_params.reverse_merge!(article.attributes) if article
+    session[:article_preview] = preview_params
   end
 end

data/app/controllers/articles_controller.rb

@@ -33,6 +33,8 @@ class ArticlesController < ApplicationController
 
   def show
     @article = Article.published.find_by_permalink(params[:year], params[:month], params[:day], params[:permalink])
+    @images = @article.assets.images
+    @documents = @article.assets.documents
     
     @page_title = @article.title
     @page_description = @article.description
@@ -49,6 +51,11 @@ class ArticlesController < ApplicationController
   def preview
     @page_class = 'show'
     @article = Article.new(session[:article_preview])
+    @images = Asset.images.all(:conditions => {:id => session[:article_preview][:asset_ids] })
+    @documents = Asset.documents.all(:conditions => {:id => session[:article_preview][:asset_ids] })
+
+RAILS_DEFAULT_LOGGER.debug session[:article_preview].inspect
+
     @article.id = 0
     @article.published_at = Time.now
     @article.created_by = current_user

data/app/views/articles/show.html.erb

@@ -16,9 +16,9 @@
   
   <%= render :partial => 'meta', :locals => {:article => @article } %>
   
-  <%= gallery @article.assets %>
+  <%= gallery @images %>
 
-  <%= documents @article.assets %>
+  <%= documents @documents %>
   
   <h4 id="share-title" title="Share This Article">Share This</h4>
   <p class="share-links">

data/beef-articles.gemspec

@@ -0,0 +1,87 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{beef-articles}
+  s.version = "0.4.6"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Steve England"]
+  s.date = %q{2010-02-19}
+  s.email = %q{steve@wearebeef.co.uk}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "app/controllers/admin/articles_controller.rb",
+     "app/controllers/admin/categories_controller.rb",
+     "app/controllers/admin/comments_controller.rb",
+     "app/controllers/articles_controller.rb",
+     "app/controllers/comments_controller.rb",
+     "app/helpers/articles_helper.rb",
+     "app/helpers/comments_helper.rb",
+     "app/models/article.rb",
+     "app/models/category.rb",
+     "app/models/comment.rb",
+     "app/views/admin/articles/index.html.erb",
+     "app/views/admin/articles/preview.js.rjs",
+     "app/views/admin/articles/show.html.erb",
+     "app/views/admin/categories/index.html.erb",
+     "app/views/admin/categories/show.html.erb",
+     "app/views/admin/comments/index.html.erb",
+     "app/views/articles/_article.html.erb",
+     "app/views/articles/_meta.html.erb",
+     "app/views/articles/index.html.erb",
+     "app/views/articles/index.rss.builder",
+     "app/views/articles/show.html.erb",
+     "app/views/comments/_comment.html.erb",
+     "app/views/comments/_form.html.erb",
+     "app/views/comments/new.html.erb",
+     "beef-articles.gemspec",
+     "config/routes.rb",
+     "generators/articles_migration/articles_migration_generator.rb",
+     "generators/articles_migration/templates/migration.rb",
+     "lib/articles.rb",
+     "rails/init.rb",
+     "test/articles_test.rb",
+     "test/database.yml",
+     "test/schema.rb",
+     "test/test_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/beef/articles}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{Article/Blogging engine}
+  s.test_files = [
+    "test/articles_test.rb",
+     "test/test_helper.rb",
+     "test/schema.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<mbleigh-acts-as-taggable-on>, [">= 0"])
+      s.add_runtime_dependency(%q<jackdempsey-acts_as_commentable>, [">= 0"])
+    else
+      s.add_dependency(%q<mbleigh-acts-as-taggable-on>, [">= 0"])
+      s.add_dependency(%q<jackdempsey-acts_as_commentable>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<mbleigh-acts-as-taggable-on>, [">= 0"])
+    s.add_dependency(%q<jackdempsey-acts_as_commentable>, [">= 0"])
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: beef-articles
 version: !ruby/object:Gem::Version 
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors: 
 - Steve England
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-17 00:00:00 +00:00
+date: 2010-02-19 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,6 +72,7 @@ files:
 - app/views/comments/_comment.html.erb
 - app/views/comments/_form.html.erb
 - app/views/comments/new.html.erb
+- beef-articles.gemspec
 - config/routes.rb
 - generators/articles_migration/articles_migration_generator.rb
 - generators/articles_migration/templates/migration.rb