adva_blog 0.0.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: eaca04c9824c2a859bd1a6702a393f9d6bd47608
-  data.tar.gz: 9b49939cb632912f8a3a7e3718bdd7bc40ab2e2b
+SHA256:
+  metadata.gz: 85b9f7df75c4a48ce6dc3ab8e567a49f4b0d65e042f7e59f1ab204f626416c03
+  data.tar.gz: 37e7e41f62a13b73d3b0db962c5571e4b8b4a9fe4efee004439afeb5bd678a88
 SHA512:
-  metadata.gz: 6f1a8bf1af639cc618b2182e1f3e6c55ea5e0b40abe5270d2b3e21e70197eed4b1139858446bdb8ca80c72732d38cc2551ffd89ca69ffece4eebad7d6b6c2c7d
-  data.tar.gz: 178fdf0d38457b057202543ad331f83c1d32a57f94372f0b7bcc846892d0202fe1ad4f675fb0a84ae149a64a78481edbc44f0cef71aba0a4f74a1443ebcbd4c2
+  metadata.gz: 3b55484db019345e339206c2bcc29c2daa65f3c326079cb369f06d4de76d5dd9d4c90e8411fab63e7be8e542966dab5cd2d0694f33dfa023225164294295e032
+  data.tar.gz: d75ed39340ccf5ed1fca04a7542b40b1586b03f1a9a6fb085d23925ca557a76bc25bd5791982eddeb6ee83ca50eeed11ffb087aa6b16968ae5c3ec0b541c266f

data/app/controllers/admin/blog/contents_controller.rb

@@ -1,5 +1,5 @@
 class Admin::Blog::ContentsController < Admin::Page::ContentsController
   def index
-    redirect_to [:admin, @site, @section, :articles]
+    redirect_to [:admin, @section, :articles]
   end
 end

data/app/controllers/blog_articles_controller.rb

@@ -1,23 +1,19 @@
 class BlogArticlesController < ArticlesController
   def index
-    if skip_caching? or stale?(:etag => @section, :last_modified => [@articles.to_a, @section, @site].flatten.collect(&:updated_at).compact.max.utc, :public => true)
+    articles
+
+    if defined?(Comment)
+      articles.includes!(:approved_comments_counter)
+    end
+
+    # set after articles are fetched
+    @category ||= section.categories.build(title: "All Categories")
+
+    if skip_caching? or stale?([site, section], public: true)
       respond_to do |format|
         format.html { render :template => "blogs/articles/index" }
         format.atom { render :template => "blogs/articles/index", :layout => false }
       end
     end
   end
-
-  protected
-    def set_articles
-      scope = @category ? @category.all_contents : @section.articles
-      scope = scope.tagged("'#{@tags}'") if @tags.present?
-      scope = scope.published # (params[:year], params[:month])
-      scope = scope.includes(:approved_comments_counter) if defined?(Comment)
-      @articles = scope.paginate(page: current_page, per_page: @section.contents_per_page).order(published_at: :desc)
-    end
-
-    def valid_article?
-      @article and (@article.draft? or @article.published_at?(params.values_at(:year, :month, :day)))
-    end
 end

data/app/helpers/blog_helper.rb

@@ -5,12 +5,12 @@ module BlogHelper
     month = archive_month(month) if month && !month.is_a?(Time)
 
     title = []
-    title << t(:'adva.blog.titles.date', :date => l(month, :format => '%B %Y')) if month
-    title << t(:'adva.blog.titles.about', :category => category.title) if category
-    title << t(:'adva.blog.titles.tags', :tags => tags.to_sentence) if tags
+    title << "from #{month.strftime('%B %Y')}" if month
+    title << "about #{category.title}" if category
+    title << "tagged #{tags.to_sentence}" if tags
     
     if title.present?
-      title = t(:'adva.blog.titles.articles', :articles => title.join(', ')) 
+      title = "Articles #{title.join(', ')}"
       options[:format] ? raw(options[:format]) % title : title
     end
   end
@@ -19,7 +19,7 @@ module BlogHelper
     Time.local(params[:year], params[:month]) if params[:year]
   end
 
-  def blog_article_path section, article
+  def blog_article_path section, article, options={}
     if article.published_at
       super :section_permalink => section.permalink,
         :year => article.published_at.year,
@@ -31,7 +31,7 @@ module BlogHelper
     end
   end
 
-  def blog_article_url section, article
+  def blog_article_url section, article, options={}
     if article.published_at
       super :section_permalink => section.permalink,
         :year => article.published_at.year,

data/app/models/blog.rb

@@ -1,7 +1,7 @@
 class Blog < Section  
-  has_many :articles, -> { order("contents.published_at DESC") }, :foreign_key => 'section_id', :dependent => :destroy do
+  has_many :articles, -> { order("contents.published_at DESC") }, foreign_key: :section_id, dependent: :destroy do
     def permalinks
-      published.map(&:permalink)
+      published.pluck(:permalink)
     end
   end
   alias_method :contents, :articles

data/app/views/admin/blog/articles/index.html.erb

@@ -9,32 +9,18 @@
 
     t.row do |r, content|
       r.add_class "level_#{content.level}"
-      r.cell content_status(content) + link_to(content.title, [:edit, :admin, @site, @section, content], :class => content.state)
+      r.cell content_status(content) + " " + link_to(content.title, [:edit, :admin, @section, content], :class => content.state)
       r.cell content.category_titles.join(", ") if @section.categories.any?
-      r.cell content.accept_comments? && content.comments.present? ? link_to(content.comments.size, admin_comments_path) : t(:"adva.common.none") if defined?(Comment)
+      r.cell content.accept_comments? && content.comments.present? ? link_to(content.comments.size, admin_comments_path) : "none" if defined?(Comment)
       r.cell published_at_formatted(content)
-      r.cell link_to("Edit", [:edit, :admin, @site, @section, content], :class => "edit content") +
-        link_to("Delete", [:admin, @site, @section, content], :method => :delete, :class => "delete content")
+      r.cell link_to("Edit", [:edit, :admin, @section, content], :class => "edit content") +
+        link_to("Delete", [:admin, @section, content], :method => :delete, :class => "delete content")
     end
 
     t.empty :p, :class => 'empty' do
-      raw params[:filters] ?
-        t(:'adva.content.no_filtered_contents') :
-        t(:'adva.contents.no_contents', :section => @section.title) + "\n" +
-        link_to(t(:'adva.contents.links.create_now'), [:new, :admin, @site, @section, :article])
+      raw "There are no contents in #{@section.title}. " +
+        link_to("Create one now", [:new, :admin, @section, :article])
     end
   end
 %>
 
-<%= content_for :sidebar do -%>
-  <!--
-  <div class="tabs">
-    <ul>
-      <li class="active"><a href="#filters" onclick="return false;">Filters</a></li>
-    </ul>
-    <div class="tab active" id="tab_filters">
-      <%= filter_for(Article, :categories => @section.categories) %>
-    </div>
-  </div>
-  -->
-<% end -%>

data/app/views/admin/sections/settings/_blog.html.erb

@@ -1,11 +1,7 @@
-<h2><%= t(:'adva.sections.titles.blog_settings') %></h2>
+<h2>Blog settings</h2>
 
 <% f.field_set :blog_settings do %>
   <div class="col">
     <%= f.text_field :contents_per_page, :label => true %>
   </div>
-
-  <div class="col">
-    <%= f.select :content_filter, filter_options, {}, :label => true, :hint => :'adva.sections.hints.content_filter' %>
-  </div>
 <% end %>

data/app/views/blogs/articles/_article.html.erb

@@ -3,15 +3,15 @@
     <div class="meta">
       <p>
         <%= datetime_with_microformat(article.published_at, :format => :long) %><br />
-        <%= t(:'adva.blog.attribution', :author => article.author_name) %>
+        by: <%= article.author_name %>
         <%= link_to_content_comments article if (defined?(Comment) && (article.accept_comments? || article.comments.present?)) && mode != :single %>
         <% authorized_tag :span, :update, article do -%>
-          <%= link_to t(:'adva.common.edit'), edit_admin_article_path(@site, @section, article) %>
+          <%= link_to "Edit", edit_admin_article_path(@section, article) %>
         <% end -%>
       </p>
       <p>
-        <%= links_to_content_categories article, :'adva.common.content_categories' %>
-        <%= links_to_content_tags article, :'adva.common.content_tags' %>
+        <%= links_to_content_categories article %>
+        <%= links_to_content_tags article %>
       </p>
     </div>
     <div class="content">
@@ -20,7 +20,8 @@
       </h2>
       <% if article.has_excerpt? %>
         <%= raw article.excerpt_html %>
-        <p><%= link_to_content t( :'adva.blog.links.more' ), article unless mode == :single %></p>
+        <p><%= link_to_content "Read the rest of this entry", article unless mode == :single %></p>
+        
       <% end %>
       <%= raw article.body_html if mode == :single || !article.has_excerpt? %>
     </div>

data/app/views/blogs/articles/_footer.html.erb

@@ -1,8 +1,8 @@
 <% content_for :footer do %>
   <div id="footer" class="clearing">
-    <% if @section.categories.present? %>
+    <% if @section.categories.select(&:persisted?).any? %>
       <div>
-        <h4><%=t :'adva.titles.categories' %></h4>
+        <h4>Categories</h4>
         <ul id="categories_list">
         <% @section.categories.each do |category| %>
           <li><%= link_to_category @section, category %></li>
@@ -13,7 +13,7 @@
 
     <% if @section.article_counts_by_month.present? %>
       <div>
-        <h4><%=t :'adva.titles.archives' %></h4>
+        <h4>Archives</h4>
         <ul id="archives">
         <% @section.archive_months.each do |month| %>
           <li><%= link_to l( month, :format => '%B %Y' ), blog_path(@section, :year => month.year, :month => month.month) %></li>
@@ -23,7 +23,7 @@
     <% end %>
     
     <% if false and @section and @section.tag_counts.present? %>
-      <h4><%=t :'adva.titles.tags' %></h4>
+      <h4>Tags</h4>
       <ul id="tags_list">
       <% @section.tag_counts.each do |tag| %>
         <li><%= link_to_tag @section, tag %></li>
@@ -32,9 +32,7 @@
     <% end %>  
   </div>
 
-  <%= render :partial => 'shared/footer' %>
-  
   <ul id="feeds">
-    <li><%= link_to t( :'adva.links.entries_feed' ),  blog_url(@section, :format => :atom) %></li>
+    <li><%= link_to "Entries feed", blog_url(@section, :format => :atom) %></li>
   </ul>
 <% end %>

data/app/views/blogs/articles/index.atom.builder

@@ -8,7 +8,7 @@ atom_feed :url => request.url do |feed|
   feed.updated @articles.first ? @articles.first.updated_at : Time.now.utc
 
   @articles[0..12].each do |article|
-    url = "http://#{@site.host}#{url_for([@section, article])}"
+    url = [request.protocol, @site.host, url_for([@section, article])].join("")
     feed.entry article, :url => url do |entry|
       entry.title article.title
       entry.content "#{absolutize_links(article.excerpt_html)} #{absolutize_links(article.body_html)}", :type => 'html'

data/config/initializers/base_controller.rb

@@ -1,3 +1,3 @@
-ActionDispatch::Callbacks.to_prepare do
+ActiveSupport::Reloader.to_prepare do
   BaseController.class_eval { helper BlogHelper }
 end

data/config/routes.rb

@@ -8,12 +8,10 @@ Rails.application.routes.draw do
   end
 
   namespace :admin do
-    resources :sites do
-      resources :blogs do
-        scope :module => :blog do
-          resources :contents, :articles, :categories do
-            put "/", :action => "update_all", :on => :collection
-          end
+    resources :blogs do
+      scope :module => :blog do
+        resources :contents, :articles, :categories do
+          put "/", :action => "update_all", :on => :collection
         end
       end
     end

data/lib/adva_blog/version.rb

@@ -1,3 +1,3 @@
 module AdvaBlog
-  VERSION = "0.0.1"
+  VERSION = "0.2.0"
 end

data/lib/adva_blog.rb

@@ -1,10 +1,14 @@
 # require "adva_blog/version"
 require "rails"
 
+# FIXME there's gotta be a better way!
+spec = Gem::Specification.find_by_name("adva")
+require "#{spec.gem_dir}/app/models/section"
+
 module AdvaBlog
   class Engine < Rails::Engine
     initializer "adva_blog.init" do
-      Section.register_type 'Blog'
+      ::Section.register_type 'Blog'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adva_blog
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-29 00:00:00.000000000 Z
+date: 2024-07-30 00:00:00.000000000 Z
 dependencies: []
 description: Adva Blog
 email:
@@ -76,8 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: Engine for Adva CMS blog component