refinerycms-blog 2.0.4 → 2.0.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a3112353a79633fd20a81d13c11c85bad6db5c9c
+  data.tar.gz: b8864564da5a0c75a0c037a4c93eadcf8a648227
+SHA512:
+  metadata.gz: 3cabbaae668655f98c6ea62758ffe821d17b741cc9ac4152bc1ca33f8f70ee575dd80e0c7d850e0c8ac7488631e554d6bc6e38e0fe11245731de734f7ff56b6b
+  data.tar.gz: b0f32d1805116b613b0f0c4a1b358e7d95e857ad3244b786d7956109af5aef007bed8bd8ffe88648c34ba107eed047eaf0d92b93d1443f0619cf2f8a14a5a0f0

data/.travis.yml

@@ -1,18 +1,36 @@
+language: ruby
+before_install:
+  - 'if [[ "$TRAVIS_RUBY_VERSION" =~ "jruby" ]] ; then gem update --system ; fi'
 before_script:
+  - "sh -e /etc/init.d/xvfb start"
   - "bundle exec rake refinery:testing:dummy_app > /dev/null"
-script: "bundle exec rake spec"
+script:
+  - "DISPLAY=:99.0 bundle exec rspec spec"
 notifications:
-  email:
-    - parndt@gmail.com
-    - ugis.ozolss@gmail.com
-    - joe@joesak.com
-    - jamie@enmasse.com
+  email: true
+  irc:
+    use_notice: true
+    skip_join: true
+    channels:
+      - "irc.freenode.org#refinerycms"
+  campfire:
+    on_success: always
+    on_failure: always
+    rooms:
+      - secure: "JaX+Ckvdd2wqL2bD6t8PHvMDBHxWBlCrkBKPcDKxV0t0DOwzzzwxMryVqcRi\nPsmM/zvmWFATDyRmivhNOpu4lRg9RytSroxZ9nkmbLDqjCyEAZ6tv4yZXME/\nPaxPwmfwgS9g8TKjj3lSWS7rEpqqg0D5S0XIfIHrj6KB6LUmFHc="
 env:
   - DB=postgresql
   - DB=mysql
+matrix:
+  allow_failures:
+    - rvm: rbx-18mode
+    - rvm: rbx-19mode
+    - rvm: jruby-19mode
+    - rvm: jruby-18mode
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
-  - rbx
-  - jruby
+  - 1.8.7
+  - rbx-19mode
+  - jruby-19mode
+  - rbx-18mode
+  - jruby-18mode

data/Gemfile

@@ -2,63 +2,36 @@ source "http://rubygems.org"
 
 gemspec
 
-gem 'refinerycms', '~> 2.0.3'
+gem 'refinerycms', '~> 2.0.10'
 
-group :development, :test do
-  require 'rbconfig'
+gem 'quiet_assets', :group => :development
 
-  gem 'refinerycms-testing', '~> 2.0.0'
-
-  platforms :jruby do
-    gem 'activerecord-jdbcsqlite3-adapter'
-    gem 'activerecord-jdbcmysql-adapter'
-    gem 'activerecord-jdbcpostgresql-adapter'
-    gem 'jruby-openssl'
-  end
-
-  unless defined?(JRUBY_VERSION)
-    gem 'sqlite3'
-    gem 'mysql2'
-    gem 'pg'
-  end
+# Database Configuration
+unless ENV['TRAVIS']
+  gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
+  gem 'sqlite3', :platform => :ruby
+end
 
-  platforms :mswin, :mingw do
-    gem 'win32console'
-    gem 'rb-fchange', '~> 0.0.5'
-    gem 'rb-notifu', '~> 0.0.4'
-  end
+if !ENV['TRAVIS'] || ENV['DB'] == 'mysql'
+  gem 'activerecord-jdbcmysql-adapter', :platform => :jruby
+  gem 'jdbc-mysql', '= 5.1.13', :platform => :jruby
+  gem 'mysql2', :platform => :ruby
+end
 
-  platforms :ruby do
-    gem 'spork', '0.9.0.rc9'
-    gem 'guard-spork'
+if !ENV['TRAVIS'] || ENV['DB'] == 'postgresql'
+  gem 'activerecord-jdbcpostgresql-adapter', :platform => :jruby
+  gem 'pg', :platform => :ruby
+end
 
-    unless ENV['TRAVIS']
-      if RbConfig::CONFIG['target_os'] =~ /darwin/i
-        gem 'rb-fsevent', '>= 0.3.9'
-        gem 'growl',      '~> 1.0.3'
-      end
-      if RbConfig::CONFIG['target_os'] =~ /linux/i
-        gem 'rb-inotify', '>= 0.5.1'
-        gem 'libnotify',  '~> 0.1.3'
-        gem 'therubyracer', '~> 0.9.9'
-      end
-    end
-  end
+gem 'jruby-openssl', :platform => :jruby
 
