omf_web 0.9.8 → 0.9.9

data/lib/omf-web/config.ru

@@ -7,11 +7,16 @@ use ::Rack::ShowExceptions
 OMF::Web::Runner.instance.life_cycle(:pre_rackup)
 options = OMF::Web::Runner.instance.options
 
-require 'omf-web/rack/session_authenticator'                               
-use OMF::Web::Rack::SessionAuthenticator, #:expire_after => 10, 
+require 'omf-web/rack/session_authenticator'
+use OMF::Web::Rack::SessionAuthenticator, #:expire_after => 10,
           #:login_url => '/tab/login',
           :no_session => ['^/resource/', '^/login', '^/logout']
 
+map "/resource/vendor/" do
+  require 'omf-web/rack/multi_file'
+  run OMF::Web::Rack::MultiFile.new(options[:static_dirs], :sub_path => 'vendor', :version => true)
+end
+
 
 map "/resource" do
   require 'omf-web/rack/multi_file'
@@ -48,7 +53,7 @@ end
 # end
 
 map '/login' do
-  handler = Proc.new do |env| 
+  handler = Proc.new do |env|
     # req = ::Rack::Request.new(env)
     # #puts ">>> post?: #{req.post?} - #{req.params.inspect}"
     # if req.post?
@@ -63,7 +68,7 @@ map '/login' do
 end
 
 map '/logout' do
-  handler = Proc.new do |env| 
+  handler = Proc.new do |env|
     OMF::Web::Rack::SessionAuthenticator.logout
     [301, {'Location' => '/tab', "Content-Type" => ""}, ['Next window!']]
   end
@@ -71,7 +76,7 @@ map '/logout' do
 end
 
 map "/" do
-  handler = Proc.new do |env| 
+  handler = Proc.new do |env|
     req = ::Rack::Request.new(env)
     case req.path_info
     when '/'
@@ -81,7 +86,7 @@ map "/" do
     else
       OMF::Common::Loggable.logger('rack').warn "Can't handle request '#{req.path_info}'"
       [401, {"Content-Type" => ""}, "Sorry!"]
-    end 
+    end
   end
   run handler
 end

data/lib/omf-web/rack/multi_file.rb

@@ -10,14 +10,40 @@ module OMF::Web::Rack
   # like sendfile on the +path+.
   #
   class MultiFile < ::Rack::File
-    def initialize(roots, cache_control = nil)
-      super nil, cache_control
+    def initialize(roots, opts = {})
+      super nil, opts[:cache_control]
       @roots = roots
+      if opts[:sub_path]
+        @sub_path = opts[:sub_path].split SEPS
+      end
+      if @version = opts[:version]
+        # read VERSION_MAP.yaml files
+        @version_map = {}
+        require 'yaml'
+        yml = File.join((@sub_path || []), 'VERSION_MAP.yaml')
+        @roots.reverse.each do |dir|
+          fn = File.join(dir, yml)
+          #puts "Checking for #{fn}"
+          if File.readable?(fn)
+            mh = YAML.load_file(fn)
+            #puts "VERSIONS: #{mh.inspect}"
+            @version_map.merge!(mh)
+          end
+        end
+      end
     end
-    
+
     def _call(env)
       @path_info = ::Rack::Utils.unescape(env["PATH_INFO"])
       parts = @path_info.split SEPS
+      if @version_map
+        if pkg_name = @version_map[parts[1]]
+          parts[1] = pkg_name # replace with version
+        end
+      end
+      if @sub_path
+        parts = @sub_path + parts
+      end
 
       return fail(403, "Forbidden")  if parts.include? ".."
 
@@ -36,7 +62,7 @@ module OMF::Web::Rack
       end
       fail(404, "File not found: #{@path_info}")
     end # _call
-    
+
   end # MultiFile
 end # module
 

data/lib/omf-web/version.rb

@@ -1,7 +1,7 @@
 
 module OMF
   module Web
-    VERSION = '0.9.8'
+    VERSION = '0.9.9'
     # Used for finding the example directory
     TOP_DIR = File.dirname(File.dirname(File.dirname(__FILE__)))
   end

data/share/htdocs/vendor/VERSION_MAP.yaml

