retter 0.2.1 → 0.2.2

data/ChangeLog.md

@@ -1,3 +1,7 @@
+# 0.2.2
+
+Sidebar added to built-in themes.
+
 # 0.2.1
 
 ## Features
@@ -21,7 +25,7 @@ If you want, add `allow_binding` configuration to Retterfile.
 allow_binding :none
 
 # allow only entries.html and feed.html
-allow_binding [:profile, :entries, :feed]
+allow_binding [:entries, :feed]
 ```
 
 ## Bugfix

data/README.md

@@ -299,7 +299,7 @@ If you want, add `allow_binding` configuration to Retterfile.
 allow_binding :none
 
 # allow only entries.html and feed.html
-allow_binding [:profile, :entries, :feed]
+allow_binding [:entries, :feed]
 ```
 
 # Other template engines

data/lib/retter/generator/skel/Retterfile

@@ -25,7 +25,7 @@ renderer    Retter::Renderers::PygmentsRenderer
 #
 #     after :edit do
 #       Retter.reset!
-#       ident = ARGV.pop || 'today'
+#       ident = ARGV.pop
 #
 #       preview ident if yes?("Preview now? [yes/no]")
 #     end

data/lib/retter/generator/skel/layouts/article.html.haml

@@ -1,4 +1,4 @@
-%article.autopagerize_page_element
+%article.article.autopagerize_page_element
   %h1.date
     %a{href: entry_path(entry)}= entry.date
 

data/lib/retter/generator/skel/layouts/entries.html.haml

@@ -1,9 +1,14 @@
 %article
+  %h1 Archives
   %ul#entries
+    - current = nil
     - entries.each do |entry|
       %li
-        %a.entry{href: entry_path(entry)}= entry.date
+        - unless current == entry.date.year
+          - current = entry.date.year
+          %h2= current
+        %a.entry{href: entry_path(entry)}= entry.date.strftime('%m/%d')
         %ul.titles
           - entry.articles.each do |article|
             %li
-              %a.title{href: article_path(article)}= article.title
+              %a.article{href: article_path(article)}= article.title

data/lib/retter/generator/skel/layouts/entry.html.haml

@@ -1,4 +1,4 @@
-%article.autopagerize_page_element
+%article.article.autopagerize_page_element
   %h1.date
     %a{href: entry_path(entry)}= entry.date
 

data/lib/retter/generator/skel/layouts/index.html.haml

@@ -1,7 +1,7 @@
 #entries.autopagerize_page_element
   - recent_entries = entries[0..4]
   - recent_entries.each do |entry|
-    %article
+    %article.article
       %h1.date
         %a{href: entry_path(entry)}= entry.date
 

data/lib/retter/generator/skel/layouts/profile.html.haml

@@ -1,4 +1,5 @@
 %article
+  %h1 Profile
   %dl
     %dt Author
     %dd= config.author

data/lib/retter/generator/skel/layouts/retter.html.haml

@@ -6,25 +6,39 @@
     %meta{name: 'author',  content: config.author}
     %link{rel: 'icon', type: 'image/png', href: '/favicon.png'}
     %link{href: '/stylesheets/base.css', media: 'screen', rel: 'stylesheet', type: 'text/css'}
-    %link{href: '/stylesheets/retter.css', media: 'screen', rel: 'stylesheet', type: 'text/css'}
+    %link{href: '/stylesheets/orange.css', media: 'screen', rel: 'stylesheet', type: 'text/css'}
     %link{href: '/stylesheets/pygments.css', media: 'screen', rel: 'stylesheet', type: 'text/css'}
     %link{rel: 'alternate', type: 'application/rss+xml', title: 'RSS', href: '/entries.rss'}
   %body
-    #header
+    %header#header
       %h1
         %a{href: '/'}= config.title
