monologue 0.1.3 → 0.2.0.beta3

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

@@ -1,4 +1,3 @@
-
 <% content_for :title do %>
   <%= @revision.title %>
 <% end %>
@@ -8,31 +7,19 @@
 <% end %>
 
 <article>
-  <header><h1><%= link_to @revision.title, @revision.full_url %></h1></header>
-        <div class="posted">
-        <time datetime="<%= @revision.published_at %>">
-          <%= @revision.published_at.to_date.to_formatted_s(:long_ordinal) %>
-        </time>&nbsp;&nbsp;|&nbsp;&nbsp;<%= @revision.user.name %>&nbsp;&nbsp;|&nbsp;&nbsp;<a href="<%= @revision.full_url + "#disqus_thread" %>"></a>
-      </div>
-  <p><%= raw @revision.content %></p>
+  <%= render :partial => 'monologue/posts/revision_header', :locals => {:revision=>@revision}%>
+  <div id="content" data-monologue="content">
+    <%= raw @revision.content %>
+  </div>
+
+	<div id="tags" data-monologue="tags">
+    <%= render @revision.post.tags %>
+  </div>
 
   <%= render "social_sharing" %>
 
   <div id="disqus_thread"></div>
-  <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
-    
-      <% if Rails.env.development?  %>
-            var disqus_developer = 1; // developer mode is on
-        <% end %>
+  <%= render 'layouts/monologue/application/disqus_embed' %>
+  <noscript>Please enable JavaScript to view the comments.</noscript>
+</article>
 
-      /* * * DON'T EDIT BELOW THIS LINE * * */
-      (function() {
-          var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-          dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js';
-          (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-      })();
-  </script>
-  <noscript>Please enable JavaScript to view the comments.</a></noscript>
-</article>

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

@@ -0,0 +1,7 @@
+<%= sidebar_section_for(t(".title")) do %>
+   <ul>
+     <% @tags.each do |tag| %>
+       <li id="tag"><%=link_to "#{tag.name} (#{tag.frequency})", tag_url(tag) %> </li>
+     <% end %>
+   </ul>
+ <% end %>

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

@@ -0,0 +1,7 @@
+<%= sidebar_section_for(t(".title")) do  %>
+  <ul>
+    <% @recent_posts.each do |post| %>
+      <li><%= link_to post.active_revision.title, post.active_revision.full_url %></li>
+    <% end %>
+  </ul>
+<% end %>

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

@@ -0,0 +1,8 @@
+<% unless Monologue.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="http://twitter.com/statuses/user_timeline/<%= Monologue.twitter_username %>.json?callback=TwitterWidget.callback&amp;count=5"></script>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,5 @@
+<%= sidebar_section_for(t(".title")) do  %>
+  <% @tags.each do |tag| %>
+    <%=link_to tag.name, tag_url(tag), :class =>label_for_tag(tag,@tags_frequency_min,@tags_frequency_max) %>
+  <% end %>
+<% end  %>

data/app/views/monologue/tags/_tag.html.erb

@@ -0,0 +1 @@
+<span class='tag'><%=link_to tag.name, tag_url(tag) %></span>

data/app/views/monologue/tags/show.html.erb

@@ -0,0 +1,4 @@
+<div class="tag-search">
+  <%= t(".showing_post_with_tag")%> <strong>'<%= @tag.name %>'</strong>. <%=link_to t(".show_all_posts"),:root %>
+</div>
+<%= render @posts %>

data/config/locales/en.yml

@@ -9,7 +9,7 @@ en:
       social_sharing:
         tagline:
           "Loved what you just read? Share it!"
-      index:
+      post:
         readmore:
           "Read more"
       "404":
@@ -17,10 +17,37 @@ en:
           "The page you were looking for doesn't exist."
         message:
           "You may have mistyped the address or the page may have moved."
+    sidebar:
+      categories:
+        title:
+          "Categories"
+      latest_posts:
+        title:
+          "Latest posts"
+      latest_tweets:
+        title:
+          "Latest tweets"
+      tag_cloud:
+        title:
+          "Tags"
+    tags:
+      show:
+        showing_post_with_tag:
+          "Showing posts with label"
+        show_all_posts:
+          "Show all posts"
     admin:
       login:
         need_auth:
           "You must first log in to access admin section."
+      users:
+        edit:
+          header: "Edit your account"
+          email: "Email"
+          name: "Name"
+          password: "Password"
+          confirmation: "Password confirmation"
+          save: "Save"
       posts:
         index:
           title:
@@ -62,12 +89,8 @@ en:
           content:
             "Content"
           url:
-            before_generated_url:
-              "URL <br /><i> This will be filled by default with "
-            after_generated_url:
-              ". You can choose your own URL. </i>"
-            do_not_add_mount_point:
-              "Do not add at the beginning of your URL :"
+            caption:
+              "URL<br/><i> This will be filled by default with '%s'. You can choose your own URL. Do not add '%s' at the beginning of your URL.</i>"
             generated_title:
               "your-post-title"
           published_at:
@@ -78,10 +101,24 @@ en:
             "Save"
           preview:
             "Preview"
+          tags:
+            "Tags <br/><i>Separate tags by commas</i>"
       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 competely 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:
@@ -109,8 +146,9 @@ en:
             "List of monologues"
           comments:
             "Comments"
-          logged_in_as:
-            "Logged in as"
+          cache: "Manage cache"
+          edit_user_info: "My account"
+          settings: "Settings"
           log_out:
             "Log out"
   activerecord:
@@ -132,4 +170,10 @@ en:
               start_with_slash:
                 "URL can't start with a slash ('/')"
               unique:
-                "URL is already used by another post"
+                "URL is already used by another post"
+        monologue/user:
+          blank:
+            "%{attribute} is required"
+          attributes:
+            password:
+              confirmation: "Password and confirmation doesn't match."

data/config/locales/fr.yml

@@ -8,8 +8,8 @@ fr:
           "Articles plus récents"
       social_sharing:
         tagline:
-          "Vous avez ce que vous avez lu? Partagez le!"
-      index:
+          "Vous avez aimé ce que vous avez lu? Partagez le!"
+      post:
         readmore:
           "Lire"
       "404":
@@ -17,10 +17,37 @@ fr:
           "La page que vous cherchiez n'existe pas."
         message:
           "You pourriez avoir mal tappé l'adresse ou la page pourrait avoir été déplacée."
+    sidebar:
+      categories:
+        title:
+          "Catégories"
+      latest_posts:
+        title:
+          "Derniers articles"
+      latest_tweets:
+        title:
+          "Derniers tweets"
+      tag_cloud:
+        title:
+          "Labels"
+    tags:
+      show:
+        showing_post_with_tag:
+          "Articles ayant le label"
+        show_all_posts:
+          "Voir tous les articles"
     admin:
       login:
         need_auth:
           "Vous devez d'abord vous connectez à la section d'administration."
+      users:
+        edit:
+          header: "Modifier mon compte"
+          email: "Courriel"
+          name: "Nom"
+          password: "Mot de passe"
+          confirmation: "Confirmation du mot de passe"
+          save: "Sauvegarder"
       posts:
         index:
           title:
@@ -62,12 +89,8 @@ fr:
           content:
             "Contenu"
           url:
-            before_generated_url:
-              "Adresse URL <br /><i> Ce sera rempli par défaut avec "
-            after_generated_url:
-              ". Vous pouvez aussi choisir votre propre adresse URL. </i>"
-            do_not_add_mount_point:
-              "N'ajoutez pas au début de l'adresse URL:"
+            caption:
+              "Adresse URL<br/><i> Ce sera rempli par défaut avec '%s'. Vous pouvez aussi choisir votre propre adresse URL. N'ajoutez pas '%s' au début de l'adresse URL.</i>"
             generated_title:
               "nom-de-votre-article"
           published_at:
@@ -78,6 +101,20 @@ fr:
             "Sauvegarder"
           preview:
             "Aperçu"
+          tags:
+            "Catégories<br/><i>Séparer les catégories par des virgules</i>"
+      cache:
+        show:
+          title: "Gérer la cache"
+          description: "Vous pouvez complètement effacer la cache ici."
+          files_in_cache: "Voici les fichiers en cache:"
+          no_files_are_cached: "Il n'y a aucun fichier en cache."
+          delete: "Effacer complètement la cache?"
+          confirm: 'Voulez-vous vraiment effacer la cache?'
+          cache_wiped: "La cache a été effacée!"
+        how_to_enable:
+          warning: "Vous ne pouvez gérer la cache!"
+          explanations: "Il y a certaines configurations à effectuer pour utiliser la gestion de cache de base de Monologue. SVP voir la documentation ci-dessous (anglais seulement)."
       comments:
         show:
           recent_comments:
@@ -109,8 +146,9 @@ fr:
             "Liste des monologues"
           comments:
             "Commentaires"
-          logged_in_as:
-            "Connecté en tant que"
+          cache: "Gérer la cache"
+          edit_user_info: "Mon compte"
+          settings: "Paramètres"
           log_out:
             "Déconnexion"
   activerecord:
@@ -132,4 +170,10 @@ fr:
               start_with_slash:
                 "L'adresse URL ne peut débuter par un slash ('/')"
               unique:
-                "L'adresse URL est déjà utilisée par un autre article"
+                "L'adresse URL est déjà utilisée par un autre article"
+        monologue/user:
+          blank:
+            "%{attribute} est requis"
+          attributes:
+            password:
+              confirmation: "Le mot de passe et sa confirmation doivent concorder."

data/config/routes.rb

@@ -2,15 +2,21 @@ Monologue::Engine.routes.draw do
   root :to =>  "posts#index"
   match "/page/:page", :to =>  "posts#index", :as =>  "posts_page"
   match "/feed" => "posts#feed", :as =>  "feed", :defaults => {:format => :rss}
-  
+
+  match "/tags/:tag" =>"tags#show", :as => "tags_page"
+
   namespace :admin, :path => "monologue" do
     get "/" => "posts#index", :as =>  "" # responds to admin_url and admin_path
     get "logout" => "sessions#destroy"
     get "login" => "sessions#new"
     resources :sessions
     resources :posts
+    resources :users
     get "comments" => "comments#show", :as => "comments"
+
+    get "cache" => "cache#show", :as => "cache"
+    delete "cache" => "cache#destroy"
   end
-  
+
   match "*post_url" => "posts#show", :as =>  "post"
 end

data/db/migrate/20120514164158_create_monologue_tags.rb

@@ -0,0 +1,8 @@
+class CreateMonologueTags < ActiveRecord::Migration
+  def change
+    create_table :monologue_tags do |t|
+      t.string :name
+
+    end
+  end
+end

data/db/migrate/20120514194459_join_posts_and_tags.rb

@@ -0,0 +1,7 @@
+class JoinPostsAndTags < ActiveRecord::Migration
+  def change
+     create_table :posts_tags, :id=>false do |t|
+       t.integer :post_id,:tag_id
+     end
+   end
+end

data/db/migrate/20120604010152_rename_post_tags_table.rb

@@ -0,0 +1,5 @@
+class RenamePostTagsTable < ActiveRecord::Migration
+  def change
+    rename_table :posts_tags, :monologue_posts_tags
+  end
+end

data/db/migrate/20120612013442_create_taggings.rb

@@ -0,0 +1,11 @@
+class CreateTaggings < ActiveRecord::Migration
+  def change
+    create_table :monologue_taggings do |t|
+      t.integer :post_id, :tag_id
+    end
+
+    add_index :monologue_taggings, :post_id
+    add_index :monologue_taggings, :tag_id
+
+  end
+end

data/db/migrate/20120612015727_delete_join_posts_tags.rb

@@ -0,0 +1,11 @@
+class DeleteJoinPostsTags < ActiveRecord::Migration
+  def up
+    drop_table :monologue_posts_tags
+  end
+
+  def down
+    create_table :monologue_posts_tags, :id=>false do |t|
+      t.integer :post_id,:tag_id
+    end
+  end
+end

data/db/migrate/20120612020023_add_index_to_tag_name.rb

@@ -0,0 +1,5 @@
+class AddIndexToTagName < ActiveRecord::Migration
+  def change
+    add_index :monologue_tags, :name
+  end
+end

data/deprecations.rb

@@ -0,0 +1,10 @@
+def deprecate msg
+  puts "\e[#{31}m#{msg}\e[0m"
+end
+
+if RUBY_VERSION.include?("1.8.")
+  deprecate "#############################################"
+  deprecate "#         NOTE FOR RUBY 1.8.X USERS         #"
+  deprecate "#############################################"
+  deprecate "Please note that Monologue 0.2 is the last version to support Ruby 1.8."
+end

data/lib/monologue.rb

@@ -7,12 +7,31 @@ module Monologue
                  :site_url,
                  :meta_description,
                  :meta_keyword,
+
+                 :show_rss_icon,
+
                  :twitter_username,
                  :twitter_locale,
+
                  :facebook_like_locale,
+                 :facebook_url,
+                 :facebook_logo, #used in the open graph protocol to display an image when a post is liked
+
+                 :google_plus_account_url,
                  :google_plusone_locale,
+
+                 :linkedin_url,
+
+                 :github_username,
+
                  :admin_force_ssl,
                  :posts_per_page,
                  :google_analytics_id,
-                 :layout
+                 :gauge_analytics_site_id,
+                 :layout,
+                 :sidebar
+end
+
+module Monologue::PageCache
+    mattr_accessor :enabled, :wipe_enabled, :wipe_after_save
 end

data/lib/monologue/engine.rb

@@ -1,11 +1,22 @@
 require "tinymce-rails"
+require "truncate_html"
 module Monologue
   class Engine < Rails::Engine
     isolate_namespace Monologue
-    
+
+
+
     config.generators.test_framework :rspec, :view_specs => false, :fixture => false
     config.generators.stylesheets     false
     config.generators.fixture_replacement :factory_girl
     config.generators.integration_tool :rspec
+
+    initializer :assets do |config|
+      Rails.application.config.assets.paths << Rails.root.join('vendor', 'assets', 'fonts')
+    end
+
+
+    ENGINE_ROOT = File.join(File.dirname(__FILE__), '../..')
+    require "#{ENGINE_ROOT}/deprecations"
   end
 end