clipster 0.3.0 → 0.4.0

data/app/views/clipster/clips/list.atom.builder

@@ -0,0 +1,22 @@
+atom_feed do |feed|
+  feed.title("Clipster - Recent")
+  feed.updated(@updated_at) unless @updated_at.nil?
+
+  @clips.each do |clip|
+    feed.entry(clip) do |entry|
+      entry.title(clip.title)
+      if clip.expires.nil?
+        entry.subtitle("A #{clip.language} clip that never expires")
+      else
+        entry.subtitle("A #{clip.language} clip that expires on #{clip.expires}")
+      end
+      entry.updated(clip.updated_at)
+      entry.content(clip.div.html_safe, :type => 'html')
+      
+      #TODO set author once user integration is compleate
+      #entry.author do |author|
+      #  author.name("DHH")
+      #end
+    end
+  end
+end

data/app/views/clipster/clips/list.html.erb

@@ -1,44 +1,61 @@
-<legend>Recent Clips <%= "- #{params[:lang]}" unless params[:lang].nil? %></legend>
-<div class="span7">
-    <table class="table table-striped table-bordered table-hover span6">
-        <thead>
-            <tr>
-                <th>
-                    Title
-                </th>
-                <th>
-                    Language
-                </th>
-                <th>
-                    Created On
-                </th>
-                <th>
-                    Expires
-                </th>
-            </tr>
-        </thead>
-        <tbody>
-            <% @clips.each do |clip| %>
-            <tr>
-                <td><%= link_to clip.title, clip %></td>
-                <td><%= clip.language %></td>
-                <td><%= l clip.created_at, :format => :short %></td>
-                <td><%= clip.lifespan %></td>
-            </tr>
-            <% end %>
-            <% unless @clips.length > 0 %>
-            <tr>
-                <td colspan="3" style="text-align: center;">There are no public clips.</td>
-            </tr>
-            <% end %>
-        </tbody>
-    </table>
-    <div class="clearfix"></div>
-    <%= paginate @clips %>
-</div>
-<aside class="languages bordered span3 offset1">
-    <div class="title">Languages</div>
-    <% @languages.each do |lang| %>
-    <div><%= link_to lang.language, list_clips_path(:lang => lang.language) %> (<%= lang.count %>)</div>
-    <% end %>
+<%= content_for :head, auto_discovery_link_tag(:atom) %>
+
+<legend>
+        Recent Clips<%= " - #{params[:lang]}" unless params[:lang].nil? %>
+        <%= link_to "", list_clips_path(:lang => params[:lang], :format=>:atom), :class=>"image-feed pull-right" %>
+</legend>
+<div class="span7">
+    <table class="table table-striped table-bordered table-hover span6">
+        <thead>
+            <tr>
+                <th>
+                    Title
+                </th>
+                <% if Clipster.config.associates_clip_with_user %>
+                <th>
+                    User
+                </th>
+                <% end %>
+                <th>
+                    Language
+                </th>
+                <th>
+                    Created On
+                </th>
+                <th>
+                    Expires
+                </th>
+            </tr>
+        </thead>
+        <tbody>
+            <% @clips.each do |clip| %>
+            <tr>
+                <td><%= link_to clip.title, clip %></td>
+                <% if Clipster.config.associates_clip_with_user %>
+                <td>
+                    <%= link_to(display_user_text(clip.user), clip.user) if clip.user %>
+                </td>
+                <% end %>
+                <td><%= clip.language.capitalize %></td>
+                <td><%= l clip.created_at, :format => :short %></td>
+                <td><%= clip.expires_in_words %></td>
+            </tr>
+            <% end %>
+            <% unless @clips.length > 0 %>
+            <tr>
+                <td colspan="3" style="text-align: center;">There are no public clips.</td>
+            </tr>
+            <% end %>
+        </tbody>
+    </table>
+    <div class="clearfix"></div>
+    <%= paginate @clips %>
+</div>
+
+<%# Refactor out into common partial %>
+<aside class="languages bordered span3 offset1">
+    <div class="title">Languages</div>
+    <% get_language_counts.each do |lang| %>
+    <div><%= link_to lang.language, list_clips_path(:lang => lang.language) %> (<%= lang.count %>)</div>
+    <% end %>
 </aside>

data/app/views/clipster/clips/show.html.erb

@@ -1,8 +1,8 @@
-<legend>
-  <div class="span10"><%=@clip.title %></div>
-    <div class="span3 secondary">A <%=@clip.language.capitalize %> clip</div>
-    <div class="span5 secondary">Expires: <%= @clip.lifespan.humanize %></div>
-    <div class="clearfix"></div>
-</legend>
-<div class="clearfix"></div>
-<%= @clip_div.html_safe  %>
+<legend>
+  <div class="span10"><%=@clip.title %></div>
+    <div class="span3 secondary">A <%=@clip.language.capitalize %> clip</div>
+    <div class="span5 secondary">Expires: <%= @clip.expires_in_words %></div>
+    <div class="clearfix"></div>
+</legend>
+<div class="clearfix"></div>
+<%= @clip.div.html_safe  %>

data/app/views/clipster/users/index.html.erb

@@ -0,0 +1,2 @@
+<h1>Users#index</h1>
+<p>Find me in app/views/clipster/users/index.html.erb</p>

data/app/views/clipster/users/show.html.erb

@@ -0,0 +1,46 @@
+<legend>Recent Clips from <%= @user %></legend>
+<div class="span7">
+    <table class="table table-striped table-bordered table-hover span6">
+        <thead>
+            <tr>
+                <th>
+                    Title
+                </th>
+                <th>
+                    Language
+                </th>
+                <th>
+                    Created On
+                </th>
+                <th>
+                    Expires
+                </th>
+            </tr>
+        </thead>
+        <tbody>
+            <% @clips.each do |clip| %>
+            <tr>
+                <td><%= link_to clip.title, clip_path %></td>
+                <td><%= clip.language.capitalize %></td>
+                <td><%= l clip.created_at, :format => :short %></td>
+                <td><%= clip.expires_in_words %></td>
+            </tr>
+            <% end %>
+            <% unless @clips.length > 0 %>
+            <tr>
+                <td colspan="3" style="text-align: center;">There are no public clips.</td>
+            </tr>
+            <% end %>
+        </tbody>
+    </table>
+    <div class="clearfix"></div>
+    <%= paginate @clips %>
+</div>
+
+<%# Refactor out into common partial %>
+<aside class="languages bordered span3 offset1">
+    <div class="title">Languages</div>
+    <% get_language_counts.each do |lang| %>
+    <div><%= link_to lang.language.capitalize, list_clips_path(:lang => lang.language) %> (<%= lang.count %>)</div>
+    <% end %>
+</aside>

data/app/views/kaminari/_first_page.html.erb

@@ -1,3 +1,3 @@
-<li>
-  <%= link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, :remote => remote %>
-</li>
+<li>
+  <%= link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, :remote => remote %>
+</li>

data/app/views/kaminari/_gap.html.erb

@@ -1,3 +1,3 @@
-<li class="disabled">
-  <%= link_to raw(t 'views.pagination.truncate'), '#' %>
-</li>
+<li class="disabled">
+  <%= link_to raw(t 'views.pagination.truncate'), '#' %>
+</li>

data/app/views/kaminari/_last_page.html.erb

@@ -1,3 +1,3 @@
-<li>
-  <%= link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, {:remote => remote} %>
-</li>
+<li>
+  <%= link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, {:remote => remote} %>
+</li>

data/app/views/kaminari/_next_page.html.erb

@@ -1,3 +1,3 @@
-<li>
-  <%= link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, :rel => 'next', :remote => remote %>
-</li>
+<li>
+  <%= link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, :rel => 'next', :remote => remote %>
+</li>

data/app/views/kaminari/_page.html.erb