-      %ul#menu
-        %li
-          %a{href: '/'} Home
-        %li
-          %a{href: '/profile.html'} Profile
-        %li
-          %a{href: '/entries.html'} Archives
-        %li
-          %a{href: '/entries.rss', target: '_blank'} RSS
+      %nav
+        %ul#menu
+          %li
+            %a{href: '/'} Home
+          %li
+            %a{href: '/profile.html'} Profile
+          %li
+            %a{href: '/entries.html'} Archives
+          %li
+            %a{href: '/entries.rss', target: '_blank'} RSS
     #page
       #content= content
-    #footer
+      %aside#sidebar
+        %h3 Author
+        .author
+          %a{href: '/profile.html'}= config.author
+        %h3 Recent entries
+        .recent-entries
+          %ul
+            - entries[0..5].each do |entry|
+              - entry.articles.each do |article|
+                %li
+                  %a{href: article_path(article)}= article.title
+          .archives
+            %a{href: '/entries.html'} Archives
+    %footer#footer
       #{config.title} (C) #{config.author}
       Generated by
       %a{href: 'https://github.com/hibariya/retter', target: '_blank'} Retter

data/lib/retter/generator/skel/stylesheets/base.css

@@ -1,8 +1,22 @@
-
 dl dd {
   margin-bottom: 1em;
 }
 
 pre {
   overflow: hidden;
+  line-height: 1.3em;
+}
+
+code {
+  padding: 0 5px;
 }
+
+.clearfix {
+  width: 100%;
+}
+
+.clearfix:after {
+  content: "";
+  display: block;
+  clear: both;
+}

data/lib/retter/generator/skel/stylesheets/orange.css

@@ -12,10 +12,10 @@ body {
   background-image: url("../images/orange/bg_body.jpg");
   background-attachment: fixed;
   height: 100%;
-  line-height: 1.4;
+  line-height: 1.5em;
 }
 
-ul {
+#header ul {
   list-style: none;
 }
 
@@ -24,22 +24,19 @@ a {
   color: rgb(25,30,10);
 }
 
-code{
-	padding: 0 5px;
-}
-
 #header {
-  padding: 0;
+  height: 40px;
+  background-image: url("../images/orange/bg_header.png");
+  background-repeat: repeat-x;
   margin: 0;
+  padding: 0.2em 0 0.2em 1em;
+  box-shadow: 0 2px 2px rgba(0,0,0,0.4);
 }
 
 #header h1 {
-  margin: 0;
-  padding: 0.2em 0 0.2em 1em;
   color: rgb(77,144,253);
-  height: 40px;
-  background-image: url("../images/orange/bg_header.png");
-  background-repeat: repeat-x;
+  margin: 0;
+  padding-top: 0.2em;
 }
 
 #header h1 a {
@@ -47,11 +44,8 @@ code{
 }
 
 #header ul#menu {
-  margin: 0.5em 0 6em 0;
-  padding: 0 0 0 2em;
-}
-
-#header ul#menu{
+  margin: 0.5em 0 0 0;
+  padding: 1em 0 0 2em;
 }
 
 #header ul#menu li {
@@ -71,10 +65,74 @@ code{
 
 #page {
   clear: both;
-  margin: 0 auto 0 auto;
-  width: 800px;
-  position: relative;
+  margin: 6em auto 0 auto;
+  width: 1200px;
   min-height: 100%;
+  position: relative;
+}
+
+#page #content {
+  width: 800px;
+}
+
+#page #sidebar {
+  width: 250px;
+  position: absolute;
+  top: 0;
+  margin-left: 830px;
+
+  color: #603;
+  border: 3px #FFC solid;
+  border-radius: 10px;
+  -moz-border-radius: 10px;
+  -webkit-border-radius: 10px;
+  padding: 0em 1em 1em 1em;
+  background-image: url("../images/orange/bg_entry.jpg");
+}
+
+#page #sidebar h3 {
+  margin-bottom: 0;
+  padding-bottom: 0.25em;
+  border-bottom: 1px solid #e4d7b3;
+  box-shadow: 0 1px 0 #FFF;
+}
+
+#page #sidebar .author {
+  margin-top: 0.25em;
+}
+
+#page #sidebar .recent-entries ul {
+  margin-top: 0.25em;
+  margin-bottom: 0.25em;
+  padding-left: 0;
+  list-style: none;
+}
+
+#page #sidebar .recent-entries ul li {
+  font-size: 0.9em;
+  margin-bottom: 0.5em;
+  line-height: 1.3em;
+}
+
+#page #sidebar .recent-entries ul li a{
+  color: #ab4d01;
+}
+
+#page #sidebar .recent-entries ul li a:hover{
+  color: #ca600a;
+}
+
+#page #sidebar .recent-entries .archives {
+  text-align: right;
+  font-size: 0.9em;
+}
+
+#page #sidebar .recent-entries .archives a{
+  color: #C00;
+}
+
+#page #sidebar .recent-entries .archives a:hover{
+  color: #F33;
 }
 
 article {
@@ -83,14 +141,18 @@ article {
   border: 3px #FFC solid;
   -moz-border-radius: 10px;
   -webkit-border-radius: 10px;
-  padding: 2em 3em;
+  padding: 1em 3em;
   background-image: url("../images/orange/bg_entry.jpg");
   position: relative;
-  margin-top:60px;
 }
 
-article ul li {
-	list-style-image: url("../images/orange/ic_li01.gif");
+article.article {
+  margin-top: 60px;
+  padding: 2em 3em;
+}
+
+article.article ul li {
+  list-style-image: url("../images/orange/ic_li01.gif");
 }
 
 article p a {
@@ -125,16 +187,30 @@ article .date a:hover {
   color: #669;
 }
 
-article ul#entries > li {
-  margin-top: 1em;
+article ul#entries {
+  list-style: none;
+  padding-left: 0;
 }
 
-article ul#entries {
-  line-height: 1.5em;
+article ul#entries h2 {
+  padding-bottom: 0.25em;
+  margin-bottom: 0.5em;
+  border-bottom: 1px solid #e4d7b3;
+  box-shadow: 0 1px 0 #FFF;
+}
+
+article ul#entries ul {
+  list-style: none;
+  margin-top: -1.5em;
+  padding-left: 3em;
 }
 
-article img{
-	max-width: 100%
+article ul#entries > li {
+  margin-top: 1em;
+}
+
+article img {
+  max-width: 100%
 }
 
 #entries {
@@ -169,7 +245,8 @@ pre {
   padding: 0.5em 0.5em 0.5em 1em;
   background: #036;
   color: #FFF;
-  position: relative; bottom: 0;
+  position: relative;
+  bottom: 0;
 }
 
 #footer a {
@@ -182,5 +259,4 @@ pre {
 
 #footer a:hover {
   color: #669;
-}
-
+}

data/lib/retter/generator/skel/stylesheets/retter.css

@@ -6,9 +6,9 @@ body {
   margin: 0 auto 0 auto;
   padding: 0;
   font-family: sans-serif;
-  /*lbackground: rgb(55,65,60);*/
   background: #EEE;
   height: 100%;
+  line-height: 1.5em;
 }
 
 ul {
@@ -21,15 +21,17 @@ a {
 }
 
 #header {
+  height: 40px;
   width: 100%;
-  padding: 0;
   margin: 0;
+  padding: 0.2em 0 0.2em 1em;
+  background: rgb(25,30,10);
+  color: rgb(77,144,253);
 }
 
 #header h1 {
-  width: 100%;
   margin: 0;
-  padding: 0.2em 0 0.2em 1em;
+  padding-top: 0.2em;
   background: rgb(25,30,10);
   color: rgb(77,144,253);
 }
@@ -39,9 +41,8 @@ a {
 }
 
 #header ul#menu {
-  margin: 0.5em 0 3em 0;
+  margin: 1.5em 0 0 0;
   padding: 0 0 0 2em;
