schnitzelpress 0.1.1 → 0.2.0

data/lib/schnitzelpress.rb

@@ -6,6 +6,7 @@ require 'sass'
 require 'redcarpet'
 require 'schnitzelstyle'
 require 'rack/contrib'
+require 'rack/cache'
 require 'mongoid'
 require 'chronic'
 
@@ -13,10 +14,14 @@ require 'active_support/inflector'
 require 'active_support/core_ext/class'
 require 'active_support/concern'
 
+require 'schnitzelpress/cache_control'
+require 'schnitzelpress/env'
 require 'schnitzelpress/static'
 require 'schnitzelpress/helpers'
 require 'schnitzelpress/markdown_renderer'
+require 'schnitzelpress/config'
 require 'schnitzelpress/post'
+require 'schnitzelpress/actions/assets'
 require 'schnitzelpress/actions/blog'
 require 'schnitzelpress/actions/auth'
 require 'schnitzelpress/actions/admin'
@@ -27,18 +32,29 @@ Sass::Engine::DEFAULT_OPTIONS[:load_paths].unshift(File.expand_path("./views"))
 
 Mongoid.logger.level = 3
 
-module SchnitzelPress
+module Schnitzelpress
   mattr_reader :mongo_uri
 
   class << self
     def mongo_uri=(uri)
       Mongoid::Config.from_hash("uri" => uri)
-      SchnitzelPress::Post.create_indexes
+      Schnitzelpress::Post.create_indexes
       @@mongo_uri = uri
     end
 
-    def env
-      (ENV['RACK_ENV'] || 'development').inquiry
+    def init!
+      # Mongoid.load!("./config/mongo.yml")
+      if mongo_uri = ENV['MONGOLAB_URI'] || ENV['MONGOHQ_URL'] || ENV['MONGO_URL']
+        self.mongo_uri = mongo_uri
+      else
+        raise "Please set MONGO_URL, MONGOHQ_URL or MONGOLAB_URI to your MongoDB connection string."
+      end
+      Schnitzelpress::Post.create_indexes
+    end
+
+    def omnomnom!
+      init!
+      App.with_local_files
     end
   end
 end
@@ -48,7 +64,7 @@ module Haml::Filters::Redcarpet
   include Haml::Filters::Base
 
   def render(text)
