RubyGems - contraption - Versions diffs - 0.2.0 → 0.3.0 - Mend

contraption 0.2.0 → 0.3.0

Files changed (33) hide show

checksums.yaml +4 -4
data/.gitignore +0 -1
data/README.md +21 -9
data/Rakefile +4 -0
data/benchmark.rb +8 -0
data/bin/contraption +3 -5
data/data/formats/landing_page.erb +22 -0
data/data/formats/page.erb +22 -0
data/data/formats/tag_cloud.erb +2 -0
data/doc/classes.dot +118 -0
data/doc/classes.png +0 -0
data/features/{author_generates_site.feature → author_builds_site.feature} +0 -0
data/features/repository_is_generated.feature +12 -0
data/features/step_definitions/repository_generation_steps.rb +22 -0
data/features/support/hooks.rb +1 -1
data/lib/contraption.rb +2 -0
data/lib/contraption/catalog.rb +3 -4
data/lib/contraption/command_selector.rb +27 -0
data/lib/contraption/diagnoser.rb +12 -0
data/lib/contraption/generator.rb +35 -0
data/lib/contraption/header.rb +1 -0
data/lib/contraption/location.rb +12 -0
data/lib/contraption/options.rb +4 -0
data/lib/contraption/orchestrator.rb +54 -0
data/lib/contraption/previewer.rb +28 -0
data/lib/contraption/repository.rb +23 -2
data/lib/contraption/runner.rb +5 -38
data/lib/contraption/s3_uploader.rb +5 -3
data/lib/contraption/site.rb +13 -0
data/lib/contraption/tag_cloud.rb +1 -1
data/lib/contraption/version.rb +1 -1
data/spec/contraption/lib/catalog_spec.rb +0 -29
metadata +19 -4

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1c34da43377fb2b0cec9e0c8cf821867a18a85b
-  data.tar.gz: 8623c83b4113c1878756257ea4f43f02d8fa8ab4
+  metadata.gz: db47cc8b0f80c9b56c5ce15af3e3d02201d2a3d2
+  data.tar.gz: 04dd17291329b373f04780fb7dccebde4abb1064
 SHA512:
-  metadata.gz: 873f12c0aa72c64145879a0b09564419aef292d60fd3eee8d00553c9639279ec353b21a0c5bc77e3558ad6dc8ab7223f34b186b98263daff0c847aa1c20e4d4a
-  data.tar.gz: 78c1b4f321c8327e687f542dfc508a0f4bf8df61ed8e71a4f463fd1a5e2bdced4b9b5bf82987d5e642c5bd5f7b721e38612a2b6f2c248eceb18e7e001f195fb9
+  metadata.gz: 5da3efa5065cd2a501f2d67f40af417db884f49549a3acd4319f9fd5fe27903a73debd3507b7e76a0fd753d1155d3ebe92d53a006c2798c493c1a6ad3252253a
+  data.tar.gz: 63e2c8eee732f05dc0d6b1a73f87a2495cc6a9085f8fe79dc6f02c6685582b3e80fdb987d5e6b9f6719d9d6bac84c47a3f7785015e721c0b4db21e093fdadaf0

data/.gitignore CHANGED

@@ -7,7 +7,6 @@ Gemfile.lock
 InstalledFiles
 _yardoc
 coverage
-doc/
 lib/bundler/man
 pkg
 rdoc

data/README.md CHANGED

@@ -1,24 +1,31 @@
 # Contraption
-TODO: Write a gem description
+__Contraption__ - *Informal, often facetious or derogatory, a device or contrivance, esp one considered strange, unnecessarily intricate, or improvised*
+Contraption is a engine for managing static web content specifically targeted at blogging.
 ## Installation
