schreihals 0.0.3 → 0.0.4

data/.gitignore

@@ -6,7 +6,6 @@
 .rbfu-version
 .powenv
 .sass-cache
-Gemfile.lock
 InstalledFiles
 _yardoc
 coverage
@@ -19,3 +18,4 @@ test/tmp
 test/version_tmp
 tmp
 *.sublime*
+Gemfile.lock

data/.rspec

@@ -0,0 +1 @@
+--color

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3
+  #- jruby-19mode # JRuby in 1.9 mode
+#  - rbx-18mode
+  # - rbx-19mode # currently in active development, may or may not work for your project
+# uncomment this line if your project needs to run something other than `rake`:
+# script: bundle exec rspec spec

data/.watchr

@@ -1,14 +1,15 @@
-def run(cmd)
+def run(cmd, msg = nil)
+  puts "=== %s" % msg if msg
   puts "=== %s" % cmd
   system cmd
   puts "\n"
 end
 
-watch("test/.*_test\.rb")        { |m| run("bundle exec ruby %s" % m[0]) }
-watch("lib/schreihals/(.*)\.rb") { |m| run("bundle exec ruby test/%s_test.rb" % m[1]) }
-watch('^test/test_helper\.rb')   { run "rake test" }
+watch("spec/.*_spec\.rb")        { |m| run("bundle exec rspec %s" % m[0]) }
+watch("lib/schreihals/(.*)\.rb") { |m| run("bundle exec rspec spec/%s_spec.rb" % m[1]) }
+watch('^spec/(spec_helper|factories)\.rb')   { |f| run "bundle exec rake spec", "%s.rb has been modified" % f }
 
 # Ctrl-\
-Signal.trap('QUIT')   { run("rake test") }
+Signal.trap('QUIT')   { run("bundle exec rake spec") }
 # Ctrl-C
 Signal.trap('INT')    { abort("\nQuitting.") }

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Hendrik Mans
+Copyright (c) 2012 Hendrik Mans
 
 MIT License
 
@@ -19,4 +19,4 @@ 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.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,57 +1,5 @@
 # Schreihals
 
-Everybody should be developing their own blogging engine for hackers, so here's mine.
-Documentation is pretty minimal at the moment, so for now, how about a list of
-overall design goals?
+## A blogging engine for sane hackers.
 
