middleman-blog 3.0.0.beta.3 → 3.0.0.rc.1

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 (24) hide show
  1. data/.travis.yml +4 -3
  2. data/Gemfile +14 -10
  3. data/README.md +0 -1
  4. data/Rakefile +6 -1
  5. data/features/support/env.rb +3 -0
  6. data/fixtures/indexes-app/config.rb +1 -0
  7. data/fixtures/indexes-app/source/layout.erb +1 -2
  8. data/fixtures/preview-app/source/layout.erb +10 -2
  9. data/fixtures/tags-app/source/layout.erb +1 -1
  10. data/lib/middleman-blog/extension.rb +1 -1
  11. data/lib/middleman-blog/version.rb +1 -1
  12. data/lib/middleman-blog.rb +1 -1
  13. data/middleman-blog.gemspec +8 -8
  14. metadata +52 -19
  15. data/fixtures/indexes-app/source/_article_template.erb +0 -1
  16. data/fixtures/preview-app/source/_article_template.erb +0 -10
  17. data/fixtures/utf8ouch/config.rb +0 -17
  18. data/fixtures/utf8ouch/source/2010/11/13/telling-time.html.markdown +0 -73
  19. data/fixtures/utf8ouch/source/2011/01/01/new-article.html.markdown +0 -6
  20. data/fixtures/utf8ouch/source/_article_template.erb +0 -10
  21. data/fixtures/utf8ouch/source/archives/index.html.erb +0 -10
  22. data/fixtures/utf8ouch/source/feed.xml.builder +0 -23
  23. data/fixtures/utf8ouch/source/index.html.erb +0 -9
  24. data/fixtures/utf8ouch/source/layout.erb +0 -30
data/.travis.yml CHANGED
@@ -2,8 +2,9 @@ rvm:
2
2
  - 1.8.7
3
3
  - 1.9.2
4
4
  - 1.9.3
5
+ - jruby-18mode
6
+ - jruby-19mode
7
+
5
8
  script: "bundle exec rake test"
6
9
 
7
- branches:
8
- only:
9
- - master
10
+ env: TEST=true
data/Gemfile CHANGED
@@ -1,23 +1,27 @@
1
- source "http://rubygems.org"
1
+ source :rubygems
2
2
 
3
3
  git "git://github.com/middleman/middleman.git" do
4
4
  # gem "middleman"
5
5
  gem "middleman-core"
6
- # gem "middleman-more"
6
+ gem "middleman-more"
7
7
  end
8
8
 
9
9
  # Specify your gem's dependencies in middleman-blog.gemspec
10
10
  gemspec
11
11
 
12
12
  group :development do
13
- gem "cucumber", "~> 1.1.0"
14
- gem "aruba", "~> 0.4.11"
15
13
  gem "rake", "~> 0.9.2"
16
- gem "rspec", "~> 2.7"
17
- # gem "rdoc", "~> 3.9"
18
- # gem "yard"
14
+ gem "rdoc", "~> 3.9"
15
+ gem "yard", "~> 0.8.0"
19
16
  end
20
17
 
21
- group :test do
22
- gem "rdiscount"
23
- end
18
+ group :test do
19
+ gem "cucumber", "~> 1.2.0"
20
+ gem "fivemat"
21
+ gem "aruba", "~> 0.4.11"
22
+ gem "rspec", "~> 2.7"
23
+
24
+ platforms :ruby do
25
+ gem "redcarpet", "~> 2.1.1"
26
+ end
27
+ end
data/README.md CHANGED
@@ -42,7 +42,6 @@ The best way to get quick responses to your issues and swift fixes to your bugs
42
42
  # Build & Dependency Status
43
43
 
