From 83b9ba6e7e326d4f667c3baafc17887ac56dce7e Mon Sep 17 00:00:00 2001
From: Florent Solt <florent@solt.biz>
Date: Wed, 27 Mar 2013 19:25:05 +0100
Subject: [PATCH 1/9] Allow api && add more lang

---
 app/controllers/pastes_controller.rb | 2 ++
 app/helpers/pastes_helper.rb         | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/controllers/pastes_controller.rb b/app/controllers/pastes_controller.rb
index d3dab54..e36075f 100644
--- a/app/controllers/pastes_controller.rb
+++ b/app/controllers/pastes_controller.rb
@@ -27,6 +27,8 @@ class PastesController < ApplicationController
 
   accept_rss_auth :index
 
+  accept_api_auth :create
+
   def index
     @limit = per_page_option
 
diff --git a/app/helpers/pastes_helper.rb b/app/helpers/pastes_helper.rb
index adca49e..8068501 100644
--- a/app/helpers/pastes_helper.rb
+++ b/app/helpers/pastes_helper.rb
@@ -20,7 +20,8 @@
 
 module PastesHelper
   PASTEBIN_LANGS = ["Plain Text", "C", "C++", "Java", "JavaScript",
-                    "Python", "Ruby", "PHP", "SQL", "XML", "Diff"]
+                    "Python", "Ruby", "PHP", "SQL", "XML", "Diff",
+                    "Clojure", "CSS", "HAML", "HTML", "JSON", "YAML"]
 
   # This maps pretty language/syntax name to identifier that CodeRay
   # can understand.  If a language is not mapped, unchanged name is
@@ -57,7 +58,7 @@ def pastebin_language_name(lang)
   end
 
   def pastebin_language_choices
-    PASTEBIN_LANGS.map { |v| [v, pastebin_lang_to_scanner(v)] }
+    PASTEBIN_LANGS.sort.map { |v| [v, pastebin_lang_to_scanner(v)] }
   end
 
   def pastebin_expiration_choices

From 78761217d4f5b476278af4953e81d55b08f2dd19 Mon Sep 17 00:00:00 2001
From: Florent Solt <florent@solt.biz>
Date: Wed, 27 Mar 2013 19:33:41 +0100
Subject: [PATCH 2/9] Beter index listing

---
 app/views/pastes/index.html.erb | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/views/pastes/index.html.erb b/app/views/pastes/index.html.erb
index b511890..eb9c287 100644
--- a/app/views/pastes/index.html.erb
+++ b/app/views/pastes/index.html.erb
@@ -6,6 +6,12 @@
 .paste {
   margin-bottom: 1.5em;
 }
+.paste .author, .paste .actions {
+  float: right;
+}
+.paste .box {
+  margin-bottom: 2px;
+}
 </style>
 <% end %>
 
@@ -20,12 +26,16 @@
     <% unless @project %>
       <%= link_to_project paste.project %>&nbsp;&ndash;
     <% end %>
-    <%= pastebin_language_name(paste.lang) %><br>
+    <div class="author">
+      <%= render :partial => "authorship", :locals => { :paste => paste } %>
+    </div>
+    <%= pastebin_language_name(paste.lang) %>
     <div class="box">
       <pre><%=h paste.short_text %></pre>
     </div>
-    <%= render :partial => "authorship", :locals => { :paste => paste } %><br>
-    <%= manage_paste_links(paste) %>
+    <div class="actions">
+      <%= manage_paste_links(paste) %>
+    </div>
   </div>
 <% end %>
 

From bb2f49392027e541bc18168dd9d6944aa8d321e6 Mon Sep 17 00:00:00 2001
From: Florent Solt <florent@solt.biz>
Date: Wed, 27 Mar 2013 19:35:59 +0100
Subject: [PATCH 3/9] Beter index listing

---
 app/views/pastes/index.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/pastes/index.html.erb b/app/views/pastes/index.html.erb
index eb9c287..9b7ff5c 100644
--- a/app/views/pastes/index.html.erb
+++ b/app/views/pastes/index.html.erb
@@ -4,7 +4,7 @@
 <% content_for :header_tags do %>
 <style type="text/css">
 .paste {
-  margin-bottom: 1.5em;
+  margin-bottom: 2.5em;
 }
 .paste .author, .paste .actions {
   float: right;

From dac0b0a2405b5cb1df3a3b6cc4a73280e19bdab8 Mon Sep 17 00:00:00 2001
From: Florent Solt <florent@solt.biz>
Date: Mon, 8 Apr 2013 13:52:21 +0200
Subject: [PATCH 4/9] Bash support

---
 .gitignore                   | 1 +
 Gemfile                      | 1 +
 app/helpers/pastes_helper.rb | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 .gitignore
 create mode 100644 Gemfile

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b844b14
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+Gemfile.lock
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000..2c74d0e
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1 @@
+gem "coderay_bash"
diff --git a/app/helpers/pastes_helper.rb b/app/helpers/pastes_helper.rb
index 8068501..3ec7d3a 100644
--- a/app/helpers/pastes_helper.rb
+++ b/app/helpers/pastes_helper.rb
@@ -21,7 +21,8 @@
 module PastesHelper
   PASTEBIN_LANGS = ["Plain Text", "C", "C++", "Java", "JavaScript",
                     "Python", "Ruby", "PHP", "SQL", "XML", "Diff",
-                    "Clojure", "CSS", "HAML", "HTML", "JSON", "YAML"]
+                    "Clojure", "CSS", "HAML", "HTML", "JSON", "YAML",
+                    "Bash"]
 
   # This maps pretty language/syntax name to identifier that CodeRay
   # can understand.  If a language is not mapped, unchanged name is

From efbcc2e8f0bf80c3b6abeefa30031025fa9e13a7 Mon Sep 17 00:00:00 2001
From: Florent Solt <florent@solt.biz>
Date: Fri, 17 Oct 2014 18:08:09 +0200
Subject: [PATCH 5/9] Ignore .DS_Store

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index b844b14..8f44ec3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 Gemfile.lock
+.DS_Store

From cb6c9428dac3e78b6b376f0b63018248283826d2 Mon Sep 17 00:00:00 2001
From: Sys <sys@netvibes.com>
Date: Fri, 5 Jun 2015 10:12:04 +0200
Subject: [PATCH 6/9] Redmine 3 support

---
 app/controllers/pastes_controller.rb |  5 ++---
 app/models/paste.rb                  | 22 ++++++++--------------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/app/controllers/pastes_controller.rb b/app/controllers/pastes_controller.rb
index 1d5afe0..644d40b 100644
--- a/app/controllers/pastes_controller.rb
+++ b/app/controllers/pastes_controller.rb
@@ -35,9 +35,8 @@ def index
     @pastes_count = @pastes.count
     @pastes_pages = Paginator.new(self, @pastes_count, @limit, params[:page])
     @offset ||= @pastes_pages.current.offset
-    @pastes = @pastes.all(:order => "#{Paste.table_name}.created_on DESC",
-                          :offset => @offset,
-                          :limit => @limit)
+    @pastes = @pastes.order("#{Paste.table_name}.created_on DESC")
+                          .offset(@offset).limit(@limit)
 
     respond_to do |format|
       format.html { render :layout => false if request.xhr? }
diff --git a/app/models/paste.rb b/app/models/paste.rb
index e8bab7c..e3f9c05 100644
--- a/app/models/paste.rb
+++ b/app/models/paste.rb
@@ -30,10 +30,10 @@ class Paste < ActiveRecord::Base
     where({ :project_id => project })
   }
 
-  scope :secure, where("access_token IS NOT NULL")
+  scope :secure, -> { where("access_token IS NOT NULL") }
 
-  scope :expired, where("expires_at <= current_timestamp")
-  scope :unexpired, where("expires_at IS NULL OR expires_at > current_timestamp")
+  scope :expired, -> { where("expires_at <= current_timestamp") }
+  scope :unexpired, -> { where("expires_at IS NULL OR expires_at > current_timestamp") }
 
   #
   # * Restrict to projects where the user has a role allowing to view
@@ -72,19 +72,17 @@ class Paste < ActiveRecord::Base
   # conflict by overriding the user.
   #
   def self.visible_to(user, options={})
-    with_exclusive_scope do
-      Paste.visible(user, options)
-    end
+    Paste.visible(user, options).unscope(:where)
   end
 
   acts_as_searchable :columns => ["#{table_name}.title", "#{table_name}.text"],
-    :include => :project
+    :preload => :project
 
   acts_as_event :title => Proc.new{ |o| o.title },
     :url => Proc.new{ |o| { :controller => 'pastes', :action => 'show',
       :id => o.to_param } }
 
-  acts_as_activity_provider :find_options => {:include => [:project, :author]},
+  acts_as_activity_provider :scope => preload(:project, :author),
     :author_key => :author_id
 
   def title
@@ -132,9 +130,7 @@ def self.secure_id?(id)
   end
 
   def self.find_by_secure_id(id)
-    with_exclusive_scope do
-      find_by_access_token(id)
-    end
+    where(:acces_token => id).unscope(:where)
   end
 
   def expired?
@@ -146,9 +142,7 @@ def expire_in(seconds)
   end
 
   def self.wipe_all_expired
-    with_exclusive_scope do
-      Paste.expired.delete_all
-    end
+    Paste.expired.unscope(:where).delete_all
   end
 
   private

From 5a71b259ce70353dc8d8454365d3f9ecd1a6d7e9 Mon Sep 17 00:00:00 2001
From: Sys <sys@netvibes.com>
Date: Fri, 5 Jun 2015 10:50:10 +0200
Subject: [PATCH 7/9] Add cache

---
 app/controllers/pastes_controller.rb |  2 ++
 app/models/paste.rb                  |  8 ++++++-
 app/views/pastes/index.html.erb      |  2 ++
 app/views/pastes/show.html.erb       | 33 ++++++++++++++--------------
 4 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/app/controllers/pastes_controller.rb b/app/controllers/pastes_controller.rb
index 644d40b..85181c1 100644
--- a/app/controllers/pastes_controller.rb
+++ b/app/controllers/pastes_controller.rb
@@ -78,6 +78,8 @@ def update
       create
     else
       if @paste.update_attributes(params[:paste])
+        expire_fragment("paste-short-#{@paste.id}-#{User.current.language}")
+        expire_fragment("paste-#{@paste.id}-#{User.current.language}")
         flash[:notice] = l(:notice_paste_updated)
         redirect_to @paste
       else
diff --git a/app/models/paste.rb b/app/models/paste.rb
index e3f9c05..433c8f2 100644
--- a/app/models/paste.rb
+++ b/app/models/paste.rb
@@ -87,7 +87,13 @@ def self.visible_to(user, options={})
 
   def title
     t = super
-    t.present? ? t : "Paste ##{id}"
+    if t.present?
+      t
+    elsif not id.nil?
+      "Paste ##{id}"
+    else
+      ""
+    end
   end
 
   def description
diff --git a/app/views/pastes/index.html.erb b/app/views/pastes/index.html.erb
index 9b7ff5c..151ea79 100644
--- a/app/views/pastes/index.html.erb
+++ b/app/views/pastes/index.html.erb
@@ -21,6 +21,7 @@
   <p class="nodata"><%= l(:label_no_data) %></p>
 <% else %>
 <% @pastes.each do |paste| %>
+  <% cache("paste-short-#{paste.id}-#{User.current.language}", skip_digest: true) do %>
   <div class="paste">
     <%= link_to_paste paste %>&nbsp;&ndash;
     <% unless @project %>
@@ -37,6 +38,7 @@
       <%= manage_paste_links(paste) %>
     </div>
   </div>
+  <% end %>
 <% end %>
 
 <p class="pagination">
diff --git a/app/views/pastes/show.html.erb b/app/views/pastes/show.html.erb
index 1bf302f..39475d6 100644
--- a/app/views/pastes/show.html.erb
+++ b/app/views/pastes/show.html.erb
@@ -13,25 +13,26 @@ table.CodeRay td.line_numbers {
 </style>
 <% end %>
 
-<% html_title @paste.title %>
+<% cache("paste-#{@paste.id}-#{User.current.language}", skip_digest: true) do %>
+    <% html_title @paste.title %>
 
-<h2><%=h @paste.title %></h2>
+    <h2><%=h @paste.title %></h2>
 
-<p>
-<%= l(:label_paste_link_here, :link => link_to(paste_url(@paste), @paste)).html_safe %>
-</p>
+    <p>
+    <%= l(:label_paste_link_here, :link => link_to(paste_url(@paste), @paste)).html_safe %>
+    </p>
 
-<p>
-<%= render :partial => "authorship", :locals => { :paste => @paste } %><br>
-<%=l :label_paste_syntax, :lang => pastebin_language_name(@paste.lang) %>
-</p>
+    <p>
+    <%= render :partial => "authorship", :locals => { :paste => @paste } %><br>
+    <%=l :label_paste_syntax, :lang => pastebin_language_name(@paste.lang) %>
+    </p>
 
-<div class="paste">
-<%= highlighted_content_for_paste(@paste) %>
-</div>
-
-<p>
-<%= manage_paste_links(@paste) %>
-</p>
+    <div class="paste">
+    <%= highlighted_content_for_paste(@paste) %>
+    </div>
 
+    <p>
+    <%= manage_paste_links(@paste) %>
+    </p>
+<% end %>
 <%= render "sidebar" if @project %>

From 2505ccd6ef10ca03eb89d83be210d69380c615f0 Mon Sep 17 00:00:00 2001
From: Sys <sys@netvibes.com>
Date: Mon, 8 Jun 2015 16:31:40 +0200
Subject: [PATCH 8/9] Fix for Redmine3

---
 app/models/paste.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/paste.rb b/app/models/paste.rb
index 433c8f2..b108212 100644
--- a/app/models/paste.rb
+++ b/app/models/paste.rb
@@ -50,7 +50,7 @@ class Paste < ActiveRecord::Base
   scope :visible, lambda{ |user=nil, options={}|
     user ||= User.current
 
-    s = where(Project.allowed_to_condition(user, :view_pastes, options)).includes(:project)
+    s = Paste.where(Project.allowed_to_condition(user, :view_pastes, options)).joins(:project)
     unless user.admin?
       s = s.where(["access_token IS NULL OR author_id = ?", user.id])
     end
@@ -83,7 +83,7 @@ def self.visible_to(user, options={})
       :id => o.to_param } }
 
   acts_as_activity_provider :scope => preload(:project, :author),
-    :author_key => :author_id
+     :author_key => :author_id
 
   def title
     t = super

From 6a12cf7e9a18dd3ccb08a3f304bc634cc9554c8f Mon Sep 17 00:00:00 2001
From: Sys <sys@netvibes.com>
Date: Wed, 28 Oct 2015 15:13:24 +0100
Subject: [PATCH 9/9] Fix when bad text

---
 app/models/paste.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/paste.rb b/app/models/paste.rb
index b108212..f174db1 100644
--- a/app/models/paste.rb
+++ b/app/models/paste.rb
@@ -103,6 +103,7 @@ def description
   SHORT_TEXT_LIMIT = 100
 
   def short_text
+    return "" if not text
     if text.length < SHORT_TEXT_LIMIT
       text
     else