staticpress 0.1.1 → 0.1.2

data/lib/skeleton/config.yml

@@ -48,7 +48,7 @@
 :recent_posts: 5
 :simple_search: http://google.com/search
 :email:
-:theme: classic
+:theme: basic
 :twitter_user:
 :twitter_tweet_count: 4
 :twitter_show_replies: false

data/lib/staticpress/configuration.rb

@@ -5,6 +5,7 @@ require 'staticpress/js_object'
 
 module Staticpress
   # IDEA look into configatron https://github.com/markbates/configatron
+  # FIXME this class is hard to test
   class Configuration < JSObject
     def save
       (Staticpress.blog_path + 'config.yml').open('w') do |f|

data/lib/staticpress/theme.rb

@@ -14,6 +14,10 @@ module Staticpress
       @root = custom.directory? ? custom : Staticpress.root + 'themes' + @name.to_s
     end
 
+    def ==(other)
+      other.respond_to?(:root) ? (root == other.root) : super
+    end
+
     [
       :include,
       :layout,
@@ -37,7 +41,7 @@ module Staticpress
     end
 
     def self.theme
-      @theme ||= new config.theme
+      new config.theme
     end
   end
 end

data/lib/staticpress/version.rb

@@ -3,7 +3,7 @@ module Staticpress
   class Version
     MAJOR = 0
     MINOR = 1
-    PATCH = 1
+    PATCH = 2
 
     def self.to_s
       [ MAJOR, MINOR, PATCH ].join '.'

data/staticpress.gemspec

@@ -7,13 +7,13 @@ Gem::Specification.new do |s|
   s.version     = Staticpress::Version.to_s
   s.authors     = ['Raving Genius']
   s.email       = ['rg+code@ravinggenius.com']
-  s.summary     = %q{...}
+  s.summary     = 'Blog-centric static site builder'
   s.license     = 'MIT'
 
   s.rubyforge_project = 'staticpress'
 
   s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,feature}{,s}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ['lib']
 

data/tests/lib/staticpress/content/theme_test.rb

@@ -10,14 +10,14 @@ class ContentThemeTest < ContentBaseTest
   def setup
     super
 
-    Staticpress::Content::Theme.all
+    config.theme = :test_theme
 
     @theme_dir = Staticpress::Theme.theme.root
 
-    @asset_style_route = Staticpress::Route.from_url_path '/assets/classic/styles/all'
+    @asset_style_route = Staticpress::Route.from_url_path '/assets/test_theme/styles/all'
     @asset_style = Staticpress::Content::Theme.new @asset_style_route, @theme_dir + 'assets' + 'styles' + 'all.sass'
 
-    @asset_script_route = Staticpress::Route.from_url_path '/assets/classic/scripts/application.js'
+    @asset_script_route = Staticpress::Route.from_url_path '/assets/test_theme/scripts/application.js'
     @asset_script = Staticpress::Content::Theme.new @asset_script_route, @theme_dir + 'assets' + 'scripts' + 'application.js'
   end
 
@@ -50,12 +50,12 @@ class ContentThemeTest < ContentBaseTest
   end
 
   def test_inspect
-    assert_equal '#<Staticpress::Content::Theme url_path=/assets/classic/styles/all>', @asset_style.inspect
+    assert_equal '#<Staticpress::Content::Theme url_path=/assets/test_theme/styles/all>', @asset_style.inspect
   end
 
   def test_output_path
-    assert_equal (Staticpress.blog_path + 'public' + 'assets' + 'classic' + 'styles' + 'all'), @asset_style.output_path
-    assert_equal (Staticpress.blog_path + 'public' + 'assets' + 'classic' + 'scripts' + 'application.js'), @asset_script.output_path
+    assert_equal (Staticpress.blog_path + 'public' + 'assets' + 'test_theme' + 'styles' + 'all'), @asset_style.output_path
+    assert_equal (Staticpress.blog_path + 'public' + 'assets' + 'test_theme' + 'scripts' + 'application.js'), @asset_script.output_path
   end
 
   def test_raw
@@ -98,6 +98,6 @@ class ContentThemeTest < ContentBaseTest
   end
 
   def test_route
-    assert_equal '/assets/classic/styles/all', @asset_style.route.url_path
+    assert_equal '/assets/test_theme/styles/all', @asset_style.route.url_path
   end
 end

data/tests/lib/staticpress/theme_test.rb

@@ -1,10 +1,27 @@
 require_relative '../../test_helper'
 
+require 'staticpress/helpers'
 require 'staticpress/theme'
 
 class ThemeTest < TestHelper
+  include Staticpress::Helpers
+
   def setup
-    @theme = Staticpress::Theme.new :classic
+    Staticpress.blog_path = TEST_BLOG
+    config.theme = :test_theme
+    @theme = Staticpress::Theme.new :test_theme
+  end
+
+  def test__equalsequals
+    assert_operator @theme, :==, Staticpress::Theme.new(:test_theme)
+  end
+
+  def test_root
+    assert_equal @theme.root, (Staticpress.blog_path + 'themes' + 'test_theme')
+  end
+
+  def test_theme
+    assert_equal @theme, Staticpress::Theme.theme
   end
 
 

data/tests/lib/staticpress_test.rb

@@ -3,10 +3,17 @@ require_relative '../test_helper'
 require 'pathname'
 
 class StaticpressTest < TestHelper
+  def setup
+    Staticpress.blog_path = TEST_BLOG
+  end
+
   def test_blog_path
-    assert_equal Pathname.new('.').expand_path, Staticpress.blog_path
-    Staticpress.blog_path = 'tests/test_blog'
-    assert_equal Pathname.new('tests/test_blog').expand_path, Staticpress.blog_path
+    assert_equal Pathname.new('tests/sample_sites/test_blog').expand_path, Staticpress.blog_path
+  end
+
+  def test_blog_path=
+    Staticpress.blog_path = 'some/other/directory'
+    assert_equal Pathname.new('some/other/directory').expand_path, Staticpress.blog_path
   end
 
   def test_root

data/tests/sample_sites/test_blog/config.yml

@@ -2,3 +2,4 @@
 :plugins:
 - blockquote
 :title: Test Blog
+:theme: test_theme

data/tests/sample_sites/test_blog/themes/test_theme/assets/scripts/application.js

@@ -0,0 +1,4 @@
+(function ($) {
+  $(document).ready(function () {
+  });
+})(jQuery);

data/tests/sample_sites/test_blog/themes/test_theme/includes/list_posts.haml

@@ -0,0 +1,3 @@
+%section
+  - posts.each do |post|
+    %article= post.render_partial

data/tests/sample_sites/test_blog/themes/test_theme/layouts/default.haml

@@ -0,0 +1,5 @@
+%html
+  %head
+    %title= page.title
+  %body
+    = yield

data/tests/sample_sites/test_blog/themes/test_theme/layouts/post_index.haml

@@ -0,0 +1,5 @@
+%html
+  %head
+    %title= page.title
+  %body
+    = yield

data/tests/sample_sites/test_blog/themes/test_theme/views/default.haml

@@ -0,0 +1,5 @@
+---
+layout: post_index
+---
+
+= partial :list_posts, :posts => page.sub_content

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: staticpress
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -54,7 +54,7 @@ date: 2011-10-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &21717820 !ruby/object:Gem::Requirement
+  requirement: &22843760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -62,10 +62,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21717820
+  version_requirements: *22843760
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &21717400 !ruby/object:Gem::Requirement
+  requirement: &22843340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -73,10 +73,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21717400
+  version_requirements: *22843340
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &21716980 !ruby/object:Gem::Requirement
+  requirement: &22842920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -84,10 +84,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21716980
+  version_requirements: *22842920
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &21716560 !ruby/object:Gem::Requirement
+  requirement: &22842500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -95,10 +95,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21716560
+  version_requirements: *22842500
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &21716140 !ruby/object:Gem::Requirement
+  requirement: &22842080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -106,10 +106,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21716140
+  version_requirements: *22842080
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &21715720 !ruby/object:Gem::Requirement
+  requirement: &22841660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -117,7 +117,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21715720
+  version_requirements: *22841660
 description: 
 email:
 - rg+code@ravinggenius.com
@@ -166,15 +166,15 @@ files:
 - lib/staticpress/theme.rb
 - lib/staticpress/version.rb
 - lib/staticpress/view_helpers.rb
-- lib/themes/classic/assets/scripts/application.js
-- lib/themes/classic/assets/styles/all.sass
-- lib/themes/classic/includes/list_posts.haml
-- lib/themes/classic/layouts/archive.haml
-- lib/themes/classic/layouts/atom.haml
-- lib/themes/classic/layouts/default.haml
-- lib/themes/classic/layouts/index.haml
-- lib/themes/classic/layouts/post_index.haml
-- lib/themes/classic/views/default.haml
+- lib/themes/basic/assets/scripts/application.js
+- lib/themes/basic/assets/styles/all.sass
+- lib/themes/basic/includes/list_posts.haml
+- lib/themes/basic/layouts/archive.haml
+- lib/themes/basic/layouts/atom.haml
+- lib/themes/basic/layouts/default.haml
+- lib/themes/basic/layouts/index.haml
+- lib/themes/basic/layouts/post_index.haml
+- lib/themes/basic/views/default.haml
 - staticpress.gemspec
 - tests/lib/staticpress/cli_test.rb
 - tests/lib/staticpress/configuration_test.rb
@@ -215,6 +215,15 @@ files:
 - tests/sample_sites/test_blog/content/style1.css
 - tests/sample_sites/test_blog/content/style2.css.sass
 - tests/sample_sites/test_blog/content/style3.sass
+- tests/sample_sites/test_blog/themes/test_theme/assets/scripts/application.js
+- tests/sample_sites/test_blog/themes/test_theme/assets/styles/all.sass
+- tests/sample_sites/test_blog/themes/test_theme/includes/list_posts.haml
+- tests/sample_sites/test_blog/themes/test_theme/layouts/archive.haml
+- tests/sample_sites/test_blog/themes/test_theme/layouts/atom.haml
+- tests/sample_sites/test_blog/themes/test_theme/layouts/default.haml
+- tests/sample_sites/test_blog/themes/test_theme/layouts/index.haml
+- tests/sample_sites/test_blog/themes/test_theme/layouts/post_index.haml
+- tests/sample_sites/test_blog/themes/test_theme/views/default.haml
 - tests/test_helper.rb
 homepage: 
 licenses:
@@ -240,5 +249,5 @@ rubyforge_project: staticpress
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: ! '...'
+summary: Blog-centric static site builder
 test_files: []