monologue 0.3.0 → 0.4.0

data/app/helpers/monologue/tags_helper.rb

@@ -5,7 +5,7 @@ module Monologue
     NUMBER_OF_LABEL_SIZES = 5
 
     def tag_url(tag)
-      "#{Monologue::Engine.routes.url_helpers.root_path}tags/#{tag.name.downcase}"
+      "#{Monologue::Engine.routes.url_helpers.root_path}tags/#{URI.encode(tag.name.mb_chars.to_s.downcase)}"
     end
 
     def label_for_tag(tag, min, max)

data/app/models/monologue/post.rb

@@ -1,15 +1,13 @@
 class Monologue::Post < ActiveRecord::Base
   has_many :taggings
-  has_many :tags, through: :taggings, dependent: :destroy
+  has_many :tags, -> { order "id ASC" }, through: :taggings, dependent: :destroy
   before_validation :generate_url
   belongs_to :user
 
-  attr_accessible :title, :content, :url, :published, :published_at, :tag_list
+  scope :default,  -> {order("published_at DESC, monologue_posts.created_at DESC, monologue_posts.updated_at DESC") }
+  scope :published, -> { default.where(published: true).where("published_at <= ?", DateTime.now) }
 
-  scope :default, order("published_at DESC, monologue_posts.created_at DESC, monologue_posts.updated_at DESC")
-  scope :published, lambda { default.where(published: true).where("published_at <= ?", DateTime.now) }
-
-  default_scope includes(:tags)
+  default_scope{includes(:tags)}
 
   validates :user_id, presence: true
   validates :title, :content, :url, :published_at, presence: true
@@ -26,7 +24,7 @@ class Monologue::Post < ActiveRecord::Base
 
   def tag!(tags_attr)
     self.tags = tags_attr.map(&:strip).reject(&:blank?).map do |tag|
-      Monologue::Tag.find_or_create_by_name(tag)
+      Monologue::Tag.where(name: tag).first_or_create
     end
   end
 
@@ -39,10 +37,10 @@ class Monologue::Post < ActiveRecord::Base
   end
 
   def self.page p
-    per_page = Monologue.posts_per_page || 10
+    per_page = Monologue::Config.posts_per_page || 10
     set_total_pages(per_page)
     p = (p.nil? ? 0 : p.to_i - 1)
-    offset = p * per_page
+    offset =  p * per_page
     self.limit(per_page).offset(offset)
   end
 

data/app/models/monologue/tag.rb

@@ -1,6 +1,4 @@
 class Monologue::Tag < ActiveRecord::Base
-  attr_accessible :name
-
   validates :name, uniqueness: true,presence: true
   has_many :taggings
   has_many :posts,through: :taggings
@@ -12,4 +10,4 @@ class Monologue::Tag < ActiveRecord::Base
   def frequency
     posts_with_tag.size
   end
-end
+end

data/app/models/monologue/tagging.rb

@@ -1,6 +1,4 @@
 class Monologue::Tagging < ActiveRecord::Base
   belongs_to :post
   belongs_to :tag
-
-  attr_accessible :tag_id
-end
+end

data/app/models/monologue/user.rb

@@ -1,8 +1,6 @@
 class Monologue::User < ActiveRecord::Base
   has_many :posts
 
-  attr_accessible :name, :email, :password, :password_confirmation
-
   has_secure_password
 
   validates_presence_of :password, on: :create
@@ -15,4 +13,4 @@ class Monologue::User < ActiveRecord::Base
     return false if user.posts.any?
     true
   end
-end
+end

data/app/views/layouts/monologue/admin/_nav_bar.html.erb

@@ -10,9 +10,6 @@
 
       <ul class="nav pull-right" data-monologue="nav-bar-right">
         <%= activable_li_tag_with_link t(".users"), admin_users_path %>
-        <% if ActionController::Base.perform_caching %>
-          <%= activable_li_tag_with_link t(".cache"), admin_cache_path %>
-        <% end %>
         <li id="fat-menu" class="dropdown">
           <a href="#" id="settings" data-toggle="dropdown"><%= t(".settings") %> <b class="caret"></b></a>
           <ul class="dropdown-menu" role="menu" aria-labelledby="settings">
@@ -24,4 +21,4 @@
 
     </div>
   </div>
-</div>
+</div>

data/app/views/layouts/monologue/application.html.erb

@@ -10,8 +10,8 @@
   <div class="container">
     <header class="main-header sixteen columns clearfix">
       <%= rss_icon %>
-      <h1><a href="<%= root_path %>"><%=Monologue.site_name%></a></h1>
-      <h2><%=Monologue.site_subtitle%></h2>
+      <h1><a href="<%= root_path %>"><%=Monologue::Config.site_name%></a></h1>
+      <h2><%=Monologue::Config.site_subtitle%></h2>
       <%= render partial: "layouts/monologue/application/social_icons" %>
     </header>
 

data/app/views/layouts/monologue/application/_disqus.html.erb

@@ -1,6 +1,6 @@
 <script type="text/javascript">
   /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
-  var disqus_shortname = '<%= Monologue.disqus_shortname%>'; // required: replace example with your forum shortname
+  var disqus_shortname = '<%= Monologue::Config.disqus_shortname%>'; // required: replace example with your forum shortname
 
   <% if Rails.env.development?  %>
   var disqus_developer = 1; // developer mode is on

data/app/views/layouts/monologue/application/_disqus_embed.html.erb

@@ -1,6 +1,6 @@
 <script type="text/javascript">
   /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
-  var disqus_shortname = '<%= Monologue.disqus_shortname%>'; // required: replace example with your forum shortname
+  var disqus_shortname = '<%= Monologue::Config.disqus_shortname%>'; // required: replace example with your forum shortname
 
   <% if Rails.env.development?  %>
   var disqus_developer = 1; // developer mode is on

data/app/views/layouts/monologue/application/_fb_open_graph.html.erb

@@ -1,7 +1,7 @@
 <meta property="og:title" content="<%= monologue_accurate_title %>"/>
 <meta property="og:type" content="<%= controller.action_name == "show" ? "article" : "blog" %>"/>
 <meta property="og:url" content="<%= request.protocol %><%= request.host_with_port %><%= request.path.gsub("//","/") %>"/>
-<meta property="og:site_name" content="<%= Monologue.site_name %>"/>
-<% if Monologue.facebook_logo%>
-   <meta property="og:image" content="<%= absolute_image_url(image_path(Monologue.facebook_logo)) %>" />
+<meta property="og:site_name" content="<%= Monologue::Config.site_name %>"/>
+<% if Monologue::Config.facebook_logo%>
+   <meta property="og:image" content="<%= absolute_image_url(image_path(Monologue::Config.facebook_logo)) %>" />
 <% end  %>

data/app/views/layouts/monologue/application/_gauge_analytics.html.erb

@@ -1,4 +1,4 @@
-<% unless Monologue.gauge_analytics_site_id.nil? %>
+<% unless Monologue::Config.gauge_analytics_site_id.nil? %>
   <script type="text/javascript">
     var _gauges = _gauges || [];
     (function() {
@@ -6,7 +6,7 @@
       t.type  = 'text/javascript';
       t.async = true;
       t.id    = 'gauges-tracker';
-      t.setAttribute('data-site-id', '<%= Monologue.gauge_analytics_site_id %>');
+      t.setAttribute('data-site-id', '<%= Monologue::Config.gauge_analytics_site_id %>');
       t.src = '//secure.gaug.es/track.js';
       var s = document.getElementsByTagName('script')[0];
       s.parentNode.insertBefore(t, s);

data/app/views/layouts/monologue/application/_google_analytics.html.erb

@@ -1,8 +1,8 @@
-<% unless Monologue.google_analytics_id.nil? %>
+<% unless Monologue::Config.google_analytics_id.nil? %>
   <script type="text/javascript">
 
     var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', '<%= Monologue.google_analytics_id %>']);
+    _gaq.push(['_setAccount', '<%= Monologue::Config.google_analytics_id %>']);
     _gaq.push(['_trackPageview']);
 
     (function() {

data/app/views/layouts/monologue/application/_head.html.erb

@@ -3,7 +3,7 @@
 <%= render "layouts/monologue/application/meta_description" %>
 <%= render "layouts/monologue/application/fb_open_graph" %>
 <%= render "layouts/monologue/application/twitter_cards" %>
-<meta name="keyword" content="<%=Monologue.meta_keyword%>">
+<meta name="keyword" content="<%=Monologue::Config.meta_keyword%>">
 
 <meta http-equiv="content-type" content="text/html;charset=utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">

data/app/views/layouts/monologue/application/_meta_description.html.erb

@@ -1 +1 @@
-<meta name="description" content="<%= content_for?(:meta_description) ? yield(:meta_description) : Monologue.meta_description  %>" />
+<meta name="description" content="<%= content_for?(:meta_description) ? yield(:meta_description) : Monologue::Config.meta_description  %>" />

data/app/views/layouts/monologue/application/_sidebar.html.erb

@@ -1,6 +1,6 @@
-<% if Monologue.sidebar %>
+<% if Monologue::Config.sidebar %>
 <aside class="sidebar four columns">
-   <% Monologue.sidebar.each do |ext| %>
+   <% Monologue::Config.sidebar.each do |ext| %>
      <%= render partial: "monologue/sidebar/#{ext}" %>
    <% end %>
 </aside>

data/app/views/layouts/monologue/application/_twitter_cards.html.erb

@@ -1,7 +1,7 @@
 <meta name="twitter:card" content="summary">
-<% if Monologue.twitter_username %>
-  <meta name="twitter:site" content="<%= Monologue.twitter_username %>">
+<% if Monologue::Config.twitter_username %>
+  <meta name="twitter:site" content="<%= Monologue::Config.twitter_username %>">
 <% end %>
 <meta name="twitter:url" content="<%= request.protocol %><%= request.host_with_port %><%= request.path.gsub("//","/") %>">
 <meta name="twitter:title" content="<%= monologue_accurate_title %>">
-<meta name="twitter:description" content="<%= content_for?(:meta_description) ? yield(:meta_description) : Monologue.meta_description  %>">
+<meta name="twitter:description" content="<%= content_for?(:meta_description) ? yield(:meta_description) : Monologue::Config.meta_description  %>">

data/app/views/monologue/admin/comments/show.html.erb

@@ -1,4 +1,4 @@
 <div id="recentcomments" class="dsq-widget">
   <h1 class="dsq-widget-title"><%= t(".recent_comments") %></h1>
-  <script type="text/javascript" src="//<%= Monologue.disqus_shortname%>.disqus.com/recent_comments_widget.js?num_items=20&hide_avatars=0&avatar_size=48&excerpt_length=500"></script>
+  <script type="text/javascript" src="//<%= Monologue::Config.disqus_shortname%>.disqus.com/recent_comments_widget.js?num_items=20&hide_avatars=0&avatar_size=48&excerpt_length=500"></script>
 </div>

data/app/views/monologue/posts/_social_sharing.html.erb

@@ -8,7 +8,7 @@
 
          <!-- Placez cet appel d'affichage à l'endroit approprié. -->
          <script type="text/javascript">
-           window.___gcfg = {lang: '<%=Monologue.google_plusone_locale || "en" %>'};
+           window.___gcfg = {lang: '<%=Monologue::Config.google_plusone_locale || "en" %>'};
 
            (function() {
              var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
@@ -21,9 +21,9 @@
     <div id="twitter">
       <!-- TWITTER -->
       <a href="https://twitter.com/share" class="twitter-share-button"
-          data-lang="<%= Monologue.twitter_locale || "en" %>"
+          data-lang="<%= Monologue::Config.twitter_locale || "en" %>"
           data-url="<%= request.protocol %><%= request.host_with_port %><%= request.path.gsub("//","/") %>"
-          data-via="<%=Monologue.twitter_username%>"
+          data-via="<%=Monologue::Config.twitter_username%>"
           data-text="<%=@post.title%>"
           data-count="horizontal">Tweet</a>
 
@@ -39,7 +39,7 @@
         var js, fjs = d.getElementsByTagName(s)[0];
         if (d.getElementById(id)) return;
         js = d.createElement(s); js.id = id;
-        js.src = "//connect.facebook.net/<%= Monologue.facebook_like_locale || "en_US" %>/all.js#xfbml=1&appId=288133081204194";
+        js.src = "//connect.facebook.net/<%= Monologue::Config.facebook_like_locale || "en_US" %>/all.js#xfbml=1&appId=288133081204194";
         fjs.parentNode.insertBefore(js, fjs);
       }(document, 'script', 'facebook-jssdk'));</script>
       <div class="fb-like" data-send="false" data-width="450" data-show-faces="false"></div>

data/app/views/monologue/posts/feed.rss.builder

@@ -1,8 +1,8 @@
 xml.instruct! :xml, version: "1.0"
 xml.rss version: "2.0" do
   xml.channel do
-    xml.title Monologue.site_name
-    xml.description Monologue.meta_description
+    xml.title Monologue::Config.site_name
+    xml.description Monologue::Config.meta_description
     xml.link root_url
 
     for post in @posts
@@ -10,8 +10,8 @@ xml.rss version: "2.0" do
         xml.title post.title
         xml.description raw(post.content)
         xml.pubDate post.published_at.to_s(:rfc822)
-        xml.link Monologue.site_url + post.full_url
-        xml.guid Monologue.site_url + post.full_url
+        xml.link Monologue::Config.site_url + post.full_url
+        xml.guid Monologue::Config.site_url + post.full_url
       end
     end
   end

data/app/views/monologue/sidebar/_archive.html.erb

@@ -0,0 +1,27 @@
+<%= sidebar_section_for(t(".archive")) do  %>
+  <div class="archive">
+    <ul>
+      <% DateTime.now.year.downto(@first_post_year) do |year| %>
+        <li>
+          <span class="js-year blog-year" ><%= year %></span>
+          <ul class="js-months" style="display:none">
+            <% 12.downto(1) do |month|
+                year_month = "#{year} #{month}"
+              %>
+              <% if @archive_posts[year_month]%>
+                <li>
+                  <span class="js-month blog-month" ><%= Date::MONTHNAMES[month] %></span>
+                  <ul class="js-posts" style="display:none">
+                    <% @archive_posts[year_month].sort.reverse.each do |post| %>
+                      <li><%= link_to post.title, post.full_url %></li>
+                    <% end %>
+                  </ul>
+                </li>
+              <% end %>
+            <% end %>
+          </ul>
+        </li>
+      <% end %>
+    </ul>
+  </div>
+<% end  %>

data/app/views/monologue/sidebar/_latest_tweets.html.erb

@@ -1,8 +1,8 @@
-<% unless Monologue.twitter_username.nil? %>
+<% unless Monologue::Config.twitter_username.nil? %>
   <%= sidebar_section_for(t(".title")) do %>
     <ul id="latest_tweets">
       <li id="tweet_template" style="display:none;">{{text}}</li>
     </ul>
-    <script type="text/javascript" src="https://api.twitter.com/1/statuses/user_timeline/<%= Monologue.twitter_username %>.json?callback=TwitterWidget.callback&amp;count=5"></script>
+    <script type="text/javascript" src="https://api.twitter.com/1/statuses/user_timeline/<%= Monologue::Config.twitter_username %>.json?callback=TwitterWidget.callback&amp;count=5"></script>
   <% end %>
 <% end %>

data/config/locales/de.yml

@@ -0,0 +1,136 @@
+de:
+  monologue:
+    posts:
+      pagination:
+        older_posts: "Ältere Beitrag"
+        newer_posts: "Neuere Beitrag"
+      social_sharing:
+        tagline: "Magst du was du liest? Teile es!"
+      post:
+        readmore: "Lese mehr"
+      "404":
+        title: "Die Seite nach dem Sie gesucht haben existiert nicht."
+        message: "Vielleicht haben Sie die falsche Adresse eingegeben oder sie wurde verschoben."
+    sidebar:
+      categories:
+        title: "Kategorien"
+      latest_posts:
+        title: "Letzte Beiträge"
+      latest_tweets:
+        title: "Letzte Tweets"
+      tag_cloud:
+        title: "Tags"
+    tags:
+      show:
+        showing_post_with_tag: "Zeige alle Beiträge mit tag"
+        show_all_posts: "Zeige alle Beiträge"
+    admin:
+      login:
+        need_auth: "Sie müssen sich erst anmelden um in den Admin-Bereich zu kommen"
+      users:
+        form:
+          email: "Email"
+          name: "Name"
+          password: "Passwort"
+          password_confirmation: "Password Bestätigung"
+        edit:
+          header: "Bearbeite dein Zugang"
+          save: "Speichern"
+        new:
+          create: "Erstelle"
+          header: "Benutzer hinzufügen"
+        create:
+          success: "Benutzer erstellt"
+        delete:
+          removed: "Benutzer '%{user}' erfolgreich entfernt"
+          failed: "Benutzer '%{user}' konnte nicht entfernt werden"
+        index:
+          email: "Email"
+          name: "Name"
+          edit: "Bearbeiten"
+          delete: "Löschen"
+          create: "Erstellen"
+      posts:
+        index:
+          title: "Titel"
+          edit: "Bearbeiten"
+          delete: "Löschen"
+          published: "Yes"
+          not_published: "Nicht veröffentlicht"
+          status: "Veröffentlichen ?"
+        new:
+          header: "Neuer Monologue"
+        create:
+          saved: "Monologue erstellt"
+          saved_with_future_date_and_cache: "Monologue erstellt: Beiträge mit Zukunft Veröffentlichungsdatum wird nicht angezeigt, es sei denn, der Cache wird am selben Tag gelöscht. Wahrscheinlich wird der Cache vorher erzeugt und wird nicht automatisch aktualisiert."
+        edit:
+          header: "bearbeiten"
+        update:
+          saved_with_future_date_and_cache: "Monologue gespeichert: Beiträge mit Zukunft Veröffentlichungsdatum wird nicht angezeigt, es sei denn, der Cache wird am selben Tag gelöscht. Wahrscheinlich wird der Cache vorher erzeugt und wird nicht automatisch aktualisiert."
+          saved: "Monologue gespeichert"
+        delete:
+          removed: "Monologue entfernt"
+          fail: "Entfernt von monologue fehlgeschlagen!"
+        form:
+          title: "Titel"
+          content: "Inhalt"
+          url:
+            caption: "URL<br/><i> Dies wird mit dem Stadard URL befüllt. '%{default_url}'. Sie können sich Ihr eigene URL einfügen. Fügen sie kein '%{root}' am Anfang ihrer URL.</i>"
+            generated_title: "ihr-beitrags-titel"
+          published_at: "veröffentlicht am"
+          published: "Veröffentlicht"
+          save: "Speichern"
+          preview: "Vorschau"
+          close: "Schliesen"
+          tags: "Tags"
+      comments:
+        show:
+          recent_comments: "Neuste Kommentare"
+      sessions:
+        new:
+          title: "Anmelden"
+          email: "Email"
+          password: "Passwort"
+          button: "anmelden"
+        messages:
+          invalid: "Fehlerhafte Email oder Passwort"
+          logged_in: "Angemeldet!"
+          logged_out: "Abgemeldet!"
+  layouts:
+    monologue:
+      admin:
+        nav_bar:
+          add_a_monologue: "Monologue hinzufügen"
+          list_monologues: "Liste der Monologue"
+          comments: "Kommentare"
+          cache: "Cache managen"
+          edit_user_info: "Mein Zugang"
+          settings: "Einstellung"
+          log_out: "Abmelden"
+          users: "Benutzer"
+  activerecord:
+    attributes:
+      monologue/user:
+        password_digest: "Password bestätigung"
+    errors:
+      format: "%{message}"
+    errors:
+      full_messages: "%{message}"
+    errors:
+      models:
+        full_messages: "%{message}"
+        monologue/post:
+          blank: "%{attribute} ist benötigt"
+          taken: "%{attribute} wurde schon in einem anderen Beitrag von einem anderen Benutzer verwendet"
+          attributes:
+            published_at:
+              blank: "'Veröffentlichen am' wird benötigt"
+            url:
+              start_with_slash: "URL darf nicht mit einem Schrägstrich anfangen ('/')"
+
+        monologue/user:
+          blank: "%{attribute} wird benötigt"
+          taken: "%{attribute} wurde schon benutzt"
+          attributes:
+            password:
+              confirmation: "Passwort und Bestätigung stimmen nicht überein."

data/config/locales/en.yml

@@ -86,18 +86,6 @@ en:
       comments:
         show:
           recent_comments: "Recent comments"
-      cache:
-        show:
-          title: "Manage cache"
-          description: "You can completely wipe cache here."
-          files_in_cache: "Here are the files actually cached:"
-          no_files_are_cached: "There are actually no file in cache."
-          delete: "Completely wipe cache?"
-          confirm: 'Are you sure you want to completely clear cache?'
-          cache_wiped: "Cache was wiped!"
-        how_to_enable:
-          warning: "You can't manage cache!"
-          explanations: "There are certain settings that are not set correctly to be able to use Monologue's basic cache. Please review configuration documentation."
       sessions:
         new:
           title: "Sign in"