serif 0.5.2 → 0.6

data/lib/serif/post.rb

@@ -87,4 +87,4 @@ class Post < ContentFile
     h
   end
 end
-end
+end

data/lib/serif/server.rb

@@ -39,4 +39,4 @@ class DevelopmentServer
     app.run!(:port => 8000)
   end
 end
-end
+end

data/lib/serif/site.rb

@@ -1,14 +1,3 @@
-
-module Liquid #:nodoc:#
-module StandardFilters #:nodoc:#
-  alias_method :date_orig, :date
-
-  def date(input, format)
-    input == "now" ? date_orig(Time.now, format) : date_orig(input, format)
-  end
-end
-end
-
 module Serif
 module Filters
   def strip(input)
@@ -21,24 +10,11 @@ module Filters
   end
 
   def smarty(text)
-    text.gsub!('`', '\\\\`')
-    Redcarpet::Render::SmartyPants.render(text)
+    RubyPants.new(text).to_html
   end
 
   def markdown(body)
-    renderer = Redcarpet::Markdown.new(Serif::MarkupRenderer, fenced_code_blocks: true)
-    html = renderer.render(body).strip
-
-    # make sure we aren't overriding unless we need to.
-    # causes the workaround to automatically turn off.
-    if !(renderer.render("a 'quoted' word").include?("’"))
-      # fix the broken single curly quotes by putting them back
-      # as unescaped characters and then re-running the renderer.
-      html.gsub!("'", "'")
-      html = renderer.render(html)
-    end
-
-    html
+    Serif::Markdown.render(body)
   end
 
   def xmlschema(input)
@@ -77,7 +53,7 @@ class FileDigest < Liquid::Tag
     return "" unless ENV["ENV"] == "production"
 
     full_path = File.join(context["site"]["directory"], @path.strip)
-    
+
     return @prefix + DIGEST_CACHE[full_path] if DIGEST_CACHE[full_path]
 
     digest = Digest::MD5.hexdigest(File.read(full_path))
@@ -492,7 +468,7 @@ class Site
 
     months.each do |month, posts|
       archive_path = tmp_path(archive_url_for_date(month))
-      
+
       FileUtils.mkdir_p(archive_path)
 
       File.open(File.join(archive_path + ".html"), "w") do |f|
@@ -517,4 +493,4 @@ class Site
     result
   end
 end
-end
+end

data/rakefile

@@ -4,14 +4,11 @@ require "rspec/core/rake_task"
 require "benchmark"
 require "rdoc/task"
 
-RSpec::Core::RakeTask.new(:test) do |t|
-  t.rspec_opts = "-I test --color --format nested"
-  t.pattern = "test/**/*_spec.rb"
-  t.verbose = false
-  t.fail_on_error = true
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = ["spec/**/*_spec.rb", "spec/acceptance/**/*.feature"]
 end
 
-task :default => :test
+task :default => :spec
 
 Rake::RDocTask.new(:docs) do |rd|
   rd.main = "README.md"

data/serif.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name         = "serif"
-  s.version      = "0.5.2"
+  s.version      = "0.6"
   s.authors      = ["Adam Prescott"]
   s.email        = ["adam@aprescott.com"]
   s.homepage     = "https://github.com/aprescott/serif"
@@ -12,15 +12,17 @@ Gem::Specification.new do |s|
   s.executables  = "serif"
   s.test_files   = Dir["test/*"]
   s.required_ruby_version = ">= 1.9.3"
+  s.licenses = ["MIT"]
 
   [
     "rack", "~> 1.0",
-    "redcarpet", "~> 2.2",
+    "kramdown", "~> 1.3",
+    "rubypants", nil,
     "rouge", "~> 0.3.2",
     "sinatra", "~> 1.3",
     "redhead", "~> 0.0.8",
     "liquid", "~> 2.4",
-    "reverse_markdown", "~> 0.4.3",
+    "reverse_markdown", nil,
     "nokogiri", "~> 1.5",
     "timeout_cache"
   ].each_slice(2) do |name, version|
@@ -33,4 +35,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency("timecop", "~> 0.6.1")
   s.add_development_dependency("rdoc", "~> 4.0.0")
   s.add_development_dependency("coveralls")
+  s.add_development_dependency("turnip")
+  s.add_development_dependency("capybara")
+  s.add_development_dependency("poltergeist")
+  s.add_development_dependency("pry")
 end

data/statics/assets/js/attachment.js

