chiver 0.3.2 → 0.3.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. data/VERSION +1 -1
  2. data/chiver.gemspec +2 -2
  3. data/lib/chiver.rb +12 -1
  4. metadata +3 -3
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.3.2
1
+ 0.3.3
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{chiver}
8
- s.version = "0.3.2"
8
+ s.version = "0.3.3"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Ryo NAKAMURA"]
12
- s.date = %q{2011-06-15}
12
+ s.date = %q{2011-06-16}
13
13
  s.description = %q{a simple archive system using sinatra and markdown}
14
14
  s.email = %q{r7kamura@gmail.com}
15
15
  s.extra_rdoc_files = [
@@ -1,4 +1,5 @@
1
1
  require "date"
2
+ require "yaml"
2
3
  require "rubygems"
3
4
  require "sinatra/base"
4
5
  require "sinatra_more/markup_plugin"
@@ -7,6 +8,7 @@ require "haml"
7
8
  require "sass"
8
9
  require "redcarpet"
9
10
  require "nokogiri"
11
+ require "Hashie"
10
12
 
11
13
  class Chiver < Sinatra::Base
12
14
  register SinatraMore::MarkupPlugin
@@ -18,6 +20,14 @@ class Chiver < Sinatra::Base
18
20
  set :ext, ".md"
19
21
 
20
22
  helpers do
23
+ def config
24
+ file = File.join(settings.root, "config.yml")
25
+ Hashie::Mash.new(
26
+ "title" => "Chiver",
27
+ "ext" => ".md",
28
+ ).merge(File.exist?(file) ? YAML::load_file(file) : {})
29
+ end
30
+
21
31
  def convert(name)
22
32
  filename = File::basename(name) + settings.ext
23
33
  text = File.read(File.join(settings.pages, filename))
@@ -28,7 +38,7 @@ class Chiver < Sinatra::Base
28
38
  end
29
39
 
30
40
  before do
31
- @title = settings.title
41
+ @title = config.title
32
42
  end
33
43
 
34
44
  error { haml :error } unless development?
@@ -54,3 +64,4 @@ class Chiver < Sinatra::Base
54
64
  haml :page
55
65
  end
56
66
  end
67
+
metadata CHANGED
@@ -2,7 +2,7 @@
2
2
  name: chiver
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease:
5
- version: 0.3.2
5
+ version: 0.3.3
6
6
  platform: ruby
7
7
  authors:
8
8
  - Ryo NAKAMURA
@@ -10,7 +10,7 @@ autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
12
 
13
- date: 2011-06-15 00:00:00 +09:00
13
+ date: 2011-06-16 00:00:00 +09:00
14
14
  default_executable:
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
@@ -180,7 +180,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
180
180
  requirements:
181
181
  - - ">="
182
182
  - !ruby/object:Gem::Version
183
- hash: -3943369961096070924
183
+ hash: 1327674303437019476
184
184
  segments:
185
185
  - 0
186
186
  version: "0"