refinerycms-blog 2.1.0 → 3.0.1

data/config/locales/zh-CN.yml

@@ -36,7 +36,17 @@ zh-CN:
         posts:
           form:
             toggle_advanced_options: 点击进入标签详解设置和菜单选项
-            published_at: 发布日期
+            published_at: 公布日期 
+            custom_url: 自设网址
+            custom_url_help: 由此字句生成网志发帖，而非从标题 
+            source_url: 来源网站
+            source_url_help: 记录发帖来源
+            source_url_title: 网址来源标题
+            source_url_title_help: 发帖的来源网址标题 
+            author: 作者
+            author_help: 设定此用者成为作者 
+            copy_body: 复制发帖内容至前言
+            copy_body_help: '复制发帖内容至前言，前言留白让系统自动生成前言。'
           index:
             no_items_yet: '目前尚未发博。 点击 "%{create}" 添加您的第一篇博文。'
           uncategorized:
@@ -74,6 +84,7 @@ zh-CN:
             moderation: 等待审核
             update_notified: 更新获得通知的人
             comments: 评论
+            teasers: 前言
       comment_mailer:
         notification:
           greeting: 您好
@@ -99,6 +110,8 @@ zh-CN:
           singular: 评论
           none: 没有评论
         archives: 档案
+        tags:
+          title: "标签"
       categories:
         show:
           no_posts: 此处没有文章。
@@ -124,3 +137,21 @@ zh-CN:
         archive:
           blog_archive_for: '博客存档 %{date}'
           no_blog_articles_posted: '没有发布文章 %{date}。敬请关注。'
+
+  activerecord:
+    models:
+      refinery/blog/category: 分类 
+      refinery/blog/comment: 评论
+      refinery/blog/post: 博文发帖
+    attributes:
+      refinery/blog/category:
+        title: 标题
+      refinery/blog/comment:
+        name: 姓名
+        email: 电邮
+        message: 信息
+      refinery/blog/post:
+        title: Title
+        body: 标题
+        teaser: 前言
+        

data/config/locales/zh-TW.yml

