cartoonist 0.0.9 → 0.0.10

data/app/controllers/admin_controller.rb

@@ -9,11 +9,17 @@ class AdminController < CartoonistController
   def backup
     respond_to do |format|
       format.html { redirect_to "/admin/main" }
-      format.json do
-        prefix = "dev-" unless Rails.env.production?
-        filename = "#{prefix}comics-backup-#{Time.now.strftime("%Y-%m-%d_%H%M%S")}.json"
-        headers["Content-Disposition"] = "attachment; filename=\"#{filename}\""
-        render :text => Backup.all.to_json, :content_type => "application/json"
+
+      format.tgz do
+        backup = Backup.new :tgz
+        headers["Content-Disposition"] = backup.content_disposition
+        self.response_body = backup.response_body
+      end
+
+      format.zip do
+        backup = Backup.new :zip
+        headers["Content-Disposition"] = backup.content_disposition
+        self.response_body = backup.response_body
       end
     end
   end

data/app/controllers/cartoonist_controller.rb

@@ -46,6 +46,21 @@ class CartoonistController < ActionController::Base
   end
 
   def cache_page_as(path)
+    if block_given?
+      expiration = expiration_for path
+      response.headers["Expires"] = CGI.rfc1123_date expiration.from_now
+      expires_in expiration, :public => true
+      yield
+    end
+
     cache_page @response, "/cache/#{path}"
   end
+
+  def expiration_for(path)
+    if path =~ /\.tmp\.[^.]*$/
+      2.hours
+    else
+      7.days
+    end
+  end
 end

data/app/controllers/site_controller.rb

@@ -5,8 +5,10 @@ class SiteController < CartoonistController
 
       format.ico do
         data = ActionController::Base.helpers.asset_paths.asset_environment[Cartoonist::Theme.favicon].to_s
-        send_data data, :filename => "favicon.ico", :type => "image/x-icon", :disposition => "inline"
-        cache_page_as "static/favicon.ico"
+
+        cache_page_as "static/favicon.ico" do
+          send_data data, :filename => "favicon.ico", :type => "image/x-icon", :disposition => "inline"
+        end
       end
     end
   end
@@ -16,8 +18,9 @@ class SiteController < CartoonistController
       format.html { redirect_to "/" }
 
       format.text do
-        render :layout => false
-        cache_page_as "static/robots.txt"
+        cache_page_as "static/robots.txt" do
+          render :layout => false
+        end
       end
     end
   end

data/app/models/backup.rb

@@ -1,11 +1,110 @@
 class Backup
+  ALLOWED_EXTENSIONS = [:tgz, :zip]
+
+  def initialize(extension)
+    raise "Invalid extension '#{extension}'" unless ALLOWED_EXTENSIONS.include? extension.to_sym
+    @extension = extension.to_sym
+  end
+
+  def content_disposition
+    %{attachment; filename="#{filename}"}
+  end
+
+  def filename
+    prefix = "dev-" unless Rails.env.production?
+    "#{prefix}cartoonist-backup-#{Time.now.strftime("%Y-%m-%d_%H%M%S")}.#{@extension}"
+  end
+
+  def response_body
+    Enumerator.new do |out|
+      send @extension, out
+    end
+  end
+
+  def zip(out)
+    buffer = Zip::ZipOutputStream.write_buffer do |zos|
+      Backup.each do |entry|
+        zos.put_next_entry entry.path
+        zos.write entry.content
+      end
+    end
+
+    out << buffer.string
+  end
+
+  def tgz(out)
+    gzip = Zlib::GzipWriter.new Backup::ResponseOutWriter.new(out)
+
+    begin
+      Archive::Tar::Minitar::Writer.open gzip do |tar|
+        Backup.each do |entry|
+          tar.add_file_simple entry.path, :mode => 0644, :size => entry.content.length do |output|
+            output.write entry.content
+          end
+        end
+      end
+    ensure
+      gzip.close
+    end
+  end
+
+  class ResponseOutWriter < Struct.new(:stream)
+    def write(content)
+      stream << content
+    end
+  end
+
   class << self
-    def all
-      result = Cartoonist::Backup.all.map do |key, value|
-        [key, value.call]
+    def each
+      Cartoonist::Backup.all.each do |key, proc|
+        proc.call.find_each do |value|
+          if value.respond_to? :to_backup_entries
+            value.to_backup_entries.each do |entry|
+              yield entry.with_key(key)
+            end
+          else
+            yield Backup::Entry.from_record(value).with_key(key)
+          end
+        end
+      end
+    end
+  end
+
+  class Entry
+    attr_reader :key, :filename, :content
+
+    def initialize(id, title, extension, content)
+      if title
+        title = "%05d_%s" % [id, title]
+      else
+        title = "%05d" % id
       end
 
-      Hash[result]
+      title = DatabaseFile.sanitize title
+      extension = DatabaseFile.sanitize(extension || "")
+      extension = ".#{extension}" if extension.present?
+      @filename = "#{title}#{extension}"
+      @content = content
+    end
+
+    def with_key(key)
+      @key = key
+      self
+    end
+
+    def safe_key
+      DatabaseFile.sanitize key.to_s
+    end
+
+    def path
+      "#{safe_key}/#{filename}"
+    end
+
+    class << self
+      def from_record(record)
+        title = record.zip_title if record.respond_to? :zip_title
+        new record.id, title, "json", record.to_json
+      end
     end
   end
 end

data/app/models/database_file.rb

@@ -1,3 +1,36 @@
 class DatabaseFile < ActiveRecord::Base
-  attr_accessible :filename, :content
+  attr_accessible :filename, :extension, :content
+
+  def to_backup_entries
+    if filename
+      meta_name = "#{filename}.meta"
+    else
+      meta_name = "meta"
+    end
+
+    file = Backup::Entry.new id, filename, extension, content
+    meta = Backup::Entry.new id, meta_name, "json", to_json(:except => :content)
+    [file, meta]
+  end
+
+  class << self
+    def sanitize(value)
+      value.gsub(/\s+/, "_").gsub(/[^0-9a-zA-Z.\-_]/, "")
+    end
+
+    def create_from_param(file, options = {})
+      original_filename = file.original_filename
+      extension = File.extname original_filename
+      filename = File.basename original_filename, extension
+      filename = nil if filename.blank?
+      extension = extension[/^\.?(.*?)$/, 1].downcase if extension
+      extension = nil if extension.blank?
+
+      if options.include?(:allowed_extensions) && !options[:allowed_extensions].map(&:downcase).include?(extension)
+        raise "Extension must be one of: #{options[:allowed_extensions].join ", "}"
+      end
+
+      create :filename => filename, :extension => extension, :content => file.read
+    end
+  end
 end

data/app/models/markdown.rb

@@ -1,13 +1,33 @@
 class Markdown
+  class LinkToAbsoluteRenderer < Redcarpet::Render::HTML
+    def link(link, title, content)
+      link = "http://#{Setting[:domain]}#{link}" if link =~ /^\//
+      title = %{ title="#{title}"} if title
+      %{<a href="#{link}"#{title}>#{content}</a>}
+    end
+  end
+
   class << self
-    def config
-      @markdown ||= Redcarpet::Markdown.new Redcarpet::Render::HTML
+    RENDER_DEFAULTS = { :html_safe => true, :link_to_absolute => false }
+
+    def standard_renderer
+      @standard_renderer ||= Redcarpet::Markdown.new(Redcarpet::Render::HTML)
     end
 
-    def render(text, safe = true)
-      result = config.render text
+    def link_to_absolute_renderer
+      @link_to_absolute_renderer ||= Redcarpet::Markdown.new(LinkToAbsoluteRenderer.new)
+    end
+
+    def render(text, options = {})
+      options = RENDER_DEFAULTS.merge options
+
+      if options[:link_to_absolute]
+        result = link_to_absolute_renderer.render text
+      else
+        result = standard_renderer.render text
+      end
 
-      if safe
+      if options[:html_safe]
         result.html_safe
       else
         result

data/app/models/setting.rb

@@ -1,6 +1,10 @@
 class Setting < ActiveRecord::Base
   attr_accessible :label, :value, :locked
 
+  def zip_title
+    label
+  end
+
   class << self
     def [](label)
       raise "Invalid label" unless label.present?

data/app/models/user.rb

@@ -4,6 +4,10 @@ class User < ActiveRecord::Base
   # Setup accessible (or protected) attributes for your model
   attr_accessible :email, :password, :password_confirmation, :remember_me, :name
 
+  def zip_title
+    name
+  end
+
   class << self
     def create_user(params)
       create :email => params[:email], :name => params[:name], :password => params[:password], :password_confirmation => params[:confirm_password]

data/app/views/admin/main.html.erb

@@ -3,5 +3,9 @@
 </p>
 
 <p>
-  <a href="/admin/backup.json"><%= t "admin.general.actions.backup" %></a>
+  <a href="/admin/backup.tgz"><%= t "admin.general.actions.backup_tgz" %></a>
+</p>
+
+<p>
+  <a href="/admin/backup.zip"><%= t "admin.general.actions.backup_zip" %></a>
 </p>

data/cartoonist.gemspec

@@ -14,4 +14,6 @@ Gem::Specification.new do |s|
   s.add_dependency "jquery-rails", "~> 2.0.0"
   s.add_dependency "railties", "~> 3.2.0"
   s.add_dependency "redcarpet", "~> 2.1.0"
+  s.add_dependency "rubyzip", "~> 0.9.0"
+  s.add_dependency "minitar", "~> 0.5.0"
 end

data/config/locales/en.yml

@@ -34,7 +34,8 @@ en:
         users: Users
     general:
       actions:
-        backup: Download Backup
+        backup_tgz: Download Backup (tarball)
+        backup_zip: Download Backup (zip)
         reload: Update and Reload
       layout:
         actions: Actions

data/db/migrate/20120524032959_add_extension_to_database_files.rb

@@ -0,0 +1,6 @@
+class AddExtensionToDatabaseFiles < ActiveRecord::Migration
+  def change
+    add_column :database_files, :extension, :string
+    DatabaseFile.update_all :extension => "png"
+  end
+end

data/lib/cartoonist/engine.rb

@@ -294,19 +294,20 @@ module Cartoonist
     end
 
     Mime::Type.register "image/x-icon", :ico
+    Mime::Type.register "application/octet-stream", :tgz
     Cartoonist::Admin::Tab.add :general, :url => "/admin", :order => 3
     Cartoonist::Migration.add_for self
 
     Cartoonist::Backup.for :files do
-      DatabaseFile.order(:id).all
+      DatabaseFile.order(:id)
     end
 
     Cartoonist::Backup.for :settings do
-      Setting.order(:id).all
+      Setting.order(:id)
     end
 
     Cartoonist::Backup.for :users do
-      User.order(:id).all
+      User.order(:id)
     end
 
     Cartoonist::Cron.add do

data/lib/cartoonist.rb

@@ -1,6 +1,9 @@
 require "devise"
 require "jquery-rails"
 require "redcarpet"
+require "zlib"
+require "archive/tar/minitar"
+require "zip/zip"
 
 module Cartoonist
   module Admin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cartoonist
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-15 00:00:00.000000000 Z
+date: 2012-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &11950700 !ruby/object:Gem::Requirement
+  requirement: &12204220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *11950700
+  version_requirements: *12204220
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &11937860 !ruby/object:Gem::Requirement
+  requirement: &12203580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *11937860
+  version_requirements: *12203580
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &11935680 !ruby/object:Gem::Requirement
+  requirement: &12203040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *11935680
+  version_requirements: *12203040
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &11934640 !ruby/object:Gem::Requirement
+  requirement: &12273440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,29 @@ dependencies:
         version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *11934640
+  version_requirements: *12273440
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: &12272860 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *12272860
+- !ruby/object:Gem::Dependency
+  name: minitar
+  requirement: &12272340 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *12272340
 description: This provides the main functionality and plugin api for Cartoonist.
 email: reasonnumber@gmail.com
 executables: []
@@ -110,6 +132,7 @@ files:
 - db/migrate/20120320043253_create_database_files.rb
 - db/migrate/20120401014029_create_settings.rb
 - db/migrate/20120417075756_devise_create_users.rb
+- db/migrate/20120524032959_add_extension_to_database_files.rb
 - lib/cartoonist.rb
 - lib/cartoonist/engine.rb
 - public/errors/404.html