schnitzelpress 0.1.1 → 0.2.0

data/lib/views/admin/config.haml

@@ -0,0 +1,27 @@
+- set_page_title "Configuration"
+
+%section
+  %form.post{:action => '/admin/config', :method => 'post'}
+    %h2 Blog
+    = form_field config, :blog_title
+    = form_field config, :blog_description
+    = form_field config, :blog_footer
+
+    %h2 Author
+    = form_field config, :author_name
+
+    %h2 External Services
+    = form_field config, :blog_feed_url, :label => "ATOM Feed URL", :hint => "This is what the /feed URL will redirect to. You can change this to eg. your FeedBurner URL."
+    .row
+      .six.columns
+        = form_field config, :disqus_id, :label => "Disqus shortname"
+      .six.columns
+        = form_field config, :twitter_id, :label => "Twitter user name"
+    .row
+      .six.columns
+        = form_field config, :google_analytics_id, :label => "Google Analytics ID"
+      .six.columns
+        = form_field config, :gauges_id, :label => "Gauges ID"
+
+    .buttons
+      %input{:type => 'submit', :value => 'Update Configuration'}

data/lib/views/atom.haml

@@ -1,13 +1,13 @@
 !!! XML
 %feed{:xmlns => 'http://www.w3.org/2005/Atom'}
-  %title= settings.blog_title
+  %title= config.blog_title
   %link{:href => url_for('/', :absolute => true)}
   %id= base_url
   - if @posts.any?
     %updated= @posts.first.published_at
 
   %author
-    %name= settings.author_name
+    %name= config.author_name
 
   - @posts.each do |post|
     %entry
@@ -17,7 +17,7 @@
       %published= post.published_at
       %updated= post.published_at
       %author
-        %name= settings.author_name
+        %name= config.author_name
       %content{:type => 'html'}
         :cdata
           #{post.to_html}

data/lib/views/index.haml

@@ -5,7 +5,7 @@
   - else
     #welcome
       :redcarpet
-        **Congratulations on setting up your new SchnitzelPress blog!**
+        **Congratulations on setting up your new Schnitzelpress blog!**
         A world of hackery and adventure awaits.
         <span class="heart">♥</span>
 

data/lib/views/layout.haml

@@ -1,28 +1,32 @@
 !!! 5
 %html
   %head
-    %title= [@page_title, settings.blog_title].compact.join(" | ")
+    %title= [@page_title, config.blog_title].compact.join(" | ")
     %meta{ :"http-equiv" => "content-type", :content => "text/html; charset=UTF-8" }
     %meta{ :name => "viewport", :content => "width=device-width, initial-scale=1.0" }
-    %link{ :href => '/blog.css', :media => "screen", :rel => "stylesheet", :type => "text/css" }
-    %link{ :href => settings.feed_url, :title => "Subscribe via Atom Feed", :rel => 'alternate', :type => 'application/atom+xml' }
-    %script{ :type => 'text/javascript', :src => '//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js' }
-    %script{ :type => 'text/javascript', :src => '//browserid.org/include.js' }
-    %script{ :type => 'text/javascript', :src => '/js/schnitzelpress.js' }
+    %link{ :href => "/assets/schnitzelpress.#{ASSET_TIMESTAMP}.css", :media => "screen", :rel => "stylesheet", :type => "text/css" }
+    %link{ :href => config.blog_feed_url, :title => "Subscribe via Atom Feed", :rel => 'alternate', :type => 'application/atom+xml' }
   %body
     .container
       %header
         .site-title
-          %a{:href => '/'}= settings.blog_title
+          %a{:href => '/'}= h config.blog_title
         - if @show_description
-          ~ markdown settings.blog_description
+          ~ markdown config.blog_description
+
+      #actions.admin_only
+        = yield_content :actions
+        %a{:href => '/admin/'} #{icon 'cog'} Go To Admin
+        %a{:href => '/logout'} #{icon 'signout'} Logout
 
       = yield
 
       %footer
-        ~ markdown settings.footer
+        ~ markdown config.blog_footer
 
-      - if production? && settings.google_analytics_id.present?
+      - if production? && config.google_analytics_id.present?
         = partial 'google_analytics'
-      - if production? && settings.gauges_id.present?
+      - if production? && config.gauges_id.present?
         = partial 'gauges'
