omf_web 0.9.7 → 0.9.8

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

@@ -14,17 +14,17 @@ 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
+    # @@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
@@ -32,17 +32,17 @@ module OMF::Web
     # 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.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
@@ -57,23 +57,21 @@ module OMF::Web
 
     attr_reader :name, :top_dir
     
-    def initialize(name, top_dir)
-      @name = name
-      @top_dir = top_dir
-      @repo = Grit::Repo.new(top_dir)
-      @url_prefix = "git:#{name}:"
-      #@@git_repositories['git:foo'] = self
+    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
+    # 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
@@ -87,9 +85,9 @@ module OMF::Web
     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 = {}
       descr[:url] = url      
       descr[:url_key] = key
       descr[:path] = path      
@@ -119,6 +117,12 @@ module OMF::Web
       end
     end
     
+    # Return a URL for a path in this repo
+    # 
+    def get_url_for_path(path)
+      @url_prefix + path
+    end
+    
     
     
     #
@@ -148,7 +152,7 @@ module OMF::Web
           if long_name.match(search_pattern)
             mt = mime_type_for_file(e.name)
             path = @url_prefix + long_name
-            res << {:path => path, :name => e.name,
+            res << {:path => path, url => url_for_path(path), :name => e.name,
                     :mime_type => mt,
                     #:id => Base64.encode64(long_name).gsub("\n", ''), 
                     :size => e.size, :blob => e.id}

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

@@ -0,0 +1,191 @@
+
+require 'find'
+require 'omf_common/lobject'
+require 'omf_web'
+require 'omf-web/content/content_proxy'
+require 'omf-web/content/repository'
+require 'irods4r'
+
+module OMF::Web
+
+  # This class provides an interface to a directory based repository
+  # It retrieves, archives and versions content.
+  #
+  class IRodsContentRepository < ContentRepository  
+    
+    @@irods_repositories = {}
+    
+    # Return the repository which is referenced to by elements in 'opts'.
+    #
+    #
+    def self.[](name)
+      unless repo = @@irods_repositories[name.to_sym]
+        raise "Unknown iRODS repo '#{name}'"
+      end
+      repo
+    end
+      
+    # Register an existing directory to the system. It will be 
+    # consulted for all content url's starting with
+    # 'irods:_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_file_repo(name, top_dir, is_primary = false)
+      name = name.to_sym
+      if @@irods_repositories[name]
+        warn "Ignoring repeated registration of iRODS rep '#{name}'"
+        return
+      end
+      repo = @@irods_repositories[name] = self.new(name, top_dir)
+      if is_primary
+        @@primary_repository = repo
+      end
+    end
+    
+    attr_reader :name, :top_dir
+    
+    def initialize(name, opts)
+      super
+      unless @top_dir
+        raise "No top_dir defined (#{opts.keys.inspect})"
+      end
+      @url_prefix = "irods:#{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 = get_url_for_path(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])
+       return nil if IRODS4r.exists?(path)
+      end
+      proxy = ContentProxy.create(descr, self)
+      return proxy
+    end
+        
+    def write(content_descr, content, message)
+      path = _get_path(content_descr)
+      #puts "WRITE PATHS>>> #{path}"
+      f = IRODS4r::File.create(path, false)
+      f.write(content)
+    end
+    
+    def read(content_descr)
+      path = _get_path(content_descr)
+      #puts "READ PATHS>>> #{path}"
+      f = IRODS4r::File.create(path, false)
+      f.read()
+    end    
+    
+    #
+    # Return an array of file names which are in the repository and
+    # match 'search_pattern'
+    #
+    def find_files(search_pattern, opts = {})
+      begin
+        dir = IRODS4r.find(@top_dir)
+      rescue IRODS4r::IRODS4rException
+        return []
+      end
+      res = []
+      _find_files(search_pattern, dir, res, opts[:mime_type])
+      res
+    end
+    
+    def _find_files(search_pattern, dir, res, mime_type)
+      dir.list.each do |e|
+        if e.directory?
+          _find_files(search_pattern, e, res, mime_type)
+        else
+          path = e.path
+          if path.match(search_pattern)
+            mt = mime_type_for_file(path)
+            next if mime_type != nil && mime_type != mt 
+            res << {:url => get_url_for_path(path), :path => path, #:name => 'foo',
+                    :mime_type => mt}
+          end
+        end
+      end
+      res
+    end
+    
+    
+    # Return a URL for a path in this repo
+    # 
+    def get_url_for_path(path)
+      puts "PATH>>>>> '#{path}:#{path.class}'-'#{@top_dir}:#{@top_dir.class}'"
+      if m = path.match("#{@top_dir}(.*)")
+        path = m[1]
+      end
+      url = @url_prefix + path
+    end
+    
+    # HACK ALERT!!!
+    # 
+    # This method may be called by an entity which wants to access the content
+    # directly through the file system. In the absence of a FUSE mounted iRODS 
+    # repo, we 'iget' the resource to a temporary directory and return that 
+    # path. The calling entity needs to be aware that any changes to that file
+    # will NOT show up in iRODS without an iput.
+    #
+    # This should really NOT be necessary. Use FUSE
+    #
+    def absolute_path(content_descr)
+      path = _get_path(content_descr)
+      
+      require 'etc'
+      tmp_dir = "#{Dir::tmpdir}/LabWiki-#{Etc.getlogin}"
+      # unless Dir.exists? tmp_dir
+        # Dir.mkdir tmp_dir, 0700
+      # end
+      
+      target = File.join(tmp_dir, path)
+      IRODS4r::ICommands.export(path, target)
+      target
+    end
+
+    
+    def _get_path(content_descr)
+      #puts ">>>GET PATH #{content_descr.inspect}"
+      if content_descr.is_a? String
+        path = content_descr.to_s
+        if path.start_with? 'irods:'
+          path = File.join(@top_dir, path.split(':')[2])
+        end
+      elsif content_descr.is_a? Hash
+        descr = content_descr
+        unless path = descr[:path]
+          if url = descr[:url]
+            path = File.join(@top_dir, url.split(':')[2]) # irods:repo_name:path
+          end
+        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
+    end
+              
+  end # class
+end # module

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

@@ -22,8 +22,48 @@ module OMF::Web
       :txt => 'text' 
     }
     
+    REPO_PLUGINS = {
+      git: lambda do |name, opts|
+              require 'omf-web/content/git_repository' 
+              return GitContentRepository.new(name, opts)
+          end,
+      file: lambda do |name, opts|
+              require 'omf-web/content/file_repository' 
+              return FileContentRepository.new(name, opts)
+          end,
+      irods: lambda do |name, opts|
+              require 'omf-web/content/irods_repository' 
+              return IRodsContentRepository.new(name, opts)
+          end,
+      static: lambda do |name, opts|
+              require 'omf-web/content/static_repository' 
+              return StaticContentRepository.new(name, opts)
+          end
+    }
+    
     # Repo to be used for all newly created content
     @@primary_repository = nil
+    @@repositories = {}
+    
+    def self.register_repo(name, opts)
+      raise "ArgumentMismatch: Expected Hash, but got #{opts}" unless opts.is_a? Hash
+      
+      name = name.to_sym
+      if @@repositories[name]
+        warn "Ignoring repeated registration of repo '#{name}'"
+        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 = repo_creator.call(name, opts)
+      @@primary_repository = r if opts[:is_primary]
+    end
+    
      
     # Load content described by either a hash or a straightforward url
     # and return a 'ContentProxy' holding it.
@@ -39,7 +79,13 @@ module OMF::Web
       if url_or_descr.is_a? String
         url = url_or_descr
       else
-        url = url_or_descr[:url]
+        if (text = url_or_descr[:text])
+          # a bit of a hack for small static text blocks
+          # Much better for maintenance is to use a separate file
+          url = "static:-"
+        else
+          url = url_or_descr[:url]
+        end
       end
       unless url
         throw "Can't find url in '#{url_or_descr.inspect}"
@@ -49,19 +95,6 @@ module OMF::Web
       repo.create_content_proxy_for(url_or_descr)
     end
     
-    def self.find_repo_for(url)
-      parts = url.split(':')
-      case type = parts[0]
-      when 'git'
-        require 'omf-web/content/git_repository' 
-        return GitContentRepository[parts[1]]
-      when 'file'
-        require 'omf-web/content/file_repository' 
-        return FileContentRepository[parts[1]]
-      else
-        raise "Unknown repo type '#{type}'"
-      end
-    end
     
     def self.absolute_path_for(url)
       find_repo_for(url).absolute_path(url)
@@ -71,6 +104,16 @@ module OMF::Web
       find_repo_for(url).read(url)
     end
     