-  platforms :jruby do
-    unless ENV['TRAVIS']
-      if RbConfig::CONFIG['target_os'] =~ /darwin/i
-        gem 'growl',      '~> 1.0.3'
-      end
-      if RbConfig::CONFIG['target_os'] =~ /linux/i
-        gem 'rb-inotify', '>= 0.5.1'
-        gem 'libnotify',  '~> 0.1.3'
-      end
-    end
-  end
+group :test do
+  gem 'refinerycms-testing', '~> 2.0.3'
+  gem 'generator_spec', '~> 0.8.7'
 end
 
-# Refinery/rails should pull in the proper versions of these
+# Gems used only for assets and not required
+# in production environments by default.
 group :assets do
   gem 'sass-rails'
   gem 'coffee-rails'

data/Rakefile

@@ -17,3 +17,5 @@ Refinery::Testing::Railtie.load_tasks
 Refinery::Testing::Railtie.load_dummy_tasks(ENGINE_PATH)
 
 load File.expand_path('../tasks/rspec.rake', __FILE__)
+
+task :default => :spec

data/app/assets/javascripts/refinery/blog/backend.js

@@ -53,7 +53,7 @@ $(document).ready(function(){
     $('#page-tabs').tabs();
     $('#copy_body_link').click(function(event) {
       // Find the WYMEditor that maps to the custom_teaser field
-      var teaserTextArea = $('#blog_post_custom_teaser')[0];
+      var teaserTextArea = $('#post_custom_teaser')[0];
       var teaserEditor = null;
       $.each(WYMeditor.INSTANCES, function(index, editor) {
         if (editor._element[0] == teaserTextArea) {
@@ -62,7 +62,7 @@ $(document).ready(function(){
       });
 
       if (teaserEditor) {
-        teaserEditor.html($('#blog_post_body').attr('value'));
+        teaserEditor.html($('#post_body').attr('value'));
       }
 
       event.preventDefault();

data/app/assets/stylesheets/refinery/blog/backend.css.scss

@@ -64,7 +64,7 @@ ul.blog_categories, ul.blog_categories li {
   margin:5px 0;
 }
 a#copy_body_link {
-  background: image_url('refinery/blog/icons/add.png') no-repeat scroll 0 6px transparent;
+  background: image_url('refinery/icons/add.png') no-repeat scroll 0 6px transparent;
   border-bottom: 0 none;
   display: inline;
   line-height: 29px;

data/app/controllers/refinery/blog/admin/comments_controller.rb

@@ -3,8 +3,6 @@ module Refinery
     module Admin
       class CommentsController < ::Refinery::AdminController
 
-        cache_sweeper Refinery::BlogSweeper
-
         crudify :'refinery/blog/comment',
                 :title_attribute => :name,
                 :order => 'published_at DESC'

data/app/controllers/refinery/blog/admin/posts_controller.rb

@@ -3,8 +3,6 @@ module Refinery
     module Admin
       class PostsController < ::Refinery::AdminController
 
-        cache_sweeper Refinery::BlogSweeper
-
         crudify :'refinery/blog/post',
                 :order => 'published_at DESC'
 

data/app/controllers/refinery/blog/blog_controller.rb

@@ -10,7 +10,7 @@ module Refinery
       protected
 
         def find_page
-          @page = Refinery::Page.find_by_link_url("/blog")
+          @page = Refinery::Page.find_by_link_url(Refinery::Blog.page_url)
         end
     end
   end

data/app/controllers/refinery/blog/posts_controller.rb

@@ -2,8 +2,6 @@ module Refinery
   module Blog
     class PostsController < BlogController
 
-      caches_page :index, :unless => proc {|c| c.refinery_user_signed_in? || c.flash.any? || params[:page].present? }
-
       before_filter :find_all_blog_posts, :except => [:archive]
       before_filter :find_blog_post, :only => [:show, :comment, :update_nav]
       before_filter :find_tags
@@ -11,8 +9,11 @@ module Refinery
       respond_to :html, :js, :rss
 
       def index
-        # Rss feeders are greedy. Let's give them every blog post instead of paginating.
-        (@posts = Post.live.includes(:comments, :categories).all) if request.format.rss?
+        if request.format.rss?
+          @posts = Post.live.includes(:comments, :categories)
+          # limit rss feed for services (like feedburner) who have max size
+          @posts = Post.recent(params["max_results"]) if params["max_results"].present?
+        end
         respond_with (@posts) do |format|
           format.html
           format.rss
@@ -23,7 +24,7 @@ module Refinery
         @comment = Comment.new
 
         @canonical = url_for(:locale => ::Refinery::I18n.default_frontend_locale) if canonical?
-        
+
         @post.increment!(:access_count, 1)
 
         respond_with (@post) do |format|

data/app/models/refinery/blog/comment.rb

@@ -41,11 +41,11 @@ module Refinery
       end
 
       def approve!
-        self.update_attribute(:state, 'approved')
+        self.update_column(:state, 'approved')
       end
 
       def reject!
-        self.update_attribute(:state, 'rejected')
+        self.update_column(:state, 'rejected')
       end
 
       def rejected?

data/app/models/refinery/blog/post.rb

@@ -78,7 +78,7 @@ module Refinery
         end
 
         def uncategorized
-          live.includes(:categories).where(:categories => { Refinery::Categorization.table_name => { :blog_category_id => nil } })
+          live.includes(:categories).where(Refinery::Categorization.table_name => { :blog_category_id => nil })
         end
 
         def next(current_record)

data/app/views/refinery/blog/admin/categories/_category.html.erb

@@ -11,6 +11,8 @@
                 :class => "cancel confirm-delete",
                 :title => t('.delete'),
                 :method => :delete,
-                :confirm => t('message', :scope => 'refinery.admin.delete', :title => category.title) %>
+                :data => {
+                  :confirm => t('message', :scope => 'refinery.admin.delete', :title => category.title)
+                } %>
   </span>
 </li>

data/app/views/refinery/blog/admin/posts/_post.html.erb

@@ -16,6 +16,8 @@
         :class => "cancel confirm-delete",
         :title => t('.delete'),
         :method => :delete,
-        :confirm => t('message', :scope => 'refinery.admin.delete', :title => post.title) %>
+        :data => {
+          :confirm => t('message', :scope => 'refinery.admin.delete', :title => post.title)
+        } %>
   </span>
 </li>

data/app/views/refinery/blog/categories/show.html.erb

@@ -1,6 +1,6 @@
 <% content_for :body_content_title, @category.title %>
 
-<% content_for :body_content_left do %>
+<% content_for :body do %>
   <% if @posts.any? %>
     <section id="blog_posts">
       <%= render :partial => "/refinery/blog/shared/post", :collection => @posts %>
@@ -13,7 +13,7 @@
   <% end %>
 <% end %>
 
-<% content_for :body_content_right do %>
+<% content_for :side_body do %>
   <%= render :partial => "/refinery/blog/shared/categories" %>
 <% end %>
 

data/app/views/refinery/blog/posts/_nav.html.erb

@@ -1,17 +1,17 @@
 <nav id="next_prev_article">
   <% if @post.next.present? -%>
-    <%= link_to (truncate(@post.next.title) + " &#187;").html_safe, 
-                refinery.blog_post_path(@post.next), 
+    <%= link_to h(truncate(@post.next.title)) + " &#187;".html_safe,
+                refinery.blog_post_path(@post.next),
                 :class => 'next' %>
   <% end -%>
 
-  <%= link_to t('blog_home', :scope => 'refinery.blog.posts.show'), 
-              refinery.blog_root_path, 
+  <%= link_to t('blog_home', :scope => 'refinery.blog.posts.show'),
+              refinery.blog_root_path,
               :class => 'home' %>
 
   <% if @post.prev.present? -%>
-    <%= link_to ("&#171; " + truncate(@post.prev.title)).html_safe, 
-                refinery.blog_post_path(@post.prev), 
+    <%= link_to "&#171; ".html_safe + h(truncate(@post.prev.title)),
+                refinery.blog_post_path(@post.prev),
                 :class => 'prev' %>
   <% end -%>
 </nav><!-- /next_prev_article -->

data/app/views/refinery/blog/posts/archive.html.erb

@@ -1,6 +1,6 @@
 <% content_for :title, "#{t('.blog_archive_for', :date => @archive_date.strftime('%B %Y'))}" %>
 
-<% content_for :body_content_left do %>
+<% content_for :body do %>
   <h1><%= t('.blog_archive_for', :date => @archive_date.strftime('%B %Y')) %></h1>
   <% if @posts.any? %>
     <section id="blog_posts">

data/app/views/refinery/blog/posts/index.html.erb

@@ -1,4 +1,4 @@
-<% content_for :body_content_left do %>
+<% content_for :body do %>
   <%= raw @page.content_for(Refinery::Pages.default_parts.first.to_sym) if Refinery::Pages.default_parts.any? %>
 
   <% if @posts.any? %>

data/app/views/refinery/blog/posts/show.html.erb

@@ -1,4 +1,4 @@
-<% content_for :body_content_left do %>
+<% content_for :body do %>
   <div id="show_blog_post">
     <%= render 'post' %>
   </div>

data/app/views/refinery/blog/posts/tagged.html.erb

@@ -2,7 +2,7 @@
 
 <% content_for :body_content_title, "#{t('.posts_tagged')} &#8220;#{@tag_name.titleize}&#8221;".html_safe -%>
 
-<% content_for :body_content_left do %>
+<% content_for :body do %>
   <% if @posts.any? %>
     <section id="blog_posts">
       <%= render :partial => "/refinery/blog/shared/post", :collection => @posts %>

data/app/views/refinery/blog/shared/_body_content_right.html.erb

@@ -1,4 +1,4 @@
-<% content_for :body_content_right do %>
+<% content_for :side_body do %>
   <%= yield(:body_content_right_prepend) %>
   <%= render :partial => "/refinery/blog/shared/rss_feed" %>
   <%= render :partial => "/refinery/blog/shared/categories" %>

data/app/views/refinery/shared/admin/_autocomplete.html.erb

@@ -1,5 +1 @@
 <% content_for :stylesheets, stylesheet_link_tag("refinery/blog/ui-lightness/jquery-ui-1.8.13.custom") %>
-
-<% content_for :javascripts do %>
-  <%= javascript_include_tag "https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.13/jquery-ui.min.js" %>
-<% end %>

data/config/locales/bg.yml

@@ -142,17 +142,17 @@ bg:
           no_blog_articles_posted: 'Все още няма публикувани статии за %{date}. Очаквайте скоро.'
   activerecord:
     models:
-      refinery/blog_category: Категория
-      refinery/blog_comment: Коментар
-      refinery/blog_post: Публикация
+      refinery/blog/category: Категория
+      refinery/blog/comment: Коментар
+      refinery/blog/post: Публикация
     attributes:
-      refinery/blog_category:
+      refinery/blog/category:
         title: Заглавие
-      refinery/blog_comment:
+      refinery/blog/comment:
         name: Име
         email: Е-поща
         message: Съобщение
-      refinery/blog_post:
+      refinery/blog/post:
         title: Заглавие
         body: Съдържание
         teaser: Извадка

data/config/locales/en.yml

@@ -150,17 +150,17 @@ en:
           no_blog_articles_posted: 'There are no blog articles posted for %{date}. Stay tuned.'
   activerecord:
     models:
-      refinery/blog_category: Category
-      refinery/blog_comment: Comment
-      refinery/blog_post: Blog post
+      refinery/blog/category: Category
+      refinery/blog/comment: Comment
+      refinery/blog/post: Blog post
     attributes:
-      refinery/blog_category:
+      refinery/blog/category:
         title: Title
-      refinery/blog_comment:
+      refinery/blog/comment:
         name: Name
         email: Email
         message: Message
-      refinery/blog_post:
+      refinery/blog/post:
         title: Title
         body: Body
         teaser: Teaser

data/config/locales/fr.yml

@@ -139,16 +139,16 @@ fr:
           no_blog_articles_posted: "Il n'y a aucun article pour la date du %{date}. Restez en alerte."
   activerecord:
     models:
-      refinery/blog_category: Categorie
-      refinery/blog_comment: Commentaire
-      refinery/blog_post: Article
+      refinery/blog/category: Categorie
+      refinery/blog/comment: Commentaire
+      refinery/blog/post: Article
     attributes:
-      refinery/blog_category:
+      refinery/blog/category:
         title: Titre
-      refinery/blog_comment:
+      refinery/blog/comment:
         name: Nom
         email: Email
         message: Message
-      refinery/blog_post:
+      refinery/blog/post:
         title: Titre
         body: Corps

data/config/locales/it.yml

@@ -141,16 +141,16 @@ it:
           no_blog_articles_posted: Non sono stati pubblicati articoli nel blog il %{date}. Continuate a seguirci.
   activerecord:
     models:
-      refinery/blog_category: Categoria
-      refinery/blog_comment: Commento
-      refinery/blog_post: Articolo
+      refinery/blog/category: Categoria
+      refinery/blog/comment: Commento
+      refinery/blog/post: Articolo
     attributes:
-      refinery/blog_category:
+      refinery/blog/category:
         title: Titolo
-      refinery/blog_comment:
+      refinery/blog/comment:
         name: Nome
         email: Email
         message: Testo
-      refinery/blog_post:
+      refinery/blog/post:
         title: Titolo
         body: Testo

data/config/locales/ja.yml

@@ -142,17 +142,17 @@ ja:
           no_blog_articles_posted: '%{date}付のブログ記事が投稿されてません。'
   activerecord:
     models:
-      refinery/blog_category: カテゴリ
-      refinery/blog_comment: コメント
-      refinery/blog_post: 投稿
+      refinery/blog/category: カテゴリ
+      refinery/blog/comment: コメント
+      refinery/blog/post: 投稿
     attributes:
-      refinery/blog_category:
+      refinery/blog/category:
         title: 題名
-      refinery/blog_comment:
+      refinery/blog/comment:
         name: 名前
         email: メール
         message: メッセージ
-      refinery/blog_post:
+      refinery/blog/post:
         title: 題名
         body: 本文
         teaser: 短紹介文

data/config/locales/pl.yml

@@ -128,7 +128,7 @@ pl:
           no_blog_articles_posted: 'Brak wpisów dla daty %{date}.'
   activerecord:
     attributes:
-      refinery/blog_comment:
+      refinery/blog/comment:
         name: "Imię"
         email: "Email"
         message: "Treść"

data/config/locales/pt-BR.yml

@@ -130,9 +130,9 @@ pt-BR:
           filed_in: Arquivado em
   activerecord:
     attributes:
-      refinery/blog_post:
+      refinery/blog/post:
         title: Título
         body: Corpo
-      refinery/blog_comment:
+      refinery/blog/comment:
         name: Nome
         message: Mensagem

data/config/locales/sk.yml

@@ -10,7 +10,7 @@ sk:
             edit: Upraviť kategóriu
             delete: Zmazať kategóriu
           index:
-            no_items_yet: 'Niesu tu žiadne kategórie. Klikni "%{create}" pre pridanie prvej.'
+            no_items_yet: 'Nie sú vytvorené žiadne kategórie. Klikni "%{create}" pre pridanie prvej.'
         comments:
           approved: 'Komentár od "%{author}" bol schválený.'
           comment:
@@ -20,7 +20,7 @@ sk:
             approve: Schváliť
           rejected: 'Komentár od "%{author}" bol zamietnutý.'
           index:
-            no_items_yet: 'Niesu tu žiadne %{type} komentáre.'
+            no_items_yet: 'Nie sú žiadne %{type} komentáre.'
           show:
             comment: Komentár
             blog_post: Blog článok
@@ -39,21 +39,31 @@ sk:
             toggle_advanced_options: Klikni pre prístup k nastaveniam meta tagov a menu
             save_as_draft: Uložiť ako koncept
             published_at: Dátum publikovania
+            custom_url: Vlastná url
+            custom_url_help: Generovať url pre blog článok z tohto textu namiesto názvu blog článku.
+            source_url: Url adresa zdroja informácií
+            source_url_help:  Url adresa zdroja informácií pre článok.
+            source_url_title: Názov zdroja informácii
+            source_url_title_help: Názov zdroja informácií pre zadanú url adresu zdroja informácií.
+            author: Autor
+            author_help: Vyber, ktorý používateľ bude zobrazený ako autor tohto článku.
+            copy_body: Skopírovať text článku do teaser.
+            copy_body_help: Skopíruje text článku do teaser. Nechaj teaser nevyplnený, ak chceš aby ho Refinery automaticky vygenerovalo.
           index:
-            no_items_yet: 'Niesu žiadne články na blogu. Klikni na "%{create}" pre pridanie prvého.'
+            no_items_yet: 'Nie sú žiadne blog články. Klikni na "%{create}" pre pridanie prvého.'
           uncategorized:
-            no_items_yet: 'Niesu žiadne nekategorizované články.'
+            no_items_yet: 'Nie sú žiadne nezradené články.'
           post:
-            view_live_html: 'Zobraziť článok<br/><em>(otvorí ho v novom okne)</em>'
+            view_live_html: 'Zobraziť živý náhľad článku<br/><em>(otvorí sa v novom okne)</em>'
             edit: Upraviť článok
             delete: Zmazať článok
         settings:
           notification_recipients:
             value: Poslať notifikáciu pre
-            explanation: 'Vždy keď niekto pridá komentár, Refinery pošle notifikáciu.'
-            hint: 'Vždy keď niekto pridá komentár, Refinery ti pošle notifikáciu.'
+            explanation: 'Vždy keď niekto pridá komentár, Refinery pošle e-mail notifikáciu.'
+            hint: 'Vždy keď niekto pridá komentár, Refinery ti pošle e-mail notifikáciu.'
             example: "Zadaj tvoju emailovú adresu(y) ako napríklad: jack@work.com, jill@office.com"
-            updated: 'Zoznam príjemcov notifikácií "%{recipients}"'
+            updated: 'Zoznam príjemcov notifikácií: "%{recipients}"'
         submenu:
           categories:
             title: Kategórie
@@ -61,7 +71,7 @@ sk:
             new: Nová kategória
           comments:
             title: Komentáre
-            title_with_count: 'Komentáre (%{new_count} nových)'
+            title_with_count: 'Komentáre (%{new_count})'    #TODO 0 nových, 1 nový, 2-4 nové,  >= 5 nových
             new: Nový
             unmoderated: Nový
             approved: Schválený
@@ -70,12 +80,13 @@ sk:
             title: Články
             manage: Spravovať články
             new: Vytvoriť nový článok
-            uncategorized: Nekategorizované články
+            uncategorized: Nezaradené články
           settings:
             title: Nastavenia
             moderation: Moderovanie
             update_notified: Upraviť zoznam notifikovaných
             comments: Komentáre
+            teasers: Teasers
       comment_mailer:
         notification:
           greeting: Ahoj
@@ -99,30 +110,60 @@ sk:
           read_more: Celý článok
         comments:
           singular: komentár
-          none: Niesu tu žiadne komentáre
+          one: '%{count} komentár'
+          few: '%{count} komentáre'
+          other: '%{count} komentárov'
+          none: Nie sú tu žiadne komentáre
         archives: Archív
+        tags:
+          title: Tagy
       categories:
         show:
-          no_posts: Niesu tu žiadne články momentálne.
+          no_posts: Momentálne tu nie sú žiadne články.
       posts:
         post:
-          filed_in: Podaný
+          filed_in: Zaradené do
         comment: komentár
         comments:
           by: 'Odoslal %{who}'
-          time_ago: '%{time} späť'
+          time_ago: '%{time} spáť'
           thank_you: 'Vďaka za komentár.'
-          thank_you_moderated: 'Ďakujeme za Váš komentár. Vaša správa čaká na schválenie a objaví sa v najbližšej dobe.'
+          thank_you_moderated: 'Ďakujeme za Váš komentár. Vaša správa čaká na schválenie a čoskoro sa objaví.'
         index:
-          no_blog_articles_yet: Práve niesu žiadne články na blogu. Zostante naladení.
+          no_blog_articles_yet: Zatiaľ nie sú v blogu žiadne články. Zostaňte naladení.
         show:
           blog_home: Hlavná stránka blogu
           comments:
             title: Komentáre
             add: Pridať komentár
           other: Ďalšie články
-          filed_in: Podaný
+          filed_in: Zaradené do
           submit: Odoslať komentár
+          name: Meno
+          email: E-mail
+          message: Správa
+          by: Od
+          source: Zdroj
+        tagged:
+          no_blog_articles_yet: 'Zatiaľ nie sú v blogu žiadne články. Zostaňte naladení.'
+          posts_tagged: Príspevky pre tag
         archive:
           blog_archive_for: 'Blog archív pre %{date}'
-          no_blog_articles_posted: 'Niesu žiadne články publikované %{date}.'
+          no_blog_articles_posted: 'Nie sú žiadne články publikované %{date}. Zostaňte naladení.'
+  activerecord:
+      models:
+        refinery/blog/category: Kategória
+        refinery/blog/comment: Komentár
+        refinery/blog/post: Blog článok
+      attributes:
+        refinery/blog/category:
+          title: Názov
+        refinery/blog/comment:
+          name: Meno
+          email: E-mail
+          message: Správa
+        refinery/blog/post:
+          title: Názov
+          body: Text
+          teaser: Teaser
+

data/config/locales/sv.yml

@@ -0,0 +1,167 @@
+sv:
+  refinery:
+    plugins:
+      refinerycms_blog:
+        title: Blogg
+    blog:
+      admin:
+        categories:
+          category:
+            edit: Editera kategori
+            delete: Radera kategori
+          index:
+            no_items_yet: 'Det finns inga kategorier än. Klicka på "%{create}" för att lägga till den första kategorin.'
+        comments:
+          approved: 'Kommentaren från "%{author}" Har godkänts.'
+          comment:
+            view_live_html: 'Visa kommentaren på webbplatsen. <br/><em>(öppnas i ett nytt fönster)</em>'
+            read: Läs denna kommentar
+            reject: Avslå kommentar
+            approve: Godkänn kommentar
+          rejected: 'Kommentaren från "%{author}" har avslagits.'
+          index:
+            no_items_yet: 'Det finns inga %{type} kommentarer.'
+          show:
+            comment: Kommentar
+            blog_post: Blogg post
+            from: Postat av
+            date: Postat
+            message: Kommentar
+            details: Detaljer
+            age: Ålder
+            actions: Actions
+            back: Tillbaka till alla kommentarer
+            reject: Avslå denna kommentar
+            approve: Godkänn denna kommentar
+        posts:
+          form:
+            advanced_options: Avancerat
+            toggle_advanced_options: Klicka för att ställa in metataggar och menyinställningar
+            save_as_draft: Spara som utkast
+            published_at: Publiceringsdatum
+            custom_url: Anpassad URL
+            custom_url_help: Skapa URL för bloggposten med denna text istället för ttieln
+            source_url: Källans URL
+            source_url_help: Sparar URL för postens källa
+            source_url_title: Källhänvisning (titel)
+            source_url_title_help: Källhänvisning för posten (URL).
+            author: Författare
+            author_help: Ställ in författare för denna post.
+            copy_body: Kopiera innehåll i posten till en teaser.
+            copy_body_help: Kopierar inneållet i posten till en teaser, lämna tom om du vill att det ska ske automatiskt.
+          index:
+            no_items_yet: 'Det finns inga poster än. Klicka "%{create}" för att lägga till din första post.'
+          uncategorized:
+            no_items_yet: 'Det finns inga okategoriserade poster.'
+          post:
+            view_live_html: 'Visa denna post i en webbläsare <br/><em>(öppnas i ett nytt fönster)</em>'
+            edit: Redigera denna bloggpost
+            delete: Ta bort denna bloggpost
+            draft: Utkast
+        settings:
+          notification_recipients:
+            value: Skicka notis till
+            explanation: 'Varje gång någon kommenterar på en post, skickas ett mail om kommentaren.'
+            hint: 'När en kommentar läggs till, så skickar vi en notis till dig.'
+            example: "Lägg till epostadress(er) i detta format: kalle@home.se, pelle@work.com"
+            updated: 'Notiser har blivit skickade till: "%{recipients}"'
+        submenu:
+          categories:
+            title: Kategorier
+            manage: Hantera
+            new: Skapa ny kategori
+          comments:
+            title: Kommentarer
+            title_with_count: 'Det finns (%{new_count} nya kommentarer)'
+            new: Ny
+            unmoderated: Ny
+            approved: Godkänd
+            rejected: Avslagen
+          posts:
+            title: Poster
+            manage: Hantera poster
+            new: Skapa ny post
+            uncategorized: Okategoriserade poster
+          settings:
+            title: Inställningar
+            moderation: Moderering
+            update_notified: Uppdarea vilka som får notiser
+            comments: Kommentarer
+            teasers: Teasers
+      comment_mailer:
+        notification:
+          greeting: Hej!
+          you_recieved_new_comment: Du har fått en ny kommentar på bloggenYou just received a new comment on your website.
+          comment_starts: --- kommentar ---
+          comment_ends: --- // kommentar ---
+          from: Från
+          email: E-post
+          message: Meddelande
+          closing_line: Vänliga hälsningar
+          ps: 'P.S. Alla dina kommentarer finns lagrade i bloggsektionen av ditt CMS i undermenyn kommentarer, om du vill se dem senare.'
+      shared:
+        categories:
+          title: Kategorier
+        rss_feed:
+          title: RSS
+          subscribe: Prenumerera
+        posts:
+          other: Övriga poster
+          created_at: 'Postat den %{when}'
+          read_more: Läs mer
+        comments:
+          singular: Kommentar
+          none: Inga kommentarer
+        archives: Arkiv
+        tags:
+          title: "Taggar"
+      categories:
+        show:
+          no_posts: Det finns inga poster än.
+      posts:
+        post:
+          filed_in: Kategoriserat som
+        comment: kommentar
+        comments:
+          by: 'Postad av %{who}'
+          time_ago: 'för %{time} sedan'
+          thank_you: 'Tack för din kommentar.'
+          thank_you_moderated: 'Tack för din kommentar. Ditt meddelande har placerats i modereringskön och kommer snart att bli publicerat.'
+        index:
+          no_blog_articles_yet: Det finns inga bloggposter än.
+        show:
+          blog_home: Blogg hem
+          comments:
+            title: Kommentarer
+            add: Kommentera
+          other: Andra bloggposter
+          filed_in: Kategoriserat i
+          tagged: Taggar
+          submit: Skicka kommentar
+          name: Namn
+          email: E-post
+          message: Meddelande
+          by: av
+          source: Källa
+        tagged:
+          no_blog_articles_yet: Det finns inga bloggposter än.
+          posts_tagged: Poster taggade med
+        archive:
+          blog_archive_for: 'Arkiv för %{date}'
+          no_blog_articles_posted: 'Det finns inga artiklar för %{date}.'
+  activerecord:
+    models:
+      refinery/blog/category: Kategori
+      refinery/blog/comment: Kommentarer
+      refinery/blog/post: Bloggposter
+    attributes:
+      refinery/blog/category:
+        title: Titel
+      refinery/blog/comment:
+        name: Namn
+        email: E-post
+        message: Meddelande
+      refinery/blog/post:
+        title: Titel
+        body: Innehåll
+        teaser: Teaser

data/config/routes.rb

@@ -1,5 +1,5 @@
 Refinery::Core::Engine.routes.draw do
-  namespace :blog do
+  namespace :blog, :path => Refinery::Blog.page_url do
     root :to => "posts#index"
     resources :posts, :only => [:show]
 
@@ -12,7 +12,7 @@ Refinery::Core::Engine.routes.draw do
 
   namespace :blog, :path => '' do
     namespace :admin, :path => 'refinery' do
-      scope :path => 'blog' do
+      scope :path => Refinery::Blog.page_url do
         root :to => "posts#index"
 
         resources :posts do

data/db/migrate/20110803223522_create_blog_structure.rb

@@ -45,7 +45,7 @@ class CreateBlogStructure < ActiveRecord::Migration
 
     drop_table Refinery::Blog::Post.table_name
     drop_table Refinery::Blog::Comment.table_name
-    drop_table Refinery::Category.table_name
+    drop_table Refinery::Blog::Category.table_name
     drop_table Refinery::Categorization.table_name
   end
 

data/lib/generators/refinery/blog/templates/config/initializers/refinery/blog.rb.erb

@@ -8,4 +8,6 @@ Refinery::Blog.configure do |config|
   # config.post_teaser_length = <%= Refinery::Blog.post_teaser_length.inspect %>
 
   # config.share_this_key = <%= Refinery::Blog.share_this_key.inspect %>
+
+  # config.page_url = <%= Refinery::Blog.page_url.inspect %>
 end

data/lib/refinery/blog/configuration.rb

@@ -3,12 +3,13 @@ module Refinery
     include ActiveSupport::Configurable
 
     config_accessor :validate_source_url, :comments_per_page, :posts_per_page,
-      :post_teaser_length, :share_this_key
+      :post_teaser_length, :share_this_key, :page_url
 
     self.validate_source_url = false
     self.comments_per_page = 10
     self.posts_per_page = 10
     self.post_teaser_length = 250
     self.share_this_key = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+    self.page_url = "/blog"
   end
 end

data/lib/refinery/blog/version.rb

@@ -3,7 +3,7 @@ module Refinery
     class Version
       @major = 2
       @minor = 0
-      @tiny  = 4
+      @tiny  = 5
 
       class << self
         attr_reader :major, :minor, :tiny
@@ -14,4 +14,4 @@ module Refinery
       end
     end
   end
-end
+end

data/readme.md

@@ -52,3 +52,14 @@ Run the test suite with [Guard](https://github.com/guard/guard)
 Or just with rake spec
 
     $ bundle exec rake spec
+
+## Additional Features
+* To limit rss feed length, use the 'max_results' parameter
+
+        http://test.host/blog/feed.rss?max_results=10
+
+## More Information
+* Check out our [Website](http://refinerycms.com/)
+* Documentation is available in the [guides](http://refinerycms.com/guides)
+* Questions can be asked on our [Google Group](http://group.refinerycms.org)
+* Questions can also be asked in our IRC room, [#refinerycms on freenode](irc://irc.freenode.net/refinerycms)

data/refinerycms-blog.gemspec

@@ -13,6 +13,7 @@ Gem::Specification.new do |s|
   s.homepage          = %q{http://refinerycms.com/blog}
   s.authors           = ['Resolve Digital', 'Neoteric Design']
   s.require_paths     = %w(lib)
+  s.licenses          = %q{MIT}
 
   s.files             = `git ls-files`.split("\n")
   s.test_files        = `git ls-files -- spec/*`.split("\n")
@@ -27,4 +28,4 @@ Gem::Specification.new do |s|
 
   # Development dependencies
   s.add_development_dependency 'refinerycms-testing', '~> 2.0.0'
-end
+end

data/spec/controllers/refinery/blog/posts_controller_spec.rb

@@ -0,0 +1,26 @@
+require "spec_helper"
+
+module Refinery
+  module Blog
+    describe PostsController do
+      login_refinery_user
+
+      before do
+        FactoryGirl.create(:blog_post, :title => "blogpost_one")
+        FactoryGirl.create(:blog_post, :title => "blogpost_two")
+        FactoryGirl.create(:blog_post, :title => "blogpost_three")
+      end
+
+      it "should not limit rss feed" do
+        get :index, :format => :rss
+        assigns[:posts].size.should == 3
+      end
+
+      it "should limit rss feed" do
+        get :index, :format => :rss, :max_results => 2
+        assigns[:posts].count.should == 2
+      end
+    end
+  end
+end
+

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-blog
 version: !ruby/object:Gem::Version
-  version: 2.0.4
-  prerelease: 
+  version: 2.0.5
 platform: ruby
 authors:
 - Resolve Digital
@@ -10,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-14 00:00:00.000000000 Z
+date: 2013-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: refinerycms-core
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -23,7 +21,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -31,7 +28,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: refinerycms-settings
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -39,7 +35,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -47,7 +42,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: filters_spam
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,7 +49,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -63,23 +56,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: seo_meta
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -87,7 +77,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -95,23 +84,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails_autolink
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: refinerycms-testing
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -119,7 +105,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -188,10 +173,8 @@ files:
 - app/models/.gitkeep
 - app/models/refinery/blog/category.rb
 - app/models/refinery/blog/comment.rb
-- app/models/refinery/blog/comment_mailer.rb
 - app/models/refinery/blog/post.rb
 - app/models/refinery/categorization.rb
-- app/sweepers/refinery/blog_sweeper.rb
 - app/views/.gitkeep
 - app/views/refinery/blog/admin/_submenu.html.erb
 - app/views/refinery/blog/admin/categories/_category.html.erb
@@ -202,6 +185,7 @@ files:
 - app/views/refinery/blog/admin/categories/new.html.erb
 - app/views/refinery/blog/admin/comments/_comment.html.erb
 - app/views/refinery/blog/admin/comments/_sortable_list.html.erb
+- app/views/refinery/blog/admin/comments/approve.html.erb
 - app/views/refinery/blog/admin/comments/index.html.erb
 - app/views/refinery/blog/admin/comments/show.html.erb
 - app/views/refinery/blog/admin/posts/_form.html.erb
@@ -249,6 +233,7 @@ files:
 - config/locales/pt-BR.yml
 - config/locales/ru.yml
 - config/locales/sk.yml
+- config/locales/sv.yml
 - config/locales/zh-CN.yml
 - config/routes.rb
 - db/migrate/20110803223522_create_blog_structure.rb
@@ -273,6 +258,7 @@ files:
 - readme.md
 - refinerycms-blog.gemspec
 - script/rails
+- spec/controllers/refinery/blog/posts_controller_spec.rb
 - spec/factories/blog_categories.rb
 - spec/factories/blog_comments.rb
 - spec/factories/blog_posts.rb
@@ -291,30 +277,31 @@ files:
 - tasks/rspec.rake
 - todo.md
 homepage: http://refinerycms.com/blog
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.22
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby on Rails blogging engine for Refinery CMS.
 test_files:
+- spec/controllers/refinery/blog/posts_controller_spec.rb
 - spec/factories/blog_categories.rb
 - spec/factories/blog_comments.rb
 - spec/factories/blog_posts.rb

data/app/models/refinery/blog/comment_mailer.rb

@@ -1 +0,0 @@
-require File.expand_path('../../../../mailers/refinery/blog/comment_mailer', __FILE__)

data/app/sweepers/refinery/blog_sweeper.rb

@@ -1,26 +0,0 @@
-module Refinery
-  class BlogSweeper < ActionController::Caching::Sweeper
-    observe Blog::Post, Blog::Comment
-
-    def after_create(record)
-      expire_cache_for(record)
-    end
-
-    def after_update(record)
-      expire_cache_for(record)
-    end
-
-    def after_destroy(record)
-      expire_cache_for(record)
-    end
-
-    private
-
-      def expire_cache_for(record)
-        # TODO: Convert these to url helpers
-        expire_page '/blog'
-        expire_page '/blog/feed.rss'
-      end
-
-  end
-end