-    Redcarpet::Markdown.new(SchnitzelPress::MarkdownRenderer,
+    Redcarpet::Markdown.new(Schnitzelpress::MarkdownRenderer,
       :autolink => true, :space_after_headers => true, :fenced_code_blocks => true).
       render(text)
   end

data/lib/schnitzelpress/actions/admin.rb

@@ -1,4 +1,4 @@
-module SchnitzelPress
+module Schnitzelpress
   module Actions
     module Admin
       extend ActiveSupport::Concern
@@ -15,6 +15,20 @@ module SchnitzelPress
           haml :'admin/admin'
         end
 
+        get '/admin/config/?' do
+          haml :'admin/config'
+        end
+
+        post '/admin/config' do
+          config.attributes = params[:config]
+          if config.save
+            CacheControl.bust!
+            redirect '/admin'
+          else
+            haml :'admin/config'
+          end
+        end
+
         get '/admin/new/?' do
           @post = Post.new
           haml :'admin/new'
@@ -43,6 +57,12 @@ module SchnitzelPress
             haml :'admin/edit'
           end
         end
+
+        delete '/admin/edit/:id/?' do
+          @post = Post.find(params[:id])
+          @post.destroy
+          redirect '/admin'
+        end
       end
     end
   end

data/lib/schnitzelpress/actions/assets.rb

@@ -0,0 +1,36 @@
+require 'packr'
+
+
+module Schnitzelpress
+  class JavascriptPacker
+    def self.pack_javascripts!(files)
+      plain = files.map do |filename|
+        File.read(File.expand_path("../lib/assets/js/#{filename}", settings.root))
+      end.join("\n")
+
+      Packr.pack(plain)
+    end
+  end
+
+  module Actions
+    module Assets
+      extend ActiveSupport::Concern
+
+      ASSET_TIMESTAMP = Time.now.to_i
+      JAVASCRIPT_ASSETS = ['jquery-1.7.1.js', 'jquery.cookie.js', 'schnitzelpress.js', 'jquery-ujs.js']
+
+      included do
+        get '/assets/schnitzelpress.:timestamp.css' do
+          cache_control :public, :max_age => 1.year.to_i
+          scss :blog
+        end
+
+        get '/assets/schnitzelpress.:timestamp.js' do
+          cache_control :public, :max_age => 1.year.to_i
+          content_type 'text/javascript; charset=utf-8'
+          JavascriptPacker.pack_javascripts!(JAVASCRIPT_ASSETS)
+        end
+      end
+    end
+  end
+end

data/lib/schnitzelpress/actions/auth.rb

@@ -1,18 +1,29 @@
 require 'omniauth'
 require 'omniauth-browserid'
 
-module SchnitzelPress
+module Schnitzelpress
   module Actions
     module Auth
       extend ActiveSupport::Concern
 
       included do
-        use OmniAuth::Strategies::BrowserID
+        use OmniAuth::Builder do
+          provider :browser_id
+          if Schnitzelpress.env.development?
+            provider :developer , :fields => [:email], :uid_field => :email
+          end
+        end
 
         post '/auth/:provider/callback' do
           auth = request.env['omniauth.auth']
           session[:auth] = {:provider => auth['provider'], :uid => auth['uid']}
-          redirect admin_logged_in? ? '/admin/' : '/'
+
+          if admin_logged_in?
+            response.set_cookie('show_admin', :value => true, :path => '/')
+            redirect '/admin/'
+          else
+            redirect '/'
+          end
         end
 
         get '/login' do
@@ -21,6 +32,8 @@ module SchnitzelPress
 
         get '/logout' do
           session[:auth] = nil
+          response.delete_cookie('show_admin')
+
           redirect '/login'
         end
       end

data/lib/schnitzelpress/actions/blog.rb

@@ -1,4 +1,4 @@
-module SchnitzelPress
+module Schnitzelpress
   module Actions
     module Blog
       extend ActiveSupport::Concern
@@ -31,25 +31,21 @@ module SchnitzelPress
           render_posts
         end
 
-        get '/blog.css' do
-          cache_for 1.hour
-          scss :blog
-        end
-
         # /posts.atom is now deprecated.
         get '/posts.atom' do
           redirect '/blog.atom', 301
         end
 
         get '/blog.atom' do
-          cache_for 3.minutes
+          cache_control :public, :must_revalidate, :s_maxage => 2, :max_age => 3.minutes.to_i
+
           @posts = Post.latest.limit(10)
           content_type 'application/atom+xml; charset=utf-8'
           haml :atom, :format => :xhtml, :layout => false
         end
 
         get '/feed/?' do
-          redirect settings.feed_url, 307
+          redirect config.blog_feed_url, 307
         end
 
         get %r{^/(\d{4})/(\d{1,2})/(\d{1,2})/?$} do
@@ -90,10 +86,12 @@ module SchnitzelPress
             if enforce_canonical_url && request.path != url_for(@post)
               redirect url_for(@post)
             else
-              fresh_when :last_modified => @post.updated_at, :etag => @post.to_etag
-              cache_for 60
+              fresh_when :last_modified => @post.updated_at,
+                :etag => CacheControl.etag(@post.updated_at)
 
               @show_description = @post.home_page?
+
+              cache_control :public, :must_revalidate, :s_maxage => 2, :max_age => 60
               haml :post
             end
           else
@@ -104,10 +102,10 @@ module SchnitzelPress
         def render_posts
           if freshest_post = @posts.where(:updated_at.ne => nil).desc(:updated_at).first
             fresh_when :last_modified => freshest_post.updated_at,
-              :etag => freshest_post.to_etag
-            cache_for 60
+              :etag => CacheControl.etag(freshest_post.updated_at)
           end
 
+          cache_control :public, :must_revalidate, :s_maxage => 2, :max_age => 60
           haml :index
         end
       end

data/lib/schnitzelpress/app.rb

@@ -1,10 +1,13 @@
-module SchnitzelPress
+require "sinatra/content_for"
+
+module Schnitzelpress
   class App < Sinatra::Base
     STATIC_PATHS = ["/favicon.ico", "/img", "/js"]
 
     set :views, ['./views/', File.expand_path('../../views/', __FILE__)]
     set :public_folder, File.expand_path('../../public/', __FILE__)
 
+    use Rack::Cache if Schnitzelpress.env.production?
     use Rack::ShowExceptions
     use Rack::StaticCache,
       :urls => STATIC_PATHS,
@@ -12,31 +15,25 @@ module SchnitzelPress
     use Rack::MethodOverride
     use Rack::Session::Cookie
 
-    helpers SchnitzelPress::Helpers
+    helpers Sinatra::ContentFor
+    helpers Schnitzelpress::Helpers
     include Rack::Utils
-    include SchnitzelPress::Actions::Auth
-    include SchnitzelPress::Actions::Admin
-    include SchnitzelPress::Actions::Blog
+    include Schnitzelpress::Actions::Auth
+    include Schnitzelpress::Actions::Assets
+    include Schnitzelpress::Actions::Admin
+    include Schnitzelpress::Actions::Blog
 
     configure do
-      set :blog_title, "My SchnitzelPress Blog"
-      set :blog_description, ""
-      set :author_name, "Author"
-      set :disqus_name, nil
-      set :google_analytics_id, nil
-      set :gauges_id, nil
-      set :read_more, "Read Complete Article"
-      set :twitter_id, nil
-      set :footer, ""
-      set :administrator, nil
-      set :feed_url, '/blog.atom'
-
       disable :protection
       set :logging, true
     end
 
-    def cache_for(time)
-      cache_control :public, :must_revalidate, :s_maxage => 2, :max_age => time.to_i
+    before do
+      # Reload configuration before every request. I know this isn't ideal,
+      # but right now it's the easiest way to get the configuration in synch
+      # across multiple instances of the app.
+      #
+      Config.instance.reload
     end
 
     def fresh_when(options)

data/lib/schnitzelpress/cache_control.rb

@@ -0,0 +1,17 @@
+module Schnitzelpress
+  module CacheControl
+    class << self
+      def timestamp
+        Schnitzelpress::Config.get 'cache_timestamp'
+      end
+
+      def bust!
+        Schnitzelpress::Config.set 'cache_timestamp', Time.now
+      end
+
+      def etag(*args)
+        Digest::MD5.hexdigest("-#{timestamp.to_i}-#{args.join '-'}-")
+      end
+    end
+  end
+end

data/lib/schnitzelpress/cli.rb

@@ -1,27 +1,58 @@
 require "thor"
 
-module SchnitzelPress
+module Schnitzelpress
   class Cli < Thor
     include Thor::Actions
 
     source_root(File.expand_path('../../templates', __FILE__))
 
-    desc "create NAME", "Creates a new SchnitzelPress blog."
-
-    method_option :git, :aliases => "-g", :default => false,
+    desc "create NAME", "Creates a new Schnitzelpress blog."
+    method_option :git, :aliases => "-g", :default => false, :type => :boolean,
       :desc => "Initialize a git repository in your blog's directory."
 
-    method_option :bundle, :aliases => "-b", :default => false,
-      :desc => "Run 'bundle install' after generating your new blog."
-
     def create(name)
       @name = name
       self.destination_root = name
       directory 'new_blog', '.'
 
       in_root do
-        run "bundle"   if options[:bundle]
-        run "git init" if options[:git]
+        if options[:git]
+          run "git init"
+          run "git add ."
+          run "git commit -m 'Created new Schnitzelpress blog'"
+        end
+      end
+    end
+
+    desc "update", "Update your blog's bundled Schnitzelpress version."
+    def update
+      run "bundle update schnitzelpress"
+    end
+
+    desc "console", "Run the Schnitzelpress console."
+    def console
+      require 'schnitzelpress'
+      require 'pry'
+      Schnitzelpress.init!
+      ARGV.clear
+      pry Schnitzelpress
+    end
+
+    desc "mongo_pull", "Pulls contents of remote MongoDB into your local MongoDB"
+    def mongo_pull
+      if uri = YAML.load_file('./config/mongo.yml')['development']['uri']
+        system "MONGO_URL=\"#{uri}\" heroku mongo:pull"
+      else
+        abort "URI is missing :("
+      end
+    end
+
+    desc "mongo_push", "Pushes contents of your local MongoDB to remote MongoDB"
+    def mongo_push
+      if uri = YAML.load_file('./config/mongo.yml')['development']['uri']
+        system "MONGO_URL=\"#{uri}\" heroku mongo:push"
+      else
+        abort "URI is missing :("
       end
     end
   end

data/lib/schnitzelpress/config.rb

@@ -0,0 +1,43 @@
+module Schnitzelpress
+  class Config
+    include Mongoid::Document
+    include Mongoid::Timestamps
+    identity :type => String
+    store_in :config
+
+    field :blog_title, :type => String, :default => "A New Schnitzelpress Blog"
+    field :blog_description, :type => String, :default => ""
+    field :blog_footer, :type => String, :default => "powered by [Schnitzelpress](http://schnitzelpress.org)"
+    field :blog_feed_url, :type => String, :default => "/blog.atom"
+
+    field :author_name, :type => String, :default => "Joe Schnitzel"
+
+    field :disqus_id, :type => String
+    field :google_analytics_id, :type => String
+    field :gauges_id, :type => String
+    field :twitter_id, :type => String
+
+    field :cache_timestamp, :type => DateTime
+
+    validates :blog_title, :author_name, :presence => true
+
+    class << self
+      def instance
+        @@instance ||= find_or_create_by(:id => 'schnitzelpress')
+      end
+
+      def forget_instance
+        @@instance = nil
+      end
+
+      def get(k)
+        instance.send(k)
+      end
+
+      def set(k, v)
+        instance.update_attributes!(k => v)
+        v
+      end
+    end
+  end
+end

data/lib/schnitzelpress/env.rb

@@ -0,0 +1,5 @@
+module Schnitzelpress
+  def self.env
+    (ENV['RACK_ENV'] || 'development').inquiry
+  end
+end