marty 0.5.18 → 0.5.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a348a98b692037a2ab1dbc2d09d32d64be591374
-  data.tar.gz: bb8f318e11ba6164af0102b71c3edffbc852c78b
+  metadata.gz: 7b041dfaff63f5f2a9252330f8a9899b0f1323ed
+  data.tar.gz: 7dcea16c26b2f970166fa238570d25237120cc29
 SHA512:
-  metadata.gz: 60e777f722bdd38bea19a725018210bef66700acc5fb5c6b14356e4454deaf4dc9bcd2150bd6fc17c4de098c504f9c8706537943ecede9791b988ad3381f7204
-  data.tar.gz: e66099a715242f06fec907becf577f37d40c058125c6dd4244509b6443f9f8a62255d518e30faa2cd9c0936b506b6ae4fc872496b9994ba3b198b4462063f0cf
+  metadata.gz: 19f4a3eac575745e9f84f45d2816b9a915553e335bfb132f8061e6a2d5e40828ab86b1a7f3511f39919e8f57a860a2f89565018a267be5b571f98065cbe1db56
+  data.tar.gz: baf2d7634667b9a634410102c6b96698bbf1d9165a0015e40f299847f9d7adde9c56f4cb2ed4d5d4c2d132ec02d1b8cc8f2823fd4fa0ebc1b2c2c4f157848ca2

data/app/components/marty/report_form.rb

@@ -98,13 +98,21 @@ class Marty::ReportForm < Marty::Form
        var values = this.getForm().getValues();
        var data = Ext.encode(values);
 
+       var params = {data: data, reptitle: this.reptitle};
+
+       // very hacky -- when selected_testing is set, we assume we're
+       // testing and try to inline the result.
+       if (values["selected_testing"]) {
+          this.repformat = "txt";
+          params["disposition"] = "inline";
+       }
+
        var form = document.createElement("form");
+
        form.setAttribute("method", "post");
        form.setAttribute("action", "#{@@mount_path}/report."+this.repformat);
 
-       var params = {data: data, reptitle: this.reptitle};
-
-       for(var key in params) {
+       for (var key in params) {
           if (params.hasOwnProperty(key)) {
              var hiddenField = document.createElement("input");
              hiddenField.setAttribute("type", "hidden");
@@ -196,7 +204,12 @@ class Marty::ReportForm < Marty::Form
       items.empty?
 
     # add hidden fields for selected tag/script/node
-    items += [:selected_tag_id, :selected_script_name, :selected_node].map { |f|
+    items += [:selected_tag_id,
+              :selected_script_name,
+              :selected_node,
+              # just for testing
+              :selected_testing,
+             ].map { |f|
       {
         name:   f,
         xtype:  :textfield,

data/app/models/marty/tag.rb

@@ -36,7 +36,12 @@ class Marty::Tag < Marty::Base
   end
 
   def self.map_to_tag(tag_id)
+    # FIXME: this is really hacky. This function should not take so
+    # many different types of arguments.
+
     case tag_id
+    when Fixnum, /\A[0-9]+\z/
+      tag = find_by_id(tag_id)
     when String
       tag = find_by_name(tag_id)
       # if tag name wasn't found, look for a matching
@@ -46,15 +51,13 @@ class Marty::Tag < Marty::Base
         tag = find_match(Mcfly.normalize_infinity(posting.created_dt)) if
           posting
       end
-    when Fixnum
-      tag = find_by_id(tag_id)
     when nil
       tag = get_latest1
     else
       tag = tag_id
     end
 
-    raise "bad tag identifier #{tag_id || 'nil'}" unless tag.is_a? Marty::Tag
+    raise "bad tag identifier #{tag_id.inspect}" unless tag.is_a? Marty::Tag
     tag
   end
 

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "0.5.18"
+  VERSION = "0.5.19"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 0.5.18
+  version: 0.5.19
 platform: ruby
 authors:
 - Arman Bostani