@@ -0,0 +1,160 @@
+zh-TW:
+  refinery:
+    plugins:
+      refinerycms_blog:
+        title: 博客
+    blog:
+      admin:
+        categories:
+          category:
+            edit: 編輯此類別
+            delete: 永久删除此類別
+          index:
+            no_items_yet: '沒有此類別。 點擊 "%{create}" 添加第一次類別。'
+        comments:
+          approved: '評論來自 "%{author}" 已被審批。'
+          comment:
+            view_live_html: '查看此評論 <br/><em>(opens in a new window)</em>'
+            read: 閱讀此評論
+            reject: 駁回此評論
+            approve: 批准此評論
+          rejected: '評論來自 "%{author}" 已被駁回。'
+          index:
+            no_items_yet: '沒有 %{type} 評論。'
+          show:
+            comment: 評論
+            blog_post: 發博客
+            from: 發佈由
+            date: 發佈在
+            message: 評論
+            details: 詳情
+            age: 年齡
+            actions: 行動
+            back: 返回至所有評論
+            reject: 駁回此評論
+            approve: 批准此評論
+        posts:
+          form:
+            toggle_advanced_options: 按此存取關鍵字標簽及菜單選項
+            published_at: 公佈日期
+            custom_url: 自設網址
+            custom_url_help: 由此字句生成網誌發帖，而非從標題
+            source_url: 來源網站
+            source_url_help: 記錄發帖來源
+            source_url_title: 網址來源標題
+            source_url_title_help: 發帖的來源網址標題
+            author: 作者
+            author_help: 設定此用者成為作者
+            copy_body: 複製發帖內容至前言
+            copy_body_help: '複製發帖內容至前言。前言留白讓系統自動生成前言。'
+          index:
+            no_items_yet: '目前尚未發博客。點擊 "%{create}" 添加您的第一篇博客。'
+          uncategorized:
+            no_items_yet: '沒有未歸類的博客。'
+          post:
+            view_live_html: '查看此博客 <br/><em>(opens in a new window)</em>'
+            edit: 編輯此博客
+            delete: 永久删除此博客
+        settings:
+          notification_recipients:
+            value: 發送通知
+            explanation: '每次有人發表評論，發送郵件告知有新評論。'
+            hint: '增加新評論時，將會發送郵件告知您。'
+            example: "輸入您的郵件地址，如: jack@work.com, jill@office.com"
+            updated: '通知收件人已被設為 "%{recipients}"'
+        submenu:
+          categories:
+            title: 分類
+            manage: 管理
+            new: 創建新的類別
+          comments:
+            title: 評論
+            title_with_count: '評論 (%{new_count} new)'
+            new: 新
+            unmoderated: 新
+            approved: 批准
+            rejected: 駁回
+          posts:
+            title: 題目
+            manage: 管理博客
+            new: 創建新博客
+            uncategorized: 未歸類博客
+          settings:
+            title: 設置
+            moderation: 等待審核
+            update_notified: 更新獲得通知的人
+            comments: 評論
+            teasers: 前言
+      comment_mailer:
+        notification:
+          greeting: 您好
+          you_recieved_new_comment: 您剛收到來自網站的一條新評論
+          comment_starts: --- 評論開始 ---
+          comment_ends: --- 評論結束 ---
+          from: 來自
+          email: 郵件
+          message: 信息
+          closing_line: 親切問候
+          ps: '備註： 您所有的評論也會備存於「博客」部份的「評論」菜單下。您以後隨時可以再閱讀。'
+      shared:
+        categories:
+          title: 分類
+        rss_feed:
+          title: RSS源
+          subscribe: 訂閱
+        posts:
+          other: 其他博客
+          created_at: '發表於 %{when}'
+          read_more: 閱讀更多
+        comments:
+          singular: 評論
+          none: 没有評論
+        archives: 檔案
+        tags:
+          title: "標簽"
+      categories:
+        show:
+          no_posts: 此處沒有文章。
+      posts:
+        post:
+          filled_in: 用戶體驗
+        comment: 評論
+        comments:
+          by: '發佈由 %{who}'
+          time_ago: '%{time} 之前'
+          thank_you: '感謝您的評論。'
+          thank_you_moderated: '感謝您的評論。您的信息已被列入等待審核隊列，並會在短期內出現。'
+        index:
+          no_blog_articles_yet: 尚未發布文章。敬請關注。
+        show:
+          blog_home: 博客首頁
+          by: 作者
+          categories: 標簽
+          category: 標簽
+          comments:
+            title: 評論
+            add: 發表評論
+          other: 其他博客
+          filled_in: 用戶體驗
+          source: 來自
+          submit: 發送評論
+          tagged: 標簽
+        archive:
+          blog_archive_for: '博客存檔 %{date}'
+          no_blog_articles_posted: '沒有發布文章 %{date}。敬請關注。'
+  activerecord:
+    models:
+      refinery/blog/category: 分類
+      refinery/blog/comment: 評論
+      refinery/blog/post: 博文發帖
+    attributes:
+      refinery/blog/category:
+        title: 標題
+      refinery/blog/comment:
+        name: 姓名
+        email: 電郵
+        message: 信息
+      refinery/blog/post:
+        title: Title
+        body: 標題
+        teaser: 前言

data/config/routes.rb

@@ -3,9 +3,9 @@ Refinery::Core::Engine.routes.draw do
     root :to => "posts#index"
     resources :posts, :only => [:show]
 
-    match 'feed.rss', :to => 'posts#index', :as => 'rss_feed', :defaults => {:format => "rss"}
-    match 'categories/:id', :to => 'categories#show', :as => 'category'
-    match ':id/comments', :to => 'posts#comment', :as => 'comments'
+    get 'feed.rss', :to => 'posts#index', :as => 'rss_feed', :defaults => {:format => "rss"}
+    get 'categories/:id', :to => 'categories#show', :as => 'category'
+    post ':id/comments', :to => 'posts#comment', :as => 'comments'
     get 'archive/:year(/:month)', :to => 'posts#archive', :as => 'archive_posts'
     get 'tagged/:tag_id(/:tag_name)' => 'posts#tagged', :as => 'tagged_posts'
   end
@@ -20,6 +20,9 @@ Refinery::Core::Engine.routes.draw do
             get :uncategorized
             get :tags
           end
+          member do
+            post :delete_translation
+          end
         end
 
         resources :categories

data/db/migrate/20110803223522_create_blog_structure.rb

@@ -1,7 +1,7 @@
 class CreateBlogStructure < ActiveRecord::Migration
 
   def up
