suite 0.1.1 → 0.1.2

data/lib/suite/server.rb

@@ -1,16 +1,46 @@
 require 'goliath/api'
 require 'goliath/runner'
-require 'suite/server/asset'
-require 'suite/server/root_asset'
-require 'suite/server/content'
+require 'suite/server/error'
+require 'suite/renderers/page'
+require 'mime/types'
 
 module Suite
   class Server < Goliath::API
-    map "/assets/*asset", Suite::AssetServer
-    map "/*content", Suite::ContentServer
+    include Suite::ServerError
+    def response(env)
+      path =  env["REQUEST_PATH"]
+      if path =~ /^\/assets/
+        respond_with_asset path
+      else
+        respond_with_content path
+      end
+    end
+
+    def respond_with_asset path
+      asset = Suite.project.asset path.gsub(/^\/assets\//,'')
+      return not_found unless asset
+      content_types = MIME::Types.type_for(path)
+      headers = {'content-type'=> content_types.first.content_type } unless content_types.size == 0
+      [
+        200,
+        headers || {},
+        asset.body
+      ]
+    end
 
-    %w[favicon.ico].each do |resource|
-      map "/#{resource}", Suite::RootAssetServer
+    def respond_with_content path
+      return not_found unless page = Suite.project.page_at_slugs(slugs)
+      renderer = Suite::Renderers::Page.new page[:layout], page[:content]
+      [200,{},renderer.render]
     end
+
+    def slugs
+      if self.env["REQUEST_PATH"] == "/"
+        ["index"]
+      else
+        self.env["REQUEST_PATH"].split("/")
+      end
+    end
+
   end
 end

data/lib/suite/version.rb

@@ -1,3 +1,3 @@
 module Suite
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: suite
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-07 00:00:00.000000000 Z
+date: 2012-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70111184752820 !ruby/object:Gem::Requirement
+  requirement: &70337811301140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70111184752820
+  version_requirements: *70337811301140
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70111184748680 !ruby/object:Gem::Requirement
+  requirement: &70337811299280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70111184748680
+  version_requirements: *70337811299280
 - !ruby/object:Gem::Dependency
   name: goliath
-  requirement: &70111184743340 !ruby/object:Gem::Requirement
+  requirement: &70337811295260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70111184743340
+  version_requirements: *70337811295260
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &70111184740900 !ruby/object:Gem::Requirement
+  requirement: &70337811293880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70111184740900
+  version_requirements: *70337811293880
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70111184740020 !ruby/object:Gem::Requirement
+  requirement: &70337811292600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70111184740020
+  version_requirements: *70337811292600
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &70111184738060 !ruby/object:Gem::Requirement
+  requirement: &70337811289920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70111184738060
+  version_requirements: *70337811289920
 - !ruby/object:Gem::Dependency
   name: sprockets-sass
-  requirement: &70111184736600 !ruby/object:Gem::Requirement
+  requirement: &70337811285080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70111184736600
+  version_requirements: *70337811285080
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &70111184735220 !ruby/object:Gem::Requirement
+  requirement: &70337811282420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70111184735220
+  version_requirements: *70337811282420
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &70111184734260 !ruby/object:Gem::Requirement
+  requirement: &70337811278360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70111184734260
+  version_requirements: *70337811278360
 - !ruby/object:Gem::Dependency
   name: yui-compressor
-  requirement: &70111184733260 !ruby/object:Gem::Requirement
+  requirement: &70337811276640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70111184733260
+  version_requirements: *70337811276640
 description: All the stuff that make front end web development fun, in one simple
   toolkit
 email:
@@ -163,10 +163,7 @@ files:
 - lib/suite/renderers/html.rb
 - lib/suite/renderers/page.rb
 - lib/suite/server.rb
-- lib/suite/server/asset.rb
-- lib/suite/server/content.rb
 - lib/suite/server/error.rb
-- lib/suite/server/root_asset.rb
 - lib/suite/version.rb
 - suite.gemspec
 homepage: ''

data/lib/suite/server/asset.rb

@@ -1,17 +0,0 @@
-require 'suite/server/error'
-require 'mime/types'
-
-module Suite
-  class AssetServer < Goliath::API
-    include Suite::ServerError
-    def response(env)
-      asset = Suite.project.asset env.params[:asset].join("/")
-      return not_found unless asset
-      [
-        200,
-        {'content-type'=> MIME::Types.type_for(env.params[:asset].last).first.content_type },
-        asset.body
-      ]
-    end
-  end
-end

data/lib/suite/server/content.rb

@@ -1,18 +0,0 @@
-require 'suite/server/error'
-require 'suite/renderers/page'
-
-module Suite
-  class ContentServer < Goliath::API
-    include Suite::ServerError
-    def response env
-      return not_found unless page = Suite.project.page_at_slugs(slugs)
-      renderer = Suite::Renderers::Page.new page[:layout], page[:content]
-      [200,{},renderer.render]
-    end
-
-    # Returns the array of slugs, or index if no slug
-    def slugs
-      self.env.params[:content].map{ |slug| slug == "" ? "index" : slug }
-    end
-  end
-end

data/lib/suite/server/root_asset.rb

@@ -1,4 +0,0 @@
-module Suite
-  class RootAssetServer < Goliath::API
-  end
-end