chiver 0.3.3 → 0.3.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. data/Gemfile +1 -0
  2. data/Gemfile.lock +2 -0
  3. data/VERSION +1 -1
  4. data/chiver.gemspec +4 -1
  5. data/lib/chiver.rb +8 -7
  6. metadata +23 -12
data/Gemfile CHANGED
@@ -7,6 +7,7 @@ gem "haml"
7
7
  gem "sass"
8
8
  gem "redcarpet"
9
9
  gem "nokogiri"
10
+ gem "hashie"
10
11
 
11
12
  group :development do
12
13
  gem "shoulda", ">= 0"
data/Gemfile.lock CHANGED
@@ -5,6 +5,7 @@ GEM
5
5
  awesome_print (0.3.2)
6
6
  git (1.2.5)
7
7
  haml (3.1.1)
8
+ hashie (1.0.0)
8
9
  i18n (0.5.0)
9
10
  jeweler (1.6.2)
10
11
  bundler (~> 1.0)
@@ -36,6 +37,7 @@ DEPENDENCIES
36
37
  awesome_print
37
38
  bundler (~> 1.0.0)
38
39
  haml
40
+ hashie
39
41
  i18n
40
42
  jeweler (~> 1.6.2)
41
43
  nokogiri
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.3.3
1
+ 0.3.4
data/chiver.gemspec CHANGED
@@ -5,7 +5,7 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{chiver}
8
- s.version = "0.3.3"
8
+ s.version = "0.3.4"
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"]
@@ -46,6 +46,7 @@ Gem::Specification.new do |s|
46
46
  s.add_runtime_dependency(%q<sass>, [">= 0"])
47
47
  s.add_runtime_dependency(%q<redcarpet>, [">= 0"])
48
48
  s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
49
+ s.add_runtime_dependency(%q<hashie>, [">= 0"])
49
50
  s.add_development_dependency(%q<shoulda>, [">= 0"])
50
51
  s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
51
52
  s.add_development_dependency(%q<jeweler>, ["~> 1.6.2"])
@@ -59,6 +60,7 @@ Gem::Specification.new do |s|
59
60
  s.add_dependency(%q<sass>, [">= 0"])
60
61
  s.add_dependency(%q<redcarpet>, [">= 0"])
61
62
  s.add_dependency(%q<nokogiri>, [">= 0"])
63
+ s.add_dependency(%q<hashie>, [">= 0"])
62
64
  s.add_dependency(%q<shoulda>, [">= 0"])
63
65
  s.add_dependency(%q<bundler>, ["~> 1.0.0"])
64
66
  s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
@@ -73,6 +75,7 @@ Gem::Specification.new do |s|
73
75
  s.add_dependency(%q<sass>, [">= 0"])
74
76
  s.add_dependency(%q<redcarpet>, [">= 0"])
75
77
  s.add_dependency(%q<nokogiri>, [">= 0"])
78
+ s.add_dependency(%q<hashie>, [">= 0"])
76
79
  s.add_dependency(%q<shoulda>, [">= 0"])
77
80
  s.add_dependency(%q<bundler>, ["~> 1.0.0"])
78
81
  s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
data/lib/chiver.rb CHANGED
@@ -8,7 +8,7 @@ require "haml"
8
8
  require "sass"
9
9
  require "redcarpet"
10
10
  require "nokogiri"
11
- require "Hashie"
11
+ require "hashie"
12
12
 
13
13
  class Chiver < Sinatra::Base
14
14
  register SinatraMore::MarkupPlugin
@@ -16,8 +16,6 @@ class Chiver < Sinatra::Base
16
16
  set :pages, File.join(root, "pages")
17
17
  set :haml, :format => :html5
18
18
  set :sass, :views => "#{root}/public/stylesheets"
19
- set :title, root.split("/").last
20
- set :ext, ".md"
21
19
 
22
20
  helpers do
23
21
  def config
@@ -25,11 +23,12 @@ class Chiver < Sinatra::Base
25
23
  Hashie::Mash.new(
26
24
  "title" => "Chiver",
27
25
  "ext" => ".md",
26
+ "date" => "%b, %d, %Y",
28
27
  ).merge(File.exist?(file) ? YAML::load_file(file) : {})
29
28
  end
30
29
 
31
30
  def convert(name)
32
- filename = File::basename(name) + settings.ext
31
+ filename = File::basename(name) + config.ext
33
32
  text = File.read(File.join(settings.pages, filename))
34
33
  text = Markdown.new(text, :fenced_code, :autolink, :generate_toc, :lax_htmlblock, :tables, :hard_wrap)
35
34
  html = Nokogiri::HTML(text.to_html)
@@ -49,12 +48,15 @@ class Chiver < Sinatra::Base
49
48
  end
50
49
 
51
50
  get "/" do
52
- @entries = Dir::glob("#{settings.pages}/*#{settings.ext}")\
51
+ @entries = Dir::glob("#{settings.pages}/*#{config.ext}")\
53
52
  .sort{|a, b| b<=>a }\
54
53
  .map{|file|
55
54
  y, m, d, name = File::basename(file).split("-", 4)
56
55
  next unless [y, m, d, name].all?
57
- { :date => Date.new(y.to_i, m.to_i, d.to_i), :name => name.split(".").first }
56
+ Hashie::Mash.new(
57
+ :date => Date.new(y.to_i, m.to_i, d.to_i),
58
+ :name => name.split(".").first,
59
+ )
58
60
  }
59
61
  haml :index
60
62
  end
@@ -64,4 +66,3 @@ class Chiver < Sinatra::Base
64
66
  haml :page
65
67
  end
66
68
  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.3
5
+ version: 0.3.4
6
6
  platform: ruby
7
7
  authors:
8
8
  - Ryo NAKAMURA
@@ -91,19 +91,30 @@ dependencies:
91
91
  prerelease: false
92
92
  version_requirements: *id007
93
93
  - !ruby/object:Gem::Dependency
94
- name: shoulda
94
+ name: hashie
95
95
  requirement: &id008 !ruby/object:Gem::Requirement
96
96
  none: false
97
97
  requirements:
98
98
  - - ">="
99
99
  - !ruby/object:Gem::Version
100
100
  version: "0"
101
- type: :development
101
+ type: :runtime
102
102
  prerelease: false
103
103
  version_requirements: *id008
104
104
  - !ruby/object:Gem::Dependency
105
- name: bundler
105
+ name: shoulda
106
106
  requirement: &id009 !ruby/object:Gem::Requirement
107
+ none: false
108
+ requirements:
109
+ - - ">="
110
+ - !ruby/object:Gem::Version
111
+ version: "0"
112
+ type: :development
113
+ prerelease: false
114
+ version_requirements: *id009
115
+ - !ruby/object:Gem::Dependency
116
+ name: bundler
117
+ requirement: &id010 !ruby/object:Gem::Requirement
107
118
  none: false
108
119
  requirements:
109
120
  - - ~>
@@ -111,10 +122,10 @@ dependencies:
111
122
  version: 1.0.0
112
123
  type: :development
113
124
  prerelease: false
114
- version_requirements: *id009
125
+ version_requirements: *id010
115
126
  - !ruby/object:Gem::Dependency
116
127
  name: jeweler
117
- requirement: &id010 !ruby/object:Gem::Requirement
128
+ requirement: &id011 !ruby/object:Gem::Requirement
118
129
  none: false
119
130
  requirements:
120
131
  - - ~>
@@ -122,10 +133,10 @@ dependencies:
122
133
  version: 1.6.2
123
134
  type: :development
124
135
  prerelease: false
125
- version_requirements: *id010
136
+ version_requirements: *id011
126
137
  - !ruby/object:Gem::Dependency
127
138
  name: rcov
128
- requirement: &id011 !ruby/object:Gem::Requirement
139
+ requirement: &id012 !ruby/object:Gem::Requirement
129
140
  none: false
130
141
  requirements:
131
142
  - - ">="
@@ -133,10 +144,10 @@ dependencies:
133
144
  version: "0"
134
145
  type: :development
135
146
  prerelease: false
136
- version_requirements: *id011
147
+ version_requirements: *id012
137
148
  - !ruby/object:Gem::Dependency
138
149
  name: awesome_print
139
- requirement: &id012 !ruby/object:Gem::Requirement
150
+ requirement: &id013 !ruby/object:Gem::Requirement
140
151
  none: false
141
152
  requirements:
142
153
  - - ">="
@@ -144,7 +155,7 @@ dependencies:
144
155
  version: "0"
145
156
  type: :development
146
157
  prerelease: false
147
- version_requirements: *id012
158
+ version_requirements: *id013
148
159
  description: a simple archive system using sinatra and markdown
149
160
  email: r7kamura@gmail.com
150
161
  executables: []
@@ -180,7 +191,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
180
191
  requirements:
181
192
  - - ">="
182
193
  - !ruby/object:Gem::Version
183
- hash: 1327674303437019476
194
+ hash: 4035095045971344302
184
195
  segments:
185
196
  - 0
186
197
  version: "0"