rbbt-views 1.0.0 → 1.0.1

data/lib/rbbt/workflow/rest/render.rb

@@ -19,37 +19,53 @@ module RbbtHTMLHelpers
 
     # workflow = workflow.to_s unless workflow.nil? or String === workflow
 
-    path = case
-           when webapp_dir_views[workflow][task][file].exists?
-             webapp_dir_views[workflow][task][file]
-           when webapp_dir_views[task][file].exists?
-             webapp_dir_views[task][file]
-           when webapp_dir_views[workflow][file].exists?
-             webapp_dir_views[workflow][file]
-           when webapp_dir_views[file].exists?
-             webapp_dir_views[file]
-
-           when (not workflow_dir_views.nil? and workflow_dir_views[workflow][task][file].exists?)
-             workflow_dir_views[workflow][task][file]
-           when (not workflow_dir_views.nil? and workflow_dir_views[task][file].exists?)
-             workflow_dir_views[task][file]
-           when (not workflow_dir_views.nil? and workflow_dir_views[workflow][file].exists?)
-             workflow_dir_views[workflow][file]
-           when (not workflow_dir_views.nil? and workflow_dir_views[file].exists?)
-             workflow_dir_views[file]
-
-           when global_views[workflow][task][file].exists?
-             global_views[workflow][task][file]
-           when global_views[task][file].exists?
-             global_views[task][file]
-           when global_views[workflow][file].exists?
-             global_views[workflow][file]
-           when global_views[file].exists?
-             global_views[file]
-           else
-             raise "File not found: #{[workflow, task, file].compact * ", "}"
-           end
+    path = nil
+    [webapp_dir_views, workflow_dir_views, global_views].compact.each do |resource|
+      path = case
+             when resource[workflow][task][file].exists?
+               resource[workflow][task][file]
+             when resource[task][file].exists?
+               resource[task][file]
+             when resource[workflow][file].exists?
+               resource[workflow][file]
+             when resource[file].exists?
+               resource[file]
+             end
+      break unless path.nil?
+    end
 
+#    path = case
+#           when webapp_dir_views[workflow][task][file].exists?
+#             webapp_dir_views[workflow][task][file]
+#           when webapp_dir_views[task][file].exists?
+#             webapp_dir_views[task][file]
+#           when webapp_dir_views[workflow][file].exists?
+#             webapp_dir_views[workflow][file]
+#           when webapp_dir_views[file].exists?
+#             webapp_dir_views[file]
+#
+#           when (not workflow_dir_views.nil? and workflow_dir_views[workflow][task][file].exists?)
+#             workflow_dir_views[workflow][task][file]
+#           when (not workflow_dir_views.nil? and workflow_dir_views[task][file].exists?)
+#             workflow_dir_views[task][file]
+#           when (not workflow_dir_views.nil? and workflow_dir_views[workflow][file].exists?)
+#             workflow_dir_views[workflow][file]
+#           when (not workflow_dir_views.nil? and workflow_dir_views[file].exists?)
+#             workflow_dir_views[file]
+#
+#           when global_views[workflow][task][file].exists?
+#             global_views[workflow][task][file]
+#           when global_views[task][file].exists?
+#             global_views[task][file]
+#           when global_views[workflow][file].exists?
+#             global_views[workflow][file]
+#           when global_views[file].exists?
+#             global_views[file]
+#           else
+#             raise "File not found: #{[workflow, task, file].compact * ", "}"
+#           end
+
+    raise "File not found: #{[workflow, task, file].compact * ", "}" if path.nil?
     Log.debug "File #{[workflow, task, file].collect{|v| "'#{ v }'"} * ", "} located at #{ path }"
     path
   end
@@ -129,7 +145,6 @@ module RbbtHTMLHelpers
     [rows, total]
   end
 
-  #def workflow_render(file, workflow = nil, task = nil, locals = {}, &block)
   def workflow_render(file, *args, &block)
     locals = Hash === args.last ? args.pop : {}
 