@@ -1,3 +1,3 @@
-<li class="<%= 'active' if page.current? %>">
-  <%= link_to page, page.current? ? '#' : url, {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %>
-</li>
+<li class="<%= 'active' if page.current? %>">
+  <%= link_to page, page.current? ? '#' : url, {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %>
+</li>

data/app/views/kaminari/_paginator.html.erb

@@ -1,17 +1,17 @@
-<%= paginator.render do -%>
-  <div class="pagination">
-    <ul>
-      <%= first_page_tag unless current_page.first? %>
-      <%= prev_page_tag unless current_page.first? %>
-      <% each_page do |page| -%>
-        <% if page.left_outer? || page.right_outer? || page.inside_window? -%>
-          <%= page_tag page %>
-        <% elsif !page.was_truncated? -%>
-          <%= gap_tag %>
-        <% end -%>
-      <% end -%>
-      <%= next_page_tag unless current_page.last? %>
-      <%= last_page_tag unless current_page.last? %>
-    </ul>
-  </div>
-<% end -%>
+<%= paginator.render do -%>
+  <div class="pagination">
+    <ul>
+      <%= first_page_tag unless current_page.first? %>
+      <%= prev_page_tag unless current_page.first? %>
+      <% each_page do |page| -%>
+        <% if page.left_outer? || page.right_outer? || page.inside_window? -%>
+          <%= page_tag page %>
+        <% elsif !page.was_truncated? -%>
+          <%= gap_tag %>
+        <% end -%>
+      <% end -%>
+      <%= next_page_tag unless current_page.last? %>
+      <%= last_page_tag unless current_page.last? %>
+    </ul>
+  </div>
+<% end -%>

data/app/views/kaminari/_prev_page.html.erb

@@ -1,3 +1,3 @@
-<li>
-  <%= link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, :rel => 'prev', :remote => remote %>
-</li>
+<li>
+  <%= link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, :rel => 'prev', :remote => remote %>
+</li>

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

@@ -1,49 +1,62 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <title>Clipster</title>
-  <%= stylesheet_link_tag    "clipster/application", :media => "all" %>
-
-  <%= javascript_include_tag "clipster/application" %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
-    <div class="container">
-        <div class="navbar navbar-inverse navbar-fixed-top">
-            <div class="navbar-inner">
-                <div class="container">
-                    <div class="nav-collapse collapse">
-                        <%= link_to "Clipster", root_path, :class => "brand" %>
-                        <ul class="nav">
-                            <li><%= link_to "New Clip", :action=>:create %></li>
-                            <li><%= link_to "Recent Clips", :action=>:list %></li>
-                            <li><%= link_to "About", :action=>:about %></li>
-                        </ul>
-                        <!-- <form class="navbar-search pull-right"> -->
-                        <%= form_tag(search_clips_path, :method => 'get', :class => 'navbar-search pull-right') do %>
-                             <%= text_field_tag(:search_term, "", :class=>"search-query", :placeholder=>"Search") %> 
-                        <% end %>
-
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <%#
-    Do we want a header, if so this is how we do it. not sure if needed with fixed navbar
-    <header class="jumbotron">
-        <div class="container">
-            <h3>Clipster</h3>
-            <p class="lead">Code snippets before they were cool</p>
-        </div>
-    </header> 
-    %>
-    <div class="container">
-        <div class="row">
-            <div class="span12">
-                <%= yield %>
-            </div>
-        </div>
-    </div>
-</body>
-</html>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <title>Clipster</title>
+  <%= stylesheet_link_tag    "clipster/application", :media => "all" %>
+
+  <%= javascript_include_tag "clipster/application" %>
+  <%= csrf_meta_tags %>
+  <%=h yield(:head) %>
+</head>
+<body>
+    <div class="container">
+        <div class="navbar navbar-inverse navbar-fixed-top">
+            <div class="navbar-inner">
+                <div class="container">
+                    <div class="nav-collapse collapse">
+                        <%= link_to "Clipster", root_path, :class => "brand" %>
+                        <ul class="nav">
+                            <li><%= link_to "New Clip", new_clip_path %></li>
+                            <li><%= link_to "Recent Clips", list_clips_path %></li>
+                            <li><%= link_to "About", about_clips_path %></li>
+                            <% if Clipster.config.associates_clip_with_user %>
+                            <li><a href="javascript:void(0);"><%= Clipster.config.user_class %></a></li>
+                            <% end %>
+                        </ul>
+                        <!-- <form class="navbar-search pull-right"> -->
+                        <%= form_tag(search_clips_path, :method => 'get', :class => 'navbar-search pull-right') do %>
+                             <%= text_field_tag(:search_term, "", :class=>"search-query", :placeholder=>"Search") %>
+                        <% end %>
+
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <%#
+    Do we want a header, if so this is how we do it. not sure if needed with fixed navbar
+    <header class="jumbotron">
+        <div class="container">
+            <h3>Clipster</h3>
+            <p class="lead">Code snippets before they were cool</p>
+        </div>
+    </header>
+    %>
+    <div class="flash">
+        <% if notice %>
+        <p class="notice"><%= notice %></p>
+        <% end %>
+        <% if alert %>
+        <p class="alert"><%= alert %></p>
+        <% end -%>
+    </div>
+
+    <div class="container">
+        <div class="row">
+            <div class="span12">
+                <%= yield %>
+            </div>
+        </div>
+    </div>
+</body>
+</html>

data/config/routes.rb

@@ -1,14 +1,16 @@
-Clipster::Engine.routes.draw do
-  #/clipster route
-  
-  resources :clips, :path => "/" do
-    collection do
-      get 'list', :action => :list
-      get 'list(/:lang)(.:format)', :action => :list
-      get 'search', :action => :search
-      get 'about', :action => :about
-    end
-  end
-
-  root :to => :clips
-end
+Clipster::Engine.routes.draw do
+
+  resources :users, :only => :show
+  #/clipster route
+
+  resources :clips, :path => "/" do
+    collection do
+      get 'list', :action => :list
+      get 'list(/:lang)(.:format)', :action => :list
+      get 'search', :action => :search
+      get 'about', :action => :about
+    end
+  end
+
+  root :to => :clips
+end

data/config/schedule.rb

@@ -1,10 +1,10 @@
-# Use this file to easily define all of your cron jobs.
-#
-# It's helpful, but not entirely necessary to understand cron before proceeding.
-# http://en.wikipedia.org/wiki/Cron
-
-every :day, :at => '3:00 am' do
-  runner "Clip.delete_expired_clips"
-end
-
-# Learn more: http://github.com/javan/whenever
+# Use this file to easily define all of your cron jobs.
+#
+# It's helpful, but not entirely necessary to understand cron before proceeding.
+# http://en.wikipedia.org/wiki/Cron
+
+every :day, :at => '3:00 am' do
+  runner "Clip.delete_expired_clips"
+end
+
+# Learn more: http://github.com/javan/whenever

data/db/migrate/20121004010757_create_clipster_clips.rb

@@ -1,16 +1,16 @@
-class CreateClipsterClips < ActiveRecord::Migration
-  def up
-    create_table :clipster_clips do |t|
-      t.string :hash, :null => false
-      t.text :clip, :null => false
-      t.string :language, :null => false
-      t.string :title, :null => false
-      t.boolean :private, :null => false
-      t.timestamps
-    end
-  end
-
-  def down
-    drop_table :clipster_clips
-  end
-end
+class CreateClipsterClips < ActiveRecord::Migration
+  def up
+    create_table :clipster_clips do |t|
+      t.string :hash, :null => false
+      t.text :clip, :null => false
+      t.string :language, :null => false
+      t.string :title, :null => false
+      t.boolean :private, :null => false
+      t.timestamps
+    end
+  end
+
+  def down
+    drop_table :clipster_clips
+  end
+end

data/db/migrate/20121007154400_add_hash_index_to_clips.rb

@@ -1,13 +1,13 @@
-class AddHashIndexToClips < ActiveRecord::Migration
-  def up
-    change_table :clipster_clips do |t|
-      t.index :hash, :unique => true
-    end
-  end
-
-  def down
-    change_table :clipster_clips do |t|
-      t.remove_index :hash
-    end
-  end
-end
+class AddHashIndexToClips < ActiveRecord::Migration
+  def up
+    change_table :clipster_clips do |t|
+      t.index :hash, :unique => true
+    end
+  end
+
+  def down
+    change_table :clipster_clips do |t|
+      t.remove_index :hash
+    end
+  end
+end

data/db/migrate/20121007155125_populate_clip_defaults.rb

@@ -1,21 +1,21 @@
-class PopulateClipDefaults < ActiveRecord::Migration
-  def up
-    change_table :clipster_clips do |t|
-      t.change_default :hash, ''
-      t.change_default :clip, ''
-      t.change_default :title, ''
-      t.change_default :language, ''
-      t.change_default :private, false
-    end
-  end
-
-  def down
-    change_table :clipster_clips do |t|
-      t.change_default :hash, nil
-      t.change_default :clip, nil
-      t.change_default :title, nil
-      t.change_default :language, nil
-      t.change_default :private, false
-    end
-  end
-end
+class PopulateClipDefaults < ActiveRecord::Migration
+  def up
+    change_table :clipster_clips do |t|
+      t.change_default :hash, ''
+      t.change_default :clip, ''
+      t.change_default :title, ''
+      t.change_default :language, ''
+      t.change_default :private, false
+    end
+  end
+
+  def down
+    change_table :clipster_clips do |t|
+      t.change_default :hash, nil
+      t.change_default :clip, nil
+      t.change_default :title, nil
+      t.change_default :language, nil
+      t.change_default :private, false
+    end
+  end
+end

data/db/migrate/20121007162741_rename_hash_to_url_hash.rb

@@ -1,9 +1,9 @@
-class RenameHashToUrlHash < ActiveRecord::Migration
-  def up
-    rename_column :clipster_clips, :hash, :url_hash
-  end
-
-  def down
-    rename_column :clipster_clips, :url_hash, :hash
-  end
-end
+class RenameHashToUrlHash < ActiveRecord::Migration
+  def up
+    rename_column :clipster_clips, :hash, :url_hash
+  end
+
+  def down
+    rename_column :clipster_clips, :url_hash, :hash
+  end
+end

data/db/migrate/20121007223358_remove_default_from_language.rb

@@ -1,9 +1,9 @@
-class RemoveDefaultFromLanguage < ActiveRecord::Migration
-  def up
-    change_column_default :clipster_clips, :language, nil
-  end
-
-  def down
-    change_column_default :clipster_clips, :language, ''
-  end
-end
+class RemoveDefaultFromLanguage < ActiveRecord::Migration
+  def up
+    change_column_default :clipster_clips, :language, nil
+  end
+
+  def down
+    change_column_default :clipster_clips, :language, ''
+  end
+end

data/db/migrate/20121007223631_set_default_title_to_untitled.rb

@@ -1,9 +1,9 @@
-class SetDefaultTitleToUntitled < ActiveRecord::Migration
-  def up
-    change_column_default :clipster_clips, :title, 'Untitled'
-  end
-
-  def down
-    change_column_default :clipster_clips, :title, ''
-  end
-end
+class SetDefaultTitleToUntitled < ActiveRecord::Migration
+  def up
+    change_column_default :clipster_clips, :title, 'Untitled'
+  end
+
+  def down
+    change_column_default :clipster_clips, :title, ''
+  end
+end

data/db/migrate/20121105212724_add_lifespan_to_clips.rb

@@ -1,9 +1,9 @@
-class AddLifespanToClips < ActiveRecord::Migration
-  def up
-    add_column :clipster_clips, :expires, :datetime
-  end
-
-  def down
-    remove_column :clipster_clips, :expires
-  end
-end
+class AddLifespanToClips < ActiveRecord::Migration
+  def up
+    add_column :clipster_clips, :expires, :datetime
+  end
+
+  def down
+    remove_column :clipster_clips, :expires
+  end
+end

data/db/migrate/20121114175749_add_user_id_to_clips.rb

@@ -0,0 +1,9 @@
+class AddUserIdToClips < ActiveRecord::Migration
+  def up
+    add_column :clipster_clips, :user_id, :integer
+  end
+
+  def down
+    remove_column :clipster_clips, :user_id
+  end
+end