Rely on middleman-core only

middleman · May 28, 2012 · cafe8e7 · cafe8e7
1 parent a5197cd
commit cafe8e7
Show file tree

Hide file tree

Showing 17 changed files with 33 additions and 204 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,19 +1,27 @@
-source "http://rubygems.org"
+source :rubygems
 
 git "git://github.com/middleman/middleman.git" do
   # gem "middleman"
   gem "middleman-core"
-  # gem "middleman-more"
+  gem "middleman-more"
 end
 
 # Specify your gem's dependencies in middleman-blog.gemspec
 gemspec
 
 group :development do
-  gem "cucumber", "~> 1.1.0"
-  gem "aruba",    "~> 0.4.11"
   gem "rake",     "~> 0.9.2"
+  gem "rdoc",     "~> 3.9"
+  gem "yard",     "~> 0.8.0"
+end
+
+group :test do
+  gem "cucumber", "~> 1.2.0"
+  gem "fivemat"
+  gem "aruba",    "~> 0.4.11"
   gem "rspec",    "~> 2.7"
-  # gem "rdoc",     "~> 3.9"
+
-  # gem "yard"
+  platforms :ruby do
-end
+    gem "redcarpet", "~> 2.1.1"
+  end
+end
diff --git a/features/support/env.rb b/features/support/env.rb
@@ -1,3 +1,6 @@
+ENV["TEST"] = "true"
+ENV["AUTOLOAD_SPROCKETS"] = "false"
+
 PROJECT_ROOT_PATH = File.dirname(File.dirname(File.dirname(__FILE__)))
 require "middleman-core"
 require "middleman-core/step_definitions"

diff --git a/fixtures/indexes-app/config.rb b/fixtures/indexes-app/config.rb
@@ -2,4 +2,5 @@
   blog.sources = ":year/:month/:day/:title.html"
 end
 
+require "middleman-more"
 activate :directory_indexes
diff --git a/fixtures/indexes-app/source/_article_template.erb b/fixtures/indexes-app/source/_article_template.erb
diff --git a/fixtures/indexes-app/source/layout.erb b/fixtures/indexes-app/source/layout.erb
@@ -4,8 +4,7 @@
   </head>
   <body>
     <% if is_blog_article? %>
-      <% content_for :blog_article, yield %>
+      <%= current_article.url %>
-      <%= partial 'article_template' %>
     <% else %>
       <%= yield %>
     <% end %>

diff --git a/fixtures/preview-app/source/_article_template.erb b/fixtures/preview-app/source/_article_template.erb
diff --git a/fixtures/preview-app/source/layout.erb b/fixtures/preview-app/source/layout.erb
@@ -12,8 +12,16 @@
 
     <div id="main" role="main">
       <% if is_blog_article? %>
-        <% content_for :blog_article, yield %>
+        <article class="hentry">
-        <%= partial 'article_template' %>
+          <h1 class="entry-title">
+            <%= current_article.title %> 
+            <time class="updated"><%= current_article.date.strftime('%b %e %Y') %></time>
+          </h1>
+
+          <div class="entry-content">
+            <%= yield %>
+          </div>
+        </article>
       <% else %>
         <%= yield %>
       <% end %>

diff --git a/fixtures/utf8ouch/config.rb b/fixtures/utf8ouch/config.rb
diff --git a/fixtures/utf8ouch/source/2010/11/13/telling-time.html.markdown b/fixtures/utf8ouch/source/2010/11/13/telling-time.html.markdown
diff --git a/fixtures/utf8ouch/source/2011/01/01/new-article.html.markdown b/fixtures/utf8ouch/source/2011/01/01/new-article.html.markdown
diff --git a/fixtures/utf8ouch/source/_article_template.erb b/fixtures/utf8ouch/source/_article_template.erb
diff --git a/fixtures/utf8ouch/source/archives/index.html.erb b/fixtures/utf8ouch/source/archives/index.html.erb
diff --git a/fixtures/utf8ouch/source/feed.xml.builder b/fixtures/utf8ouch/source/feed.xml.builder
diff --git a/fixtures/utf8ouch/source/index.html.erb b/fixtures/utf8ouch/source/index.html.erb
diff --git a/fixtures/utf8ouch/source/layout.erb b/fixtures/utf8ouch/source/layout.erb
diff --git a/lib/middleman-blog.rb b/lib/middleman-blog.rb
@@ -1,5 +1,4 @@
 require "middleman-core"
-require "middleman-more"
 
 require "middleman-blog/version"
 require "middleman-blog/template"

diff --git a/middleman-blog.gemspec b/middleman-blog.gemspec
@@ -16,8 +16,8 @@ Gem::Specification.new do |s|
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  # s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency("middleman-more", [">= 3.0.0.beta.3"])
+  s.add_dependency("middleman-core", [">= 3.0.0.beta.3"])
-end
+  s.add_dependency("maruku", ["~> 0.6.0"])
+end