-Add this line to your application's Gemfile:
+    $ gem install contraption
-    gem 'contraption'
+## Usage
-And then execute:
+__Step 1__: Generate new content directory.
-    $ bundle
+    bin/contraption generate -d my_content
-Or install it yourself as:
+__Step 2__: Write a new draft.
-    $ gem install contraption
+    vim drafts/why_contraption_is_awesome.md
-## Usage
+__Step 3__: Preview site.
+    bin/contraption preview -s my_content
+__Step 4__: Build website.
+    bin/contraption -s my_content -d public_html
-TODO: Write usage instructions here
 ## Development
 [![Code Climate](https://codeclimate.com/github/rampantmonkey/contraption.png)](https://codeclimate.com/github/rampantmonkey/contraption)
@@ -31,3 +38,8 @@ TODO: Write usage instructions here
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+If you are looking for ideas check out the [issue tracker](https://github.com/rampantmonkey/contraption/issues).
+## License
+Contraption is licensed under [The MIT License](http://opensource.org/licenses/MIT).

data/Rakefile CHANGED

@@ -8,5 +8,9 @@ Cucumber::Rake::Task.new(:features) do |t|
   t.cucumber_opts = "features --format pretty"
 end
+task :doc do
+  `dot -Tpng -o doc/classes.png doc/classes.dot`
+end
 task :default => [:spec, :features]

data/benchmark.rb ADDED

@@ -0,0 +1,8 @@
+require 'benchmark'
+require_relative 'lib/contraption/command_selector'
+elapsed_time = Benchmark.realtime do
+  Contraption::CommandSelector.go ARGV
+end
+puts "Time: #{elapsed_time}s"

data/bin/contraption CHANGED

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
+$:.unshift File.expand_path('../../lib', __FILE__)
+require 'contraption/command_selector'
-require 'contraption/options'
-require 'contraption/runner'
-options = Contraption::Options.new ARGV
-Contraption::Runner.new(options).run!
+Contraption::CommandSelector.go ARGV

data/data/formats/landing_page.erb ADDED

@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<!-- This is an example generated by Contraption
+'landing_page.erb' represents the first page visitors will see when visiting your website.
+Currently this is just a copy of 'page.rb', but it provides an opportunity for customization.
+-->
+<body>
+  <nav>
+    <ul>
+      <li><a href="">Home</a></li>
+      <li><a href="recent.html">Posts</a></li>
+      <li><a href="about.html">About Me</a></li>
+    </ul>
+  </nav>
+  <div class="content">
+    <!-- the 'context' tag below is the outlet which tells contraption to "insert text here". -->
+    <%= context %>
+  </div>
+  <footer>
+    <p>&copy; Your Name Goes Here <%= Time.new.year %></p>
+  </footer>
+</body>

data/data/formats/page.erb ADDED

@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<!-- This is an example generated by Contraption
+'page.erb' represents the outermost layer of every page in the website.
+You should put the structure of your page along with common elements (navagation, stylesheets, footer, etc.)
+-->
+<body>
+  <nav>
+    <ul>
+      <li><a href="">Home</a></li>
+      <li><a href="recent.html">Posts</a></li>
+      <li><a href="about.html">About Me</a></li>
+    </ul>
+  </nav>
+  <div class="content">
+    <!-- the 'context' tag below is the outlet which tells contraption to "insert text here". -->
+    <%= context %>
+  </div>
+  <footer>
+    <p>&copy; Your Name Goes Here <%= Time.new.year %></p>
+  </footer>
+</body>

data/data/formats/tag_cloud.erb ADDED

	@@ -0,0 +1,2 @@
1	+ <h1>Tag Cloud</h1>
2	+ <%= context[:content] %>

data/doc/classes.dot ADDED

@@ -0,0 +1,118 @@
+digraph G {
+  rankdir = "BT"
+  fontname = "Menlo-Regular"
+  fontsize = 8
+  node [
+    fontname = "Menlo-Regular"
+    fontsize = 8
+    shape = "record"
+  ]
+  edge [
+    fontname = "Menlo-Regular"
+    fontsize = 8
+  ]
+  // Classes
+  AwsS3 [ label="AWS::S3" ]
+  Catalog [ label = "{Catalog|+ initialize(items)\l+ \<\<(new_item)\l+ by_year()\l+ by_month()\l+ by_day()\l+ by_tag()\l+ each()\l+ most_recent(n=1)}" ]
+  CommandSelector [ label="{CommandSelector|+ go(args)}" ]
+  Day [ label="{Day}" ]
+  Diagnoser [ label="Diagnoser}" ]
+  Enumerable [ label = "{«module»\nEnumerable}" ]
+  Erb [ label = "{ERB}" ]
+  Formatter [ label = "{Formatter|+ initialize(location)\l+ formats()\l+ format(context,method=nil)}" ]
+  Generator [ label="{Generator}" ]
+  Header [ label = "{Header|+ from(string)|+ initialize(opts=\{\})\l+ filename(ext)\l+ new?\l+ update(new_opts=\{\})}" ]
+  HttpHandler [ label="{HttpHandler}" ]
+  Location [ label="{Location|+ initialize(path='.')\l+ list(ext=/.*/)\l+ path()\l+ cd(dir)\l+ create!()\l+ remove(file_name)\l+ ==(other)\l+ exist?\l+ executable?\l+ readable?\l+ read(file_name)\l+ writable?\l+ write(file_name, content)}" ]
+  Month [ label="{Month}" ]
+  Options [ label="{Options|+ initialize(args)}" ]
+  Optparse [ label="{OptionParser}" ]
+  Orchestrator [ label="{Orchestrator}" ]
+  Post [ label="{Post|+ build(data='')\l+ translate_markdown content|+ body()\l+ metadata\l+ publish(handlers=[])}" ]
+  Previewer [ label="{Previewer}" ]
+  RedcarpetMarkdown [ label="{Redcarpet::Markdown}" ]
+  RedcarpetRender [ label="{Redcarpet::Render}" ]
+  Repository [ label="{Repository|+ initialize(path)\l+ formatter()\l+ validate()\l+ valid_layout?\l+ construct_locations()\l+ drafts()\l+ posts()\l+ static_files()\l+ completed_drafts()\l+ finalize_completed_drafts(link_handlers=[])}" ]
+  RssBuilder [ label="{RSSBuilder|+ to_rss()\l+ initialize(posts)}" ]
+  RssMaker [ label="{RSS::Maker}" ]
+  Runner [ label="{Runner}" ]
+  S3Uploader [ label="{S3Uploader|+ initialize(connection_args=\{\},\r target_bucket,\r path)}" ]
+  Site [ label="{Site|+ initialize(location, posts, formats)\l+ build_all_individuals()\+ build_individual(i)\l+ build_month_pages()\l+ build_year_pages()\l+ build_tag_pages()\l+ build_recent()\l+ build_landing()\l+ build_tag_cloud()\l+ build_rss()\l+ root()}" ]
+  Tag [ label="{Tag|+ initialize(text)\l+ to_s()\l+ to_url()\l+ to_sym()}" ]
+  TagCloud [ label="{TagCloud|+ initialize(posts)\l+ to_s()}" ]
+  Yaml [ label="{YAML}" ]
+  Year [ label="{Year}" ]
+  // Protocols
+  edge [
+    arrowhead = "onormal"
+    style = "dashed"
+  ]
+  ControlProtocol [ label="{«protocol»|+ run!\l+ initialize(options)}" ]
+  OptionProtocol [ label="{«protocol»|+ source\l+ destination}" ]
+  Options -> OptionProtocol
+  LinkHandler [ label="{«protocol»\nLinkHandler|+ protocol\l+ handle(link)}" ]
+  HttpHandler -> LinkHandler
+  S3Uploader -> LinkHandler
+  S3Credentials [ label="{«protocol»\nS3Credentials|+ s3_target_bucket\l+ s3_access_key_id\l+ s3_secret_access_key}" ]
+  Options -> S3Credentials
+  // Dependencies
+  edge [
+    arrowhead = "vee"
+    style = "dashed"
+  ]
+  Catalog -> Day
+  Catalog -> Month
+  Catalog -> Year
+  CommandSelector -> Diagnoser
+  CommandSelector -> Generator
+  CommandSelector -> Options
+  CommandSelector -> Previewer
+  CommandSelector -> Runner
+  Formatter -> Erb
+  Options -> Location
+  Options -> Optparse
+  Options -> Yaml
+  Orchestrator -> HttpHandler
+  Orchestrator -> OptionProtocol
+  Orchestrator -> Repository
+  Orchestrator -> Site
+  Post -> Header
+  Post -> LinkHandler
+  Post -> RedcarpetMarkdown
+  Post -> RedcarpetRender
+  Repository -> Catalog
+  Repository -> Formatter
+  Repository -> Post
+  RssBuilder -> RssMaker
+  Runner -> S3Credentials
+  Runner -> S3Uploader
+  S3Uploader -> AwsS3
+  S3Uploader -> S3Credentials
+  Site -> RssBuilder
+  Site -> Tag
+  Site -> TagCloud
+  TagCloud -> Tag
+  // Inheritance
+  edge [
+    arrowhead = "onormal"
+    style = "solid"
+  ]
+  Catalog -> Enumerable
+  Diagnoser -> ControlProtocol
+  Generator -> ControlProtocol
+  Orchestrator -> ControlProtocol
+  Previewer -> Orchestrator
+  Runner -> Orchestrator
+}

data/doc/classes.png ADDED

Binary file

data/features/{author_generates_site.feature → author_builds_site.feature} RENAMED

File without changes

data/features/repository_is_generated.feature ADDED

@@ -0,0 +1,12 @@
+Feature: Repository is generated
+  As a new user
+  I want to create a valid directory structure
+  That will serve as input to Contraption
+  And include example template to help get started
+  Scenario: generate repository
+    Given I have a writeable directory
+    When I run contraption generate
+    Then I should have a valid project
+    And contraption should accept the generated repository as input

data/features/step_definitions/repository_generation_steps.rb ADDED

@@ -0,0 +1,22 @@
+require_relative '../../lib/contraption/location'
+require_relative '../../lib/contraption/repository'
+require_relative '../../lib/contraption/command_selector'
+Given(/^I have a writeable directory$/) do
+  @target_dir = 'new_repository'
+  FileUtils.rm_r @target_dir if File.exist? @target_dir
+  expect(Dir.mkdir(@target_dir)).to eq 0
+end
+When(/^I run contraption generate$/) do
+  Contraption::CommandSelector.go ['generate', '-d', @target_dir]
+end
+Then(/^I should have a valid project$/) do
+  path = Contraption::Location.new @target_dir
+  expect{Contraption::Repository.new path}.not_to raise_error
+end
+Then(/^contraption should accept the generated repository as input$/) do
+  expect{Contraption::CommandSelector.go ['-s', @target_dir, '-d', @target_dir + 'output']}.not_to raise_error
+end

data/features/support/hooks.rb CHANGED

@@ -1,3 +1,3 @@
 After do
-  `rm -rf tmp`
+  `rm -rf tmp #{@target_dir} #{@target_dir ? @target_dir+'output' : ''}`
 end

data/lib/contraption.rb CHANGED

@@ -3,6 +3,8 @@ require "contraption/post"
 require "contraption/header"
 require "contraption/catalog"
 require "contraption/location"
+require "contraption/orchestrator"
+require "contraption/previewer"
 require "contraption/runner"
 require "contraption/tag"
 require "contraption/tag_cloud"

data/lib/contraption/catalog.rb CHANGED

@@ -27,10 +27,9 @@ module Contraption
     end
     def by_tag
-      all(:tags).each_with_object(Hash.new {|h,k| h[k] = []}) do |tag, result|
-        items.each do |item|
-          result[tag.to_sym] << item if item.tags.include? tag
-        end
+      tags = all(:tags).uniq{|t| t.to_url}
+      items.each_with_object(Hash.new {|h,k| h[k] = []}) do |item, result|
+        item.tags.each{|t| result[t.to_url] << item}
       end
     end

data/lib/contraption/command_selector.rb ADDED

@@ -0,0 +1,27 @@
+require_relative 'diagnoser'
+require_relative 'generator'
+require_relative 'options'
+require_relative 'runner'
+require_relative 'previewer'
+module Contraption
+  class CommandSelector
+    class << self
+      def go args
+        case args.first
+        when 'diagnose'
+          args.shift
+          Diagnoser
+        when 'generate'
+          args.shift
+          Generator
+        when 'preview'
+          args.shift
+          Previewer
+        else
+          Runner
+        end.send("new", Options.new(args)).run!
+      end
+    end
+  end
+end

data/lib/contraption/diagnoser.rb ADDED

@@ -0,0 +1,12 @@
+module Contraption
+  class Diagnoser
+    def initialize args
+      @options = args.values
+    end
+    def run!
+      key_width = @options.keys.map(&:length).max + 1
+      @options.each_pair{|k,v| puts "#{(k.to_s << ':').ljust key_width} #{v}"}
+    end
+  end
+end

data/lib/contraption/generator.rb ADDED

@@ -0,0 +1,35 @@
+module Contraption
+  class Generator
+    def initialize args
+      @options = args
+    end
+    def run!
+      directories = ['drafts', 'posts']
+      directories.each do |d|
+        destination.cd d
+      end
+      init_git
+      copy_example_files
+      make_initial_commit
+    end
+    private
+    def destination
+      @options.destination
+    end
+    def init_git
+      `git init #{destination.path}`
+    end
+    def copy_example_files
+      `cp -r data/* #{destination.path}`
+    end
+    def make_initial_commit
+      `cd #{destination.path}; git add --all .; git commit -m 'Generated input for Contraption static site generator'`
+    end
+  end
+end

data/lib/contraption/header.rb CHANGED

@@ -51,6 +51,7 @@ module Contraption
     def initialize opts={}
       @defaults = { title: "",
+                    external: nil,
                     publication_date: "",
                     summary: "",
                     type: "",

data/lib/contraption/location.rb CHANGED

@@ -16,10 +16,18 @@ module Contraption
         .map{ |f| f.basename.to_s }
     end
+    def entries
+      pn.entries.map{|e| e.expand_path(pn) }
+    end
     def path
       pn.to_s
     end
+    def to_s
+      pn.expand_path.to_s
+    end
     def read file_name
       complete_name = pn+file_name
       return :file_does_not_exist unless complete_name.exist?
@@ -29,6 +37,10 @@ module Contraption
       complete_name.open("r") { |f| yield f }
     end
+    def destroy
+      FileUtils.rm_rf pn.expand_path
+    end
     def cd directory
       l = Location.new(pn+directory)
       l.create!  unless l.pn.directory?

data/lib/contraption/options.rb CHANGED

@@ -36,6 +36,10 @@ module Contraption
           opts.on("-d", "--destination path", "Path to destination") do |path|
             @values[:destination] = Location.new path
           end
+          opts.on("-h", "--help") do
+            puts opts
+            exit
+          end
           opts.on("-s", "--source path", "Path to source") do |path|
             @values[:source] = Location.new path
           end

data/lib/contraption/orchestrator.rb ADDED

@@ -0,0 +1,54 @@
+require_relative 'repository'
+require_relative 'site'
+require_relative 'http_handler'
+module Contraption
+  class Orchestrator
+    def initialize options
+      @options = options
+    end
+    def run!
+      source.finalize_completed_drafts handlers
+      site.build_all_individuals
+      site.build_month_pages
+      site.build_year_pages
+      site.build_tag_pages
+      site.build_tag_cloud
+      site.build_recent
+      site.build_landing
+      site.build_rss
+      site.build_archive_navigation
+      copy_static_files
+      post_run
+    end
+    private
+    def site
+      @site ||= Site.new @options.destination, posts, formatter
+    end
+    def source
+      raise "Not implemented"
+    end
+    def post_run; end
+    def formatter
+      @formatter ||= source.formatter
+    end
+    def posts
+      @posts ||= source.posts
+    end
+    def copy_static_files
+      `cp -r #{source.static_file_path}/* #{site.root}` unless (Dir[source.static_file_path.to_s + "/*"]).length == 0
+    end
+    def handlers
+      [ HttpHandler.new ]
+    end
+  end
+end

data/lib/contraption/previewer.rb ADDED

@@ -0,0 +1,28 @@
+require_relative 'orchestrator'
+module Contraption
+  class Previewer < Orchestrator
+    PORT = 9009
+    def post_run
+      trap("INT") { cleanup }
+      spawn_server
+    end
+    private
+    def source
+      @source ||= Repository.new(@options.source).clone
+    end
+    def cleanup
+      puts "\nremoving temporary files and shutting down server"
+      source.destroy
+      site.location.destroy
+    end
+    def spawn_server
+      puts "Previewing site on http://localhost:#{PORT}"
+      `ruby -run -e httpd #{site.root} -p #{PORT} &> /dev/null`
+    end
+  end
+end

data/lib/contraption/repository.rb CHANGED

@@ -13,6 +13,16 @@ module Contraption
       @formatter = Formatter.new @formats_source
     end
+    def clone
+      new_path = @path.cd "../.tmp_#{Time.now.to_i}"
+      `cp -r #{@path.path}/* #{new_path.path}`
+      Repository.new new_path
+    end
+    def destroy
+      @path.destroy
+    end
     def validate
       raise "Invalid source directory structure in #{@path}" unless valid_layout?
     end
@@ -26,13 +36,24 @@ module Contraption
     end
     def posts
-      Catalog.new( @posts_source.list.map{|p| Post.build(@posts_source.read p)} )
+      Catalog.new( @posts_source.list.map do |p|
+        begin
+          Post.build(@posts_source.read p)
+        rescue ArgumentError => e
+          STDERR.puts "Invalid post #{p}"
+        end
+      end.select{|p| p.title != ''}
+      )
     end
-    def static_files
+    def static_file_path
       @static_source.path
     end
+    def static_files
+      @static_source.entries
+    end
     def completed_drafts
       drafts.map{|draft| [draft, @drafts_source.read(draft)]}
             .each_with_object([]) do |draft, result|

data/lib/contraption/runner.rb CHANGED

@@ -1,60 +1,27 @@
-require_relative 'repository'
-require_relative 'site'
+require_relative 'orchestrator'
 require_relative 's3_uploader'
-require_relative 'http_handler'
 module Contraption
-  class Runner
+  class Runner < Orchestrator
     def initialize options
       @options = options
     end
-    def run!
-      source.finalize_completed_drafts handlers
-      site.build_all_individuals
-      site.build_month_pages
-      site.build_year_pages
-      site.build_tag_pages
-      site.build_tag_cloud
-      site.build_recent
-      site.build_landing
-      site.build_rss
-      copy_static_files
-    end
     private
-    def formatter
-      @formatter ||= source.formatter
-    end
-    def posts
-      @posts ||= source.posts
-    end
-    def site
-      @site ||= Site.new @options.destination, posts, formatter
-    end
     def source
       @source ||= Repository.new @options.source
     end
-    def copy_static_files
-      `cp -r #{source.static_files}/* #{site.root}` unless (Dir[source.static_files.to_s + "/*"]).length == 0
-    end
     def handlers
+      h = super
       if @options.s3_access_key_id
-        [
-          HttpHandler.new,
+        h <<
           S3Uploader.new({access_key_id: @options.s3_access_key_id,
                           secret_access_key: @options.s3_secret_access_key},
                           @options.s3_target_bucket,
                           @options.source)
-        ]
-      else
-        [ HttpHandler.new]
       end
+      h
     end
   end
 end

data/lib/contraption/s3_uploader.rb CHANGED

@@ -16,14 +16,16 @@ module Contraption
     def handle request
       local_path = Pathname.new(@path.path) + request.last
       if local_path.exist?
-        upload local_path, request.last
-        ["http:", "#{@target_bucket}/#{request.last}"]
+        remote_path = "#{Time.now.year}" + "/#{"%02d" % Time.now.mon}/" + request.last.split('/').last
+        upload local_path, remote_path
+        ["http:", "#{@target_bucket}/#{remote_path}"]
       else
-        raise "#{request.last} does not exist"
+        raise "#{local_path.expand_path} does not exist"
       end
     end
     def upload local_path, remote_path
+      puts "Uploading #{local_path} to #{remote_path}"
       AWS::S3::S3Object.store(remote_path, open(local_path), @target_bucket, :access => :public_read, 'Cache-Control' => 'max-age=3136000')
     end
   end

data/lib/contraption/site.rb CHANGED

@@ -55,10 +55,23 @@ module Contraption
       @location.write 'rss', feed
     end
+    def build_archive_navigation
+      content = @posts.by_month
+                      .keys
+                      .sort_by{|m| m.year*12 + m.month}
+                      .map{|m| %Q{<a class="indivisible" href="#{m.year}/#{"%02d" % m.month}">#{Date::ABBR_MONTHNAMES[m.month]} #{m.year}</a>}}
+                      .join("\n")
+      write_as_page content, @location, 'archive.html'
+    end
     def root
       @location.path
     end
+    def location
+      @location
+    end
     private
     def build collection
       Array(collection).map {|p| @formats.format p}.join

data/lib/contraption/tag_cloud.rb CHANGED

@@ -15,7 +15,7 @@ module Contraption
     private
     def tag_link tag
       tag = Tag.new tag
-      %Q{<a href="tags/#{tag.to_url}/index.html">#{tag.to_s}</a>}
+      %Q{<a class="indivisible" href="tags/#{tag.to_url}/index.html">#{tag.to_s}</a>}
     end
     def scale element

data/lib/contraption/version.rb CHANGED

@@ -1,3 +1,3 @@
 module Contraption
-  VERSION = "0.2.0"
+  VERSION = '0.3.0'
 end

data/spec/contraption/lib/catalog_spec.rb CHANGED

@@ -69,35 +69,6 @@ module Contraption
       end
     end
-    context "tag grouping" do
-      let(:item_1)  { stub(tags: %w[a b c]) }
-      let(:item_2)  { stub(tags: [])}
-      let(:item_3)  { stub(tags: %w[a d]) }
-      let(:item_4)  { stub(tags: %w[b c d]) }
-      let(:item_5)  { stub(tags: %w[c e]) }
-      let(:catalog) { Catalog.new [item_1, item_2, item_3, item_4, item_5] }
-      it "groups all items tagged with 'a'" do
-        catalog.by_tag[:a].should eq [item_1, item_3]
-      end
-      it "groups all items tagged with 'b'" do
-        catalog.by_tag[:b].should eq [item_1, item_4]
-      end
-      it "groups all items tagged with 'c'" do
-        catalog.by_tag[:c].should eq [item_1, item_4, item_5]
-      end
-      it "groups all items tagged with 'd'" do
-        catalog.by_tag[:d].should eq [item_3, item_4]
-      end
-      it "groups all items tagged with 'e'" do
-        catalog.by_tag[:e].should eq [item_5]
-      end
-    end
     it "includes enumerable" do
       Catalog.included_modules.should include Enumerable
     end

metadata CHANGED

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contraption
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Casey Robinson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-11-03 00:00:00.000000000 Z
+date: 2014-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,22 +122,35 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- benchmark.rb
 - bin/contraption
 - contraption.gemspec
+- data/formats/landing_page.erb
+- data/formats/page.erb
+- data/formats/tag_cloud.erb
+- doc/classes.dot
+- doc/classes.png
+- features/author_builds_site.feature
 - features/author_finalizes_draft.feature
-- features/author_generates_site.feature
+- features/repository_is_generated.feature
 - features/step_definitions/author_steps.rb
+- features/step_definitions/repository_generation_steps.rb
 - features/support/env.rb
 - features/support/example_inputs.rb
 - features/support/hooks.rb
 - lib/contraption.rb
 - lib/contraption/catalog.rb
+- lib/contraption/command_selector.rb
+- lib/contraption/diagnoser.rb
 - lib/contraption/formatter.rb
+- lib/contraption/generator.rb
 - lib/contraption/header.rb
 - lib/contraption/http_handler.rb
 - lib/contraption/location.rb
 - lib/contraption/options.rb
+- lib/contraption/orchestrator.rb
 - lib/contraption/post.rb
+- lib/contraption/previewer.rb
 - lib/contraption/repository.rb
 - lib/contraption/rss_builder.rb
 - lib/contraption/runner.rb
@@ -182,9 +195,11 @@ signing_key:
 specification_version: 4
 summary: Static site generator
 test_files:
+- features/author_builds_site.feature
 - features/author_finalizes_draft.feature
-- features/author_generates_site.feature
+- features/repository_is_generated.feature
 - features/step_definitions/author_steps.rb
+- features/step_definitions/repository_generation_steps.rb
 - features/support/env.rb
 - features/support/example_inputs.rb
 - features/support/hooks.rb