@@ -247,10 +262,9 @@ module RbbtHTMLHelpers
 
     size = locals.delete(:_size) || locals.delete("_size") || :normal
 
-    workflow = WorkflowREST.workflows.last
-
     entity = locals[:entity]
 
+
     entity_class = case
                    when Entity.formats.include?(format)
                      Entity.formats[format] 
@@ -260,6 +274,8 @@ module RbbtHTMLHelpers
                      nil
                    end
 
+    workflow = Workflow === entity_class ? entity_class : WorkflowREST.workflows.last
+
     path = case
            when (entity.respond_to? :template and not entity.template.nil?)
              entity.template
@@ -330,9 +346,6 @@ module RbbtHTMLHelpers
     type, format = type.split ":"
 
     size = locals.delete(:_size) || locals.delete("_size") || :normal
-
-    workflow = WorkflowREST.workflows.last
-
     entity = locals[:entity]
 
     entity_class = case
@@ -344,6 +357,8 @@ module RbbtHTMLHelpers
                      nil
                    end
 
+    workflow = Workflow === entity_class ? entity_class : WorkflowREST.workflows.last
+
     path = case
            when (entity.respond_to? :action_template and Hash === entity.action_template and not entity.action_template[action].nil?)
              entity.action_template[action]
@@ -415,9 +430,10 @@ module RbbtHTMLHelpers
 
     size = locals.delete(:_size) || locals.delete("_size") || :normal
 
-    workflow = WorkflowREST.workflows.last
+    locals[:type] = type
+    locals[:format] = format
 
-    list = locals[:list] = Entity::REST.load_list(locals[:id])
+    list = locals[:list] = Entity::REST.load_list(locals[:type], locals[:id], user)
 
     entity_class = case
                    when Entity.formats.include?(format)
@@ -428,6 +444,8 @@ module RbbtHTMLHelpers
                      nil
                    end
 
+    workflow = Workflow === entity_class ? entity_class : WorkflowREST.workflows.last
+    
     path = case
            when (list.respond_to? :list_template and not list.list_template.nil?)
              list.list_template
@@ -436,7 +454,7 @@ module RbbtHTMLHelpers
            else
              path = nil
 
-             [format, type].compact.each do |file|
+             [format, type, "Default"].compact.each do |file|
                break unless path.nil?
                begin
                  case size.to_sym
@@ -457,24 +475,10 @@ module RbbtHTMLHelpers
                  next
                end
              end
-             raise "List Template not found for type, format: #{[type, format] * ", "}" if path.nil?
+             raise "List template not found for type, format: #{[type, format] * ", "}" if path.nil?
              path
            end
 
-    if entity_class
-      entity_class.setup(list, *locals.values_at(*entity_class.annotations).collect{|v| 
-        case v
-        when "false"
-          false
-        when "true"
-          true
-        else
-          v
-        end
-      })
-      list.format = format if list.respond_to? :format
-    end
-
     layout = locals[:_layout]
     layout = false if locals[:_xhr] and layout.nil?
     layout = true if layout.nil?
@@ -493,16 +497,15 @@ module RbbtHTMLHelpers
     end
   end
 
-  
+
 
   def entity_list_action_render(type, action, locals, &block)
     type, format = type.split ":"
 
     size = locals.delete(:_size) || locals.delete("_size") || :normal
 
-    workflow = WorkflowREST.workflows.last
-
-    list = locals[:list] = Entity::REST.load_list(locals[:id])
+    list = locals[:list] = Entity::REST.load_list(type, locals[:id], user)
+    locals[:type] = type
 
     entity_class = case
                    when Entity.formats.include?(format)
@@ -513,6 +516,8 @@ module RbbtHTMLHelpers
                      nil
                    end
 
+    workflow = Workflow === entity_class ? entity_class : WorkflowREST.workflows.last
+
     path = case
            when (list.respond_to? :list_action_template and Hash === list.list_action_template and not list.list_action_template[action].nil?)
              list.list_action_template[action]
@@ -547,20 +552,6 @@ module RbbtHTMLHelpers
              path
            end
 
-    if entity_class
-      entity_class.setup(list, *locals.values_at(*entity_class.annotations).collect{|v| 
-        case v
-        when "false"
-          false
-        when "true"
-          true
-        else
-          v
-        end
-      })
-      list.format = format if list.respond_to? :format
-    end
-
     layout = locals[:_layout]
     layout = false if locals[:_xhr] and layout.nil?
     layout = true if layout.nil?
@@ -577,7 +568,7 @@ module RbbtHTMLHelpers
     else
       renderer.render(self, locals, &block)
     end
- 
+
   end
 end
 

data/lib/rbbt/workflow/rest/util.rb

@@ -8,18 +8,130 @@ module Sinatra
       ENV.include? "RACK_ENV" and not ENV["RACK_ENV"].nil? and ENV['RACK_ENV'].downcase == "production"
     end
 
-    def cache(type, options)
+    def old_cache(path, check)
+      return false if check.nil?
+      return false if not File.exists? path
+      check = [check] unless Array === check
+      return check.select{|file| not File.exists?(file) or File.mtime(file) > File.mtime(path)}.any?
+    end
+
+    def cache(type, options, &block)
+      cache_type, update, check = Misc.process_options options, :cache_type, :update, :check
+      
+      check = [check] if not check.nil? and not Array === check
+
       name = type  + ":" + Misc.hash2md5(options)
+
       if production?
-        @@cache ||= Persist.open_tokyocabinet 'sinatra.cache', true
-        return @@cache[name] if @@cache.include? name
-        res = yield
-        Misc.lock @@cache.persistence_path do
-          @@cache.write
-          @@cache[name] = res 
-          @@cache.read
+        cache_type ||= :memory
+      else
+        cache_type = :none
+      end
+      
+      case cache_type.to_sym
+      when :sync, :synchronous
+
+        path = File.join(settings.cache_dir, "sinatra", name)
+        task = Task.setup(:name => "Sinatra cache", :result_type => :string, &block)
+        step = Step.new(path, task, nil, nil, self)
+
+        step.clean if old_cache(path, check)
+
+        begin
+          case
+          when (not step.started? and not update == 'check')
+            step.run
+          when (step.started? and update == 'reload')
+            step.clean
+            step.run
+          end
+        rescue
+        end
+
+        begin
+          case
+          when step.error?
+            status 500
+            status = step.status || "error"
+            messages = step.messages || []
+            backtrace = step.info[:backtrace] || []
+            step.clean
+            "<span class='cache_status'>" << status.to_s << "</span> " << "\n" <<
+            "<span class='cache_message'>" << messages.last << "</span> "  << "\n" <<
+            "<ul class='backtrace'>" + backtrace.collect{|line| "<li>" << line << "</li>"} * "\n"
+          when step.done?
+            step.load
+          else
+            if request.xhr? 
+              status 202
+              "<span class='cache_status'>" << (step.status || "starting").to_s << "</span>"
+            else
+              retry unless step.done? and not step.error?
+              step.load
+            end
+          end
         end
-        res
+
+
+      when :async
+
+        path = File.join(settings.cache_dir, "sinatra", name)
+        task = Task.setup(:result_type => :string, &block)
+        step = Step.new(path, task, nil, nil, self)
+
+        step.clean if old_cache(path, check)
+
+        case
+        when (not step.started? and not update == 'check')
+          step.fork
+          sleep 0.5
+          sleep 2 unless step.done?
+        when (step.started? and update == 'reload')
+          step.clean
+          step.fork
+          sleep 0.5
+          sleep 2 unless step.done?
+        end
+
+        begin
+          case
+          when (not step.started?)
+            status 202
+            "<span class='cache_status'>" << "not started" << "</span>"
+          when step.error?
+            status 500
+            status = step.status || "error"
+            messages = step.messages || []
+            backtrace = step.info[:backtrace] || []
+            step.clean
+            "<span class='cache_status'>" << status.to_s << "</span> " << "\n" <<
+            "<span class='cache_message'>" << messages.last << "</span> "  << "\n" <<
+            "<ul class='backtrace'>" + backtrace.collect{|line| "<li>" << line << "</li>"} * "\n"
+ 
+         when step.done?
+            step.load
+          else
+            if request.xhr? 
+              status 202
+              "<span class='cache_status'>" << (step.status || "starting").to_s << "</span>"
+            else
+              step.join
+              case
+              when step.error?
+                retry
+              when step.done? 
+                step.load
+              else
+                retry 
+              end
+            end
+          end
+        end
+
+      when :memory
+        @@cache ||= {}
+        @@cache.delete name if not check.nil?
+        @@cache[name] ||= yield
       else
         yield
       end
