georgi-shinmun 0.3.9 → 0.3.10

data/example/templates/post.rhtml

@@ -14,7 +14,7 @@
     <% if @post.category %>
       Posted in category <%= link_to @post.category, "/categories/#{urlify @post.category}" %> by <%= @blog.author %>.
     <% end %>
-    Tagged with <%= @post.tag_list.map {|tag| link_to tag, "/tags/#{urlify tag}" }.join(', ') %>.
+    Tagged with <%= @post.tag_list.map {|tag| link_to tag, "/tags/#{tag}" }.join(', ') %>.
   </div>
 
   <h6>Similar Posts</h6>

data/lib/shinmun/blog.rb

@@ -6,9 +6,9 @@ module Shinmun
 
     include Helpers
 
-    attr_reader :aggregations, :categories, :comments, :repo
+    attr_reader :aggregations, :categories, :comments, :repo, :store
 
-    %w[ assets comments config posts pages ].each do |name|
+    %w[ assets comments config posts pages templates ].each do |name|
       define_method(name) { store.root.tree(name) }
     end
 
@@ -22,6 +22,14 @@ module Shinmun
 
       @aggregations = {}
 
+      if ENV['RACK_ENV'] == 'production'
+        @store = GitStore.new(path)
+      else
+        @store = GitStore::FileStore.new(path)
+      end
+      
+      @store.load
+      
       @repo = Grit::Repo.new(path) if defined?(Grit)
       
       Thread.start do
@@ -41,6 +49,19 @@ module Shinmun
       `git commit -m 'init'`
     end
 
+    def load_template(file)
+      templates[file] or raise "template #{file} not found"
+    end    
+
+    def render(name, vars = {})
+      super(name, vars.merge(:blog => self))
+    end
+
+    def call(env)
+      store.refresh!      
+      super
+    end
+
     def load_aggregations
       config['aggregations.yml'].to_a.each do |c|
         aggregations[c['name']] = Object.const_get(c['class']).new(c['url'])
@@ -144,15 +165,6 @@ module Shinmun
         io << render(template, vars)
       end
     end
-
-    def render(name, vars = {})
-      super(name, vars.merge(:blog => self))
-    end
-
-    def call(env)
-      templates['helpers.rb']
-      super
-    end
     
   end  
   

data/lib/shinmun/bluecloth_coderay.rb

@@ -10,7 +10,7 @@ class BlueCloth
       # Generate the codeblock
       if codeblock =~ /^(?:[ ]{4}|\t)@@(.*?)\n\n(.*)\n\n/m
          "\n\n<pre class='highlight'>%s</pre>\n\n%s" %
-          [CodeRay.scan(outdent($2), $1).html(:css => :class, :line_numbers => :list).delete("\n"), remainder]
+          [CodeRay.scan(outdent($2), $1).html(:css => :style, :line_numbers => :list).delete("\n"), remainder]
       else
          "\n\n<pre><code>%s\n</code></pre>\n\n%s" %
           [encode_code(outdent(codeblock), rs).rstrip, remainder]

data/lib/shinmun/helpers.rb

@@ -60,6 +60,16 @@ module Shinmun
     def rfc822(time)
       time.strftime("%a, %d %b %Y %H:%M:%S %z")
     end
+    
+    # Render a link for the navigation bar. If the text of the link
+    # matches the @header variable, the css class will be set to acitve.
+    def navi_link(text, path)
+      link_to text, path, :class => (request.path_info == path) ? 'active' : nil
+    end
+
+    def html_escape(s)
+      s.to_s.gsub(/>/, '&gt;').gsub(/</n, '&lt;')
+    end
 
     def diff_line_class(line)
       case line[0, 1]

data/lib/shinmun/post.rb

@@ -84,11 +84,11 @@ module Shinmun
     # Split up the source into header and body. Load the header as
     # yaml document if present.
     def parse(src)
-      if src =~ /\A(---.*?)---(.*)/m
+      if src =~ /\A---(.*?)---(.*)/m
         @head = YAML.load($1)
         @body = $2
       else
-        @body = src
+        raise ArgumentError, "yaml header not found in src"
       end
 
       @body_html = transform(@body)
@@ -101,7 +101,7 @@ module Shinmun
 
     # Convert to string representation
     def dump
-      (head.empty? ? '' : head.to_yaml + "---") + body
+      head.to_yaml + "---" + body
     end
 
     # Transform the body of this post. Defaults to Markdown.

data/lib/shinmun/routes.rb

@@ -1,7 +1,7 @@
 Shinmun::Blog.map do
   
   get '/categories/(.*)\.rss' do |category|
-    render 'category.rxml', find_category(category)
+    render 'category.rxml', find_category(category).merge(:layout => false)
   end
  
   get '/categories/(.*)' do |category|
@@ -22,7 +22,7 @@ Shinmun::Blog.map do
   end
 
   get '/index\.rss' do
-    render 'index.rxml'
+    render 'index.rxml', :layout => false
   end
 
   post '/comments' do

data/test/blog_spec.rb

@@ -156,7 +156,7 @@ describe Shinmun::Blog do
     @blog.posts_for_month(2008, 10).should_not be_empty
     @blog.posts_for_month(2008, 11).should_not be_empty
     
-    assert_listing(get('/2008/10').body, [['New post', 'Body1'], ['And this', 'Body2']])
+    assert_listing(get('/2008/10').body, [['And this', 'Body2'], ['New post', 'Body1']])
     assert_listing(get('/').body, [['Again', 'Body3'], ['And this', 'Body2'], ['New post', 'Body1']])
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: georgi-shinmun
 version: !ruby/object:Gem::Version 
-  version: 0.3.9
+  version: 0.3.10
 platform: ruby
 authors: 
 - Matthias Georgi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-17 00:00:00 -08:00
+date: 2008-04-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency