schreihals 0.0.2 → 0.0.3

data/.gitignore

@@ -18,3 +18,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+*.sublime*

data/.watchr

@@ -0,0 +1,14 @@
+def run(cmd)
+  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" }
+
+# Ctrl-\
+Signal.trap('QUIT')   { run("rake test") }
+# Ctrl-C
+Signal.trap('INT')    { abort("\nQuitting.") }

data/README.md

@@ -29,12 +29,24 @@ Just a list of keywords I need to write about:
 * pages (= posts without dates)
 * deployment (Heroku!)
 * code highlighting
-* `google_analytics_id`
+* `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!

data/Rakefile

@@ -1,7 +1,12 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
 
-# integrate rspec
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new('spec')
-task :default => :spec
+# 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

data/bin/schreihals

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+require "rubygems"
+require "schreihals/cli"
+
+Schreihals::Cli.start

data/example/Gemfile

@@ -3,7 +3,3 @@ source 'https://rubygems.org'
 # In a real-world schreihals blog, remove the :path option, obviously.
 #
 gem 'schreihals', :path => '../'
-
-# For the time being, we need this fork of document_mapper.
-#
-gem 'document_mapper', :git => 'git://github.com/hmans/document_mapper.git', :branch => "after_load_hook"

data/lib/schreihals.rb

@@ -1,155 +1,28 @@
 require 'schreihals/version'
+
 require 'sinatra'
 require 'haml'
 require 'sass'
 require 'redcarpet'
 require 'schnitzelstyle'
-require 'document_mapper'
 require 'rack-cache'
 require 'coderay'
 require 'rack/codehighlighter'
+require 'yaml'
 
 require 'active_support/core_ext/string/inflections'
+require 'active_support/core_ext/class'
+require 'active_support/concern'
 
-module Schreihals
-  class Post
-    include DocumentMapper::Document
-
-    def after_load
-      # Set some defaults
-      #
-      self.attributes = {
-        disqus: true,
-        status: 'published',
-        summary: nil,
-        link: nil
-      }.merge(attributes)
-
-      # Set slug
-      #
-      if !attributes.has_key? :slug
-        begin
-          match = attributes[:file_name_without_extension].match(/(\d{4}-\d{1,2}-\d{1,2}[-_])?(.*)/)
-          attributes[:slug] = match[2]
-        rescue NoMethodError => err
-        end
-      end
-    end
-
-    def to_url
-      date.present? ? "/#{year}/#{month}/#{day}/#{slug}/" : "/#{slug}/"
-    end
-
-    def disqus_identifier
-      attributes[:disqus_identifier] || file_name_without_extension
-    end
-
-    def disqus?
-      disqus && published?
-    end
-
-    def published?
-      status == 'published'
-    end
-
-    def post?
-      date.present?
-    end
-
-    def page?
-      !post?
-    end
-
-    # load all posts.
-    self.directory = 'posts'
-  end
-
-  class App < Sinatra::Application
-    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 :read_more, "Read Complete Article"
-
-    use Rack::ShowExceptions
-    use Rack::Cache
-    use Rack::Static, :urls => ["/media"], :root => "public"
-    use Rack::Codehighlighter, :coderay, :markdown => true, :element => "pre>code", :pattern => /\A:::(\w+)\s*\n/
-
-    helpers do
-      def partial(thing, locals = {})
-        name = case thing
-          when String then thing
-          else thing.class.to_s.demodulize.underscore
-        end
+require 'schreihals/static'
+require 'schreihals/helpers'
+require 'schreihals/document'
+require 'schreihals/post'
+require 'schreihals/actions'
+require 'schreihals/app'
 
-        haml :"partials/_#{name}", :locals => { name.to_sym => thing }.merge(locals)
-      end
+Sass::Engine::DEFAULT_OPTIONS[:load_paths].unshift(File.expand_path("../views", __FILE__))
+Sass::Engine::DEFAULT_OPTIONS[:load_paths].unshift(File.expand_path("./views"))
 
-      def set_page_title(title)
-        @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
-      end
-
-      def show_disqus?
-        settings.disqus_name.present?
-      end
-
-      def production?
-        settings.environment.to_sym == :production
-      end
-    end
-
-    before do
-      cache_control :public, :must_revalidate, :max_age => 60
-    end
-
-    get '/' do
-      @posts = Post.order_by(:date => :desc)
-      @posts = @posts.where(:status => 'published') if production?
-      @posts = @posts.limit(10).all
-      haml :index
-    end
-
-    get '/schreihals.css' do
-      scss :schreihals
-    end
-
-    get '/atom.xml' do
-      @posts = Post.where(:status => 'published').order_by(:date => :desc).limit(10).all
-      content_type 'application/xml+atom'
-      haml :atom, :layout => false
-    end
-
-    get '/:year/:month/:day/:slug/?' do |year, month, day, slug|
-      render_page(slug)
-    end
-
-    get '/:slug/?' do |slug|
-      render_page(slug)
-    end
-
-    def render_page(slug)
-      if @post = Post.where(:slug => slug).first
-        haml :post
-      else
-        halt 404
-      end
-    end
-
-    not_found do
-      haml :"404"
-    end
-  end
+module Schreihals
 end

data/lib/schreihals/actions.rb

@@ -0,0 +1,45 @@
+module Schreihals
+  module Actions
+    extend ActiveSupport::Concern
+
+    included do
+      before do
+        refresh_documents! if refresh_documents_now?
+        cache_control :public, :must_revalidate, :max_age => 60
+      end
+
+      get '/' do
+        @posts = Post.latest(published_only: production?)
+
+        @show_description = true
+        haml :index
+      end
+
+      get '/blog.css' do
+        scss :blog
+      end
+
+      get '/atom.xml' do
+        @posts = Post.latest(published_only: production?)
+
+        xml = haml :atom, :layout => false
+
+        doc = Nokogiri::XML(xml)
+        doc.css("content img").each do |node|
+          node['src'] = absolutionize(node['src'])
+        end
+
+        content_type 'application/xml+atom'
+        doc.to_xml
+      end
+
+      get '/:year/:month/:day/:slug/?' do |year, month, day, slug|
+        render_page(slug)
+      end
+
+      get '/:slug/?' do |slug|
+        render_page(slug)
+      end
+    end
+  end
+end

data/lib/schreihals/app.rb

@@ -0,0 +1,73 @@
+module Schreihals
+  class App < Sinatra::Base
+    set :views, ['./views/', File.expand_path('../../views/', __FILE__)]
+    set :public_folder, File.expand_path('../../public/', __FILE__)
+
+    use Schreihals::Static
+    use Rack::ShowExceptions
+    use Rack::Cache
+    use Rack::Codehighlighter, :coderay, :markdown => true, :element => "pre>code", :pattern => /\A:::(\w+)\s*\n/
+
+    helpers Schreihals::Helpers
+    include Schreihals::Actions
+
+    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, ""
+    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']}"
+    end
+
+    not_found do
+      haml :"404"
+    end
+  end
+end

data/lib/schreihals/cli.rb

@@ -0,0 +1,42 @@
+require "thor"
+require 'active_support/core_ext/string/inflections'
+
+module Schreihals
+  class Cli < Thor
+    include Thor::Actions
+
+    source_root(File.expand_path('../../templates', __FILE__))
+
+    desc "create NAME", "Creates a new Schreihals blog."
+
+    method_option :git, :aliases => "-g", :default => false,
+      :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', '.'
+      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/document.rb

@@ -0,0 +1,52 @@
+require 'tilt'
+
+module Schreihals
+  class Document
+    cattr_accessor :documents
+    @@documents = []
+
+    attr_accessor :attributes
+
+    def initialize(attrs = {})
+      @attributes = attrs
+      @@documents << self
+    end
+
+    def file_extension
+      File.extname(file_name).sub(/^\./, '')
+    end
+
+    def file_name_without_extension
+      File.basename(file_name, '.'+file_extension)
+    end
+
+    def method_missing(name, *args)
+      attributes.has_key?(name.to_s) ? attributes[name.to_s] : super
+    end
+
+    def to_html
+      Tilt.new(file_extension) { body }.render
+    end
+
+    class << self
+      def from_string(s, attrs = {})
+        frontmatter, body = split_original_document(s)
+        new(Psych.load(frontmatter).
+          merge('body' => body.strip).
+          merge(attrs))
+      end
+
+      def from_file(name)
+        from_string(open(name).read, 'file_name' => File.basename(name))
+      end
+
+      def load_from_directory(dir)
+        Dir[File.join(dir, "*")].collect { |f| from_file f }
+      end
+
+      def split_original_document(s)
+        s =~ /.*(---\s*\n.*)\n---\s*\n(.*)/m ? [$1, $2] : [nil, s]
+      end
+    end
+  end
+end