lines-engine 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9b5e3a26036072bb2901ef8079d3db346267714
-  data.tar.gz: 112b3d8163c8c00d723fecbaaab13b5bb45b74cb
+  metadata.gz: 7707a5c9fa3b93b41456dfe4fa66b750d79544cf
+  data.tar.gz: 18212bc967c89d0eaba2d3fe2c4410ca4b68ee8c
 SHA512:
-  metadata.gz: a27f000ce5f5aed63aeddcbe8bc0720290eda7788292b90873dec0cb7503ea66a1b0a7582847f508a9c4ab14483f4a2f409b37db276b2711f82a928ad9e70305
-  data.tar.gz: cc6548a98969104a265a1a79e5008a30400223307a02e758c82914d5a37926ff9a5080c94bde49da1a42811d27df406fd02b81a6ffb7448d7440a451b13f0ab7
+  metadata.gz: 2405705ea0961b7a61a9bb9207850aa7037cd6f8d4524e7eb83490f45640e3e3eb97a1abeb597697a46471bc447a8034e1335af4379c0475f79d4454e2d5f84c
+  data.tar.gz: d034478226878ddd5ad6b517032c6472111cdbe86e7ee78937a5e08a8e051cb3046a1d01cedce723711c3e297a25b7f76211052211fafe093d933878e67cf215

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.4.6
+
+- Fixed caching bug. 
+
 ## 0.4.5
 
 - BUGFIX: stylesheet for pagination is now included correctly

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lines-engine (0.4.5)
+    lines-engine (0.4.6)
       acts-as-taggable-on (~> 3.2.6, >= 3.2.6)
       bcrypt (~> 3.1.0, >= 3.1.0)
       carrierwave (~> 0.10.0, >= 0.10.0)

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

@@ -1,4 +1,4 @@
-<div class="article <%= (article_counter < 0) ? 'first' : 'small' %>">
+<div class="article first">
 
 <% cache article do %>
 

data/app/views/lines/articles/_article_collection.html.erb

@@ -1,4 +1,4 @@
-<%= render article_collection, article: article_collection, article_counter: article_collection_counter %>
+<%= render partial: 'article_small', locals: { article_small: article_collection, article_counter: article_collection_counter } %>
 
 <% if (article_collection_counter % 2) != 0 %>
   <div class="breaker" style="clear:both;height:1px;line-height:1px">&nbsp;</div>

data/app/views/lines/articles/_article_small.html.erb

@@ -0,0 +1,22 @@
+<div class="article small">
+<% cache "#{article_small}_small" do %>
+  <div class="hero_image">
+    <%= link_to article_path(article_small), { style: "background-image:url('#{article_small.image_url}')" } do %>
+      <img src="<%= article_small.image_url %>" alt="<%= article_small.title %>" />
+    <% end %>
+  </div>
+
+  <div class="article_header">
+    <h1><%= link_to article_small.title, article_path(article_small) %></h1>
+    <h2><%= article_small.sub_title %></h2>
+    <div class="author_name"><span>by</span> <%= display_article_authors(article_small) %></div>
+  </div>
+
+  <div class="article_teaser">
+    <%= render_teaser(article_small) %>
+    <div class="more-link">
+      <%= link_to "Read full article", article_path(article_small) %>
+    </div>
+  </div>
+<% end %>
+</div>

data/app/views/lines/articles/index.html.erb

@@ -1,12 +1,11 @@
 <% content_for :head, auto_discovery_link_tag(:atom, articles_url(format: "atom")) %>
-
 <div class="rss">
-    <%= link_to image_tag("feed-icon-28x28.png"), articles_url(format: "atom") %>
+    <%= link_to image_tag("ic_rss.png"), articles_url(format: "atom") %>
 </div>
 
 <div id="articles">
   <%= render partial: 'article', locals: { article: @first_article, article_counter: -1 } unless @first_article.nil? %>
-  <%= render partial: "article_collection", collection: @articles %>
+  <%= render partial: 'article_collection', collection: @articles %>
 </div>
 
 <% if @articles.num_pages > 1 %>

data/lib/lines/version.rb

@@ -1,3 +1,3 @@
 module Lines
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lines-engine
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Opoloo GbR
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-22 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orm_adapter
@@ -687,6 +687,7 @@ files:
 - app/views/lines/admin/pictures/destroy.js.erb
 - app/views/lines/articles/_article.html.erb
 - app/views/lines/articles/_article_collection.html.erb
+- app/views/lines/articles/_article_small.html.erb
 - app/views/lines/articles/index.atom.builder
 - app/views/lines/articles/index.html.erb
 - app/views/lines/articles/show.html.erb