@@ -40,14 +152,14 @@ module Sinatra
       @result_cache[workflow][task] ||= {}
       @result_cache[workflow][task][jobname] ||= yield
     end
- 
+
     def context_job(workflow, task)
       return nil if not defined? session
       return nil if not session.include? "context"
       return nil if not session["context"].include? workflow
       return nil if not session["context"][workflow].include? task
       jobname = session["context"][workflow][task]
-      
+
       if authorized?
         real_jobname = File.join(user, jobname)
       else
@@ -154,6 +266,7 @@ module Sinatra
 
       page = params.delete :_page
 
+
       filter = params.delete :_filter
 
       size = params.delete(:_size) || params.delete("_size")

data/share/views/compass/form.sass

@@ -9,7 +9,6 @@ span.task_description
   display: block
   font-size: 1.5em
   margin-bottom: 25px
-  border-bottom: solid 1px 
 
 form.task
 

data/share/views/compass/layout.sass

@@ -51,7 +51,7 @@ ul.job_control
     margin-right: 15px
 
 #content
-  +column(19)
+  width: 100%
   #main
     width: auto
     padding: 10px
@@ -108,7 +108,7 @@ a.entity, a.entity_list, a.entity_action, a.entity_list_action
   white-space: nowrap
   word-spacing: 0px
 
-a.replace
+a.replace, a.check_replace
   +border_radius(4px, 4px)
   +shadowed_box()
   display: inline-block
@@ -131,3 +131,94 @@ span.user
 
 a.button
   +button_link()
+ 
+span.cache_status
+  margin: 0px 15px
+  color: gray
+  text-decoration: none
+
+span.note
+  color: gray
+
+.embedded
+  position: relative
+  & > span.cache_status
+    position: absolute
+    top: 9px
+    right: 150px
+    text-align: center
+    color: red
+
+header, .contracted_embedded
+  font-size: 1.8em
+  ul.embedded_control
+    float: right
+    font-size: 12px
+    +clean_list()
+    li > a
+      +button_link()
+      margin-left: 3px
+      
+a.retry_error, a.start_checked
+  +button_link()
+
+.selected_entity
+  font-weight: bold
+
+#lists
+  position: absolute
+  top: 40px
+  right: 10px
+  width: auto
+  min-width: 300px
+  padding: 20px
+  padding-left: 30px
+  background-color: #fefefe
+  +shadowed_box 
+  ul.entity_list
+    li
+      display: block
+
+
+span.list_dropdown
+  float: right
+  margin-right: 20px
+  a
+    +button_link
+    color: gray
+
+a.remove_list, a.select_list
+  font-size: 0.7em
+  +button_link
+
+a.view_list
+  margin-left: 10px
+
+#lists
+  display: none
+  ul
+    +clean_list()
+  a
+    text-decoration: none
+
+a.remove_entity_from_list
+  +button_link()
+
+.edit_controls
+  padding: 10px
+  display: none
+
+a.open_edit_controls
+  +button_link()
+
+h5.loaded_lists
+  margin: 5px 0px
+  font-style: italic
+
+.list_control
+  header
+    font-size: 1.2em
+    span.list_id
+      font-style: italic
+  a
+    +button_link()