lib/honk/app.rb lib/honk/helpers.rb lib/honk/skel/honk.ru lib/honk/skel/public/master.css lib/honk/skel/templates/archive.haml lib/honk/skel/templates/atom.builder lib/honk/skel/templates/error.haml lib/honk/skel/templates/footer.haml lib/honk/skel/templates/header.haml lib/honk/skel/templates/index.haml lib/honk/skel/templates/layout.haml lib/honk/skel/templates/not_found.haml lib/honk/skel/templates/post.haml lib/honk/skel/templates/rss.builder lib/honk/skel/templates/tag.haml lib/honk/skel/templates/tags.haml lib/honk/tagging.rb spec/app_spec.rb spec/mock/public spec/mock/templates spec/tagging_spec.rb @@ -1,26 +1,30 @@ -require 'pathname' -require 'yaml' -require 'date' -require 'metash' +%w[pathname yaml date metash sinatra/base haml mime/types].each do |lib| + require lib +end class Pathname; alias / join; end Infinity = 1/0.0 module Honk + PATH = Pathname.new(__FILE__).dirname - class IndexError < StandardError; end + class IndexError < StandardError; end + class NoTagError < StandardError; end + class NoPostError < StandardError; end + class SecurityError < StandardError; end DEFAULT_OPTIONS = [ - :root, :paginate, :comment_hook, :comment_filter, :meta, :language + :root, :paginate, :comment_hook, :comment_filter, :meta, :time_format ] DEFAULTS = lambda { - root Pathname.new('.').expand_path + root PATH / 'honk' / 'skel' paginate 10 language :en comment_hook lambda {|p,c| } comment_filter lambda {|s| s } + time_format '%c' meta _={ :author => "Honk default author", :title => "Honk", @@ -33,6 +37,8 @@ module Honk @@options = Metash.new @@options.instance_eval(&DEFAULTS) + @@index, @@tags = nil, nil + def self.setup(&blk) @@options.instance_eval(&blk) end @@ -41,6 +47,14 @@ module Honk @@options end + def self.load! + @@index = YAML.load_file(options.root / 'index.yml') + @@tags = YAML.load_file(options.root / 'tags.yml') + end + + def self.index; @@index; end + def self.tags; @@tags; end + def self.check_options validity = true messages = {} @@ -109,6 +123,6 @@ module Honk end -%w[post comment index tag].each do |lib| - require Pathname.new(__FILE__).dirname / 'honk' / lib +%w[post comment index tagging helpers].each do |lib| + require Honk::PATH / 'honk' / lib end lib/honk.rb @@ -24,6 +24,10 @@ module Honk %w[@title @tags @timestamp @commentable @abstract @contents] end + def formatted_timestamp + @timestamp.strftime Honk.options.time_format + end + def to_yaml(opts) YAML.quick_emit(object_id, opts) do |out| out.map(taguri, to_yaml_style) do |map| lib/honk/post.rb @@ -34,6 +34,7 @@ def reset_honk Honk.setup &Honk::DEFAULTS Honk.setup { root Pathname.new(__FILE__).dirname / 'mock' + paginate 1 } end spec/helper.rb @@ -5,6 +5,13 @@ describe 'Honk' do @defaults.instance_eval &Honk::DEFAULTS end + it 'has @@index end @@tags' do + Honk.load! + + Honk.index.should.be.kind_of Honk::Index + Honk.tags.should.be.kind_of Honk::Tagging + end + describe 'Options' do should 'be accessible with the .options method' do Honk.options.should.be.kind_of Metash spec/honk_spec.rb @@ -85,7 +85,7 @@ describe Honk::Index do describe ".pages()" do it "should return the number of pages" do - @index.pages.should == 10 + @index.pages.should == 100 end end @@ -93,7 +93,7 @@ describe Honk::Index do it 'should return all the posts for a given page' do page = @index.page(0) page.first.should == {'post0' => 'post0.yml'} - page.last.should == {'post9' => 'post9.yml'} + page.last.should == {'post0' => 'post0.yml'} end it 'should return all posts for page(0) when paginate is infinity' do spec/index_spec.rb @@ -1,9 +1,9 @@ --- !honk.yapok.org,2009/Post -:title: A sample post +:title: Another post :tags: - foo - bar :timestamp: 2009-01-27T21:42:21+01:00 :commentable: true :contents: |- - <p>This is a post</p> + <p>This is another post</p> spec/mock/posts/basic_sample.yml @@ -1,4 +1,4 @@ ---- !honk.yapok.org,2009/Tags +--- !honk.yapok.org,2009/Tagging foo: - sample - short_sample spec/mock/tags.yml @@ -122,4 +122,11 @@ describe Honk::Post do end end + describe 'formatted_timestamp' do + it 'returns the timestamp formatted with Honk.options.time_format' do + @post = Honk::Post.open('sample', 'basic_sample.yml') + @post.formatted_timestamp. + should == @post.timestamp.strftime(Honk.options.time_format) + end + end end spec/post_spec.rb config.rb css/master.css honk.rb lib/honk/tag.rb spec/tag_spec.rb b8b5b2ff4c6e65ed31b7ab7042ace48d69f67a39 madx root@yapok.org http://github.com/madx/honk/commit/7d91f94dd60c46947b2fa7e19cdd43b9a91a6e39 7d91f94dd60c46947b2fa7e19cdd43b9a91a6e39 2009-07-06T14:41:06-07:00 2009-07-06T12:21:34-07:00 MASSIVE refactoring - please do not update your blogs yet This is the refactoring I've been working on. Honk is now a modular Sinatra app that runs with rackup. Some parts are still missing (notably the comment posting), and there may be bugs. I hope this version will be more usable, and that it will play nice with other Rack apps. *Please, do not use versions up from this one until further notice! They are prone to bugs and many things are missing.* ac58a93b743057dbc372068e21995bbea63cb357 madx root@yapok.org