bjork 0.1.0 → 0.1.2

data/.gitignore

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

data/lib/bjork/try_static.rb

@@ -0,0 +1,44 @@
+module Bjork
+
+  # The Bjork::TryStatic middleware delegates requests to Rack::Static middleware
+  # trying to match a static file
+  #
+  # Examples
+  #
+  # use Bjork::TryStatic,
+  #   :root => "public",  # static files root dir
+  #   :urls => %w[/],     # match all requests
+  #   :try => ['.html', 'index.html', '/index.html'] # try these postfixes sequentially
+  #
+  #   uses same options as Rack::Static with extra :try option which is an array
+  #   of postfixes to find desired file
+
+  class TryStatic
+
+    def initialize(app, options)
+      @app = app
+      @try = ['', *options[:try]]
+      @static = ::Rack::Static.new(
+        lambda { |_| [404, {}, []] },
+        options
+      )
+    end
+
+    def call(env)
+      # TODO: Should we skip for all non-GET methods?
+      # Skip for POST
+      return @app.call(env) if env["REQUEST_METHOD"] == "POST"
+
+      orig_path = env['PATH_INFO']
+      found = nil
+
+      @try.each do |path|
+        resp = @static.call(env.merge!({'PATH_INFO' => orig_path + path}))
+        break if 404 != resp[0] && found = resp
+      end
+
+      found or @app.call(env.merge!('PATH_INFO' => orig_path))
+    end
+
+  end
+end

data/lib/bjork/version.rb

@@ -1,3 +1,3 @@
 module Bjork
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

data/lib/bjork.rb

@@ -1,6 +1,7 @@
 require "bjork/version"
+require "bjork/try_static"
 
-require "sinatra"
+require "sinatra/base"
 
 require 'coffee-script'
 require "haml"
@@ -15,29 +16,37 @@ Tilt::CoffeeScriptTemplate.default_bare = true
 
 module Bjork
   class Server < Sinatra::Base
-    local_folder = File.expand_path(File.dirname(__FILE__))
+    enable :logging
+
+    # Serve any assets that exist in our folders
+    # Middlewares always take place before anything else,
+    # so if the file exists locally in the following folders
+    # it will be served.
+    # If it is not found the request will continue to the rest of the app
+    use Bjork::TryStatic, :urls => %w[/]
 
     asset_environment = Sprockets::Environment.new
-    asset_environment.cache = Sprockets::Cache::FileStore.new("/tmp")
+    asset_environment.cache = Sprockets::Cache::FileStore.new("tmp")
 
-    set :assets, asset_environment
+    server_folder = File.expand_path(File.dirname(__FILE__))
 
-    # Configure sprockets
-    settings.assets.append_path "#{local_folder}/javascripts"
-    settings.assets.append_path "#{local_folder}/stylesheets"
+    # Internal (bjork server) Sprockets asset directories
+    %w[
+      javascripts
+      stylesheets
+    ].each do |path|
+      asset_environment.append_path File.join(server_folder, path)
+    end
 
-    # External Sprockets Source directories
+    # External (host app which is running bjork) Sprockets asset directories
     %w[
-      data
-      images
-      music
-      sounds
+      lib
       source
     ].each do |path|
-      settings.assets.append_path path
+      asset_environment.append_path path
     end
 
-    set :public_folder, local_folder
+    set :assets, asset_environment
 
     set :haml, { :format => :html5 }
 
@@ -45,6 +54,21 @@ module Bjork
       haml :index
     end
 
+    # Any post to /save will write data to the path provided.
+    post '/save' do
+      data = params["data"]
+      path = params["path"]
+
+      # Ensure directory exists
+      FileUtils.mkdir_p File.dirname(path)
+
+      File.open(path, 'w') do |file|
+        file.write(data)
+      end
+
+      200
+    end
+
     get '/debug_console' do
       haml :debug
     end
@@ -57,15 +81,22 @@ module Bjork
       end
     end
 
+    # Asset gems can use any of these four directories to
+    # serve things up.
+    # Try sprockets last
     %w[
       data
       images
       javascripts
-      music
-      sounds
       stylesheets
     ].each do |dir|
       get "/#{dir}/*.*" do
+        # Keep Sprockets environment's paths up to date with
+        # any gems that have been required after we've initialized
+        (Sprockets.paths - settings.assets.paths).each do |asset_path|
+          settings.assets.append_path asset_path
+        end
+
         path, extension = params[:splat]
 
         if asset = settings.assets["#{path}.#{extension}"]
@@ -76,17 +107,5 @@ module Bjork
         end
       end
     end
-
-    # TODO: handle saving directory
-    # post '/levels' do
-    #   data = params["data"]
-    #   name = params["name"]
-
-    #   File.open("levels/#{name}.json", 'w') do |file|
-    #     file.write(data)
-    #   end
-
-    #   200
-    # end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bjork
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-26 00:00:00.000000000 Z
+date: 2013-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -155,6 +155,7 @@ files:
 - lib/bjork.rb
 - lib/bjork/source_maps.rb
 - lib/bjork/tasks.rb
+- lib/bjork/try_static.rb
 - lib/bjork/version.rb
 - lib/stylesheets/all.css
 - lib/views/debug.haml