-## Overall Design Goals
-
-* Minimal code design.
-* Author your blog through git, using Markdown and friends.
-* Near-zero boilerplate code in your blog project. (It's all in the gem.)
-* Theme support through gems.
-* No static document generation. (Not interested, there are enough engines out there that do this.)
-* HAML and SASS support out of the box.
-
-## Usage
-
-TODO: soon
-
-## Stuff
-
-Just a list of keywords I need to write about:
-
-* Configuration
-* Automatic `date` and `slug` recognition
-* `status` attribute and drafts
-* `disqus` and `disqus_identifier` attributes
-* Using different post formats (markdown, textile, haml etc.)
-* pages (= posts without dates)
-* deployment (Heroku!)
-* code highlighting
-* `google_analytics_id` and `gauges_id`
-* `footer`
-* `link`
-* `read_more`
-* `schreihals create NAME`
-* `schreihals post TITLE`
-* `documents_store`, `documents_source`
-* `twitter_id`
-* cascading views
-
-## Version History
-
-### development
-
-* Add `schreihals` executable. Use it to generate new Schreihals blogs (`schreihals create <name>`) and blog posts (`schreihals post <title>`).
-* Removed dependency from `data_mapper` and added our own implementation.
-* The contents of the `blog_description` configuration variable are now displayed at the top of the home page. The small footer at the bottom of all pages is now being populated through the `footer` variable.
-
-### 0.0.2
-
-* Fix various stupid bugs from the initial release, including the broken example app. Duh!
-* When a post or page could not be found, we now display a proper 404 page (with correct status code.)
-
-### 0.0.1
-
-* Initial release.
+[![Build Status](https://secure.travis-ci.org/hmans/schreihals.png?branch=master)](http://travis-ci.org/hmans/schreihals)

data/Rakefile

@@ -1,12 +1,7 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
 
-# integrate riot
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/*_test.rb'
-  test.verbose = true
-end
-
-task :default => :test
+# integrate rspec
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new('spec')
+task :default => :spec

data/lib/schreihals.rb

@@ -6,23 +6,24 @@ require 'sass'
 require 'redcarpet'
 require 'schnitzelstyle'
 require 'rack-cache'
-require 'coderay'
-require 'rack/codehighlighter'
-require 'yaml'
+require 'mongoid'
 
-require 'active_support/core_ext/string/inflections'
+require 'active_support/inflector'
 require 'active_support/core_ext/class'
 require 'active_support/concern'
 
-require 'schreihals/static'
-require 'schreihals/helpers'
-require 'schreihals/document'
-require 'schreihals/post'
-require 'schreihals/actions'
 require 'schreihals/app'
 
 Sass::Engine::DEFAULT_OPTIONS[:load_paths].unshift(File.expand_path("../views", __FILE__))
 Sass::Engine::DEFAULT_OPTIONS[:load_paths].unshift(File.expand_path("./views"))
 
+Mongoid.logger.level = 3
+
 module Schreihals
+  mattr_reader :mongo_uri
+
+  def self.mongo_uri=(uri)
+    Mongoid::Config.from_hash("uri" => uri)
+    @@mongo_uri = uri
+  end
 end

data/lib/schreihals/actions/admin.rb

@@ -0,0 +1,49 @@
+module Schreihals
+  module Actions
+    module Admin
+      extend ActiveSupport::Concern
+
+      included do
+        before '/admin/?*' do
+          admin_only!
+        end
+
+        get '/admin/?' do
+          @posts  = Post.published.posts.desc(:published_at)
+          @pages  = Post.published.pages
+          @drafts = Post.drafts
+          haml :'admin/admin'
+        end
+
+        get '/admin/new/?' do
+          @post = Post.new
+          haml :'admin/new'
+        end
+
+        post '/admin/new/?' do
+          @post = Post.new(params[:post])
+          if @post.save
+            redirect url_for(@post)
+          else
+            haml :'admin/new'
+          end
+        end
+
+        get '/admin/edit/:id/?' do
+          @post = Post.find(params[:id])
+          haml :'admin/edit'
+        end
+
+        post '/admin/edit/:id/?' do
+          @post = Post.find(params[:id])
+          @post.attributes = params[:post]
+          if @post.save
+            redirect url_for(@post)
+          else
+            haml :'admin/edit'
+          end
+        end
+      end
+    end
+  end
+end

data/lib/schreihals/actions/auth.rb

@@ -0,0 +1,29 @@
+require 'omniauth'
+require 'omniauth-browserid'
+
+module Schreihals
+  module Actions
+    module Auth
+      extend ActiveSupport::Concern
+
+      included do
+        use OmniAuth::Strategies::BrowserID
+
+        post '/auth/:provider/callback' do
+          auth = request.env['omniauth.auth']
+          session[:user] = "#{auth['provider']}:#{auth['uid']}"
+          redirect admin_logged_in? ? '/admin/' : '/'
+        end
+
+        get '/login' do
+          redirect '/auth/browser_id'
+        end
+
+        get '/logout' do
+          session[:user] = nil
+          redirect '/'
+        end
+      end
+    end
+  end
+end

data/lib/schreihals/actions/blog.rb

@@ -0,0 +1,68 @@
+module Schreihals
+  module Actions
+    module Blog
+      extend ActiveSupport::Concern
+
+      included do
+        get '/' do
+          # cache_for 5.minutes
+          @posts = Post.latest.skip(params[:page].to_i * 10).limit(10)
+          @show_description = true
+          haml :index
+        end
+
+        get '/blog.css' do
+          cache_for 1.hour
+          scss :blog
+        end
+
+        get '/index.atom' do
+          cache_for 3.minutes
+          @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
+        end
+
+        get %r{^/(\d{4})/(\d{1,2})/?$} do
+          year, month = params[:captures]
+          @posts = Post.for_month(year.to_i, month.to_i)
+          haml :index
+        end
+
+        get %r{^/(\d{4})/?$} do
+          year = params[:captures].first
+          @posts = Post.for_year(year.to_i)
+          haml :index
+        end
+
+        get '/:year/:month/:day/:slug/?' do |year, month, day, slug|
+          # cache_for 1.hour
+          render_post(slug)
+        end
+
+        get '/:slug/?' do |slug|
+          # cache_for 1.hour
+          render_post(slug)
+        end
+
+        def render_post(slug)
+
+          if @post = Post.where(slugs: slug).first
+            # enforce canonical URL
+            if request.path != url_for(@post)
+              redirect url_for(@post)
+            else
+              haml :post
+            end
+          else
+            halt 404
+          end
+        end
+      end
+    end
+  end
+end

data/lib/schreihals/app.rb

@@ -1,3 +1,10 @@
+require 'schreihals/static'
+require 'schreihals/helpers'
+require 'schreihals/post'
+require 'schreihals/actions/blog'
+require 'schreihals/actions/auth'
+require 'schreihals/actions/admin'
+
 module Schreihals
   class App < Sinatra::Base
     set :views, ['./views/', File.expand_path('../../views/', __FILE__)]
@@ -6,64 +13,29 @@ module Schreihals
     use Schreihals::Static
     use Rack::ShowExceptions
     use Rack::Cache
-    use Rack::Codehighlighter, :coderay, :markdown => true, :element => "pre>code", :pattern => /\A:::(\w+)\s*\n/
+    use Rack::Session::Cookie
 
     helpers Schreihals::Helpers
-    include Schreihals::Actions
+    include Schreihals::Actions::Auth
+    include Schreihals::Actions::Admin
+    include Schreihals::Actions::Blog
 
     configure do
       set :blog_title, "My Schreihals Blog"
-      set :blog_url, ""
       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 :documents_store, :filesystem
-      set :documents_source, './posts'
-      set :documents_cache, nil
       set :twitter_id, nil
       set :footer, ""
+      set :administrator, nil
+      set :feed_url, '/index.atom'
     end
 
-    def refresh_documents_now?
-      !Post.documents.any?
-    end
-
-    def refresh_documents!
-      case settings.documents_store
-      when :filesystem
-        Post.load_from_directory(settings.documents_source)
-      # when :dropbox
-      #   Post.load_from_dropbox(settings.documents_source)
-      else
-        raise "Unknown documents store '#{settings.documents_store}'."
-      end
-    end
-
-    def render_page(slug)
-      if @post = Post.with_slug(slug)
-        haml :post
-      else
-        halt 404
-      end
-    end
-
-    def absolutionize(url)
-      if should_absolutionize?(url)
-        "#{base_url}#{url}"
-      else
-        url
-      end
-    end
-
-    def should_absolutionize?(url)
-      url && url[0] == '/'
-    end
-
-    def base_url
-      "#{env['rack.url_scheme']}://#{env['HTTP_HOST']}"
+    def cache_for(time)
+      cache_control :public, :must_revalidate, :max_age => time.to_i
     end
 
     not_found do

data/lib/schreihals/cli.rb

@@ -1,5 +1,4 @@
 require "thor"
-require 'active_support/core_ext/string/inflections'
 
 module Schreihals
   class Cli < Thor
@@ -19,24 +18,11 @@ module Schreihals
       @name = name
       self.destination_root = name
       directory 'new_blog', '.'
-      post('My First Post')
 
       in_root do
         run "bundle"   if options[:bundle]
         run "git init" if options[:git]
       end
     end
-
-
-    desc "post TITLE", "Creates a new blog post."
-
-    def post(title)
-      @title = title
-      @date = Date.today.strftime("%Y-%m-%d")
-      @slug = title.downcase.gsub(/ +/,'-')
-      @text = "Type your post body here."
-
-      template 'new-post.md.tt', "posts/#{@date}-#{@slug}.md"
-    end
   end
 end

data/lib/schreihals/helpers.rb

@@ -4,6 +4,10 @@ module Schreihals
       Array(views).each { |v| super(v, name, engine, &block) }
     end
 
+    def base_url
+      "#{env['rack.url_scheme']}://#{env['HTTP_HOST']}/"
+    end
+
     def partial(thing, locals = {})
       name = case thing
         when String then thing
@@ -17,13 +21,9 @@ module Schreihals
       @page_title = title
     end
 
-    def link_to(title, thing)
-      haml "%a{href: '#{url_for thing}'} #{title}"
-    end
-
     def url_for(thing, options = {})
       url = thing.respond_to?(:to_url) ? thing.to_url : thing.to_s
-      url = "#{settings.blog_url}#{url}" if options[:absolute]
+      url = "#{base_url.sub(/\/$/, '')}#{url}" if options[:absolute]
       url
     end
 
@@ -34,5 +34,38 @@ module Schreihals
     def production?
       settings.environment.to_sym == :production
     end
+
+    def user_logged_in?
+      session[:user].present?
+    end
+
+    def admin_logged_in?
+      user_logged_in? && session[:user] == settings.administrator
+    end
+
+    def admin_only!
+      redirect '/login' unless admin_logged_in?
+    end
+
+    def form_field(object, attribute, options = {})
+      options = {
+        label: attribute.to_s.humanize,
+        value: object.send(attribute),
+        errors: object.errors[attribute.to_sym],
+        class_name: object.class.to_s.demodulize.underscore
+      }.merge(options)
+
+      options[:name] ||= "#{options[:class_name]}[#{attribute}]"
+      options[:id] ||= object.new_record? ?
+        "new_#{options[:class_name]}_#{attribute}" :
+        "#{options[:class_name]}_#{object.id}_#{attribute}"
+
+      options[:type] ||= case options[:value]
+        when DateTime, Time, Date then :datetime
+        else :text
+      end
+
+      partial 'form_field', object: object, attribute: attribute, options: options
+    end
   end
 end