rbbt-views 2.0.1 → 2.0.2

data/lib/rbbt/workflow/rest.rb

@@ -743,6 +743,8 @@ module WorkflowREST
                  result = step.load
 
                  case
+                 when workflow.task_info(task_name)[:result_type] == :binary
+                   send_file step.path
                  when workflow.task_info(task_name)[:result_type] == :annotations
                    Annotated.tsv(result, :all).to_s
                  when Array === result

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

@@ -38,7 +38,7 @@ module Entity
         klass += " " << options[:extra_classes] || "" if options.include? :extra_classes
         klass += " " << html_class if self.respond_to? :html_class
 
-        main_annotation = options[:entity_type] || annotation_types.select{|a| Entity === a}.last.to_s
+        main_annotation = options[:entity_type] || annotation_types.select{|a| a.include? Entity::REST}.last.to_s
         entity_type = self.respond_to?(:format)? main_annotation + 
           ":" + 
           CGI.escape(self.format || "") : main_annotation
@@ -93,7 +93,9 @@ module Entity
       path = list_file(entity_type, id) unless path != nil and File.exists? path
 
       begin
-        Annotated.load_tsv TSV.open(path)
+        list = Annotated.load_tsv TSV.open(path)
+        list.extend AnnotatedArray
+        list
       rescue
         nil
       end
@@ -138,17 +140,16 @@ module Entity
       klass += " " << options[:extra_classes] if options.include? :extra_classes
       klass += " " << html_class if self.respond_to? :html_class
 
-      main_annotation = options[:entity_type] || annotation_types.select{|a| Entity === a}.last.to_s
+      main_annotation = options[:entity_type] || annotation_types.select{|a| a.include? Entity::REST}.last.to_s
       entity_type = self.respond_to?(:format)? main_annotation + 
         ":" + 
         CGI.escape(self.format || "") : main_annotation
 
 
-      Entity::REST.save_list(annotation_types.last.to_s, id, self) unless reuse
+      Entity::REST.save_list(main_annotation, id, self) unless reuse
 
-      annotations_str = self.info(true).reject{|k,v| [:annotation_types, :format].include?(k)}.collect{|k,v| [k, CGI.escape(v.to_s)] * "="} * "&amp;"
 
-      "<a class='entity_list #{klass}' href='#{File.join("/entity_list", entity_type, CGI.escape(id)) + (! annotations_str.empty? ? '?' + annotations_str : "")}' title='#{text}'>#{text}</a>"
+      "<a class='entity_list #{klass}' href='#{File.join("/entity_list", entity_type, CGI.escape(id))}' title='#{text}'>#{text}</a>"
     end
 
     def action_link(action, text = nil, inputs = {})
@@ -181,14 +182,15 @@ module Entity
       klass += " " << options.delete(:extra_classes) if options.include? :extra_classes
       klass += " " << html_class if self.respond_to? :html_class
       
-      main_annotation = options[:entity_type] || annotation_types.select{|a| Entity === a}.last.to_s
+      main_annotation = options[:entity_type] || annotation_types.select{|a| a.include? Entity::REST}.last.to_s
+
       entity_type = self.respond_to?(:format)? main_annotation + 
         ":" + 
         CGI.escape(self.format || "") : main_annotation
 
-      Entity::REST.save_list(annotation_types.last.to_s, id, self) unless reuse
+      Entity::REST.save_list(main_annotation, id, self) unless reuse
 
-      annotations_str = self.info.merge(options).reject{|k,v| [:annotation_types, :format].include?(k)}.collect{|k,v| [k, CGI.escape(v.to_s)] * "="} * "&amp;"
+      annotations_str = options.collect{|k,v| [k, CGI.escape(v.to_s)] * "="} * "&amp;"
 
       "<a class='entity_list_action #{klass}' href='#{File.join("/entity_list_action", entity_type, action, CGI.escape(id)) + (!annotations_str.empty? ? '?' + annotations_str : "")}' title='#{text}'>#{text}</a>"
     end

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

@@ -77,7 +77,16 @@ module RbbtHTMLHelpers
     else
       Log.debug("Saving user defaults for #{key}")
       user_action_defaults.write_and_close do
-        user_action_defaults[key] = Hash[*(params.collect{|k,v| [k,v]}.flatten(1))]
+        begin
+          hash = {}
+          params.each{|k,v| hash[k.to_s.dup] = v.to_s.dup}
+          user_action_defaults[key.to_s.dup] = hash
+        rescue
+          Log.warn($!.message)
+          Log.warn("Error saving user defaults: #{[user, entity, action, params.inspect] * ", "}. Erasing")
+          user_action_defaults.delete key.dump
+          raise "Error saving default parameters. Cleared. Try reloading the page"
+        end
       end
     end
   end

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

@@ -282,7 +282,7 @@ module RbbtHTMLHelpers
                    end
 
     if entity_class
-      entity_class.setup(entity, *locals.values_at(*entity_class.all_annotations).collect{|v| 
+      entity_class.setup(entity, *locals.values_at(*entity_class.annotations).collect{|v| 
         case v
         when "false"
           false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-views
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-09 00:00:00.000000000 Z
+date: 2013-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra