omf_web 1.2.5 → 1.2.6

data/lib/omf-web/content/content_proxy.rb

@@ -5,31 +5,34 @@ require 'omf_web'
 
 module OMF::Web
 
+  # TODO: Is this really the right description???
+  #
   # This object maintains synchronization between a JS DataSource object
   # in a web browser and the corresponding +OmlTable+ in this server.
   #
   #
   class ContentProxy < OMF::Base::LObject
 
-    @@proxies = {}
-
-    def self.[](url)
-      @@proxies[url.to_s]
+    def self.[](key)
+      #key = Digest::MD5.hexdigest(url)
+      OMF::Web::SessionStore[key, :content_proxy]
     end
 
+    # content_descriptor: url, mime_type, name
     def self.create(content_descr, repo)
-      unless key = content_descr[:url_key]
-        raise "Missing ':url_key' in content descriptor '#{content_descr.inspect}'"
+      unless url = content_descr[:url]
+        raise "Missing ':url' in content descriptor '#{content_descr.inspect}'"
       end
-      if proxy = @@proxies[key]
+      key = Digest::MD5.hexdigest(url)
+
+      if proxy = OMF::Web::SessionStore[key, :content_proxy]
         return proxy
       end
-      debug "Create content proxy for '#{key}' (#{content_descr.inspect})"
-      @@proxies[key] = self.new(content_descr, repo)
+      debug "Create content proxy for '#{url}' (#{content_descr.inspect})"
+      self.new(key, content_descr, repo)
     end
 
-    attr_reader :content_descriptor, :content_url, :content_id, :name, :mime_type, :repository
-
+    attr_reader :content_descriptor, :content_url, :name, :mime_type, :repository
 
     def on_get(req)
       c = content()
@@ -71,20 +74,30 @@ module OMF::Web
       @repository.create_content_proxy_for(url)
     end
 
+    def read_only?
+      @repository.read_only?
+    end
+
+    def to_s
+      "\#<#{self.class} - #@name>"
+    end
+
     private
 
-    def initialize(content_descriptor, repository)
+    def initialize(key, content_descriptor, repository)
+      @key = key
       @content_descriptor = content_descriptor
       @repository = repository
       #@path = File.join(repository.top_dir, content_handle) # requires 1.9 File.absolute_path(@content_handle, @repository.top_dir)
 
-      @content_id = content_descriptor[:url_key]
-      @content_url = "/_content/#{@content_id}"  # That most likley should come from the content handler
+      #@content_id = content_descriptor[:url_key]
+      @content_url = "/_content/#{key}"  # That most likley should come from the content handler
 
       @mime_type = @content_descriptor[:mime_type] ||= repository.mime_type_for_file(content_descriptor)
       @name = content_descriptor[:name]
 
-      @@proxies[@content_id] = self
+      OMF::Web::SessionStore[key, :content_proxy] = self
+      #@@proxies[@content_id] = self
     end
 
   end

data/lib/omf-web/content/file_repository.rb

@@ -14,34 +14,7 @@ module OMF::Web
 
     def initialize(name, opts)
       super
-      @url_prefix = "file:#{name}:"
-    end
-
-    # Load content described by either a hash or a straightforward path
-    # and return a 'ContentProxy' holding it.
-    #
-    # If descr[:strictly_new] is true, return nil if file for which proxy is requested
-    # already exists.
-    #
-    # @return: Content proxy
-    #
-    def create_content_proxy_for(content_descr)
-      path = _get_path(content_descr)
-      # TODO: Make sure that key is really unique across multiple repositories
-      descr = descr ? descr.dup : {}
-      url = @url_prefix + path
-      key = Digest::MD5.hexdigest(url)
-      descr[:url] = url
-      descr[:url_key] = key
-      descr[:path] = path
-      descr[:name] = url # Should be something human digestable
-      if (descr[:strictly_new])
-        Dir.chdir(@top_dir) do
-          return nil if File.exist?(path)
-        end
-      end
-      proxy = ContentProxy.create(descr, self)
-      return proxy
+      #@url_prefix = "file:#{name}:"
     end
 
     def write(content_descr, content, message)
@@ -60,36 +33,22 @@ module OMF::Web
       end
     end
 
-    # Return a URL for a path in this repo
     #
-    def get_url_for_path(path)
-      "file:#{path}"
-    end
-
-    def _get_path(content_descr)
-      if content_descr.is_a? String
-        path = content_descr.to_s
-        if path.start_with? 'file:'
-          path = path.split(':')[2]
-        end
-      elsif content_descr.is_a? Hash
-        descr = content_descr
-        if (url = descr[:url])
-          path = url.split(':')[2] # git:repo_name:path
-        else
-          path = descr[:path]
-        end
-        unless path
-          raise "Missing 'path' or 'url' in content description (#{descr.inspect})"
-        end
-        path = path.to_s
-      else
-        raise "Unsupported type '#{content_descr.class}'"
-      end
-      unless path
-        raise "Can't find path information in '#{content_descr.inspect}'"
-      end
-      return path
+    # Return an array of file names which are in the repository and
+    # match 'search_pattern'
+    #
+    def find_files(search_pattern, opts = {})
+      Dir.chdir(@top_dir)
+      Dir.glob("**/*#{search_pattern}*").map do |path|
+        next if File.directory?(path)
+        mt = mime_type_for_file(path)
+        {
+          name: path,
+          url: get_url_for_path(path),
+          mime_type: mt,
+          size: File.size(path)
+        }
+      end.compact
     end
 
   end # class

data/lib/omf-web/content/git_repository.rb

@@ -14,94 +14,16 @@ module OMF::Web
   #
   class GitContentRepository < ContentRepository
 
-    # @@git_repositories = {}
-#
-    # # Return the repository which is referenced to by elements in 'opts'.
-    # #
-    # #
-    # def self.[](name)
-      # unless repo = @@git_repositories[name.to_sym]
-        # raise "Unknown git repo '#{name}'"
-      # end
-      # repo
-    # end
-
-    # Register an existing GIT repo to the system. It will be
-    # consulted for all content url's strarting with
-    # 'git:_top_dir_:'. If 'is_primary' is set to true, it will
-    # become the default repo for all newly created content
-    # in this app.
-    #
-    # def self.register_git_repo(name, top_dir, is_primary = false)
-      # name = name.to_sym
-      # if @@git_repositories[name]
-        # warn "Ignoring repeated registration of git rep '#{name}'"
-        # return
-      # end
-      # repo = @@git_repositories[name] = GitContentRepository.new(name, top_dir)
-      # if is_primary
-        # @@primary_repository = repo
-      # end
-    # end
-
-    # def self.read_content(url, opts)
-      # unless (a = url.split(':')).length == 3
-        # raise "Expected 'git:some_name:some_path', but got '#{url}'"
-      # end
-      # git, name, path = a
-      # unless (repo = @@repositories['git:' + name])
-        # raise "Unknown git repository '#{name}'"
-      # end
-      # repo.read(path)
-    # end
-
     attr_reader :name, :top_dir
 
     def initialize(name, opts)
       super
       @repo = Grit::Repo.new(@top_dir)
-      @url_prefix = "git:#{@name}:"
-    end
-
-    #
-    # Create a URL for a file with 'path' in.
-    # If 'strictly_new' is true, returns nil if 'path' already exists.
-    #
-    # def create_url(path, strictly_new = true)
-      # return "git:"
-      # # TODO: Need to add code to select proper repository
-      # return GitContentRepository.create_url(path, strictly_new)
-    # end
-
-
-    # Load content described by either a hash or a straightforward path
-    # and return a 'ContentProxy' holding it.
-    #
-    # If descr[:strictly_new] is true, return nil if file for which proxy is requested
-    # already exists.
-    #
-    # @return: Content proxy
-    #
-    def create_content_proxy_for(content_descr)
-      path = _get_path(content_descr)
-      # TODO: Make sure that key is really unique across multiple repositories
-      url = @url_prefix + path
-      key = Digest::MD5.hexdigest(url)
-      descr = {}
-      descr[:url] = url
-      descr[:url_key] = key
-      descr[:path] = path
-      descr[:name] = url # Should be something human digestable
-      if (descr[:strictly_new])
-        Dir.chdir(@top_dir) do
-          return nil if File.exist?(path)
-        end
-      end
-      proxy = ContentProxy.create(descr, self)
-      return proxy
     end
 
     def write(content_descr, content, message)
+      raise ReadOnlyContentRepositoryException.new if @read_only
+
       path = _get_path(content_descr)
       Dir.chdir(@top_dir) do
         d_name = File.dirname(path)
@@ -125,8 +47,6 @@ module OMF::Web
       @url_prefix + path
     end
 
-
-
     #
     # Return an array of file names which are in the repository and
     # match 'search_pattern'
@@ -136,10 +56,6 @@ module OMF::Web
       tree = @repo.tree
       res = []
       fs = _find_files(search_pattern, tree, nil, res)
-
-      # if (mt = opts[:mime_type])
-        # fs = fs.select { |f| File.fnmatch(mt, f[:mime_type]) }
-      # end
       fs
     end
 
@@ -160,44 +76,9 @@ module OMF::Web
                     #:id => Base64.encode64(long_name).gsub("\n", ''),
                     size: e.size, blob: e.id}
           end
-          # name = e.name
-          # if File.fnmatch(search_pattern, long_name)
-            # res << long_name
-          # end
         end
       end
       res
     end
-
-    def _get_path(content_descr)
-      if content_descr.is_a? String
-        path = content_descr.to_s
-        if path.start_with? 'git:'
-          path = path.split(':')[2]
-        end
-      elsif content_descr.is_a? Hash
-        descr = content_descr
-        if (url = descr[:url])
-          path = url.split(':')[2] # git:repo_name:path
-        else
-          path = descr[:path]
-        end
-        unless path
-          raise "Missing 'path' or 'url' in content description (#{descr.inspect})"
-        end
-        path = path.to_s
-      else
-        raise "Unsupported type '#{content_descr.class}'"
-      end
-      unless path
-        raise "Can't find path information in '#{content_descr.inspect}'"
-      end
-      if path.start_with? '/'
-        # Remove leading '/' .. need to stay within git directory tree
-        path = path[1 .. -1]
-      end
-      return path
-    end
-
   end # class
 end # module

data/lib/omf-web/content/irods_repository.rb

@@ -80,6 +80,8 @@ module OMF::Web
     end
 
     def write(content_descr, content, message)
+      raise ReadOnlyContentRepositoryException.new if @read_only
+
       path = _get_path(content_descr)
       #puts "WRITE PATHS>>> #{path}"
       f = IRODS4r::File.create(path, false, ticket: @ticket)

data/lib/omf-web/content/repository.rb

@@ -49,6 +49,18 @@ module OMF::Web
     @@primary_repository = nil
     @@repositories = {}
 
+    # Prepand this path if 'top_dir' starts with '.'
+    @@reference_dir = nil
+
+    # Prepand this path if 'top_dir' starts with '.'
+    def self.reference_dir=(dir)
+      @@reference_dir = dir
+    end
+
+    def self.reference_dir
+      @@reference_dir
+    end
+
     def self.register_repo(name, opts)
       raise "ArgumentMismatch: Expected Hash, but got #{opts}" unless opts.is_a? Hash
 
@@ -58,28 +70,45 @@ module OMF::Web
         return
       end
 
+      # unless type = opts[:type]
+        # raise "Missing type in repo opts (#{opts})"
+      # end
+      # unless repo_creator = REPO_PLUGINS[type.to_sym]
+        # raise "Unknown repository type '#{type}'"
+      # end
+
+      @@repositories[name] = r = create(opts)
+      @@primary_repository = r if opts[:is_primary]
+      r
+    end
+
+    def self.create(name, opts)
+      raise "ArgumentMismatch: Expected Hash, but got #{opts}" unless opts.is_a? Hash
+
       unless type = opts[:type]
         raise "Missing type in repo opts (#{opts})"
       end
       unless repo_creator = REPO_PLUGINS[type.to_sym]
         raise "Unknown repository type '#{type}'"
       end
-      @@repositories[name] = r = repo_creator.call(name, opts)
-      @@primary_repository = r if opts[:is_primary]
-      r
+      r = repo_creator.call(name, opts)
     end
 
 
+
     # Load content described by either a hash or a straightforward url
     # and return a 'ContentProxy' holding it.
     #
+    # @params
+    #    - :repo_iterator: Iterator over available repos
+    #
     # @return: Content proxy
     #
     def self.create_content_proxy_for(url_or_descr, opts = {})
-      debug "self.create_content_proxy_for: '#{url_or_descr.inspect}'"
       if url_or_descr.is_a? ContentProxy
         return url_or_descr
       end
+      debug "self.create_content_proxy_for: '#{url_or_descr.inspect}'"
 
       if url_or_descr.is_a? String
         url = url_or_descr