@@ -0,0 +1,12 @@
+backbone:     backbone-0.5.3
+bootstrap:    bootstrap-2.3.1
+codemirror:   CodeMirror-2.32
+d3:           d3-2.9.2
+jquery:       jquery-1.7.2
+jquery-ui:    jquery-ui-1.8.23
+mustache:     mustache-0.7.0
+raphael:      raphael-2.1.0
+silk_icons:   silk_icons_v013
+slickgrid:    slickgrid-200512
+stacktrace:   stacktrace-0.3
+underscore:   underscore-1.2.1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omf_web
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
   prerelease: 
 platform: ruby
 authors:
@@ -659,6 +659,7 @@ files:
 - share/htdocs/vendor/CodeMirror-2.32/theme/rubyblue.css
 - share/htdocs/vendor/CodeMirror-2.32/theme/vibrant-ink.css
 - share/htdocs/vendor/CodeMirror-2.32/theme/xq-dark.css
+- share/htdocs/vendor/VERSION_MAP.yaml
 - share/htdocs/vendor/backbone-0.5.3/backbone.js
 - share/htdocs/vendor/bootstrap-2.3.1/css/bootstrap-responsive.css
 - share/htdocs/vendor/bootstrap-2.3.1/css/bootstrap-responsive.min.css
@@ -670,6 +671,15 @@ files:
 - share/htdocs/vendor/bootstrap-2.3.1/js/bootstrap.min.js
 - share/htdocs/vendor/d3-2.9.2/d3.js
 - share/htdocs/vendor/d3-2.9.2/d3.min.js
+- share/htdocs/vendor/jquery-1.7.2/jquery.dataTables.js
+- share/htdocs/vendor/jquery-1.7.2/jquery.event.drag-2.0.js
+- share/htdocs/vendor/jquery-1.7.2/jquery.event.drag.js
+- share/htdocs/vendor/jquery-1.7.2/jquery.jeditable.js
+- share/htdocs/vendor/jquery-1.7.2/jquery.js
+- share/htdocs/vendor/jquery-1.7.2/jquery.later.js
+- share/htdocs/vendor/jquery-1.7.2/jquery.min.js
+- share/htdocs/vendor/jquery-1.7.2/jquery.periodicalupdater.js
+- share/htdocs/vendor/jquery-1.7.2/jquery.sparkline-2.0.js
 - share/htdocs/vendor/jquery-tipsy/css/tipsy.css
 - share/htdocs/vendor/jquery-tipsy/js/jquery.tipsy.js
 - share/htdocs/vendor/jquery-ui-1.8.23/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
@@ -692,22 +702,6 @@ files:
 - share/htdocs/vendor/jquery-ui-1.8.23/js/jquery-ui.min.js
 - share/htdocs/vendor/jquery-ui-1.8.23/js/jquery.ui.draggable.js
 - share/htdocs/vendor/jquery-ui-1.8.23/js/jquery.ui.droppable.js
-- share/htdocs/vendor/jquery/jquery-1.4.3.js
-- share/htdocs/vendor/jquery/jquery-1.6.1.min.js
-- share/htdocs/vendor/jquery/jquery-1.7.2.js
-- share/htdocs/vendor/jquery/jquery-1.7.2.min.js
-- share/htdocs/vendor/jquery/jquery-ui-1.8.18.custom.min.js
-- share/htdocs/vendor/jquery/jquery-ui-1.8.4.custom.min.js
-- share/htdocs/vendor/jquery/jquery-ui-1.8.custom.min.js
-- share/htdocs/vendor/jquery/jquery-ui.custom.min.js
-- share/htdocs/vendor/jquery/jquery.dataTables.js
-- share/htdocs/vendor/jquery/jquery.event.drag-2.0.js
-- share/htdocs/vendor/jquery/jquery.event.drag.js
-- share/htdocs/vendor/jquery/jquery.jeditable.js
-- share/htdocs/vendor/jquery/jquery.js
-- share/htdocs/vendor/jquery/jquery.later.js
-- share/htdocs/vendor/jquery/jquery.periodicalupdater.js
-- share/htdocs/vendor/jquery/jquery.sparkline-2.0.js
 - share/htdocs/vendor/must_have_icon_set/.DS_Store
 - share/htdocs/vendor/must_have_icon_set/Add/Add.ico
 - share/htdocs/vendor/must_have_icon_set/Add/Add_16x16.png