@@ -36,7 +36,7 @@ var createAttachment = function(file, element) {
 	$.each(placeholderValues, function(placeholder, value) {
 		s = s.replace(placeholder, value);
 	});
-	
+
 	var extension = file.name.substring(file.name.lastIndexOf('.') + 1);
 
 	var finalName = s;
@@ -88,7 +88,7 @@ var createAttachment = function(file, element) {
 		var text   = element.value;
 		var before = text.slice(0, pos);
 		var after  = text.slice(pos);
-		
+
 		// if there is only a single newline, add one more for a blank
 		// line.
 		if (/[^\n]\n$/.test(before)) {
@@ -99,7 +99,7 @@ var createAttachment = function(file, element) {
 		}
 
 	}
-	
+
 	$(element).insertAtCaret(absText);
 };
 

data/statics/skeleton/_config.yml

@@ -9,4 +9,4 @@ admin:
 permalink: /:title
 archive:
   enabled: yes
-  url_format: /archive/:year/:month
+  url_format: /archive/:year/:month

data/statics/skeleton/_layouts/default.html

@@ -3,4 +3,4 @@
 <title>My site: {{ page.title }}</title>
 <h1>mysite.com</h1>
 
-{{ content }}
+{{ content }}

data/statics/skeleton/_templates/archive_page.html

@@ -6,4 +6,4 @@
 			<a href="{{ post.url }}">{{ post.title }}</a>
 		</li>
 	{% endfor %}
-</ul>
+</ul>

data/statics/skeleton/_templates/post.html

@@ -2,4 +2,4 @@
 
 {{ post.content | markdown }}
 
-<p><a href="http://twitter.com/share?text={{ post.title | encode_uri_component }}&amp;url={{ 'http://www.mysite.com' | encode_uri_component }}{{ post.url | encode_uri_component }}">Submit this to Twitter.</p>
+<p><a href="http://twitter.com/share?text={{ post.title | encode_uri_component }}&amp;url={{ 'http://www.mysite.com' | encode_uri_component }}{{ post.url | encode_uri_component }}">Submit this to Twitter.</p>

data/statics/skeleton/archive.html

@@ -4,4 +4,4 @@
 			<a href="{{ month.archive_url }}">{{ month.date | date: "%B %Y" }}</a>
 		</h1>
 	{% endfor %}
-{% endfor %}
+{% endfor %}

data/statics/skeleton/index.html

@@ -6,4 +6,4 @@
 	{% for post in site.posts %}
 		<li><a href="{{ post.url | escape }}">{{ post.title | escape }}</a> (posted {{ post.created | xmlschema }})</li>
 	{% endfor %}
-</ul>
+</ul>

data/statics/templates/admin/bookmarks.liquid

@@ -57,4 +57,4 @@ $(function() {
 	<p class="bookmark"><a href="#" data-bookmark-now>Save draft and edit</a></p>
 
 	<p>Saves the current page as a draft and lets you start editing immediately.</p>
-</section>
+</section>

data/statics/templates/admin/edit_draft.liquid

@@ -32,7 +32,7 @@
 		</header>
 	</div>
 	<div id="content-areas">
-		<textarea data-attachify spellcheck="false" id="content" placeholder="Lorem ipsum dolor sit amet." name="markdown"{% if autofocus == "markdown" %}{{ " autofocus" }}{% endif %}>{{ post.content | strip | escape }}</textarea>
+		<textarea data-attachify spellcheck="false" id="content" placeholder="Lorem ipsum dolor sit amet." name="markdown"{% if autofocus == "markdown" %}{{ " autofocus" }}{% endif %}>{{ draft_content | strip | escape }}</textarea>
 
 		<article id="entry" class="post" data-state="hidden"></article>
 	</div>

data/statics/templates/admin/index.liquid

@@ -16,4 +16,4 @@
 {% for post in posts %}
 	<li><a href="/admin/edit/posts/{{ post.basename }}">{{ post.title | smarty }}</a></li>
 {% endfor %}
-</ul>
+</ul>

data/statics/templates/admin/layout.liquid

@@ -97,12 +97,12 @@ body > nav ul li:last-child {
 #edit #content::-webkit-scrollbar {
 	width: 0.5em;
 }
- 
+
 #edit #content::-webkit-scrollbar-track {
 	border-radius: 4px;
 	background: rgba(0,0,0,0.05);
 }
- 
+
 #edit #content::-webkit-scrollbar-thumb {
 	border-radius: 4px;
 	background: rgba(0,0,0,0.2);
@@ -418,7 +418,7 @@ body > nav ul li:last-child {
 				setDepartureCheck(false);
 				$(this).parent("form").submit();
 			});
-			
+
 			$("label.preview").click(function(event) {
 				var previewButton = $(this);
 
@@ -442,6 +442,7 @@ body > nav ul li:last-child {
 								$("#entry").toggle();
 								$("#content").toggle();
 								$("#entry").attr("data-state", "active");
+								$("#entry").trigger("markdown-previewed")
 								previewButton.toggleClass("active");
 								previewButton.html("Markdown");
 							}
@@ -537,6 +538,7 @@ body > nav ul li:last-child {
 			});
 		});
 	</script>
+	<script src="/js/admin/admin.js"></script>
 </head>
 <body id="admin">
 	<nav>
@@ -598,4 +600,4 @@ body > nav ul li:last-child {
 	</table>
 	</div>
 </body>
-</html>
+</html>

data/statics/templates/admin/new_draft.liquid

@@ -22,7 +22,7 @@
 		</header>
 	</div>
 	<div id="content-areas">
-		<textarea data-attachify spellcheck="false" id="content" placeholder="Lorem ipsum dolor sit amet." name="markdown"{% if autofocus == "markdown" %}{{ " autofocus" }}{% endif %}>{{ post.content | strip | escape }}</textarea>
+		<textarea data-attachify spellcheck="false" id="content" placeholder="Lorem ipsum dolor sit amet." name="markdown"{% if autofocus == "markdown" %}{{ " autofocus" }}{% endif %}>{{ draft_content | strip | escape }}</textarea>
 
 		<article id="entry" class="post" data-state="hidden"></article>
 	</div>

metadata

@@ -1,254 +1,293 @@
 --- !ruby/object:Gem::Specification
 name: serif
 version: !ruby/object:Gem::Version
-  version: 0.5.2
-  prerelease: 
+  version: '0.6'
 platform: ruby
 authors:
 - Adam Prescott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-10 00:00:00.000000000 Z
+date: 2014-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: kramdown
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rubypants
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rouge
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: redhead
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.8
 - !ruby/object:Gem::Dependency
   name: liquid
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
 - !ruby/object:Gem::Dependency
   name: reverse_markdown
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: timeout_cache
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: turnip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: poltergeist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Serif is a static site generator and blogging system powered by markdown
@@ -260,6 +299,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- Gemfile
+- Gemfile.lock
+- LICENSE
+- README.md
+- bin/serif
+- lib/serif.rb
 - lib/serif/admin_server.rb
 - lib/serif/commands.rb
 - lib/serif/config.rb
@@ -270,7 +315,8 @@ files:
 - lib/serif/post.rb
 - lib/serif/server.rb
 - lib/serif/site.rb
-- lib/serif.rb
+- rakefile
+- serif.gemspec
 - statics/assets/js/attachment.js
 - statics/assets/js/jquery.autosize.js
 - statics/assets/js/jquery.drop.js
@@ -289,79 +335,29 @@ files:
 - statics/templates/admin/index.liquid
 - statics/templates/admin/layout.liquid
 - statics/templates/admin/new_draft.liquid
-- bin/serif
-- test/commands_spec.rb
-- test/config_spec.rb
-- test/content_file_spec.rb
-- test/draft_spec.rb
-- test/file_digest_tag_spec.rb
-- test/filters_spec.rb
-- test/liquid_filter_date_extension_spec.rb
-- test/markup_renderer_spec.rb
-- test/post_spec.rb
-- test/site_dir/_config.yml
-- test/site_dir/_drafts/another-sample-draft
-- test/site_dir/_drafts/sample-draft
-- test/site_dir/_layouts/alt-layout.html
-- test/site_dir/_layouts/default.html
-- test/site_dir/_posts/2012-01-05-sample-post
-- test/site_dir/_posts/2013-01-01-second-post
-- test/site_dir/_posts/2013-03-07-post-with-custom-layout
-- test/site_dir/_posts/2399-01-01-penultimate-post
-- test/site_dir/_posts/2400-01-01-final-post
-- test/site_dir/_templates/archive_page.html
-- test/site_dir/_templates/post.html
-- test/site_dir/archive.html
-- test/site_dir/file-digest-test.html
-- test/site_dir/index.html
-- test/site_dir/page-alt-layout.html
-- test/site_dir/page-header-but-no-layout.html
-- test/site_dir/test-smarty-filter.html
-- test/site_dir/test-stylesheet.css
-- test/site_generation_spec.rb
-- test/site_spec.rb
-- test/test_helper.rb
-- serif.gemspec
-- rakefile
-- LICENSE
-- Gemfile
-- Gemfile.lock
-- README.md
 homepage: https://github.com/aprescott/serif
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Static site generator and markdown-based blogging with an optional admin
   interface complete with drag-and-drop image uploading.
-test_files:
-- test/commands_spec.rb
-- test/config_spec.rb
-- test/content_file_spec.rb
-- test/draft_spec.rb
-- test/file_digest_tag_spec.rb
-- test/filters_spec.rb
-- test/liquid_filter_date_extension_spec.rb
-- test/markup_renderer_spec.rb
-- test/post_spec.rb
-- test/site_generation_spec.rb
-- test/site_spec.rb
-- test/test_helper.rb
+test_files: []