awestruct 0.2.15 → 0.2.17

data/bin/awestruct

@@ -9,6 +9,7 @@ require 'awestruct/commands/init'
 require 'awestruct/commands/generate'
 require 'awestruct/commands/server'
 require 'awestruct/commands/deploy'
+require 'awestruct/commands/git_hub_pages'
 require 'yaml'
 require 'fssm'
 require 'fileutils'
@@ -203,7 +204,12 @@ if ( options.deploy )
   end
 
   puts "deploying to '#{options.profile}'"
-  cmd = Awestruct::Commands::Deploy.new( site_path, deploy_data )
+  if (deploy_data['host'] == 'github_pages')
+    puts "publishing to github pages"
+    cmd = Awestruct::Commands::GitHubPages.new( site_path )
+  else
+    cmd = Awestruct::Commands::Deploy.new( site_path, deploy_data )
+  end
   cmd.run
   puts "deploy finished"
   exit

data/lib/awestruct/commands/frameworks/bootstrap/base_layout.html.haml

@@ -8,17 +8,17 @@
       body {
         padding-top: 60px;
       }
-    %link{ :rel=>'stylesheet', :type=>'text/css', :href=>'/stylesheets/styles.css' }
+    %link{ :rel=>'stylesheet', :type=>'text/css', :href=>"#{site.base_url}/stylesheets/styles.css" }
     /[if lt IE 9]
       %script{ :type=>'text/javascript', :src=>'//html5shim.googlecode.com/svn/trunk/html5.js' }
   %body
     .navbar.navbar-fixed-top
       .navbar-inner
         .container
-          %a.brand{ :href=>'/' } Project Name
+          %a.brand{ :href=>"#{site.base_url}" } Project Name
           %ul.nav
             %li
-              %a{ :href=>'/' } Home
+              %a{ :href=>"#{site.base_url}" } Home
     .container
       ~ content
       %hr
@@ -26,4 +26,4 @@
         %p © Organization #{Date.today.year}
     -# Uncomment script tags (remove leading -#) when you're ready to use behaviors
     -# %script{ :type=>'text/javascript', :src=>'//cdnjs.cloudflare.com/ajax/libs/jquery/1.7.1/jquery.min.js' }
-    -# %script{ :type=>'text/javascript', :src=>'/javascripts/bootstrap-collapse.js' }
+    -# %script{ :type=>'text/javascript', :src=>"#{site.base_url}/javascripts/bootstrap-collapse.js" }

data/lib/awestruct/commands/git_hub_pages.rb

@@ -0,0 +1,55 @@
+require 'git'
+
+module Awestruct
+  module Commands
+
+    class GitHubPages
+      def initialize( site_path )
+        @site_path = site_path
+        @git       = Git.open(".")
+      end
+
+      def run
+        @git.status.changed.empty? ? publish_site : message_for(:existing_changes)
+      end
+
+      private
+      def publish_site
+        current_branch = @git.branch
+        checkout_pages_branch
+        add_and_commit_site @site_path
+        push_and_restore current_branch
+      end
+
+      def checkout_pages_branch
+        @git.branch('gh-pages').checkout
+      end
+
+      def add_and_commit_site( path )
+        @git.with_working( path ) do
+          @git.add(".")
+          begin
+            @git.commit("Published to gh-pages.")
+          rescue Git::GitExecuteError => e
+            $stderr.puts "Can't commit. #{e}."
+          end
+        end
+      end
+
+      def push_and_restore( branch )
+        @git.reset_hard
+        @git.push( 'origin', 'gh-pages' )
+        @git.checkout( branch )
+      end
+
+      def message_for( key )
+        $stderr.puts case key
+        when :existing_changes 
+          "You have uncommitted changes in the working branch. Please commit or stash them."
+        else 
+          "An error occured."
+        end
+      end
+    end
+  end
+end

data/lib/awestruct/extensions/extend_string.rb

@@ -0,0 +1,97 @@
+# RemoveAccents version 1.0.3 (c) 2008-2009 Solutions Informatiques Techniconseils inc.
+# 
+# This module adds 2 methods to the string class. 
+# Up-to-date version and documentation available at:
+#
+# http://www.techniconseils.ca/en/scripts-remove-accents-ruby.php
+#
+# This script is available under the following license :
+# Creative Commons Attribution-Share Alike 2.5.
+#
+# See full license and details at :
+# http://creativecommons.org/licenses/by-sa/2.5/ca/
+#
+# Version history:
+#   * 1.0.3 : July 23 2009
+#               Corrected some incorrect character codes. Source is now wikipedia at:
+#                 http://en.wikipedia.org/wiki/ISO/IEC_8859-1#Related_character_maps
+#               Thanks to Raimon Fernandez for pointing out the incorrect codes.
+#   * 1.0.2 : October 29 2008
+#               Slightly optimized version of urlize - Jonathan Grenier (jgrenier@techniconseils.ca)
+#   * 1.0.1 : October 29 2008
+#               First public revision - Jonathan Grenier (jgrenier@techniconseils.ca)
+#
+
+class String
+  # The extended characters map used by removeaccents. The accented characters 
+  # are coded here using their numerical equivalent to sidestep encoding issues.
+  # These correspond to ISO-8859-1 encoding.
+  ACCENTS_MAPPING = {
+    'E' => [200,201,202,203],
+    'e' => [232,233,234,235],
+    'A' => [192,193,194,195,196,197],
+    'a' => [224,225,226,227,228,229,230],
+    'C' => [199],
+    'c' => [231],
+    'O' => [210,211,212,213,214,216],
+    'o' => [242,243,244,245,246,248],
+    'I' => [204,205,206,207],
+    'i' => [236,237,238,239],
+    'U' => [217,218,219,220],
+    'u' => [249,250,251,252],
+    'N' => [209],
+    'n' => [241],
+    'Y' => [221],
+    'y' => [253,255],
+    'AE' => [306],
+    'ae' => [346],
+    'OE' => [188],
+    'oe' => [189]
+  }
+  
+  
+  # Remove the accents from the string. Uses String::ACCENTS_MAPPING as the source map.
+  def removeaccents    
+    str = String.new(self)
+    String::ACCENTS_MAPPING.each {|letter,accents|
+      packed = accents.pack('U*')
+      rxp = Regexp.new("[#{packed}]", nil, 'U')
+      str.gsub!(rxp, letter)
+    }
+    
+    str
+  end
+  
+  
+  # Convert a string to a format suitable for a URL without ever using escaped characters.
+  # It calls strip, removeaccents, downcase (optional) then removes the spaces (optional)
+  # and finally removes any characters matching the default regexp (/[^-_A-Za-z0-9]/).
+  #
+  # Options
+  #
+  # * :downcase => call downcase on the string (defaults to true)
+  # * :convert_spaces => Convert space to underscore (defaults to false)
+  # * :regexp => The regexp matching characters that will be converting to an empty string (defaults to /[^-_A-Za-z0-9]/)
+  def urlize(options = {})
+    options[:downcase] ||= true
+    options[:convert_spaces] ||= false
+    options[:regexp] ||= /[^-_A-Za-z0-9]/
+    
+    str = self.strip.removeaccents
+    str.downcase! if options[:downcase]
+    str.gsub!(/\ /,'-') if options[:convert_spaces]
+    str.gsub(options[:regexp], '')
+  end
+
+  # This follows the generated ID rules
+  def anchorize(options = {})
+    options[:downcase] ||= true
+    options[:convert_spaces] ||= false
+    options[:regexp] ||= /[^-_A-Za-z0-9]/
+    
+    str = self.strip.removeaccents
+    str.downcase! if options[:downcase]
+    str.gsub!(/\ /,'_') if options[:convert_spaces]
+    str.gsub(options[:regexp], '')
+  end
+end

data/lib/awestruct/extensions/tagger.rb

@@ -1,3 +1,5 @@
+require 'extend_string'
+
 module Awestruct
   module Extensions
     class Tagger
@@ -24,11 +26,12 @@ module Awestruct
         end
       end
 
-      def initialize(tagged_items_property, input_path, output_path='tags', pagination_opts={})
+      def initialize(tagged_items_property, input_path, output_path='tags', opts={})
         @tagged_items_property = tagged_items_property
         @input_path  = input_path
         @output_path = output_path
-        @pagination_opts = pagination_opts
+        @sanitize = opts[:sanitize] || false
+        @pagination_opts = opts
       end
 
       def execute(site)
@@ -81,7 +84,11 @@ module Awestruct
         end
 
         @tags.values.each do |tag|
-          paginator = Awestruct::Extensions::Paginator.new( @tagged_items_property, @input_path, { :remove_input=>false, :output_prefix=>File.join( @output_path, tag.to_s), :collection=>tag.pages }.merge( @pagination_opts ) )
+          ## Optionally sanitize tag URL
+          output_prefix = File.join( @output_path, sanitize(tag.to_s) )
+          options = { :remove_input=>false, :output_prefix=>output_prefix, :collection=>tag.pages }.merge( @pagination_opts )
+          
+          paginator = Awestruct::Extensions::Paginator.new( @tagged_items_property, @input_path, options )
           primary_page = paginator.execute( site )
           tag.primary_page = primary_page
         end
@@ -89,6 +96,14 @@ module Awestruct
         site.send( "#{@tagged_items_property}_tags=", ordered_tags )
       end
 
+      def sanitize(string)
+        #replace accents with unaccented version, go lowercase and replace and space with dash
+        if @sanitize
+          string.to_s.urlize({:convert_spaces=>true})
+        else
+          string
+        end
+      end
     end
   end
 end

data/lib/awestruct/version.rb

@@ -1,4 +1,4 @@
 
 module Awestruct
-  VERSION='0.2.15'
+  VERSION='0.2.17'
 end

metadata

