rbbt-rest 1.2.1 → 1.2.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDZjZjkwNzc2MzI5YmZjMjhhMWY0ODY3NmQwMjI4NTZiZDQ2ZjA5ZQ==
+    YjJlNWNkNzk5Y2Q2NDIyNDI0MjNhYjcxYTQ4OTY4ZTYxYWQyNzkwYw==
   data.tar.gz: !binary |-
-    OWQzNDM0MTA2MDE1OGI4Nzk0ODk1OTQzZGNiYTNiYjNhNThjNGY1YQ==
+    YjllNzlmNDdmYTM4M2ViOTE3MThjM2NhNTViZWY1Y2IzZTMwZmFkNA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MWUyYzc0N2NlODZjMzRhMzU1Zjg0YjY2MTkwMzdjMzFiNmI4ODgzYjA4NjI1
-    NTMzNGUwZjM0YWJiMjVkMmM3NzE4YjIwZjMyZmUyZDM0YjJmOWU3OGRlYjA1
-    MDFhZjRmNWQ2MGMwZGY1N2I4NzI3MDNhOTBmMmYwMWIzMThkYzE=
+    MTRkYjEwOWM1YzczNjI5MTZiZWUyYTcwYjlhOTkyNjYwYTI5NDA4YzljOTE3
+    NWFmZDAyM2Y0ODk0Yzc5NjJlYWU5Yjg1YjkxOWQ2MDNhY2I5N2JkYzY3ZjEx
+    ODViNzRlODQ3NDQ1OTYzYzExZDhmMmRmY2ExODRlNTU3MWFiNjY=
   data.tar.gz: !binary |-
-    ZGEyNDMwMzE3NzBmMmQ2NDIxMmMxYjA1ODc1OWZiMDE2ZDk3Y2NmMjczZDRl
-    OTM5NGJiZWNjOWIxMmViYmI2M2QyN2MxM2ExMDA5MDg5NzUwNWMyN2QxYmFh
-    MGRlZTk2NTg5OTJlYmViYjExYzQ2YWZlYzMzZDZmZTRjOWY3YTY=
+    MjA0ZDMwNzk1OGYxMjUxYzg2YmQ2ZmUyZWY3YzQ3NmVmYjVlNzkxMTExOWIx
+    MjIxYWQ1NGM1MTNiZmM3YjkxNWY4MTk0NTcyNGI5ODMyZTk3NWFiZTBmZjY5
+    NGE0MzliNGIxYTdjZWNkZjUwYWQ3ZDQ0NTgyOTJlZTM3NWY0ZGU=

data/lib/rbbt/rest/common/table.rb

@@ -134,12 +134,31 @@ module RbbtRESTHelpers
     if filter and filter.to_s != "false"
       filter.split(";;").each do |f|
         key, value = f.split("~")
+
+        #invert
         if value =~ /^!\s*(.*)/
           value = $1
           invert = true
         else
           invert = false
         end
+
+        #name
+        if value =~ /^:name:\s*(.*)/
+          value = $1
+          name = true
+        else
+          name = false
+        end
+
+        if name
+          old_tsv = tsv
+          tsv = tsv.reorder(:key, key).add_field "NAME" do |k,values|
+            NamedArray === values ? values[key].name : values.name
+          end
+          key = "NAME"
+        end
+        
         case
         when value =~ /^([<>]=?)(.*)/
           tsv = tsv.select(key, invert){|k| k = k.first if Array === k; k.to_f.send($1, $2.to_f)}
@@ -150,9 +169,12 @@ module RbbtRESTHelpers
         else
           tsv = tsv.select({key => value}, invert)
         end
+
+        tsv = old_tsv.select(tsv.keys) if name
       end
     end
 
+
     tsv = tsv.column(column) if column and not column.empty?
 
     tsv
@@ -261,7 +283,13 @@ module RbbtRESTHelpers
       tsv.entity_templates.each do |field,template|
         next if options[:headers].include? field
         next if template.nil?
-        options[:headers][field] = [template.annotation_types.last.to_s, template.info]
+
+        info = template.info
+        info.delete :format
+        info.delete :annotation_types
+        info.delete :annotated_array
+
+        options[:headers][field] = [template.annotation_types.last.to_s, info]
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-22 00:00:00.000000000 Z
+date: 2013-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake