clipster 0.4.1 → 0.5.2

data/app/helpers/clipster/application_helper.rb

@@ -1,15 +1,15 @@
 module Clipster
   module ApplicationHelper
-    def get_languages
+    def supported_languages
       languages = CodeRay::Scanners.all_plugins
       languages.delete(CodeRay::Scanners::Raydebug)
       languages.delete(CodeRay::Scanners::Debug)
 
-      languages
+      languages.sort{ |x,y| x.title <=> y.title } # sort by language title
     end
 
-    def get_language_counts
-      Clip.select("language, count(*) as count").group(:language)
+    def language_counts
+      Clip.select("language, count(*) as count").public.group(:language)
     end
 
     def display_user_text(user)

data/app/models/clipster/clip.rb

@@ -4,6 +4,8 @@ module Clipster
 
     before_create :default_values
 
+    self.primary_key = :id
+
     attr_accessible :clip, :language, :title, :private, :expires, :lifespan
     cattr_reader :lifespans
     cattr_accessor :current_user, :lifespan
@@ -16,15 +18,15 @@ module Clipster
     # Define all supported lifespans and their time offset
     @@lifespans = [["Forever", nil],
                    ["An Hour", :hours=>1],
-                   ["A Week", :days=>7],
                    ["A Day", :days=>1],
+                   ["A Week", :days=>7],
                    ["A Month", :months=>1],
                    ["A Year", :years=>1]]
 
     # TODO: build more powerful search term creation
     scope :search, lambda {|term|
       where("(title LIKE :term or language LIKE :term or clip LIKE :term) and (expires is null OR expires > :now)",{
-          :term => term,
+          :term => "#{term}%".gsub('*','%').gsub(/%+/, '%'),
           :now => DateTime.now
       })
     }
@@ -73,7 +75,7 @@ module Clipster
     end
 
     # Utility method called by either cron job or when an expired clip is accessed
-    def Clip.delete_expired_clips
+    def Clip.delete_expired
       Clip.destroy_all(["expires is not null AND expires <= ?", DateTime.now])
     end
 

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

@@ -0,0 +1,47 @@
+<legend>About Clipster v<%=Gem.searcher.find("clipster").version unless Gem.searcher.find("clipster").nil?%></legend>
+
+
+<div class="span9">
+  <div class="span9">
+    <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">
+    <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>
+</div>
+
+<div class="developers span2 pull-right">
+  <h5>Source Code</h5>
+    <p>
+      <a href="https://github.com/kwbock/clipster">
+        GitHub<br \>
+        <%= image_tag("clipster/git_hub.png",
+                      :alt=>"GitHub",
+                      :class=>"img-polaroid",
+                      :width=>80,
+                      :height=>80) %></a></p>
+  <h5>Developers</h5>
+    <p>
+      <a href="https://github.com/kwbock">
+        Kyle Bock<br \>
+        <%= image_tag("https://secure.gravatar.com/avatar/9ed5367a28f94871e15a428712d595b0",
+                      :alt=>"Kyle Bock",
+                      :class=>"img-polaroid",
+                      :width=>80,
+                      :height=>80) %></a></p>
+    <p>
+      <a href="https://github.com/lightswitch05">
+        Daniel White<br \>
+        <%=image_tag("https://secure.gravatar.com/avatar/6e12977acc1600c0f367d6d7b9265f95",
+                     :alt=>"Daniel White",
+                     :class=>"img-polaroid",
+                     :width=>80,
+                     :height=>80)%></a></p>
+</div>

data/app/views/clipster/clips/{list.atom.builder → clips.atom.builder}

@@ -4,14 +4,12 @@ atom_feed do |feed|
 
   @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")
+        entry.title("#{clip.title}. A #{clip.language} clip that never expires.")
       else
-        entry.subtitle("A #{clip.language} clip that expires on #{clip.expires}")
+        entry.title("#{clip.title}. A #{clip.language} clip that expires on #{clip.expires}.")
       end
-      entry.updated(clip.updated_at)
-      entry.content(clip.div.html_safe, :type => 'html')
+      entry.content('<div class="clip">' + clip.div.html_safe + '</div>', :type => 'html')
       
       #TODO set author once user integration is compleate
       #entry.author do |author|

data/app/views/clipster/clips/{list.html.erb → clips.html.erb}

@@ -2,7 +2,7 @@
 
 <legend>
         Recent Clips<%= " - #{params[:lang]}" unless params[:lang].nil? %>
-        <%= link_to "", list_clips_path(:lang => params[:lang], :format=>:atom), :class=>"image-feed pull-right" %>
+        <%= link_to "", clips_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">
@@ -43,7 +43,7 @@
             <% end %>
             <% unless @clips.length > 0 %>
             <tr>
-                <td colspan="3" style="text-align: center;">There are no public clips.</td>
+                <td colspan="100%" style="text-align: center;">There are no public clips.</td>
             </tr>
             <% end %>
         </tbody>
@@ -52,10 +52,4 @@
     <%= 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>
+<%= render "clipster/common/languages" %>

data/app/views/clipster/clips/{create.html.erb → new.html.erb}

@@ -1,8 +1,22 @@
+<script type="text/javascript">
+  $(function() {
+    $("#tabs a").click(function (e) {
+      e.preventDefault();
+      $(this).tab('show');
+    });
+
+    $('#tabs a#preview_label').bind('click', function(e) {
+      $.post("<%= preview_clips_path %>", $("#new_clip").serialize(), function(data, textStatus, jqXHR) {
+        $("#preview").html(data);
+      })
+    });
+  });
+</script>
 <legend>New Clip</legend>
 
 <%= form_for(@clip, :url => { :action => "create" }) do |f| %>
   <%= f.error_messages %>
-  
+
   <!-- 1st Row -->
   <div class="span5 offset1">
     <!-- title -->
@@ -12,17 +26,17 @@
       <%= 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")) %>
+      <%= f.collection_select("language", supported_languages, :lang, :title, :selected => (@clip.language || "text")) %>
     </div>
     <!-- /language -->
   </div>
   <!-- /1st Row -->
-  
+
   <!-- 2nd Row -->
   <div class="span5 offset1 pull-right no-left">
     <!-- lifespan -->
@@ -32,7 +46,7 @@
       <%= f.select(:lifespan, @clip.lifespans, :selected=>(@clip.lifespan || "Forever")) %>
     </div>
     <!-- /lifespan -->
-    
+
     <!-- private -->
     <div class="span4">
       <div class="help-tip">
@@ -42,15 +56,27 @@
     <!-- /private -->
   </div>
   <!-- /2nd Row -->
-  
+  <div class="span10 offset1 ">
+    <ul id="tabs" class="nav nav-tabs">
+      <li class="active"><a href="#code" data-toggle="tab">Code</a></li>
+      <li><a href="#preview" id="preview_label" data-toggle="tab">Preview</a></li>
+    </ul>
+    <div class="tab-content">
+      <div id="code" class="tab-pane active">
+        <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>
+      <div id="preview" class="tab-pane"></div><!-- ajax loaded preview content -->
+    </div>
+  </div>
   <!-- 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 class="tab-content">
+
   </div>
   <!-- /clip -->
-  
+
   <div class="span2 pull-right">
     <%= f.submit(:class=>"btn btn-primary") %>
   </div>

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

@@ -1,8 +1,28 @@
 <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>
+  <div class="span3 secondary">A <%=@clip.language.capitalize %> clip</div>
+  <div class="span5 secondary">Expires: <%= @clip.expires_in_words %></div>
+  <div id="button-container" class="pull-right secondary btn-group" style="position:relative">
+    <%=link_to({:format=>:text},{:action=>"show", :class=>"btn btn-mini"}) do %>
+      <i class='icon-file'></i>
+    <%end%>
+    <button id="copy-button" class="btn btn-mini"> <i class='icon-copy'></i></button>
+  </div>
+  <div class="clearfix"></div>
 </legend>
 <div class="clearfix"></div>
-<%= @clip.div.html_safe  %>
+
+<%= render "clipster/common/clip", :object => @clip %>
+
+<script type="text/javascript">
+    $(document).ready(function () {
+        ZeroClipboard.setMoviePath("<%= asset_path('ZeroClipboard10.swf') %>");
+        var clip = new ZeroClipboard.Client();
+        clip.setText("<%= escape_javascript(@clip.clip.html_safe) %>");
+        clip.addEventListener( 'onComplete', function(){ 
+            alertify.log("Clip successfully copied");
+        });
+        //attach to button
+        clip.glue( 'copy-button', 'button-container' );
+    });
+</script>

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

@@ -0,0 +1 @@
+<%= @clip.clip.html_safe %>

data/app/views/clipster/common/_clip.html.erb

@@ -0,0 +1,3 @@
+<div class="clip">
+    <%= @clip.div.html_safe unless @clip.nil? %>
+</div>

data/app/views/clipster/common/_includes.html.erb

@@ -0,0 +1 @@
+<!-- Insert any HTML here that you wish to include in the <head> of all clipster pages -->

data/app/views/clipster/common/_languages.html.erb

@@ -0,0 +1,6 @@
+<aside class="languages bordered span3 offset1">
+    <div class="title">Languages</div>
+    <% language_counts.each do |lang| %>
+    <div><%= link_to lang.language, clips_clips_path(:lang => lang.language) %> (<%= lang.count %>)</div>
+    <% end %>
+</aside>

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

@@ -7,6 +7,7 @@
   <%= javascript_include_tag "clipster/application" %>
   <%= csrf_meta_tags %>
   <%=h yield(:head) %>
+  <%= render "clipster/common/includes" %>
 </head>
 <body>
     <div class="container">
@@ -17,17 +18,20 @@
                         <%= 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>
+                            <li><%= link_to "Recent Clips", clips_clips_path %></li>
+                            <li><%= link_to "About", about_index_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") %>
+                        <%= form_tag(search_clips_path, :method => 'get', :class => 'navbar-search pull-right', :name=>"search_form") do %>
+                            <div class="input-append">
+                                <%= text_field_tag(:search_term, "", :class=>"search-query", :type=>"search", :placeholder=>"Search") %>
+                                <span class="add-on">
+                                <i class="icon-search"> </i></span>
+                            </div>
+                            <input id="search_button" type="submit" style="display:none;" />
                         <% end %>
-
                     </div>
                 </div>
             </div>

data/config/routes.rb

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

data/config/schedule.rb

@@ -4,7 +4,7 @@
 # http://en.wikipedia.org/wiki/Cron
 
 every :day, :at => '3:00 am' do
-  runner "Clip.delete_expired_clips"
+  runner "Clip.delete_expired"
 end
 
 # Learn more: http://github.com/javan/whenever

data/lib/clipster/engine.rb

@@ -8,8 +8,9 @@ module Clipster
 
     # so we can use rspec generators
     config.generators do |g|
-      g.test_framework :rspec
+      g.test_framework :rspec, :fixture => false
       g.integration_tool :rspec
+      g.fixture_replacement :factory_girl, :dir=>"spec/factories"
     end
   end
 

data/lib/clipster/version.rb

@@ -1,3 +1,3 @@
 module Clipster
-  VERSION = "0.4.1"
+  VERSION = "0.5.2"
 end

data/lib/generators/clipster/install_generator.rb

@@ -14,6 +14,9 @@ module Clipster
         rake("clipster:install:migrations")
       end
 
+      def copy_partials
+        template "_includes.html.erb", "app/views/clipster/common/_includes.html.erb"
+      end
     end
   end
 end

data/lib/generators/templates/_includes.html.erb

@@ -0,0 +1 @@
+<!-- Insert any HTML here that you wish to include in the <head> of all clipster pages -->

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clipster
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-27 00:00:00.000000000 Z
+date: 2012-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -147,34 +147,44 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- app/assets/flash/ZeroClipboard10.swf
+- app/assets/images/clipster/custom-clipboard.png
+- app/assets/images/clipster/git_hub.png
 - app/assets/images/clipster/glyphicons-halflings-white.png
 - app/assets/images/clipster/glyphicons-halflings.png
 - app/assets/images/clipster/rss_logo_small.png
+- app/assets/javascripts/clipster/about.js
+- app/assets/javascripts/clipster/alertify.min.js
 - app/assets/javascripts/clipster/application.js
-- app/assets/javascripts/clipster/bootstrap.js
 - app/assets/javascripts/clipster/bootstrap.min.js
-- app/assets/javascripts/clipster/clip.js
 - app/assets/javascripts/clipster/clips.js
 - app/assets/javascripts/clipster/users.js
+- app/assets/javascripts/clipster/ZeroClipboard.min.js
+- app/assets/stylesheets/clipster/about.css
+- app/assets/stylesheets/clipster/alertify.css
 - app/assets/stylesheets/clipster/application.css
 - app/assets/stylesheets/clipster/bootstrap.css
-- app/assets/stylesheets/clipster/clip.css
 - app/assets/stylesheets/clipster/clips.css
 - app/assets/stylesheets/clipster/users.css
+- app/controllers/clipster/about_controller.rb
 - app/controllers/clipster/application_controller.rb
 - app/controllers/clipster/clips_controller.rb
 - app/controllers/clipster/users_controller.rb
+- app/helpers/clipster/about_helper.rb
 - app/helpers/clipster/application_helper.rb
 - app/helpers/clipster/clips_helper.rb
-- app/helpers/clipster/clip_helper.rb
 - app/helpers/clipster/users_helper.rb
 - app/models/clipster/clip.rb
-- app/views/clipster/clips/about.html.erb
-- app/views/clipster/clips/create.html.erb
+- app/views/clipster/about/index.html.erb
+- app/views/clipster/clips/clips.atom.builder
+- app/views/clipster/clips/clips.html.erb
 - app/views/clipster/clips/expired.html.erb
-- app/views/clipster/clips/list.atom.builder
-- app/views/clipster/clips/list.html.erb
+- app/views/clipster/clips/new.html.erb
 - app/views/clipster/clips/show.html.erb
+- app/views/clipster/clips/show.text.erb
+- app/views/clipster/common/_clip.html.erb
+- app/views/clipster/common/_includes.html.erb
+- app/views/clipster/common/_languages.html.erb
 - app/views/clipster/users/index.html.erb
 - app/views/clipster/users/show.html.erb
 - app/views/kaminari/_first_page.html.erb
@@ -195,12 +205,14 @@ files:
 - lib/clipster.rb
 - lib/generators/clipster/install_generator.rb
 - lib/generators/templates/clipster.rb
+- lib/generators/templates/_includes.html.erb
 - lib/tasks/clipster_tasks.rake
 - MIT-LICENSE
 - Rakefile
 - README.md
 homepage: http://github.com/kwbock/clipster
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths: