cartoonist 0.0.19.3 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38127839d9063d465a90b25cd7de8b455c482870
-  data.tar.gz: 991ab59f3bd9f8d06bc14197e977bb5b3608ed0a
+  metadata.gz: 7fdb2663d615944f6df0658c68f6afc244720e71
+  data.tar.gz: b058bf06907f2d1627952a859a68296f38cb6170
 SHA512:
-  metadata.gz: 406996381365ae93a3355611735880a87ecaa344552456f4899e36298351b065d7ace6821106f25e2d45305c78c0360e9a17dc35c377234875d6d4b2b35c9c42
-  data.tar.gz: 07311127ded11081f7433d655857ae0620cf8dc0594bb0597448cc604b42229e5671b32b484405fd90ea8426bb5bad7795aee8be68147b9737cae14658a2ed89
+  metadata.gz: 418c3d4b10260d1d6d3581f93b9102058e09fcc3a5c04aba619c064256372d7b05dc98ba074378d088573c887999adbbf4b9ccc9432490aa1c5b7d47287bd3af
+  data.tar.gz: 4f860bb05491304f94ff880d849fc98d6d818dc8cf3a2ccad4003b2ac4b91ae2225520f4be1e493de7e702839b4f3ea17db277547822b5fab081fdeb612ea4ca

data/app/controllers/admin/settings_controller.rb

@@ -42,6 +42,7 @@ class Admin::SettingsController < AdminCartoonistController
     Setting[:secret_token] = SecureRandom.hex 30
     Setting[:secret_key_base] = SecureRandom.hex 64
     Setting[:devise_pepper] = SecureRandom.hex 64
+    Setting[:devise_secret_key] = SecureRandom.hex 64
     # This MUST go AFTER we set the pepper
     User.create! :email => params[:admin_email], :password => params[:admin_password], :password_confirmation => params[:admin_confirm_password], :name => params[:admin_name]
     redirect_to "/admin"

data/app/controllers/admin_controller.rb

@@ -6,24 +6,6 @@ class AdminController < AdminCartoonistController
     redirect_to "/admin/main"
   end
 
-  def backup
-    respond_to do |format|
-      format.html { redirect_to "/admin/main" }
-
-      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
-
   def reload
     if Rails.env.production?
       %x[git pull]

data/app/controllers/backup_controller.rb

@@ -0,0 +1,17 @@
+class BackupController < AdminCartoonistController
+  include ActionController::Live
+
+  def backup
+    respond_to do |format|
+      format.html { redirect_to "/admin/main" }
+
+      format.tgz do
+        Backup.new(:tgz).stream_to response
+      end
+
+      format.zip do
+        Backup.new(:zip).stream_to response
+      end
+    end
+  end
+end

data/app/models/backup.rb

@@ -15,43 +15,39 @@ class Backup
     "#{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
+  def stream_to(response)
+    response.headers["Content-Disposition"] = content_disposition
+    send @extension, response.stream
+  ensure
+    response.stream.close
   end
 
-  def zip(out)
-    buffer = Zip::ZipOutputStream.write_buffer do |zos|
+  # TODO: Maybe investigate zipline gem a little more and figure out
+  # how it streams zips, and use that here, so this can be properly
+  # streamed.
+  def zip(stream)
+    buffer = Zip::OutputStream.write_buffer do |zos|
       Backup.each do |entry|
         zos.put_next_entry entry.path
         zos.write entry.content
       end
     end
 
-    out << buffer.string
+    stream.write buffer.string
   end
 
-  def tgz(out)
-    gzip = Zlib::GzipWriter.new Backup::ResponseOutWriter.new(out)
+  def tgz(stream)
+    gzip = Zlib::GzipWriter.new stream
 
-    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
+    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
-    ensure
-      gzip.close
-    end
-  end
-
-  class ResponseOutWriter < Struct.new(:stream)
-    def write(content)
-      stream << content
     end
+  ensure
+    gzip.close
   end
 
   class << self

data/cartoonist.gemspec

@@ -1,7 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = "cartoonist"
-  raise "Cannot find version file!" unless File.exists?(File.join(File.dirname(__FILE__), "../CARTOONIST_VERSION"))
-  s.version       = File.read File.join(File.dirname(__FILE__), "../CARTOONIST_VERSION")
+  s.version       = "0.0.20"
   s.date          = Time.now.strftime "%Y-%m-%d"
   s.summary       = "Cartoonist Core"
   s.description   = "This provides the main functionality and plugin api for Cartoonist."
@@ -12,11 +11,11 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.homepage      = "http://reasonnumber.com/cartoonist"
   s.add_dependency "actionpack-page_caching", "~> 1.0"
-  s.add_dependency "devise", "~> 3.0"
+  s.add_dependency "devise", "~> 3.2"
   s.add_dependency "jquery-rails", "~> 3.0"
   s.add_dependency "omniauth-openid", "~> 1.0"
   s.add_dependency "railties", "~> 4.0"
   s.add_dependency "redcarpet", "~> 3.0"
-  s.add_dependency "rubyzip", "~> 0.9"
+  s.add_dependency "rubyzip", "~> 1.0"
   s.add_dependency "minitar", "~> 0.5"
 end

data/config/locales/en.yml

@@ -41,7 +41,7 @@ en:
     general:
       actions:
         backup_tgz: Download Backup (tarball)
-        backup_zip: Download Backup (zip)
+        backup_zip: "Download Backup (zip) (WARNING: Not Streamed)"
         reload: Update and Reload
       layout:
         actions: Actions
@@ -122,6 +122,7 @@ en:
         secret_key_base: "Secret Key Base: "
         secret_token: "Secret Token: "
         devise_pepper: "Devise Pepper: "
+        devise_secret_key: "Devise Secret Key: "
       tabs:
         advanced: Advanced
         general: General

data/db/migrate/20131117042451_ensure_secrets_are_set.rb

@@ -0,0 +1,30 @@
+class EnsureSecretsAreSet < ActiveRecord::Migration
+  def up
+    # We don't need to do any of this if they haven't gone through
+    # initial setup yet.
+    return if User.count == 0
+
+    if Setting[:secret_token] == Setting::Meta[:secret_token].default
+      puts "Setting secret_token"
+      Setting[:secret_token] = SecureRandom.hex 30
+    end
+
+    if Setting[:secret_key_base] == Setting::Meta[:secret_key_base].default
+      puts "Setting secret_key_base"
+      Setting[:secret_key_base] = SecureRandom.hex 64
+    end
+
+    if Setting[:devise_pepper] == Setting::Meta[:devise_pepper].default
+      puts "Setting devise_pepper"
+      Setting[:devise_pepper] = SecureRandom.hex 64
+    end
+
+    if Setting[:devise_secret_key] == Setting::Meta[:devise_secret_key].default
+      puts "Setting devise_secret_key"
+      Setting[:devise_secret_key] = SecureRandom.hex 64
+    end
+  end
+
+  def down
+  end
+end

data/lib/cartoonist/engine.rb

@@ -89,6 +89,7 @@ module Cartoonist
 
       # Setup a pepper to generate the encrypted password.
       devise_config.pepper = "temporary... this is initialized later, in the to_prepare block"
+      devise_config.secret_key = "temporary... this is initialized later, in the to_prepare block"
 
       # ==> Configuration for :confirmable
       # A period that the user is allowed to access the website even without
@@ -271,6 +272,12 @@ module Cartoonist
         end
       end
 
+      devise_secret_key_changed = lambda do
+        Devise.setup do |devise_config|
+          devise_config.secret_key = Setting[:devise_secret_key]
+        end
+      end
+
       Setting.define :domain, :order => 1
       Setting.define :site_name, :order => 2
       Setting.define :site_heading, :order => 3
@@ -300,11 +307,13 @@ module Cartoonist
         Setting.define :secret_token, :default => "ThisTokenMustBeRegenerated....", :onchange => secret_token_changed
         Setting.define :secret_key_base, :default => "ThisTokenMustBeRegenerated....", :onchange => secret_key_base_changed
         Setting.define :devise_pepper, :default => "ThisTokenMustBeRegenerated....", :onchange => devise_pepper_changed
+        Setting.define :devise_secret_key, :default => "ThisTokenMustBeRegenerated....", :onchange => devise_secret_key_changed
       end
 
       secret_token_changed.call
       secret_key_base_changed.call
       devise_pepper_changed.call
+      devise_secret_key_changed.call
     end
 
     Mime::Type.register "image/x-icon", :ico
@@ -337,11 +346,11 @@ module Cartoonist
       get "favicon" => "site#favicon", :defaults => { :format => "ico" }
       get "sitemap" => "site#sitemap", :defaults => { :format => "xml" }
       get "robots" => "site#robots", :defaults => { :format => "text" }
+      get "admin/backup" => "backup#backup"
 
       resource :admin, :controller => :admin, :only => [:show] do
         collection do
           get "cron"
-          get "backup"
           get "main"
           get "reload"
         end

data/lib/cartoonist/version.rb

@@ -2,7 +2,7 @@ module Cartoonist
   class Version
     class << self
       def to_s
-        "0.0.19.3"
+        "0.0.20"
       end
     end
   end

data/lib/cartoonist.rb

@@ -5,7 +5,7 @@ require "jquery-rails"
 require "redcarpet"
 require "zlib"
 require "archive/tar/minitar"
-require "zip/zip"
+require "zip"
 
 module Cartoonist
   module Admin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cartoonist
 version: !ruby/object:Gem::Version
-  version: 0.0.19.3
+  version: 0.0.20
 platform: ruby
 authors:
 - Mike Virata-Stone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-21 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack-page_caching
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement
@@ -139,6 +139,7 @@ files:
 - app/controllers/admin/static_cache_controller.rb
 - app/controllers/admin_cartoonist_controller.rb
 - app/controllers/admin_controller.rb
+- app/controllers/backup_controller.rb
 - app/controllers/cartoonist_controller.rb
 - app/controllers/site_controller.rb
 - app/helpers/admin/cache_helper.rb
@@ -191,9 +192,9 @@ files:
 - db/migrate/20120524032959_add_extension_to_database_files.rb
 - db/migrate/20121205091909_add_omniautable_to_users.rb
 - db/migrate/20130724085513_create_secret_key_base.rb
+- db/migrate/20131117042451_ensure_secrets_are_set.rb
 - lib/cartoonist.rb
 - lib/cartoonist/engine.rb
-- lib/cartoonist/nginxtra.rb
 - lib/cartoonist/version.rb
 - public/errors/404.html
 - public/errors/422.html

data/lib/cartoonist/nginxtra.rb

@@ -1,103 +0,0 @@
-Nginxtra::Config::Extension.partial "nginx.conf", "cartoonist_rails" do |args, block|
-  rails_server = args[:server] || :passenger
-  ssl_details = args[:ssl]
-  ruby_version = args[:ruby]
-
-  if ssl_details
-    default_port = 443
-  else
-    default_port = 80
-  end
-
-  if rails_server == :passenger && !@passenger_requirements_done
-    @config.require_passenger!
-    passenger_root!
-    passenger_ruby! unless ruby_version
-    @passenger_requirements_done = true
-  end
-
-  server do
-    listen(args[:port] || default_port)
-    server_name(args[:server_name] || "localhost")
-    root File.join(File.absolute_path(File.expand_path(args[:root] || ".")), "public")
-    gzip_static "on"
-    passenger_ruby ruby_version if ruby_version
-    passenger_on! if rails_server == :passenger
-    rails_env(args[:environment] || "production")
-
-    if ssl_details
-      ssl "on"
-      ssl_certificate ssl_details[:ssl_cert]
-      ssl_certificate_key ssl_details[:ssl_key]
-      @config.compile_option "--with-http_ssl_module"
-    end
-
-    block.call
-  end
-end
-
-Nginxtra::Config::Extension.partial "nginx.conf", "cartoonist" do |args, block|
-  if !@passenger_requirements_done
-    @config.require_passenger!
-    passenger_root!
-    passenger_ruby!
-    @passenger_requirements_done = true
-  end
-
-  cartoonist_type = args[:type] || "www"
-  server_name = args[:server_name]
-  root_path = args[:root]
-  ssl_details = args[:ssl]
-  ssl_details = { :ssl => ssl_details } if ssl_details
-  short_expiration = args[:short_expiration] || "2h"
-  long_expiration = args[:long_expiration] || "7d"
-  ruby_version = args[:ruby]
-
-  [{}, ssl_details].compact.each do |additional_options|
-    options = { :server => :custom, :server_name => server_name, :root => root_path, :ruby => ruby_version }.merge additional_options
-
-    cartoonist_rails options do
-      location "~*", "^/_long_expiration_/#{cartoonist_type}(/.*?)(?:\\.html)?$" do
-        expires long_expiration
-        add_header "Cache-Control", "public"
-        try_files "$1", "$1.html", "/cache/static$1", "@passenger"
-      end
-
-      ["/cache/static$uri", "$uri", "$uri.html"].each do |condition|
-        _if "-f #{root_path}/public#{condition}" do
-          rewrite "^(.*)$", "/_long_expiration_/#{cartoonist_type}$1", "last"
-        end
-      end
-
-      ["html", "json", "rss"].each do |extension|
-        location "~*", "^/_short_#{extension}_expiration_/#{cartoonist_type}(/.*?)(?:\\.#{extension})?$" do
-          expires short_expiration
-          add_header "Cache-Control", "public"
-          try_files "/cache$1.#{cartoonist_type}.tmp.#{extension}", "@passenger"
-        end
-
-        location "~*", "^/_long_#{extension}_expiration_/#{cartoonist_type}(/.*?)(?:\\.#{extension})?$" do
-          expires long_expiration
-          add_header "Cache-Control", "public"
-          try_files "/cache$1.#{cartoonist_type}.#{extension}", "@passenger"
-        end
-
-        _if "-f #{root_path}/public/cache$uri.#{cartoonist_type}.tmp.#{extension}" do
-          rewrite "^(.*)$", "/_short_#{extension}_expiration_/#{cartoonist_type}$1", "last"
-        end
-
-        _if "-f #{root_path}/public/cache$uri.#{cartoonist_type}.#{extension}" do
-          rewrite "^(.*)$", "/_long_#{extension}_expiration_/#{cartoonist_type}$1", "last"
-        end
-      end
-
-      location "/" do
-        try_files "/_jump_to_passenger_", "@passenger"
-      end
-
-      location "@passenger" do
-        passenger_on!
-      end
-    end
-  end
-end