-    create_table :refinery_blog_posts, :id => true do |t|
+    create_table :refinery_blog_posts do |t|
       t.string :title
       t.text :body
       t.boolean :draft
@@ -11,7 +11,7 @@ class CreateBlogStructure < ActiveRecord::Migration
 
     add_index :refinery_blog_posts, :id
 
-    create_table :refinery_blog_comments, :id => true do |t|
+    create_table :refinery_blog_comments do |t|
       t.integer :blog_post_id
       t.boolean :spam
       t.string :name
@@ -24,14 +24,14 @@ class CreateBlogStructure < ActiveRecord::Migration
     add_index :refinery_blog_comments, :id
     add_index :refinery_blog_comments, :blog_post_id
 
-    create_table :refinery_blog_categories, :id => true do |t|
+    create_table :refinery_blog_categories do |t|
       t.string :title
       t.timestamps
     end
 
     add_index :refinery_blog_categories, :id
 
-    create_table :refinery_blog_categories_blog_posts, :id => true do |t|
+    create_table :refinery_blog_categories_blog_posts do |t|
       t.integer :blog_category_id
       t.integer :blog_post_id
     end

data/db/migrate/20120531113632_delete_cached_slugs.rb

@@ -1,6 +1,6 @@
 class DeleteCachedSlugs < ActiveRecord::Migration
   def change
-    remove_column Refinery::Blog::Category.table_name, :cached_slug
-    remove_column Refinery::Blog::Post.table_name, :cached_slug
+    remove_column Refinery::Blog::Category.table_name, :cached_slug, :string
+    remove_column Refinery::Blog::Post.table_name, :cached_slug, :string
   end
 end

data/db/migrate/20140622132537_add_missing_unique_indices.acts_as_taggable_on_engine.rb

@@ -0,0 +1,20 @@
+# This migration comes from acts_as_taggable_on_engine (originally 2)
+class AddMissingUniqueIndices < ActiveRecord::Migration
+  def self.up
+    add_index :tags, :name, unique: true
+
+    remove_index :taggings, :tag_id
+    remove_index :taggings, [:taggable_id, :taggable_type, :context]
+    add_index :taggings,
+              [:tag_id, :taggable_id, :taggable_type, :context, :tagger_id, :tagger_type],
+              unique: true, name: 'taggings_idx'
+  end
+
+  def self.down
+    remove_index :tags, :name
+
+    remove_index :taggings, name: 'taggings_idx'
+    add_index :taggings, :tag_id
+    add_index :taggings, [:taggable_id, :taggable_type, :context]
+  end
+end

data/db/migrate/20140622132538_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb

@@ -0,0 +1,15 @@
+# This migration comes from acts_as_taggable_on_engine (originally 3)
+class AddTaggingsCounterCacheToTags < ActiveRecord::Migration
+  def self.up
+    add_column :tags, :taggings_count, :integer, default: 0
+
+    ActsAsTaggableOn::Tag.reset_column_information
+    ActsAsTaggableOn::Tag.find_each do |tag|
+      ActsAsTaggableOn::Tag.reset_counters(tag.id, :taggings)
+    end
+  end
+
+  def self.down
+    remove_column :tags, :taggings_count
+  end
+end

data/db/seeds.rb

@@ -5,15 +5,15 @@ Refinery::User.all.each do |user|
   end
 end if defined?(Refinery::User)
 
-if defined?(Refinery::Page) and !Refinery::Page.exists?(:link_url => '/blog')
+if defined?(Refinery::Page) and !Refinery::Page.exists?(:link_url => (url = Refinery::Blog.page_url))
   page = Refinery::Page.create(
     :title => "Blog",
-    :link_url => "/blog",
+    :link_url => url,
     :deletable => false,
-    :menu_match => "^/blogs?(\/|\/.+?|)$"
+    :menu_match => "^#{url}?(\/|\/.+?|)$"
   )
 
   Refinery::Pages.default_parts.each_with_index do |default_page_part, index|
-    page.parts.create(:title => default_page_part, :body => nil, :position => index)
+    page.parts.create(:title => default_page_part[:title], :slug => default_page_part[:slug], :body => nil, :position => index)
   end
 end

data/lib/refinery/blog.rb

@@ -1,8 +1,8 @@
 require 'refinerycms-core'
 require 'refinerycms-settings'
-require 'filters_spam'
 require 'rails_autolink'
 require 'friendly_id'
+require 'jquery-ui-rails'
 
 module Refinery
   autoload :BlogGenerator, 'generators/refinery/blog/blog_generator'

data/lib/refinery/blog/configuration.rb

@@ -26,7 +26,7 @@ module Refinery
       end
 
       def user_class
-        class_name = @@user_class_name || 'Refinery::User'
+        class_name = @@user_class_name || "Refinery::Authentication::Devise::User"
         begin
           Object.const_get(class_name)
         rescue NameError

data/lib/refinery/blog/engine.rb

@@ -5,14 +5,19 @@ module Refinery
 
       isolate_namespace Refinery::Blog
 
-      initializer "register refinerycms_blog plugin" do
+      before_inclusion do
         Refinery::Plugin.register do |plugin|
           plugin.pathname = root
           plugin.name = "refinerycms_blog"
           plugin.url = proc { Refinery::Core::Engine.routes.url_helpers.blog_admin_posts_path }
-          plugin.menu_match = /refinery\/blog\/?(posts|comments|categories)?/
-          plugin.activity = { :class_name => :'refinery/blog/post' }
+          plugin.menu_match = %r{refinery/blog/?(posts|comments|categories)?}
         end
+
+        Rails.application.config.assets.precompile += %w(
+          refinery/blog/backend.css
+          refinery/blog/frontend.css
+          refinery/blog/**/*.css
+        )
       end
 
       config.after_initialize do

data/readme.md

@@ -1,8 +1,8 @@
-# Refinery CMS Blog
+# Refinery CMS Blog [![Build Status](https://travis-ci.org/refinery/refinerycms-blog.svg?branch=master)](https://travis-ci.org/refinery/refinerycms-blog)
 
 Simple blog engine for [Refinery CMS](http://refinerycms.com). It supports posts, categories and comments.
 
-This version of `refinerycms-blog` supports Rails 3.2.x. To use Rails 2.3.x use the [refinerycms-blog "Rails 2.3.x stable branch"](http://github.com/refinery/refinerycms-blog/tree/rails2-stable).
+This version of `refinerycms-blog` supports Refinery 3.x and Rails 4.1.x.  To use Rails 3.x / Refinery 2.1.x use the [refinerycms-blog "Refinery CMS 2-1 stable branch"](http://github.com/refinery/refinerycms-blog/tree/2-1-stable).
 
 Options:
 
@@ -11,16 +11,19 @@ Options:
 
 ## Requirements
 
-Refinery CMS version 2.1.0 or above.
+Refinery CMS version 3.0.0 or above.
 
 ## Install
 
-Open up your ``Gemfile`` and add at the bottom this line:
+Open up your ``Gemfile`` and at the bottom, add this line:
+
 
 ```ruby
-gem 'refinerycms-blog', '~> 2.1.0'
+gem 'refinerycms-blog', git: 'https://github.com/refinery/refinerycms-blog', branch: 'master'
 ```
 
+Note: if the [refinerycms-page-images](https://github.com/refinery/refinerycms-page-images) extension is also installed, make sure `gem refinerycms-blog` comes before `gem 'refinerycms-page-images'`.
+
 Now, run ``bundle install``
 
 Next, to install the blog plugin run:
@@ -35,6 +38,18 @@ Finally seed your database and you're done.
 
     rake db:seed
 
+## Visual Editor
+
+By default, this extension does not require any particular visual editor.
+Previously, Refinery was coupled to WYMeditor but this has been extracted to an
+extension, [refinerycms-wymeditor](https://github.com/parndt/refinerycms-wymeditor).
+
+If you want to use `refinerycms-wymeditor`, simply place it in your Gemfile:
+
+```ruby
+gem 'refinerycms-wymeditor', ['~> 1.0', '>= 1.0.6']
+```
+
 ## Developing & Contributing
 
 The version of Refinery to develop this engine against is defined in the gemspec. To override the version of refinery to develop against, edit the project Gemfile to point to a local path containing a clone of refinerycms.
@@ -56,7 +71,7 @@ Or just with rake spec
 ## Additional Features
 * To limit rss feed length, use the 'max_results' parameter
 
-        http://test.host/blog/feed.rss?max_results=10
+    http://test.host/blog/feed.rss?max_results=10
 
 ## More Information
 * Check out our [Website](http://refinerycms.com/)