hx 0.11.0 → 0.12.0

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2010 MenTaLguY <mental@rydia.net>
+Copyright (c) 2009-2011 MenTaLguY <mental@rydia.net>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/VERSION

@@ -1 +1 @@
-0.11.0
+0.12.0

data/lib/hx/backend/hobix.rb

@@ -28,12 +28,11 @@ require 'hx/backend/rawfiles'
 module Hx
 module Backend
 
-class Hobix
+class HobixFilter
   include Hx::Filter
 
   def initialize(input, options)
-    files = Hx::Backend::RawFiles.new(input, options)
-    @source = Hx::StripPath.new(files, :suffix => ".yaml")
+    @source = Hx::StripPath.new(input, :suffix => ".yaml")
   end
 
   def yaml_repr(value)
@@ -86,5 +85,12 @@ class Hobix
   end
 end
 
+class Hobix < HobixFilter
+  def initialize(input, options)
+    files = Hx::Backend::RawFiles.new(input, options)
+    super(files, options)
+  end
+end
+
 end
 end

data/lib/hx.rb

@@ -448,7 +448,6 @@ class Site
 
   attr_reader :options
   attr_reader :sources
-  attr_reader :outputs
 
   class << self
     private :new
@@ -516,7 +515,7 @@ class Site
       end
 
       outputs = []
-      for raw_output in raw_config.fetch('outputs', [])
+      for raw_output in raw_config.fetch('output', [])
         outputs << Hx.build_source(options, NULL_INPUT, sources, raw_output)
       end
 
@@ -527,22 +526,21 @@ class Site
   def initialize(options, sources, outputs)
     @options = options
     @sources = sources
-    @outputs = outputs
-    @combined_output = Overlay.new(*@outputs)
+    @output = Overlay.new(*outputs)
   end
 
   def edit_entry(path, prototype=nil)
-    @combined_output.edit_entry(path, prototype) { |text| yield text }
+    @output.edit_entry(path, prototype) { |text| yield text }
     self
   end
 
   def each_entry_path(selector)
-    @combined_output.each_entry_path(selector) { |path| yield path }
+    @output.each_entry_path(selector) { |path| yield path }
     self
   end
 
   def get_entry(path)
-    @combined_output.get_entry(path)
+    @output.get_entry(path)
   end
 end
 

data/spec/site_spec.rb

@@ -45,12 +45,6 @@ describe "Hx::Site.load" do
     site.sources.should include('foo')
     site.sources.should include('bar')
   end
-
-  it "creates an output for every entry in outputs" do
-    yaml_config = YAML.dump({'outputs' => [{}, {}]})
-    site = Hx::Site.load(yaml_config, __FILE__)
-    site.outputs.size.should == 2
-  end
 end
 
 describe Hx::Site do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hx
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 47
   prerelease: false
   segments: 
   - 0
-  - 11
+  - 12
   - 0
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors: 
 - MenTaLguY
@@ -50,14 +50,12 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
 - VERSION
 - bin/hx
 - lib/hx.rb
-- lib/hx/backend/couchdb.rb
 - lib/hx/backend/hobix.rb
 - lib/hx/backend/rawfiles.rb
 - lib/hx/cli.rb
@@ -86,8 +84,8 @@ homepage: http://github.com/mental/hx
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -116,14 +114,14 @@ signing_key:
 specification_version: 3
 summary: A miniature static site generator.
 test_files: 
-- spec/spec_helper.rb
-- spec/rawfiles_spec.rb
 - spec/cache_spec.rb
 - spec/hx_dummy.rb
-- spec/nullinput_spec.rb
-- spec/site_spec.rb
 - spec/hx_dummy2.rb
-- spec/rack_spec.rb
+- spec/nullinput_spec.rb
 - spec/overlay_spec.rb
 - spec/pathops_spec.rb
+- spec/rack_spec.rb
+- spec/rawfiles_spec.rb
 - spec/selector_spec.rb
+- spec/site_spec.rb
+- spec/spec_helper.rb

data/.gitignore

@@ -1,22 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC
-hx.gemspec

data/lib/hx/backend/couchdb.rb

@@ -1,134 +0,0 @@
-# hx/backend/couchdb - CouchDB backend for Hx
-#
-# Copyright (c) 2009-2010 MenTaLguY <mental@rydia.net>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-# 
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-require 'cgi'
-require 'net/http'
-require 'uri'
-require 'json'
-require 'time'
-require 'hx'
-
-module Hx
-module Backend
-
-class CouchDB
-  include Hx::Filter
-
-  class HTTPError < RuntimeError
-    attr_reader :path
-    attr_reader :code
-    attr_reader :response
-
-    def initialize(path, code, response)
-      @path = path
-      @code = code
-      @response = response
-    end
-
-    def to_s
-      "HTTP Error #{@code} for #{path}"
-    end
-  end
-
-  def initialize(input, options)
-    couchdb_server = options.fetch(:couchdb_server, "http://localhost:5984/")
-    couchdb_database = options.fetch(:couchdb_database, "entries")
-    uri = URI.parse(couchdb_server)
-    if uri.scheme != "http"
-      raise RuntimeError, "Unsupported protocol #{uri.proto}"
-    end
-    @host = uri.host || "localhost"
-    @port = uri.port || 80
-    prefix = uri.path || "/"
-    prefix = "#{prefix}/" unless prefix =~ %r(/$)
-    @prefix = "#{prefix}#{couchdb_database}/"
-  end
-
-  def edit_entry(path, prototype=nil)
-    begin
-      text = get_document(path)
-    rescue HTTPError => e
-      raise e unless e.code == 404
-      raise Hx::NoSuchEntryError, "No such entry #{path}" unless prototype
-      text = prototype.to_json
-    end
-    text = yield text
-    entry = JSON.parse(text)
-    entry['updated'] = Time.now.xmlschema
-    entry['created'] ||= entry['updated']
-    put_document(path, entry.to_json)
-    self
-  end
-
-  def each_entry_path(selector)
-    listing = JSON.parse(get_document('_all_docs'))
-    listing['rows'].each do |row|
-      path = row['id']
-      yield path if selector.accept_path? path
-    end
-    self
-  end
-
-  def get_entry(path)
-    begin
-      entry = JSON.parse(get_document(path))
-    rescue HTTPError => e
-      raise e unless e.code == 404
-      raise Hx::NoSuchEntryError, path
-    end
-    for field in %(created updated)
-      entry[field] = Time.parse(entry[field] || "")
-    end
-    entry
-  end
-
-private
-  def request_path_for(id)
-    "#{@prefix}#{CGI.escape(id)}"
-  end
-
-  def get_document(id)
-    request = Net::HTTP::Get.new(request_path_for(id))
-    http_request(request)
-  end
-
-  def put_document(id, body)
-    request = Net::HTTP::Put.new(request_path_for(id),
-                                 'Content-Type' => 'application/json')
-    request.body = body
-    http_request(request)
-  end
-
-  def http_request(request)
-    response = Net::HTTP.start(@host, @port) { |http| http.request(request) }
-    case response
-    when Net::HTTPSuccess
-      response.body
-    else
-      raise HTTPError.new(request.path, response.code.to_i, response)
-    end
-  end
-end
-
-end
-end