@@ -1,233 +1,216 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: awestruct
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 15
-  version: 0.2.15
+version: !ruby/object:Gem::Version
+  version: 0.2.17
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Bob McWhirter
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-09 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-13 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: hpricot
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: &70147361505440 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 8
-        - 6
+      - !ruby/object:Gem::Version
         version: 0.8.6
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: versionomy
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: *70147361505440
+- !ruby/object:Gem::Dependency
+  name: versionomy
+  requirement: &70147361504560 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 4
-        - 3
+      - !ruby/object:Gem::Version
         version: 0.4.3
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: haml
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: *70147361504560
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: &70147361503580 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 1
-        - 4
+      - !ruby/object:Gem::Version
         version: 3.1.4
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: sass
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: *70147361503580
+- !ruby/object:Gem::Dependency
+  name: sass
+  requirement: &70147361502660 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 1
-        - 15
+      - !ruby/object:Gem::Version
         version: 3.1.15
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: hashery
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: *70147361502660
+- !ruby/object:Gem::Dependency
+  name: hashery
+  requirement: &70147361501780 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.5.0
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rdiscount
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: *70147361501780
+- !ruby/object:Gem::Dependency
+  name: rdiscount
+  requirement: &70147361500960 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 6
-        - 8
+      - !ruby/object:Gem::Version
         version: 1.6.8
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: RedCloth
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: *70147361500960
+- !ruby/object:Gem::Dependency
+  name: RedCloth
+  requirement: &70147361500040 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 4
-        - 2
-        - 9
+      - !ruby/object:Gem::Version
         version: 4.2.9
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: compass
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: *70147361500040
+- !ruby/object:Gem::Dependency
+  name: compass
+  requirement: &70147361499280 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 12
-        - 1
+      - !ruby/object:Gem::Version
         version: 0.12.1
   type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: compass-960-plugin
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: *70147361499280
+- !ruby/object:Gem::Dependency
+  name: compass-960-plugin
+  requirement: &70147361498320 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 10
-        - 4
+      - !ruby/object:Gem::Version
         version: 0.10.4
   type: :runtime
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: bootstrap-sass
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: *70147361498320
+- !ruby/object:Gem::Dependency
+  name: bootstrap-sass
+  requirement: &70147361497340 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 1
+      - !ruby/object:Gem::Version
         version: 2.0.1
   type: :runtime
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: org-ruby
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: *70147361497340
+- !ruby/object:Gem::Dependency
+  name: org-ruby
+  requirement: &70147361496420 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 5
-        - 3
+      - !ruby/object:Gem::Version
         version: 0.5.3
   type: :runtime
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: fssm
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: *70147361496420
+- !ruby/object:Gem::Dependency
+  name: fssm
+  requirement: &70147361495380 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 2
-        - 8
-        - 1
-        version: 0.2.8.1
+      - !ruby/object:Gem::Version
+        version: 0.2.8
   type: :runtime
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: *70147361495380
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70147361494620 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 6
-        - 6
+      - !ruby/object:Gem::Version
         version: 1.6.6
   type: :runtime
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: notifier
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: *70147361494620
+- !ruby/object:Gem::Dependency
+  name: notifier
+  requirement: &70147361493920 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 1
-        - 4
+      - !ruby/object:Gem::Version
         version: 0.1.4
   type: :runtime
-  version_requirements: *id014
+  prerelease: false
+  version_requirements: *70147361493920
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: &70147361493220 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.5
+  type: :runtime
+  prerelease: false
+  version_requirements: *70147361493220
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70147361492280 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.9'
+  type: :development
+  prerelease: false
+  version_requirements: *70147361492280
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70147361491400 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+  type: :development
+  prerelease: false
+  version_requirements: *70147361491400
 description: Awestruct is a framework for creating static HTML sites.
 email: bob@mcwhirter.org
-executables: 
+executables:
 - awestruct
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/awestruct/asciidoc_file.rb
 - lib/awestruct/asciidocable.rb
 - lib/awestruct/commands/deploy.rb
 - lib/awestruct/commands/frameworks/base_pipeline.rb
 - lib/awestruct/commands/generate.rb
+- lib/awestruct/commands/git_hub_pages.rb
 - lib/awestruct/commands/init.rb
 - lib/awestruct/commands/manifest.rb
 - lib/awestruct/commands/server.rb
@@ -241,6 +224,7 @@ files:
 - lib/awestruct/extensions/cachebuster.rb
 - lib/awestruct/extensions/data_dir.rb
 - lib/awestruct/extensions/disqus.rb
+- lib/awestruct/extensions/extend_string.rb
 - lib/awestruct/extensions/flattr.rb
 - lib/awestruct/extensions/google_analytics.rb
 - lib/awestruct/extensions/gsub.rb
@@ -288,35 +272,35 @@ files:
 - lib/awestruct/extensions/sitemap.xml.haml
 - lib/awestruct/extensions/tag_cloud.html.haml
 - lib/awestruct/extensions/template.atom.haml
-has_rdoc: true
+- bin/awestruct
 homepage: http://awestruct.org
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
+      hash: -3836802594647140483
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -3836802594647140483
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Static site-baking utility
 test_files: []
-