@@ -98,7 +127,8 @@ module OMF::Web
         throw "Can't find url in '#{url_or_descr.inspect}"
       end
 
-      repo = find_repo_for(url)
+      repo = find_repo_for(url, opts)
+      #puts ">>>>>> FOUND REPO: #{repo} for url #{url}"
       repo.create_content_proxy_for(url_or_descr)
     end
 
@@ -108,13 +138,21 @@ module OMF::Web
     end
 
     def self.read_content(url, opts)
-      find_repo_for(url).read(url)
+      find_repo_for(url, opts).read(url)
     end
 
-    def self.find_repo_for(url)
+    def self.find_repo_for(url, opts = {})
       parts = url.split(':')
-      name = parts[1]
-      unless repo = @@repositories[name.to_sym]
+      name = (parts[parts.length == 2 ? 0 : 1]).to_sym # old style: git:name:path, new style: name:path
+
+      repo = nil
+      #puts "REPO SELECTOR: >>>>>>>>> #{opts[:repo_iterator]}"
+      if opts[:repo_iterator]
+        repo = opts[:repo_iterator].find {|r| r.name == name}
+      else
+        repo = @@repositories[name.to_sym]
+      end
+      unless repo
         raise "Unknown repo '#{name}'"
       end
       return repo
@@ -160,13 +198,41 @@ module OMF::Web
     # opts read_only [Boolean] If true, write will fail
     def initialize(name, opts)
       @name = name
+      @url_prefix = "#{@name}:"
       @read_only = (opts[:read_only] == true)
 
       if @top_dir = opts[:top_dir]
+        if @top_dir.start_with?('.') && ContentRepository.reference_dir
+          @top_dir = File.join(ContentRepository.reference_dir, @top_dir)
+        end
         @top_dir = File.expand_path(@top_dir)
+        debug "Creating repo '#{name} with top dir: #{@top_dir}"
       end
     end
 
+    # Load content described by either a hash or a straightforward path
+    # and return a 'ContentProxy' holding it.
+    #
+    # If descr[:strictly_new] is true, return nil if file for which proxy is requested
+    # already exists.
+    #
+    # @return: Content proxy
+    #
+    def create_content_proxy_for(content_descr)
+      path = _get_path(content_descr)
+      # TODO: Make sure that key is really unique across multiple repositories - why?
+      descr = descr ? descr.dup : {}
+      url = get_url_for_path(path)
+      descr[:url] = url
+      descr[:path] = path
+      descr[:name] = url # Should be something human digestable
+      if (descr[:strictly_new])
+        return nil if exist?(path)
+      end
+      proxy = ContentProxy.create(descr, self)
+      return proxy
+    end
+
     #
     # Return an array of file names which are in the repository and
     # match 'search_pattern'
@@ -175,6 +241,19 @@ module OMF::Web
       raise "Missing implementation"
     end
 
+    # Return true if repo is read only. Any attempts to write to
+    # a read only repo will result in a 'ReadOnlyContentRepositoryException'
+    # exception.
+    #
+    def read_only?
+      @read_only
+    end
+
+    def exist?(path)
+      Dir.chdir(@top_dir) do
+        return nil if File.exist?(path)
+      end
+    end
 
     def mime_type_for_file(content_descriptor)
       fname = content_descriptor
@@ -209,10 +288,42 @@ module OMF::Web
       path = _get_path(content_descr)
     end
 
+    def _get_path(content_descr)
+      if content_descr.is_a? String
+        # Old style (file:name:path) vs. new style (name:path)
+        path = content_descr.split(':')[-1]
+        unless path
+          raise "Can't find path information in '#{content_descr.inspect}'"
+        end
+      elsif content_descr.is_a? Hash
+        if (url = content_descr[:url])
+          path = url.split(':')[-1]
+        else
+          path = content_descr[:path]
+        end
+        unless path
+          raise "Missing 'path' or 'url' in content description (#{content_descr.inspect})"
+        else
+          path = path.to_s
+        end
+      else
+        raise "Unsupported type '#{content_descr.class}'"
+      end
+
+      return path
+    end
+
+    #
     # Return a URL for a path in this repo
     #
     def get_url_for_path(path)
-      raise "Missing implementation"
+      @url_prefix + path
+    end
+
+    # Make the repo references less verbose
+    def to_s
+      #"\#<#{self.class}-#{@name} - #{@top_dir}>"
+      "\#<#{self.class}-#{@name}>"
     end
   end # class
 end # module

data/lib/omf-web/content/static_repository.rb

@@ -33,7 +33,7 @@ module OMF::Web
     # @return: Content proxy
     #
     def create_content_proxy_for(content_descr)
-      debug "CREATE CONTNT PROXY: #{content_descr}"
+      debug "CREATE CONTENT PROXY: #{content_descr}"
       if content_descr.is_a? String
         content_descr = {text: content_descr}
       end
@@ -57,7 +57,7 @@ module OMF::Web
     end
 
     def write(content_descr, content, message)
-      raise "READ ONLY"
+      raise ReadOnlyContentRepositoryException.new
     end
 
     def mime_type_for_file(content_descriptor)
@@ -72,4 +72,4 @@ module OMF::Web
 
 
   end # class
-end # module
+end # module

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

@@ -4,9 +4,9 @@ require 'omf-web/rack/rack_exceptions'
 require 'omf-web/content/content_proxy'
 
 module OMF::Web::Rack
-      
+
   class ContentHandler < OMF::Base::LObject
-    
+
     def call(env)
       req = ::Rack::Request.new(env)
       begin
@@ -17,6 +17,8 @@ module OMF::Web::Rack
         end
         method = "on_#{req.request_method().downcase}"
         body, headers = c_proxy.send(method.to_sym, req)
+      rescue OMF::Web::ReadOnlyContentRepositoryException
+        return [403, {"Content-Type" => 'text'}, "Read-only repository"]
       rescue MissingArgumentException => mex
         debug mex
         return [412, {"Content-Type" => 'text'}, [mex.to_s]]
@@ -28,12 +30,12 @@ module OMF::Web::Rack
       if headers.kind_of? String
         headers = {"Content-Type" => headers}
       end
-      [200, headers, [body]] 
+      [200, headers, [body]]
     end
   end # ContentHandler
-  
+
 end # OMF:Web
 
 
-      
-        
+
+

data/lib/omf-web/theme.rb

@@ -38,6 +38,20 @@ module OMF::Web::Theme
     @@search_order = search_order if search_order
   end
 
+  # Return a named renderer for this theme initialised with 'widget'
+  #
+  def self.create_renderer(name, widget)
+    name = name.to_sym
+    @@search_order.each do |theme|
+      if tr = @@additional_renderers[theme.to_s]
+        if klass = tr[name]
+          #self.require(name)
+          return klass.new(widget)
+        end
+      end
+    end
+    raise "Can't find class implementing renderer '#{name}' in '#{@@search_order.join(', ')}'"
+  end
 
   def self.require(name)
     name = name.to_sym
@@ -57,6 +71,6 @@ module OMF::Web::Theme
         #puts ">>>> #{le}"
       end
     end
-    raise "Can't find theme component '#{name}' in '#{@@search_order.join(', ')}"
+    raise "Can't find theme component '#{name}' in '#{@@search_order.join(', ')}'"
   end
-end
+end

data/lib/omf-web/thin/logging.rb

@@ -23,10 +23,13 @@ module Thin
 
     # Log a message to the console
     def log(msg)
-      (@logger ||= OMF::Base::LObject.new(self.class)).info(msg)
+      _logger.info(msg)
     end
     module_function :log
     public :log
+    alias :log_info log
+
+
 
     # Log a message to the console if tracing is activated
     def trace(msg=nil)
@@ -36,18 +39,20 @@ module Thin
 
 
       return unless msg
-      (@logger ||= OMF::Base::LObject.new(self.class)).debug(msg)
+      _logger.debug(msg)
     end
     module_function :trace
     public :trace
+    alias :log_trace trace
 
     # Log a message to the console if debugging is activated
     def debug(msg=nil)
       return unless msg
-      (@logger ||= OMF::Base::LObject.new(self.class)).debug(msg)
+      _logger.debug(msg)
     end
     module_function :debug
     public :debug
+    alias :log_debug debug
 
     # Log an error backtrace if debugging is activated
     #
@@ -58,9 +63,13 @@ module Thin
     def log_error(*args)
       e = args.last
       e ||= $!
-      (@logger ||= OMF::Base::LObject.new(self.class)).error(e)
+      _logger.error(e)
     end
     module_function :log_error
     public :log_error
+
+    def _logger()
+      @logger ||= OMF::Base::Loggable.logger(:thin)
+    end
   end
 end