-  background: #FFF;
 }
 
 #header ul#menu li {
@@ -52,11 +53,58 @@ a {
 #page {
   clear: both;
   margin: 0 auto 0 auto;
-  width: 800px;
+  width: 1200px;
   position: relative;
   min-height: 100%;
 }
 
+#page #content {
+  width: 800px;
+}
+
+#page #sidebar {
+  width: 250px;
+  position: absolute;
+  top: 0;
+  margin-left: 830px;
+  padding: 0em 1em 1em 1em;
+
+  background: rgb(228,239,192);
+  color: rgb(0,30,67);
+  border-radius: 20px;
+  border: 3px rgb(25,30,10) solid;
+  -moz-border-radius: 20px;
+  -webkit-border-radius: 20px;
+}
+
+#page #sidebar h3 {
+  margin-bottom: 0;
+  padding-bottom: 0.25em;
+  border-bottom: 1px solid #191E0A;
+}
+
+#page #sidebar .author {
+  margin-top: 0.25em;
+}
+
+#page #sidebar .recent-entries ul {
+  margin-top: 0.25em;
+  margin-bottom: 0.25em;
+  padding-left: 0;
+  list-style: none;
+}
+
+#page #sidebar .recent-entries ul li {
+  font-size: 0.9em;
+  margin-bottom: 0.5em;
+  line-height: 1.3em;
+}
+
+#page #sidebar .recent-entries .archives {
+  text-align: right;
+  font-size: 0.9em;
+}
+
 article {
   background: rgb(228,239,192);
   color: rgb(0,30,67);
@@ -65,11 +113,11 @@ article {
   -moz-border-radius: 20px;
   -webkit-border-radius: 20px;
   padding: 1em 1.5em 1em 1.5em;
-  margin: 1em 0 1em 0;
+  margin: 4em 0 1em 0;
   width 100%;
 }
 
-article h1 {
+article.article h1 {
   margin-top: 2em;
 }
 
@@ -92,6 +140,27 @@ article ul#entries {
   width 100%;
 }
 
+article ul#entries {
+  list-style: none;
+  padding-left: 0;
+}
+
+article ul#entries h2 {
+  padding-bottom: 0.25em;
+  margin-bottom: 0.5em;
+  border-bottom: 1px solid #191E0A;
+}
+
+article ul#entries ul {
+  list-style: none;
+  margin-top: -1.5em;
+  padding-left: 3em;
+}
+
+article ul#entries > li {
+  margin-top: 1em;
+}
+
 #comments {
   background: rgb(228,239,192);
   color: rgb(0,30,67);

data/lib/retter/version.rb

@@ -1,3 +1,3 @@
 module Retter
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/spec/command/rebind_spec.rb

@@ -45,8 +45,8 @@ describe 'Retter::Command#rebind', clean: :all do
     describe 'entries.html' do
       let(:entries_html) { Retter.config.retter_home.join('entries.html').read }
 
-      it { texts_of(entries_html, 'a.entry').first.should == '2011-01-01' }
-      it { texts_of(entries_html, 'a.title').should == %w(朝11時 夜1時) }
+      it { texts_of(entries_html, 'a.entry').first.should == '01/01' }
+      it { texts_of(entries_html, 'a.article').should == %w(朝11時 夜1時) }
     end
 
     describe 'entry.html' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: retter
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-23 00:00:00.000000000 Z
+date: 2012-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70165836752320 !ruby/object:Gem::Requirement
+  requirement: &2254844860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *70165836752320
+  version_requirements: *2254844860
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70165832522740 !ruby/object:Gem::Requirement
+  requirement: &2254844340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70165832522740
+  version_requirements: *2254844340
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70165832522260 !ruby/object:Gem::Requirement
+  requirement: &2254843860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 2.0.0b3
   type: :runtime
   prerelease: false
-  version_requirements: *70165832522260
+  version_requirements: *2254843860
 - !ruby/object:Gem::Dependency
   name: coderay
