soxer 0.9.14 → 0.9.15

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. data/CHANGES +7 -0
  2. data/lib/soxer/main.rb +3 -3
  3. data/soxer.gemspec +2 -2
  4. metadata +92 -123
data/CHANGES CHANGED
@@ -1,3 +1,10 @@
1
+ = 0.9.15 / 2011-10-23
2
+
3
+ * Fixed Sinatra::Base#options => Sinatra::Base#settings
4
+ This was upstream change. Cannot help it.
5
+
6
+ * Static site creation is mostly broken at the moment. Do not rely on it.
7
+
1
8
  = 0.9.14 / 2011-10-07
2
9
 
3
10
  * Fixed :public => :public_folder arround line 316 in main.rb (rack)
data/lib/soxer/main.rb CHANGED
@@ -121,7 +121,7 @@ module Sinatra
121
121
  # [=> Hash]
122
122
  # A hash representation of yaml file.
123
123
  def get_page url=params[:splat][0]
124
- UrlReader.new(url, options).get_content
124
+ UrlReader.new(url, settings).get_content
125
125
  end
126
126
 
127
127
  # === Document list generator method
@@ -135,10 +135,10 @@ module Sinatra
135
135
  # [=> Array]
136
136
  # Array of hashes representing yaml files.
137
137
  def get_list &block
138
- fileset= Dir.glob File.join( options.origin, "**", "*.yaml" )
138
+ fileset= Dir.glob File.join( settings.origin, "**", "*.yaml" )
139
139
  fileset.delete_if {|d| (d=~/\/index.yaml$/ and fileset.include? d[0..-12]+'.yaml') }
140
140
  output = fileset.map! do |f|
141
- file = FileReader.new f, options
141
+ file = FileReader.new f, settings
142
142
  if block_given?
143
143
  f = block.call file.get_content
144
144
  else
data/soxer.gemspec CHANGED
@@ -4,8 +4,8 @@ Gem::Specification.new do |s|
4
4
  s.rubygems_version = '1.3.7'
5
5
 
6
6
  s.name = 'soxer'
7
- s.version = '0.9.14'
8
- s.date = '2011-10-07'
7
+ s.version = '0.9.15'
8
+ s.date = '2011-10-25'
9
9
  s.rubyforge_project = 'soxer'
10
10
 
11
11
  s.summary = "Dynamic web site generator engine"
metadata CHANGED
@@ -1,112 +1,89 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: soxer
3
- version: !ruby/object:Gem::Version
4
- prerelease: false
5
- segments:
6
- - 0
7
- - 9
8
- - 14
9
- version: 0.9.14
3
+ version: !ruby/object:Gem::Version
4
+ version: 0.9.15
5
+ prerelease:
10
6
  platform: ruby
11
- authors:
7
+ authors:
12
8
  - Toni Anzlovar
13
9
  autorequire:
14
10
  bindir: bin
15
11
  cert_chain: []
16
-
17
- date: 2011-10-07 00:00:00 +02:00
18
- default_executable:
19
- dependencies:
20
- - !ruby/object:Gem::Dependency
12
+ date: 2011-10-25 00:00:00.000000000Z
13
+ dependencies:
14
+ - !ruby/object:Gem::Dependency
21
15
  name: sinatra
22
- prerelease: false
23
- requirement: &id001 !ruby/object:Gem::Requirement
16
+ requirement: &12633240 !ruby/object:Gem::Requirement
24
17
  none: false
25
- requirements:
18
+ requirements:
26
19
  - - ~>
27
- - !ruby/object:Gem::Version
28
- segments:
29
- - 1
30
- version: "1"
20
+ - !ruby/object:Gem::Version
21
+ version: '1'
31
22
  type: :runtime
32
- version_requirements: *id001
33
- - !ruby/object:Gem::Dependency
34
- name: haml
35
23
  prerelease: false
36
- requirement: &id002 !ruby/object:Gem::Requirement
24
+ version_requirements: *12633240
25
+ - !ruby/object:Gem::Dependency
26
+ name: haml
27
+ requirement: &12632740 !ruby/object:Gem::Requirement
37
28
  none: false
38
- requirements:
29
+ requirements:
39
30
  - - ~>
40
- - !ruby/object:Gem::Version
41
- segments:
42
- - 3
43
- version: "3"
31
+ - !ruby/object:Gem::Version
32
+ version: '3'
44
33
  type: :runtime
45
- version_requirements: *id002
46
- - !ruby/object:Gem::Dependency
47
- name: sass
48
34
  prerelease: false
49
- requirement: &id003 !ruby/object:Gem::Requirement
35
+ version_requirements: *12632740
36
+ - !ruby/object:Gem::Dependency
37
+ name: sass
38
+ requirement: &12632260 !ruby/object:Gem::Requirement
50
39
  none: false
51
- requirements:
40
+ requirements:
52
41
  - - ~>
53
- - !ruby/object:Gem::Version
54
- segments:
55
- - 3
56
- version: "3"
42
+ - !ruby/object:Gem::Version
43
+ version: '3'
57
44
  type: :runtime
58
- version_requirements: *id003
59
- - !ruby/object:Gem::Dependency
60
- name: uuid
61
45
  prerelease: false
62
- requirement: &id004 !ruby/object:Gem::Requirement
46
+ version_requirements: *12632260
47
+ - !ruby/object:Gem::Dependency
48
+ name: uuid
49
+ requirement: &12631740 !ruby/object:Gem::Requirement
63
50
  none: false
64
- requirements:
51
+ requirements:
65
52
  - - ~>
66
- - !ruby/object:Gem::Version
67
- segments:
68
- - 2
69
- version: "2"
53
+ - !ruby/object:Gem::Version
54
+ version: '2'
70
55
  type: :runtime
71
- version_requirements: *id004
72
- - !ruby/object:Gem::Dependency
73
- name: hashie
74
56
  prerelease: false
75
- requirement: &id005 !ruby/object:Gem::Requirement
57
+ version_requirements: *12631740
58
+ - !ruby/object:Gem::Dependency
59
+ name: hashie
60
+ requirement: &12631220 !ruby/object:Gem::Requirement
76
61
  none: false
77
- requirements:
62
+ requirements:
78
63
  - - ~>
79
- - !ruby/object:Gem::Version
80
- segments:
81
- - 1
82
- - 0
83
- - 0
64
+ - !ruby/object:Gem::Version
84
65
  version: 1.0.0
85
66
  type: :runtime
86
- version_requirements: *id005
87
- - !ruby/object:Gem::Dependency
88
- name: sinatra-reloader
89
67
  prerelease: false
90
- requirement: &id006 !ruby/object:Gem::Requirement
68
+ version_requirements: *12631220
69
+ - !ruby/object:Gem::Dependency
70
+ name: sinatra-reloader
71
+ requirement: &12630480 !ruby/object:Gem::Requirement
91
72
  none: false
92
- requirements:
73
+ requirements:
93
74
  - - ~>
94
- - !ruby/object:Gem::Version
95
- segments:
96
- - 0
97
- - 5
98
- version: "0.5"
75
+ - !ruby/object:Gem::Version
76
+ version: '0.5'
99
77
  type: :runtime
100
- version_requirements: *id006
78
+ prerelease: false
79
+ version_requirements: *12630480
101
80
  description: Soxer is a file based static/dynamic web site creation tool for Sinatra.
102
81
  email: toni@formalibre.si
103
- executables:
82
+ executables:
104
83
  - soxer
105
84
  extensions: []
106
-
107
85
  extra_rdoc_files: []
108
-
109
- files:
86
+ files:
110
87
  - soxer.gemspec
111
88
  - CHANGES
112
89
  - README.markdown
@@ -114,76 +91,68 @@ files:
114
91
  - bin/soxer
115
92
  - lib/soxer.rb
116
93
  - lib/soxer/main.rb
117
- - lib/soxer/views/atom_layout.haml
118
- - lib/soxer/views/disqus.haml
119
94
  - lib/soxer/views/google_analytics.haml
120
- - lib/soxer/views/atom.haml
121
- - lib/soxer/views/breadcrumb.haml
122
- - lib/soxer/views/sitemap.haml
123
95
  - lib/soxer/views/google_ads.haml
96
+ - lib/soxer/views/atom_layout.haml
97
+ - lib/soxer/views/sitemap.haml
98
+ - lib/soxer/views/breadcrumb.haml
99
+ - lib/soxer/views/atom.haml
100
+ - lib/soxer/views/disqus.haml
101
+ - lib/soxer/skel/empty/config.ru
102
+ - lib/soxer/skel/empty/SETUP.rb
103
+ - lib/soxer/skel/empty/config.yml.example
104
+ - lib/soxer/skel/empty/app.rb
105
+ - lib/soxer/skel/empty/views/layout.haml
106
+ - lib/soxer/skel/empty/views/css/css.sass
107
+ - lib/soxer/skel/empty/content/index.yaml
108
+ - lib/soxer/skel/blog/config.ru
109
+ - lib/soxer/skel/blog/SETUP.rb
110
+ - lib/soxer/skel/blog/public/css/blossom/blossom.jpg
111
+ - lib/soxer/skel/blog/public/css/dna/sequence.jpg
112
+ - lib/soxer/skel/blog/public/fonts/GeosansLight.ttf
124
113
  - lib/soxer/skel/blog/config.yml.example
