noumenon 0.2.1 → 0.2.2

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# 0.2.2
+
+## New Features
+
+* By default the `send_file` method is used to serve assets from the asset repository so that caching
+  is handled correctly.
+
+## Bug Fixes
+
+* The asset repository was replacing the content repository entirely in new Noumenon sites.
+* Removed asset management methods from the ContentRepository class.
+
 # 0.2.1
 
 ## New Features

data/generators/site/config.ru

@@ -2,6 +2,6 @@ require 'noumenon'
 
 Noumenon.theme = Noumenon::Theme.load("./theme")
 Noumenon.content_repository = Noumenon::ContentRepository::FileSystem.new(path: "./content/pages")
-Noumenon.content_repository = Noumenon::AssetRepository::FileSystem.new(path: "./content/assets")
+Noumenon.asset_repository = Noumenon::AssetRepository::FileSystem.new(path: "./content/assets")
 
 run Noumenon.server

data/lib/noumenon/content_repository/file_system.rb

@@ -82,29 +82,6 @@ class Noumenon::ContentRepository::FileSystem < Noumenon::ContentRepository
     }.sort { |a, b| a[:path] <=> b[:path] }
   end
   
-  # Save a static asset to the repository.
-  #
-  # @see Noumenon::Repository#save_asset
-  # @api public
-  def save_asset(path, content)
-    raise ArgumentError.new("Assets must have a file extension.") unless File.extname(path).size > 0
-    write_file File.join("assets", path), content
-  end
-
-  # Retreive a static asset to the repository.
-  #
-  # @see Noumenon::Repository#get_asset
-  # @api public
-  def get_asset(path)
-    return nil unless File.extname(path).size > 0
-    read_file File.join("assets", path)
-  end
-  
-  def get_asset_path(path)
-    return nil unless File.extname(path).size > 0
-    repository_path "assets/#{path}"
-  end
-
   private
   # Return the on-disk path to a repository item.
   def repository_path(path)

data/lib/noumenon/content_repository.rb

@@ -60,35 +60,6 @@ class Noumenon::ContentRepository
   def children(root = "/", depth = 1)
     not_supported "listing children from a path"
   end
-  
-  # Saves a static asset to the repository. To be saved the asset must have a file extension, to prevent
-  # problems with an entire directory being overridden by a single asset.
-  #
-  # @param [ String ] path The path to save the asset at.
-  # @param [ String ] content The contents of the asset.
-  # @raises [ ArgumentError ] The path did not have a file extension.
-  def save_asset(path, content)
-    not_supported "saving assets"
-  end
-  
-  # Retrieves a static asset from the repository. If the asset does not exist nil is returned.
-  #
-  # @param [ String ] path The path to load from.
-  # @return [ String, nil ] The asset's content, or nil if it does not exist.
-  def get_asset(path)
-    not_supported "loading assets"
-  end
-  
-  # Returns a URL for the specified asset, without checking for it's existence.
-  #
-  # This is most useful for repositories that save their assets to a CDN such as S3, and allows them to be
-  # directly accessed from there, instead of downloaded and then retransmitted.
-  #
-  # @param [ String ] path The asset path within the repository.
-  # @return [ String ] The URL to use when requesting the asset.
-  def asset_url(path)
-    File.join("/assets", path)
-  end
 
   protected
   def not_supported(action)

data/lib/noumenon/core.rb

@@ -52,11 +52,7 @@ class Noumenon::Core < Sinatra::Base
     asset = Noumenon.asset_repository.get(path)
     halt 404, "Asset not found" unless asset
     
-    status 200
-    headers \
-      "Content-Type" => Rack::Mime.mime_type(File.extname(path)),
-      "Length" => asset.bytesize.to_s
-    body asset
+    send_file asset
   end
 
   get "*" do |path|

data/lib/noumenon/version.rb

@@ -1,5 +1,5 @@
 module Noumenon
   # The current version of Noumenon.
   # @api public
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -2,7 +2,7 @@
 name: noumenon
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Jon Wood
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-08 00:00:00 +01:00
+date: 2011-06-11 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency