clipster 0.4.0 → 0.4.1

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

@@ -1,15 +1,15 @@
-<legend>About Clipster v.<%=Clipster::VERSION%></legend>
-
-<div class="span10 offset1">
-  <p>Clipster is an Open Source Rails engine to add clipboard code sharing to your existing Ruby on Rails applications. Complete with syntax highlighting and expiring clips, its great for internal code sharing. Please visit us on <%= link_to("GitHub", "http://github.com/kwbock/clipster") %> for downloads and support.</p>
-</div>
-
-<div class="well span9 offset1">
-  <p>Copyright 2012 Kyle Bock, Daniel White</p>
-
-  <p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p>
-
-  <p>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.<p>
-
-  <p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</p>
+<legend>About Clipster v<%=Gem.searcher.find("clipster").version unless Gem.searcher.find("clipster").nil?%></legend>
+
+<div class="span10 offset1">
+  <p>Clipster is an Open Source Rails engine to add clipboard code sharing to your existing Ruby on Rails applications. Complete with syntax highlighting and expiring clips, its great for internal code sharing. Please visit us on <%= link_to("GitHub", "http://github.com/kwbock/clipster") %> for downloads and support.</p>
+</div>
+
+<div class="well span9 offset1">
+  <p>Copyright 2012 Kyle Bock, Daniel White</p>
+
+  <p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p>
+
+  <p>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.<p>
+
+  <p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</p>
 </div>

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

@@ -1,57 +1,57 @@
-<legend>New Clip</legend>
-
-<%= form_for(@clip, :url => { :action => "create" }) do |f| %>
-  <%= f.error_messages %>
-  
-  <!-- 1st Row -->
-  <div class="span5 offset1">
-    <!-- title -->
-    <div class="span4 no-left">
-      <div class="help-tip">
-        <%= f.label(:title) %> <i class="icon-question-sign" data-title="Name your clip"></i></div>
-      <%= f.text_field(:title, :value => @clip.title, :required=>"required") %>
-    </div>
-    <!-- /title -->
-    
-    <!-- language -->
-    <div class="span4 no-left">
-      <div class="help-tip">
-        <%= f.label(:language) %> <i class="icon-question-sign" data-title="Choose a language for syntax highlighting"></i></div>
-      <%= f.collection_select("language", @languages, :lang, :title, :selected => (@clip.language || "text")) %>
-    </div>
-    <!-- /language -->
-  </div>
-  <!-- /1st Row -->
-  
-  <!-- 2nd Row -->
-  <div class="span5 offset1 pull-right no-left">
-    <!-- lifespan -->
-    <div class="span4">
-      <div class="help-tip">
-        <%= f.label(:lifespan) %> <i class="icon-question-sign" data-title="Choose how long the clip should remain available"></i></div>
-      <%= f.select(:lifespan, @clip.lifespans, :selected=>(@clip.lifespan || "Forever")) %>
-    </div>
-    <!-- /lifespan -->
-    
-    <!-- private -->
-    <div class="span4">
-      <div class="help-tip">
-        <%= f.label(:private) %> <i class="icon-question-sign" data-title="Only allow those with a link to access the clip"></i></div>
-      <%= f.check_box(:private, :value => @clip.private) %>
-    </div>
-    <!-- /private -->
-  </div>
-  <!-- /2nd Row -->
-  
-  <!-- clip -->
-  <div class="span10 offset1">
-    <div class="help-tip">
-      <%= f.label(:clip) %> <i class="icon-question-sign" data-title="The main content to be shared"></i></div>
-    <%= f.text_area(:clip, :class=>"span10", :rows=>"15", :value => @clip.clip, :required=>"required") %>
-  </div>
-  <!-- /clip -->
-  
-  <div class="span2 pull-right">
-    <%= f.submit(:class=>"btn btn-primary") %>
-  </div>
+<legend>New Clip</legend>
+
+<%= form_for(@clip, :url => { :action => "create" }) do |f| %>
+  <%= f.error_messages %>
+  
+  <!-- 1st Row -->
+  <div class="span5 offset1">
+    <!-- title -->
+    <div class="span4 no-left">
+      <div class="help-tip">
+        <%= f.label(:title) %> <i class="icon-question-sign" data-title="Name your clip"></i></div>
+      <%= f.text_field(:title, :value => @clip.title, :required=>"required") %>
+    </div>
+    <!-- /title -->
+    
+    <!-- language -->
+    <div class="span4 no-left">
+      <div class="help-tip">
+        <%= f.label(:language) %> <i class="icon-question-sign" data-title="Choose a language for syntax highlighting"></i></div>
+      <%= f.collection_select("language", @languages, :lang, :title, :selected => (@clip.language || "text")) %>
+    </div>
+    <!-- /language -->
+  </div>
+  <!-- /1st Row -->
+  
+  <!-- 2nd Row -->
+  <div class="span5 offset1 pull-right no-left">
+    <!-- lifespan -->
+    <div class="span4">
+      <div class="help-tip">
+        <%= f.label(:lifespan) %> <i class="icon-question-sign" data-title="Choose how long the clip should remain available"></i></div>
+      <%= f.select(:lifespan, @clip.lifespans, :selected=>(@clip.lifespan || "Forever")) %>
+    </div>
+    <!-- /lifespan -->
+    
+    <!-- private -->
+    <div class="span4">
+      <div class="help-tip">
+        <%= f.label(:private) %> <i class="icon-question-sign" data-title="Only allow those with a link to access the clip"></i></div>
+      <%= f.check_box(:private, :value => @clip.private) %>
+    </div>
+    <!-- /private -->
+  </div>
+  <!-- /2nd Row -->
+  
+  <!-- clip -->
+  <div class="span10 offset1">
+    <div class="help-tip">
+      <%= f.label(:clip) %> <i class="icon-question-sign" data-title="The main content to be shared"></i></div>
+    <%= f.text_area(:clip, :class=>"span10", :rows=>"15", :value => @clip.clip, :required=>"required") %>
+  </div>
+  <!-- /clip -->
+  
+  <div class="span2 pull-right">
+    <%= f.submit(:class=>"btn btn-primary") %>
+  </div>
 <% end %>

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

@@ -1,22 +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
+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,61 +1,61 @@
-<%= 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 %>
+<%= 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.expires_in_words %></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

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

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

@@ -1,46 +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 %>
+<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>