hydeweb 0.1.9 → 0.1.10

data/HISTORY.md

@@ -1,3 +1,12 @@
+v0.1.10
+-------
+
+ - New Hyde sites will now have a gems manifest. This means you can
+   push your Hyde sites to Heroku instantly.
+ - Add cuba to dependencies.
+ - The server now serves the right MIME types.
+ - When used as a Rack app, Hyde sends cache headers.
+
 v0.1.9
 ------
 

data/TODO.md

@@ -1,3 +1,6 @@
+- Caching
+- MIME types
+
 - Post build hooks?
 - tilt_build_options
 - deprecate $project, implement Hyde.project

data/data/new_site/config.ru

@@ -5,4 +5,5 @@ require 'hyde'
 require 'hyde/server'
 
 Hyde::Project.new File.dirname(__FILE__)
+Hyde::Server.options[:cache] = true
 run Hyde::Server

data/lib/hyde/cli.rb

@@ -68,9 +68,13 @@ class CLI < Shake
     port   = (params.extract('-p') || 4833).to_i
     host   = (params.extract('-o') || '0.0.0.0')
     daemon = (!! params.delete('-D'))
+    cache  = (!! params.delete('--cache'))
 
     require 'hyde/server'
 
+    # No caching whatsoever.
+    Hyde::Server.options[:cache] = cache
+
     if daemon
       pid = fork { Hyde::Server.run! :Host => host, :Port => port, :quiet => true }
       sleep 2
@@ -87,13 +91,16 @@ class CLI < Shake
   task.help = %{
     Usage:
 
-        #{executable} start [-p PORT] [-o HOST] [-D]
+        #{executable} start [-p PORT] [-o HOST] [--cache] [-D]
     
     Starts an HTTP server so you may rapidly test your project locally.
 
     If the -p and/or -o is specified, it will listen on the specified HOST:PORT.
     Otherwise, the default is 0.0.0.0:4833.
 
+    Hyde doesn't send cache instructions, ensuring that every page load is fresh.
+    You can use --cache to override this behavior.
+
     If -D is specified, it goes into daemon mode.
   }.gsub(/^ {4}/, '').strip.split("\n")
 

data/lib/hyde/project.rb

@@ -11,10 +11,14 @@ class Project
   def validate_version
     return unless config_file?
     req = config.hyde_requirement.to_s
+
+    v = lambda { |version| Gem::Version.new version }
+
     if req.empty?
-    elsif req < "0.1"
+      # pass
+    elsif v[req] < v["0.1"]
       raise LegacyError, "This is a legacy project"
-    elsif req > Hyde.version
+    elsif v[req] > v[Hyde.version]
       raise VersionError, "You will need Hyde version >= #{req} for this project."
     end
   end

data/lib/hyde/server.rb

@@ -28,6 +28,16 @@ class Hyde
       puts "%s\033[0;m %s %s" % [ status, verb, env['PATH_INFO'] ]
       puts "       src: #{page.filepath} (#{page.tilt_engine_name})"  if page && page.tilt?
     end
+
+    def mime_type_for(page)
+      type   = page.mime_type
+      type ||= Rack::Mime::MIME_TYPES[File.extname(page.file)]
+      type
+    end
+
+    def server
+      Hyde::Server
+    end
   end
 
   module Hyde::Server
@@ -37,8 +47,17 @@ class Hyde
       on default do
         begin
           page = Hyde::Page[env['PATH_INFO']]  or break not_found
-          type = page.mime_type
+
+          if server.options[:cache]
+            # Fairly aggressive caching. Best for Rack apps.
+            res['Cache-Control'] = 'max-age=86400, public'
+          else
+            res['Cache-Control'] = 'no-cache'
+          end
+
+          type = mime_type_for(page)
           res['Content-Type'] = type  if type
+
           res.write page.to_html
           show_status page
         rescue => e
@@ -51,9 +70,19 @@ class Hyde
 end
 
 module Hyde::Server
+  # Available options:
+  #  - cache      - (bool) sets if we do caching or not. Defaults to false.
+  def self.options
+    @options ||= Hash.new 
+    if @options.empty?
+      @options[:cache] = true
+    end
+    @options
+  end
+
   # :Host, :Port
   def self.run!(options={})
-    @options = options
+    self.options.merge options
     handler = rack_handler  or return false
     handler.run self, options
   end

data/lib/hyde.rb

@@ -15,7 +15,7 @@ require 'shake'
 Tilt.mappings['html'] = Tilt.mappings['erb']
 
 class Hyde
-  VERSION = "0.1.9"
+  VERSION = "0.1.10"
   PREFIX  = File.expand_path('../', __FILE__)
 
   Error        = Class.new(StandardError)

data/test/unit/fixture_test.rb

@@ -29,6 +29,10 @@ class HydeTest < TestCase
     # Build
     project = build path
 
+    assert \
+      Dir[project.root('control/**/*')].length == 
+      Dir[project.root('public/**/*')].length
+
     Dir[project.root('control/**/*')].each do |control|
       next  unless File.file?(control)
       var = control.sub('/control/', '/public/')

data/test/unit/page_test.rb

@@ -41,6 +41,13 @@ class PageTest < TestCase
     assert_equal 'text/html', Page['/about/us.html'].mime_type
     assert_equal 'html', Page['/about/us.html'].default_ext
     assert_equal 'css',  Page['/css/style.css'].default_ext
+
+    assert_equal 'image/jpeg', Page['/images/foo.jpg'].mime_type
+  end
+
+  test "ext" do
+    assert_equal '.html', Page['/'].ext
+    assert_equal '.jpg', Page['/images/foo.jpg'].ext
   end
   
   test "no layout" do

metadata

@@ -2,7 +2,7 @@
 name: hydeweb
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors: 
 - Rico Sta. Cruz
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-25 00:00:00 +08:00
+date: 2011-02-26 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,18 +36,18 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: haml
+  name: cuba
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
+        version: 1.0.0
+  type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: less
+  name: haml
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -58,7 +58,7 @@ dependencies:
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: maruku
+  name: less
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -68,6 +68,17 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: maruku
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id006
 description: Hyde lets you create static websites from a bunch of files written in HAML, Textile, Sass, or any other.
 email: 
 - rico@sinefunc.com
@@ -129,6 +140,9 @@ files:
 - test/fixture/one/control/css/style.css
 - test/fixture/one/control/hello.html
 - test/fixture/one/control/hi.html
+- test/fixture/one/control/images/bar.gif
+- test/fixture/one/control/images/baz.png
+- test/fixture/one/control/images/foo.jpg
 - test/fixture/one/control/index.html
 - test/fixture/one/hyde.conf
 - test/fixture/one/layouts/default.haml
@@ -140,6 +154,9 @@ files:
 - test/fixture/one/site/css/style.scss
 - test/fixture/one/site/hello.haml
 - test/fixture/one/site/hi.html
+- test/fixture/one/site/images/bar.gif
+- test/fixture/one/site/images/baz.png
+- test/fixture/one/site/images/foo.jpg
 - test/fixture/one/site/index.haml
 - test/fixture/parent/control/about/index.html
 - test/fixture/parent/control/about/us.html