+
+    %script{ :type => 'text/javascript', :src => "/assets/schnitzelpress.#{ASSET_TIMESTAMP}.js" }

data/lib/views/login.haml

@@ -6,6 +6,10 @@
 
   %p
     %a.button#browser_id{:href => '/auth/browser_id'} Log in with BrowserID
+    - if Schnitzelpress.env.development?
+      %a.green.button{:href => '/auth/developer'} Developer Login
 
   %form{:method => 'post', :action => '/auth/browser_id/callback', :noValidate => 'noValidate'}
     %input{:type => 'hidden', :name => 'assertion'}
+
+%script{ :type => 'text/javascript', :src => '//browserid.org/include.js' }

data/lib/views/partials/_admin_post_list.haml

@@ -1,11 +1,11 @@
 - if posts.any?
   %h2= title
-  %ul.admin-post-list
+  .admin-post-list
     - posts.each do |post|
-      %ul.admin
-        %li
-          %a.button{:href => "/admin/edit/#{post.id}"} edit
-        %li
-          %a.button{:href => url_for(post)} view
-        %li
-          = h (post.title || ("%s..." % post.body.first(50)))
+      .row
+        .ten.columns
+          %a{:href => "/admin/edit/#{post.id}"}= h (post.title || ("%s..." % post.body.first(50)))
+        .two.columns.icons
+          %a{:href => url_for(post)}= icon 'eye-open'
+          %a{:href => "/admin/edit/#{post.id}"}= icon 'edit'
+          = link_to_delete_post icon('trash'), post

data/lib/views/partials/_disqus.haml

@@ -2,7 +2,7 @@
 
 :javascript
   /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
-  var disqus_shortname = '#{settings.disqus_name}';
+  var disqus_shortname = '#{config.disqus_id}';
   var disqus_developer = #{production? ? 0 : 1};
   var disqus_identifier = '#{disqus_identifier}';
 

data/lib/views/partials/_gauges.haml

@@ -5,7 +5,7 @@
       t.type  = 'text/javascript';
       t.async = true;
       t.id    = 'gauges-tracker';
-      t.setAttribute('data-site-id', '#{settings.gauges_id}');
+      t.setAttribute('data-site-id', '#{config.gauges_id}');
       t.src = '//secure.gaug.es/track.js';
       var s = document.getElementsByTagName('script')[0];
       s.parentNode.insertBefore(t, s);

data/lib/views/partials/_google_analytics.haml

@@ -1,6 +1,6 @@
 :javascript
   var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', '#{settings.google_analytics_id}']);
+  _gaq.push(['_setAccount', '#{config.google_analytics_id}']);
   _gaq.push(['_trackPageview']);
 
   (function() {

data/lib/views/partials/_post.haml

@@ -4,13 +4,13 @@
 - show_body      ||= complete || !show_summary
 - show_read_more ||= !complete && post.summary.present?
 - show_permalink ||= true
-- show_twitter   ||= complete && post.post? && settings.twitter_id.present?
+- show_twitter   ||= complete && post.post? && config.twitter_id.present?
 
 %article.post{:class => [post.status, post.link_post? ? 'link' : 'article']}
   %header
     - if show_title
       %h1
-        %a{:href => post.link || post.to_url}= h post.title
+        %a.instapaper_title{:href => post.link || post.to_url}= h post.title
         - if post.link_post?
           %span.link-arrow ➝
 
@@ -19,11 +19,12 @@
       ~ markdown post.summary
       - if show_read_more
         %p
-          %a{:href => url_for(post)}= post.read_more.presence || settings.read_more
+          %a{:href => url_for(post)}= post.read_more.presence || "Read Complete Article"
           →
 
   - if show_body
-    ~ post.to_html
+    .instapaper_body
+      ~ post.to_html
 
   %footer
     - if show_permalink
@@ -33,6 +34,6 @@
     - if show_twitter
       .social_media_buttons
         - if show_twitter
-          %a{:href => "https://twitter.com/share", :class => "twitter-share-button", :data => {:via => settings.twitter_id}}
+          %a{:href => "https://twitter.com/share", :class => "twitter-share-button", :data => {:via => config.twitter_id}}
           :javascript
             !function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");

data/lib/views/partials/_post_form.haml

@@ -17,4 +17,6 @@
       = form_field @post, :disqus
 
   .buttons
-    %input{:type => 'submit', :value => @post.new_record? ? 'Create Post' : 'Update Post' }
+    %button.green{:type => 'submit'} #{icon 'ok'} #{@post.new_record? ? 'Create Post' : 'Update Post'}
+    or
+    = link_to_delete_post "delete this post", @post

data/lib/views/post.haml

@@ -5,7 +5,7 @@
 - if @extra_posts
   %section.extra_posts
     %h1
-      %a{href: '/blog'}= @extra_posts.first
+      %a{:href => '/blog'}= @extra_posts.first
     %ul
       - for post in @extra_posts.second
         %li
@@ -14,3 +14,6 @@
 - if show_disqus? && @post.disqus?
   %section.disqus
     = partial 'disqus', :disqus_identifier => @post.disqus_identifier
+
+- content_for :actions do
+  %a{:href => "/admin/edit/%s" % @post.id} #{icon 'edit'} Edit

data/lib/views/schnitzelpress.scss

@@ -8,6 +8,34 @@ body, .container {
   background-image: url(/img/background.png);
 }
 
+.admin_only {
+  display: none;
+  body.show_admin & { display: block; }
+}
+
+/* action panel */
+#actions {
+  @include small-type;
+  margin: 5px;
+
+  a {
+    display: inline-block;
+    padding: 3px 6px;
+    background-color: $color-text;
+    color: $color-background;
+    font-weight: bold;
+    text-decoration: none;
+    border-radius: 3px;
+    @include appear-on-hover;
+  }
+
+  @media only screen and (min-width: 641px) {
+    position: fixed;
+    top: 0px;
+    right: 0px;
+  }
+}
+
 /* posts */
 article.post {
   header {
@@ -31,8 +59,7 @@ article.post {
       @include animated;
 
       margin: 2em 0;
-      opacity: 0.3;
-      &:hover { opacity: 1 }
+      @include appear-on-hover;
     }
   }
 }
@@ -52,12 +79,35 @@ ul.admin {
   }
 }
 
-ul.admin-post-list {
+div.admin-post-list {
   padding: 5px 0;
+  margin: 1em 0;
   max-height: 300px;
   overflow: auto;
   border-bottom: 1px dotted rgba($color-text, 0.5);
   border-top: 1px dotted rgba($color-text, 0.5);
+
+  .icons {
+    display: none;
+    text-align: right;
+    a {
+      color: $color-footer;
+      &:hover { color: $color-text };
+    }
+  }
+  .row {
+    padding: 3px;
+    margin-bottom: 0;
+    &:hover {
+      background-color: rgba($color-text, 0.05);
+      .icons {
+        display: block;
+      }
+    }
+  }
+  a {
+    border: none;
+  }
 }
 
 // forms
@@ -87,3 +137,17 @@ section.posts #welcome {
     @include clearfix;
   }
 }
+
+// font-awesome
+@font-face {
+  font-family: 'FontAwesome';
+  src: url('/font/fontawesome-webfont.eot');
+  src: url('/font/fontawesome-webfont.eot?#iefix') format('embedded-opentype'), url('/font/fontawesome-webfont.woff') format('woff'), url('/font/fontawesome-webfont.ttf') format('truetype'), url('/font/fontawesome-webfont.svgz#FontAwesomeRegular') format('svg'), url('/font/fontawesome-webfont.svg#FontAwesomeRegular') format('svg');
+  font-weight: normal;
+  font-style: normal;
+}
+.font-awesome {
+    font-family: FontAwesome;
+    font-weight: normal;
+    font-style: normal;
+}

data/schnitzelpress.gemspec

@@ -13,12 +13,14 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.name          = "schnitzelpress"
   gem.require_paths = ["lib"]
-  gem.version       = SchnitzelPress::VERSION
+  gem.version       = Schnitzelpress::VERSION
 
   # base dependencies
   gem.add_dependency 'rack', '~> 1.4.1'
   gem.add_dependency 'rack-contrib', '~> 1.1.0'
+  gem.add_dependency 'rack-cache', '~> 1.1.0'
   gem.add_dependency 'sinatra', '~> 1.3.2'
+  gem.add_dependency 'sinatra-contrib', '~> 1.3.1'
   gem.add_dependency 'activesupport', '~> 3.2.0'
 
   # database related
@@ -35,10 +37,11 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'sass', '~> 3.1.15'
   gem.add_dependency 'redcarpet', '~> 2.1.0'
   gem.add_dependency 'coderay', '~> 1.0.5'
-  gem.add_dependency 'schnitzelstyle', '~> 0.1.0'
+  gem.add_dependency 'schnitzelstyle', '~> 0.1.1'
   gem.add_dependency 'i18n', '~> 0.6.0'
   gem.add_dependency 'tilt', '~> 1.3.0'
   gem.add_dependency 'ruby-oembed', '~> 0.8.5'
+  gem.add_dependency 'packr', '~> 3.1.1'
 
   # CLI related
   gem.add_dependency 'thor', '~> 0.14.6'

data/spec/app_spec.rb

@@ -1,16 +1,10 @@
 require 'spec_helper'
 
-class TestApp < SchnitzelPress::App
-  configure do
-    set :blog_title, "A Test Blog"
-  end
-end
-
-describe SchnitzelPress::App do
+describe Schnitzelpress::App do
   include Rack::Test::Methods
 
   def app
-    TestApp
+    Schnitzelpress::App
   end
 
   describe 'the home page' do
@@ -23,7 +17,7 @@ describe SchnitzelPress::App do
     subject { last_response }
 
     it { should be_ok }
-    its(:body) { should have_tag 'title', :text => "A Test Blog" }
+    its(:body) { should have_tag 'title', :text => Schnitzelpress::Config.instance.blog_title }
     its(:body) { should have_tag 'section.posts > article.post.published', :count => 5 }
     its(:body) { should_not have_tag 'section.posts > article.post.draft' }
   end
@@ -36,14 +30,14 @@ describe SchnitzelPress::App do
 
   describe 'the public feed url' do
     before do
-      TestApp.set :feed_url, 'http://feeds.feedburner.com/example_org'
+      Schnitzelpress::Config.instance.blog_feed_url = 'http://feeds.feedburner.com/example_org'
       get '/feed'
     end
 
     subject { last_response }
     it { should be_redirect }
     its(:status) { should == 307 }
-    specify { subject["Location"].should == 'http://feeds.feedburner.com/example_org' }
+    specify { subject["Location"].should == 'http://example.org/blog.atom' }
   end
 
   describe 'viewing a single post' do

data/spec/assets_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe 'Schnitzelpress::Actions::Assets' do
+  include Rack::Test::Methods
+
+  def app
+    Schnitzelpress::App
+  end
+
+  describe '/assets/schnitzelpress.*.js' do
+    before do
+      Schnitzelpress::JavascriptPacker.should_receive(:pack_javascripts!).and_return('{123}')
+      get '/assets/schnitzelpress.123.js'
+    end
+    subject { last_response }
+    it { should be_ok }
+    its(:body) { should == '{123}' }
+  end
+
+  describe '/assets/schnitzelpress.*.css' do
+    before { get '/assets/schnitzelpress.123.css' }
+    subject { last_response }
+    it { should be_ok }
+    its(:content_type) { should == 'text/css;charset=utf-8' }
+  end
+end

data/spec/factories.rb

@@ -1,5 +1,5 @@
 FactoryGirl.define do
-  factory :post, :class => SchnitzelPress::Post do
+  factory :post, :class => Schnitzelpress::Post do
     title { Faker::Lorem.sentence }
     body  { Faker::Lorem.paragraphs }
     published_at { Time.now }

data/spec/post_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe SchnitzelPress::Post do
+describe Schnitzelpress::Post do
   subject do
     Factory.build(:post)
   end
@@ -81,7 +81,7 @@ describe SchnitzelPress::Post do
     it 'should return the latest published posts' do
       2.times { Factory :draft_post }
       5.times { Factory :published_post }
-      SchnitzelPress::Post.latest.size.should == 5
+      Schnitzelpress::Post.latest.size.should == 5
     end
   end
 
@@ -91,4 +91,11 @@ describe SchnitzelPress::Post do
     its(:month) { should == 01 }
     its(:day)   { should == 02 }
   end
+
+  context 'to_url' do
+    it 'should produce double-digit months and days' do
+      @post = Factory.build(:post, :published_at => '2012-1-1 12:00:00', :slug => 'test')
+      @post.to_url.should == '/2012/01/01/test/'
+    end
+  end
 end