-  requirement: &70165832521780 !ruby/object:Gem::Requirement
+  requirement: &2254843380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: 0.9.8
   type: :runtime
   prerelease: false
-  version_requirements: *70165832521780
+  version_requirements: *2254843380
 - !ruby/object:Gem::Dependency
   name: pygments.rb
-  requirement: &70165832521300 !ruby/object:Gem::Requirement
+  requirement: &2254842900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: 0.2.7
   type: :runtime
   prerelease: false
-  version_requirements: *70165832521300
+  version_requirements: *2254842900
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70165832520820 !ruby/object:Gem::Requirement
+  requirement: &2254842420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70165832520820
+  version_requirements: *2254842420
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70165832520340 !ruby/object:Gem::Requirement
+  requirement: &2254841940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: 2.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *70165832520340
+  version_requirements: *2254841940
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70165832519860 !ruby/object:Gem::Requirement
+  requirement: &2254841460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70165832519860
+  version_requirements: *2254841460
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70165832519380 !ruby/object:Gem::Requirement
+  requirement: &2254840980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: 1.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70165832519380
+  version_requirements: *2254840980
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70165832518900 !ruby/object:Gem::Requirement
+  requirement: &2254840500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70165832518900
+  version_requirements: *2254840500
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &70165832518420 !ruby/object:Gem::Requirement
+  requirement: &2252930100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: 2.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70165832518420
+  version_requirements: *2252930100
 - !ruby/object:Gem::Dependency
   name: chronic
-  requirement: &70165832517940 !ruby/object:Gem::Requirement
+  requirement: &2252926240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: 0.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *70165832517940
+  version_requirements: *2252926240
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70165832517460 !ruby/object:Gem::Requirement
+  requirement: &2252924840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70165832517460
+  version_requirements: *2252924840
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70165832516980 !ruby/object:Gem::Requirement
+  requirement: &70120315596620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,10 +165,10 @@ dependencies:
         version: 1.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70165832516980
+  version_requirements: *70120315596620
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70165832516500 !ruby/object:Gem::Requirement
+  requirement: &70120315596140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -176,10 +176,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70165832516500
+  version_requirements: *70120315596140
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70165832516020 !ruby/object:Gem::Requirement
+  requirement: &70120315595660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -187,10 +187,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70165832516020
+  version_requirements: *70120315595660
 - !ruby/object:Gem::Dependency
   name: ir_b
-  requirement: &70165832515540 !ruby/object:Gem::Requirement
+  requirement: &70120315595180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -198,10 +198,10 @@ dependencies:
         version: 1.4.0
   type: :development
   prerelease: false
-  version_requirements: *70165832515540
+  version_requirements: *70120315595180
 - !ruby/object:Gem::Dependency
   name: tapp
-  requirement: &70165836748060 !ruby/object:Gem::Requirement
+  requirement: &70120315594700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -209,10 +209,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *70165836748060
+  version_requirements: *70120315594700
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70165836746100 !ruby/object:Gem::Requirement
+  requirement: &70120315594220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -220,10 +220,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70165836746100
+  version_requirements: *70120315594220
 - !ruby/object:Gem::Dependency
   name: fuubar
-  requirement: &70165829021360 !ruby/object:Gem::Requirement
+  requirement: &70120315593740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -231,10 +231,10 @@ dependencies:
         version: 0.0.6
   type: :development
   prerelease: false
-  version_requirements: *70165829021360
+  version_requirements: *70120315593740
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70165829020880 !ruby/object:Gem::Requirement
+  requirement: &70120315593260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -242,7 +242,7 @@ dependencies:
         version: 0.5.3
   type: :development
   prerelease: false
-  version_requirements: *70165829020880
+  version_requirements: *70120315593260
 description: Flyweight diary workflow. ruby-1.9.2 or later is required.
 email:
 - celluloid.key@gmail.com