44
44
  [![Build Status](http://travis-ci.org/middleman/middleman-blog.png)](http://travis-ci.org/middleman/middleman-blog)
45
- [![Dependency Status](https://gemnasium.com/middleman/middleman-blog.png?travis)](https://gemnasium.com/middleman/middleman-blog)
46
45
 
47
46
  # How to Run Cucumber Tests
48
47
 
data/Rakefile CHANGED
@@ -4,7 +4,12 @@ Bundler::GemHelper.install_tasks
4
4
  require 'cucumber/rake/task'
5
5
 
6
6
  Cucumber::Rake::Task.new(:cucumber, 'Run features that should pass') do |t|
7
- t.cucumber_opts = "--color --tags ~@wip --strict --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}"
7
+ ENV["TEST"] = "true"
8
+
9
+ exempt_tags = ""
10
+ exempt_tags << "--tags ~@nojava" if RUBY_PLATFORM == "java"
11
+
12
+ t.cucumber_opts = "--color --tags ~@wip #{exempt_tags} --strict --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}"
8
13
  end
9
14
 
10
15
  require 'rake/clean'
data/features/support/env.rb CHANGED
@@ -1,3 +1,6 @@
1
+ ENV["TEST"] = "true"
2
+ ENV["AUTOLOAD_SPROCKETS"] = "false"
3
+
1
4
  PROJECT_ROOT_PATH = File.dirname(File.dirname(File.dirname(__FILE__)))
2
5
  require "middleman-core"
3
6
  require "middleman-core/step_definitions"
data/fixtures/indexes-app/config.rb CHANGED
@@ -2,4 +2,5 @@ activate :blog do |blog|
2
2
  blog.sources = ":year/:month/:day/:title.html"
3
3
  end
4
4
 
5
+ require "middleman-more"
5
6
  activate :directory_indexes
data/fixtures/indexes-app/source/layout.erb CHANGED
@@ -4,8 +4,7 @@
4
4
  </head>
5
5
  <body>
6
6
  <% if is_blog_article? %>
7
- <% content_for :blog_article, yield %>
8
- <%= partial 'article_template' %>
7
+ <%= current_article.url %>
9
8
  <% else %>
10
9
  <%= yield %>
11
10
  <% end %>
data/fixtures/preview-app/source/layout.erb CHANGED
@@ -12,8 +12,16 @@
12
12
 
13
13
  <div id="main" role="main">
14
14
  <% if is_blog_article? %>
15
- <% content_for :blog_article, yield %>
16
- <%= partial 'article_template' %>
15
+ <article class="hentry">
16
+ <h1 class="entry-title">
17
+ <%= current_article.title %>
18
+ <time class="updated"><%= current_article.date.strftime('%b %e %Y') %></time>
19
+ </h1>
20
+
21
+ <div class="entry-content">
22
+ <%= yield %>
23
+ </div>
24
+ </article>
17
25
  <% else %>
18
26
  <%= yield %>
19
27
  <% end %>
data/fixtures/tags-app/source/layout.erb CHANGED
@@ -4,8 +4,8 @@
4
4
  </head>
5
5
  <body>
6
6
  <% if is_blog_article? %>
7
- <%= yield %>
8
7
  <%= current_article.url %>
8
+ <%= yield %>
9
9
  <% else %>
10
10
  <%= yield %>
11
11
  <% end %>
data/lib/middleman-blog/extension.rb CHANGED
@@ -129,7 +129,7 @@ module Middleman
129
129
  # Get a {Resource} with mixed in {BlogArticle} methods representing the current article.
130
130
  # @return [Middleman::Sitemap::Resource]
131
131
  def current_article
132
- blog.article(current_page.path)
132
+ blog.article(current_resource.path)
133
133
  end
134
134
 
135
135
  # Get a path to the given tag, based on the :taglink setting.
data/lib/middleman-blog/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Middleman
2
2
  module Blog
3
- VERSION = "3.0.0.beta.3"
3
+ VERSION = "3.0.0.rc.1"
4
4
  end
5
5
  end
data/lib/middleman-blog.rb CHANGED
@@ -4,7 +4,7 @@ require "middleman-blog/version"
4
4
  require "middleman-blog/template"
5
5
  require "middleman-blog/commands/article"
6
6
 
7
- ::Middleman::Extensions.register(:blog, ">= 3.0.0.beta.3") do
7
+ ::Middleman::Extensions.register(:blog) do
8
8
  require "middleman-blog/extension"
9
9
  ::Middleman::Blog
10
10
  end
data/middleman-blog.gemspec CHANGED
@@ -6,18 +6,18 @@ Gem::Specification.new do |s|
6
6
  s.name = "middleman-blog"
7
7
  s.version = Middleman::Blog::VERSION
8
8
  s.platform = Gem::Platform::RUBY
9
- s.authors = ["Thomas Reynolds"]
10
- s.email = ["me@tdreyno.com"]
11
- s.homepage = "https://github.com/tdreyno/middleman-blog"
9
+ s.authors = ["Thomas Reynolds", "Ben Hollis"]
10
+ s.email = ["me@tdreyno.com", "ben@benhollis.net"]
11
+ s.homepage = "https://github.com/middleman/middleman-blog"
12
12
  s.summary = %q{A blog foundation using Middleman}
13
13
  s.description = %q{A blog foundation using Middleman}
14
14
 
15
15
  s.rubyforge_project = "middleman-blog"
16
16
 
17
- s.files = `git ls-files`.split("\n")
18
- s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
19
- s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
17
+ s.files = `git ls-files -z`.split("\0")
18
+ s.test_files = `git ls-files -z -- {fixtures,features}/*`.split("\0")
20
19
  s.require_paths = ["lib"]
21
20
 
22
- s.add_runtime_dependency("middleman-core", [">= 3.0.0.beta.3"])
23
- end
21
+ s.add_dependency("middleman-core", Middleman::Blog::VERSION)
22
+ s.add_dependency("maruku", ["~> 0.6.0"])
23
+ end
metadata CHANGED
@@ -1,30 +1,43 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: middleman-blog
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.0.beta.3
4
+ version: 3.0.0.rc.1
5
5
  prerelease: 6
6
6
  platform: ruby
7
7
  authors:
8
8
  - Thomas Reynolds
9
+ - Ben Hollis
9
10
  autorequire:
10
11
  bindir: bin
11
12
  cert_chain: []
12
- date: 2012-05-21 00:00:00.000000000Z
13
+ date: 2012-06-06 00:00:00.000000000 Z
13
14
  dependencies:
14
15
  - !ruby/object:Gem::Dependency
15
16
  name: middleman-core
16
- requirement: &70247567085260 !ruby/object:Gem::Requirement
17
+ requirement: &70227422307440 !ruby/object:Gem::Requirement
17
18
  none: false
18
19
  requirements:
19
- - - ! '>='
20
+ - - =
20
21
  - !ruby/object:Gem::Version
21
- version: 3.0.0.beta.3
22
+ version: 3.0.0.rc.1
22
23
  type: :runtime
23
24
  prerelease: false
24
- version_requirements: *70247567085260
25
+ version_requirements: *70227422307440
26
+ - !ruby/object:Gem::Dependency
27
+ name: maruku
28
+ requirement: &70227422306600 !ruby/object:Gem::Requirement
29
+ none: false
30
+ requirements:
31
+ - - ~>
32
+ - !ruby/object:Gem::Version
33
+ version: 0.6.0
34
+ type: :runtime
35
+ prerelease: false
36
+ version_requirements: *70227422306600
25
37
  description: A blog foundation using Middleman
26
38
  email:
27
39
  - me@tdreyno.com
40
+ - ben@benhollis.net
28
41
  executables: []
29
42
  extensions: []
30
43
  extra_rdoc_files: []
@@ -64,12 +77,10 @@ files:
64
77
  - fixtures/filename-date-app/source/layout.erb
65
78
  - fixtures/indexes-app/config.rb
66
79
  - fixtures/indexes-app/source/2011/01/01/new-article.html.markdown
67
- - fixtures/indexes-app/source/_article_template.erb
68
80
  - fixtures/indexes-app/source/index.html.erb
69
81
  - fixtures/indexes-app/source/layout.erb
70
82
  - fixtures/preview-app/config.rb
71
83
  - fixtures/preview-app/source/2011/01/01/new-article.html.markdown
72
- - fixtures/preview-app/source/_article_template.erb
73
84
  - fixtures/preview-app/source/index.html.erb
74
85
  - fixtures/preview-app/source/layout.erb
75
86
  - fixtures/tags-app/config.rb
@@ -78,14 +89,6 @@ files:
78
89
  - fixtures/tags-app/source/index.html.erb
79
90
  - fixtures/tags-app/source/layout.erb
80
91
  - fixtures/tags-app/source/tag.html.erb
81
- - fixtures/utf8ouch/config.rb
82
- - fixtures/utf8ouch/source/2010/11/13/telling-time.html.markdown
83
- - fixtures/utf8ouch/source/2011/01/01/new-article.html.markdown
84
- - fixtures/utf8ouch/source/_article_template.erb
85
- - fixtures/utf8ouch/source/archives/index.html.erb
86
- - fixtures/utf8ouch/source/feed.xml.builder
87
- - fixtures/utf8ouch/source/index.html.erb
88
- - fixtures/utf8ouch/source/layout.erb
89
92
  - lib/middleman-blog.rb
90
93
  - lib/middleman-blog/blog_article.rb
91
94
  - lib/middleman-blog/blog_data.rb
@@ -106,7 +109,7 @@ files:
106
109
  - lib/middleman-blog/version.rb
107
110
  - lib/middleman_extension.rb
108
111
  - middleman-blog.gemspec
109
- homepage: https://github.com/tdreyno/middleman-blog
112
+ homepage: https://github.com/middleman/middleman-blog
110
113
  licenses: []
111
114
  post_install_message:
112
115
  rdoc_options: []
@@ -120,7 +123,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
120
123
  version: '0'
121
124
  segments:
122
125
  - 0
123
- hash: 3403075103366763799
126
+ hash: 2190844722922174207
124
127
  required_rubygems_version: !ruby/object:Gem::Requirement
125
128
  none: false
126
129
  requirements:
@@ -129,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
129
132
  version: 1.3.1
130
133
  requirements: []
131
134
  rubyforge_project: middleman-blog
132
- rubygems_version: 1.8.10
135
+ rubygems_version: 1.8.11
133
136
  signing_key:
134
137
  specification_version: 3
135
138
  summary: A blog foundation using Middleman
@@ -144,3 +147,33 @@ test_files:
144
147
  - features/preview.feature
145
148
  - features/support/env.rb
146
149
  - features/tags.feature
150
+ - fixtures/blog-sources-app/config.rb
151
+ - fixtures/blog-sources-app/source/_article_template.erb
152
+ - fixtures/blog-sources-app/source/blog/2011-01-01-new-article.html.markdown
153
+ - fixtures/blog-sources-app/source/index.html.erb
154
+ - fixtures/blog-sources-app/source/layout.erb
155
+ - fixtures/calendar-app/config.rb
156
+ - fixtures/calendar-app/source/blog/2011-01-01-new-article.html.markdown
157
+ - fixtures/calendar-app/source/blog/2011-01-02-another-article.html.markdown
158
+ - fixtures/calendar-app/source/calendar.html.erb
159
+ - fixtures/calendar-app/source/index.html.erb
160
+ - fixtures/calendar-app/source/layout.erb
161
+ - fixtures/filename-date-app/config.rb
162
+ - fixtures/filename-date-app/source/2011-01-01-new-article.html.markdown
163
+ - fixtures/filename-date-app/source/2011-01-03-filename-and-frontmatter.html.markdown
164
+ - fixtures/filename-date-app/source/layout.erb
165
+ - fixtures/indexes-app/config.rb
166
+ - fixtures/indexes-app/source/2011/01/01/new-article.html.markdown
167
+ - fixtures/indexes-app/source/index.html.erb
168
+ - fixtures/indexes-app/source/layout.erb
169
+ - fixtures/preview-app/config.rb
170
+ - fixtures/preview-app/source/2011/01/01/new-article.html.markdown
171
+ - fixtures/preview-app/source/index.html.erb
172
+ - fixtures/preview-app/source/layout.erb
173
+ - fixtures/tags-app/config.rb
174
+ - fixtures/tags-app/source/blog/2011-01-01-new-article.html.markdown
175
+ - fixtures/tags-app/source/blog/2011-01-02-another-article.html.markdown
176
+ - fixtures/tags-app/source/index.html.erb
177
+ - fixtures/tags-app/source/layout.erb
178
+ - fixtures/tags-app/source/tag.html.erb
179
+ has_rdoc:
data/fixtures/indexes-app/source/_article_template.erb DELETED
@@ -1 +0,0 @@
1
- <%= current_article.url %>
data/fixtures/preview-app/source/_article_template.erb DELETED
@@ -1,10 +0,0 @@
1
- <article class="hentry">
2
- <h1 class="entry-title">
3
- <%= current_article.title %>
4
- <time class="updated"><%= current_article.date.strftime('%b %e %Y') %></time>
5
- </h1>
6
-
7
- <div class="entry-content">
8
- <%= yield_content :blog_article %>
9
- </div>
10
- </article>
data/fixtures/utf8ouch/config.rb DELETED
@@ -1,17 +0,0 @@
1
- activate :blog do |blog|
2
- blog.sources = ":year/:month/:day/:title.html"
3
- end
4
-
5
- page "/feed.xml", :layout => false
6
-
7
- # Build-specific configuration
8
- configure :build do
9
- # For example, change the Compass output style for deployment
10
- # activate :minify_css
11
-
12
- # Minify Javascript on build
13
- # activate :minify_javascript
14
-
15
- # Enable cache buster
16
- # activate :cache_buster
17
- end
data/fixtures/utf8ouch/source/2010/11/13/telling-time.html.markdown DELETED
@@ -1,73 +0,0 @@
1
- ---
2
- title: Telling Time.
3
- date: 2010/11/13
4
- ---
5
-
6
- Norse legend tells of the end of this cycle of Middle Earth,
7
- before the death of gods and the total submergence of its peoples. A
8
- great battle will take place before this time, called Ragnarok, in
9
- which even Odin will meet his fate in the jaws of Fenrir. Yet, the
10
- future might be bent; the All Father watches anxiously for signs of
11
- Ragnarok's quickening.
12
-
13
- READMORE
14
-
15
- It was said that after hanging from Yggdrasil, Odin learned of eighteen runes; nine of which he would tell no one. From these had Odin learned Posix programming perhaps he might have constructed himself a warning device.
16
-
17
- #include <stdio.h>
18
- #include <stdlib.h>
19
- #include <signal.h>
20
- #include <stdbool.h>
21
- #include <sys/time.h>
22
-
23
- bool near = false ;
24
-
25
- void handler(int cause, siginfo_t *HowCome, void *ucontext) {
26
- near = !near;
27
- }
28
-
29
- int main() {
30
- struct itimerval itimer;
31
- struct sigaction sa;
32
- int i = 0;
33
-
34
- sigemptyset( &sa.sa_mask ); /* Block no signals. */
35
- sa.sa_flags = SA_SIGINFO; /* Route signal handler to sa_sigaction */
36
- sa.sa_sigaction = handler; /* Define fancy handler. */
37
- if (sigaction (SIGALRM, &sa, 0)) {
38
- perror("sigaction");
39
- exit(EXIT_FAILURE);
40
- }
41
-
42
- itimer.it_value.tv_sec=0;
43
- itimer.it_value.tv_usec=7000; /* 0.007 seconds to the next timer. */
44
- itimer.it_interval.tv_sec=0;
45
- itimer.it_interval.tv_usec=7000; /* 0.007 seconds for each timer after. */
46
- setitimer(ITIMER_REAL, &itimer, NULL);
47
-
48
- while (i != 1000000) {
49
- switch (near) {
50
- case false: {
51
- ++i;
52
- } break;
53
- case true: {
54
- --i; // BUG FIX: Damned small monitor. + is - with only one eye!
55
- } break;
56
- }
57
- }
58
-
59
- /*
60
- Sneru þær af afli
61
- örlögþáttu,
62
- þá er borgir braut
63
- í Bráluni;
64
- þær of greiddu
65
- gullin símu
66
- ok und mánasal
67
- miðjan festu.
68
- */
69
-
70
- printf("Ragnarök is nigh.\n");
71
- exit(EXIT_SUCCESS);
72
- }
73
-
data/fixtures/utf8ouch/source/2011/01/01/new-article.html.markdown DELETED
@@ -1,6 +0,0 @@
1
- ---
2
- title: "New Article title"
3
- date: 2011/01/01
4
- ---
5
-
6
- Content of my article
data/fixtures/utf8ouch/source/_article_template.erb DELETED
@@ -1,10 +0,0 @@
1
- <article class="hentry">
2
- <h1 class="entry-title">
3
- <%= current_article_title %>
4
- <time class="updated" pubdate><%= current_article_date.strftime('%b %e %Y') %></time>
5
- </h1>
6
-
7
- <div class="entry-content">
8
- <%= yield_content :blog_article %>
9
- </div>
10
- </article>
data/fixtures/utf8ouch/source/archives/index.html.erb DELETED
@@ -1,10 +0,0 @@
1
- <h1>Archive: <%# @path %></h1>
2
- <ul class="archives">
3
- <% for entry in data.blog.articles %>
4
- <li>
5
- <a href="<%= entry.url %>"><%= entry.title %></a>
6
- <span><%= entry.date.strftime('%b %e') %></span>
7
- </li>
8
- <% end %>
9
- </ul>
10
-
data/fixtures/utf8ouch/source/feed.xml.builder DELETED
@@ -1,23 +0,0 @@
1
- xml.instruct!
2
- xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
3
- xml.title "Blog Name"
4
- xml.subtitle "Blog subtitle"
5
- xml.id "http://blog.url.com/"
6
- xml.link "href" => "http://blog.url.com/"
7
- xml.link "href" => "http://blog.url.com/feed.xml", "rel" => "self"
8
- xml.updated data.blog.articles.first.date.to_time.iso8601
9
- xml.author { xml.name "Blog Author" }
10
-
11
- data.blog.articles.each do |article|
12
- xml.entry do
13
- xml.title article.title
14
- xml.link "rel" => "alternate", "href" => article.url
15
- xml.id article.url
16
- xml.published article.date.to_time.iso8601
17
- xml.updated article.date.to_time.iso8601
18
- xml.author { xml.name "Article Author" }
19
- xml.summary article.summary, "type" => "html"
20
- xml.content article.body, "type" => "html"
21
- end
22
- end
23
- end
data/fixtures/utf8ouch/source/index.html.erb DELETED
@@ -1,9 +0,0 @@
1
- <% data.blog.articles[0...5].each_with_index do |article, i| %>
2
- <article class="<%= (i == 0) ? 'first' : '' %>">
3
- <h1><a href="<%= article.url %>"><%= article.title %></a> <span><%= article.date.strftime('%b %e %Y') %></span></h1>
4
-
5
- <%= article.summary %>
6
-
7
- <div class="more"><a href="<%= article.url %>">read on &raquo;</a></div>
8
- </article>
9
- <% end %>
data/fixtures/utf8ouch/source/layout.erb DELETED
@@ -1,30 +0,0 @@
1
- <!doctype html>
2
- <html>
3
- <head>
4
- <meta charset="utf-8" />
5
- <meta http-equiv='X-UA-Compatible' content='IE=edge;chrome=1' />
6
- </head>
7
- <body>
8
-
9
- <div id="main" role="main">
10
- <% if is_blog_article? %>
11
- <% content_for :blog_article, yield %>
12
- <%= partial blog.article_template %>
13
- <% else %>
14
- <%= yield %>
15
- <% end %>
16
- </div>
17
-
18
- <aside>
19
- <h2>
20
- Recent Articles
21
- <a href="/archives">Archive</a>
22
- </h2>
23
- <ol>
24
- <% data.blog.articles[0...10].each do |article| %>
25
- <li><a href="<%= article.url %>"><%= article.title %></a> <span><%= article.date.strftime('%b %e') %></span></li>
26
- <% end %>
27
- </li>
28
- </aside>
29
- </body>
30
- </html>