+    def self.find_repo_for(url)
+      parts = url.split(':')
+      name = parts[1]
+      unless repo = @@repositories[name.to_sym]
+        raise "Unknown repo '#{name}'"
+      end
+      return repo
+    end
+    
+    
     # Find files whose file name matches 'selector'. 
     # 
     # Supported options:
@@ -96,16 +139,29 @@ module OMF::Web
     end
     
     
-
-    attr_reader :top_dir
+    attr_reader :name, :top_dir
+    
+    def initialize(name, opts)
+      @name = name
+      if @top_dir = opts[:top_dir]
+        @top_dir = File.expand_path(@top_dir)
+      end
+    end
     
-    def initialize(top_dir)
-      @top_dir = top_dir
-      @repo = Grit::Repo.new(top_dir)
+    #
+    # Return an array of file names which are in the repository and
+    # match 'search_pattern'
+    #
+    def find_files(search_pattern, opts = {})
+      raise "Missing implementation"
     end
     
     
-    def mime_type_for_file(fname)
+    def mime_type_for_file(content_descriptor)
+      fname = content_descriptor
+      if content_descriptor.is_a? Hash
+        fname = content_descriptor[:path]
+      end
       ext = fname.split('.')[-1]
       mt = MIME_TYPE[ext.to_sym] || 'text'
     end
@@ -126,7 +182,14 @@ module OMF::Web
       File.join(@top_dir, path)
     end
     
+    def path(content_descr)
+      path = _get_path(content_descr)
+    end
     
-          
+    # Return a URL for a path in this repo
+    # 
+    def get_url_for_path(path)
+      raise "Missing implementation"
+    end
   end # class
 end # module

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

@@ -0,0 +1,61 @@
+
+require 'omf_common/lobject'
+require 'omf_web'
+require 'omf-web/content/content_proxy'
+require 'omf-web/content/repository'
+require 'singleton'
+
+module OMF::Web
+  
+  # This class provides an interface to a repository of static,
+  # preloaded content.
+  #
+  class StaticContentRepository < ContentRepository  
+      
+    
+    # Load content described by either a hash or a straightforward path
+    # and return a 'ContentProxy' holding it.
+    #
+    # @return: Content proxy
+    #
+    def create_content_proxy_for(content_descr)
+      debug content_descr
+      if content_descr.is_a? String
+        content_descr = {text: content_descr}
+      end
+      descr = content_descr.dup
+      unless text = descr.delete(:text)
+        raise "Missing ':text' declaraton for static content"
+      end
+      
+      key = Digest::MD5.hexdigest(text)
+      @content[key] = text
+      descr[:url] = url = "static:" + key
+      descr[:url_key] = key
+      descr[:name] = content_descr[:name] || url # Should be something human digestable
+      proxy = ContentProxy.create(descr, self)
+      return proxy
+    end
+
+    def read(content_descr)
+      debug "READ: #{content_descr}"
+      @content[content_descr[:url_key]] || 'Unknown'
+    end
+           
+    def write(content_descr, content, message)
+      raise "READ ONLY"
+    end
+
+    def mime_type_for_file(content_descriptor)
+      content_descriptor[:mime_type] || 'text'
+    end
+
+    def initialize(name, opts)
+      super
+      @content = {}
+    end
+    
+    
+              
+  end # class
+end # module

data/lib/omf-web/data_source_proxy.rb

@@ -124,7 +124,7 @@ module OMF::Web
         block.call :added, rows
       end
       @data_source.on_content_changed(block.object_id) do |action, rows|
-        debug "on_changed: #{action}: #{rows.inspect}"
+        #debug "on_changed: #{action}: #{rows.inspect}"
         block.call action, rows
       end
     end
@@ -142,7 +142,7 @@ module OMF::Web
       sid = Thread.current["sessionID"]
       opts = opts.dup
       opts[:name] = @name
-      opts[:schema] = @data_source.schema
+      opts[:schema] = @data_source.schema.describe
       opts[:update_url] = "/_update/#{@name}?sid=#{sid}"
       opts[:sid] = sid
       unless opts[:slice] # don't send any data if this is a sliced one
@@ -150,7 +150,7 @@ module OMF::Web
         opts[:rows] = []
         opts[:offset] = @data_source.offset
       end
-      #puts "to_java2>>>>> #{opts.to_json.inspect}"
+      #puts "to_java2>>>>> #{opts.inspect}"
       
       %{
         OML.data_sources.register(#{opts.to_json});