125
- - lib/soxer/skel/blog/views/_block_history.haml
126
- - lib/soxer/skel/blog/views/_block_categories.haml
127
- - lib/soxer/skel/blog/views/css/dna/css.sass
128
- - lib/soxer/skel/blog/views/css/blossom/css.sass
129
- - lib/soxer/skel/blog/views/css/common.sass
114
+ - lib/soxer/skel/blog/app.rb
130
115
  - lib/soxer/skel/blog/views/_doc_docinfo.haml
131
116
  - lib/soxer/skel/blog/views/_block_recent.haml
117
+ - lib/soxer/skel/blog/views/_block_history.haml
118
+ - lib/soxer/skel/blog/views/layout.haml
132
119
  - lib/soxer/skel/blog/views/_doc_short.haml
133
120
  - lib/soxer/skel/blog/views/_block_about.haml
134
- - lib/soxer/skel/blog/views/layout.haml
135
- - lib/soxer/skel/blog/SETUP.rb
136
- - lib/soxer/skel/blog/app.rb
137
- - lib/soxer/skel/blog/config.ru
138
- - lib/soxer/skel/blog/public/css/dna/sequence.jpg
139
- - lib/soxer/skel/blog/public/css/blossom/blossom.jpg
140
- - lib/soxer/skel/blog/public/fonts/GeosansLight.ttf
121
+ - lib/soxer/skel/blog/views/css/blossom/css.sass
122
+ - lib/soxer/skel/blog/views/css/common.sass
123
+ - lib/soxer/skel/blog/views/css/dna/css.sass
124
+ - lib/soxer/skel/blog/views/_block_categories.haml
141
125
  - lib/soxer/skel/blog/content/blog.atom.yaml
126
+ - lib/soxer/skel/blog/content/categories/index.yaml
127
+ - lib/soxer/skel/blog/content/index.yaml
128
+ - lib/soxer/skel/blog/content/blog/2009-06-02-meum_est_propositum.yaml
129
+ - lib/soxer/skel/blog/content/blog/2010-10-12-how_to_spend_your_time_wisely.yaml
142
130
  - lib/soxer/skel/blog/content/blog/2010-11-24-what_is_where.yaml
143
- - lib/soxer/skel/blog/content/blog/2010-09-06-lorem_ipsum.yaml
144
131
  - lib/soxer/skel/blog/content/blog/2010-04-16-ecce_quomdo_moritur_iustus.yaml
145
- - lib/soxer/skel/blog/content/blog/2010-10-12-how_to_spend_your_time_wisely.yaml
146
- - lib/soxer/skel/blog/content/blog/2009-06-02-meum_est_propositum.yaml
147
- - lib/soxer/skel/blog/content/index.yaml
148
- - lib/soxer/skel/blog/content/categories/index.yaml
149
- - lib/soxer/skel/empty/config.yml.example
150
- - lib/soxer/skel/empty/views/css/css.sass
151
- - lib/soxer/skel/empty/views/layout.haml
152
- - lib/soxer/skel/empty/SETUP.rb
153
- - lib/soxer/skel/empty/app.rb
154
- - lib/soxer/skel/empty/config.ru
155
- - lib/soxer/skel/empty/content/index.yaml
156
- has_rdoc: true
132
+ - lib/soxer/skel/blog/content/blog/2010-09-06-lorem_ipsum.yaml
157
133
  homepage: http://soxer.mutsu.org
158
134
  licenses: []
159
-
160
135
  post_install_message:
161
- rdoc_options:
136
+ rdoc_options:
162
137
  - --charset=UTF-8
163
- require_paths:
138
+ require_paths:
164
139
  - lib
165
- required_ruby_version: !ruby/object:Gem::Requirement
140
+ required_ruby_version: !ruby/object:Gem::Requirement
166
141
  none: false
167
- requirements:
168
- - - ">="
169
- - !ruby/object:Gem::Version
170
- segments:
171
- - 0
172
- version: "0"
173
- required_rubygems_version: !ruby/object:Gem::Requirement
142
+ requirements:
143
+ - - ! '>='
144
+ - !ruby/object:Gem::Version
145
+ version: '0'
146
+ required_rubygems_version: !ruby/object:Gem::Requirement
174
147
  none: false
175
- requirements:
176
- - - ">="
177
- - !ruby/object:Gem::Version
178
- segments:
179
- - 0
180
- version: "0"
148
+ requirements:
149
+ - - ! '>='
150
+ - !ruby/object:Gem::Version
151
+ version: '0'
181
152
  requirements: []
182
-
183
153
  rubyforge_project: soxer
184
- rubygems_version: 1.3.7
154
+ rubygems_version: 1.8.11
185
155
  signing_key:
186
156
  specification_version: 2
187
157
  summary: Dynamic web site generator engine
188
158
  test_files: []
189
-