rbbt-rest 1.8.49 → 1.8.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b3ef0c2f04da662a68fd4729dee7425fa498d08
-  data.tar.gz: e4f93230ea85e2bae395cf018d8973fb57949f68
+  metadata.gz: 2353b037a524b17202eeba541c81b11220769463
+  data.tar.gz: 83653dd0403aea86e2f04dbe69ea707d6b11a8f8
 SHA512:
-  metadata.gz: c27f130b5803e1b6160b9cb592f51ea78b5a7c0c5a58650076777b99501307a93c908ffb42ce074f85a1b8b7f52014fe633e2d47735cd255ea90fbb4c711155d
-  data.tar.gz: ed706eb2f01ef0b403ba75c86a3acfc587573235d0cf2afc6731fac4737c1455c966406061d334c157c0a34316cec625fd750e5c139c51276f9b24e6b41f6aed
+  metadata.gz: 2ed9395ef61e64290c4143ed93ccfd40a3e3904fba8947c8269440284cbc7f2d676dd1f0dcf075d70c1c1ca9f158dd4082e92dfe57f87777ce612cc36eb80a66
+  data.tar.gz: 796779a7265e0d94b15c5309c783a0c445a4df4be9f0d261d70b553910d231fe356add7b001ca37603c96d432b40c69d38ffe84b10ac3e986bcfaed52ec69381

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

@@ -150,7 +150,8 @@ module EntityRESTHelpers
     types.each do |type|
       next if path
       path = locate_server_file(["entity_list", type, action]*"/", resources, 'haml')
-      raise "This action was rejected: #{ action }" if reject_template(path,binding)
+      check_file = locate_server_file(["entity_list", type, action]*"/", resources, 'check')
+      raise "This action was rejected: #{ action }" if reject?(check_file, binding)
     end
 
     raise TemplateMissing, "Template not found for entity list action #{action} (#{list.annotation_types * ", "})" if path.nil?
@@ -165,9 +166,18 @@ module EntityRESTHelpers
     types << "Default"
 
     paths = types.inject([]) do |acc,type|
-      acc += glob_all_server_files(["entity_list", type, "*.haml"]*"/", resources).reject{|path|
-        reject_template(path,binding)
+      all_files  = glob_all_server_files(["entity_list", type, "*.haml"]*"/", resources)
+      all_checks = glob_all_server_files(["entity_list", type, "*.check"]*"/", resources)
+      rejected = []
+      all_checks.each do |check_file|
+        rejected << File.basename(check_file).sub('.check', '') if reject?(check_file, binding)
+      end
+
+      accepted = all_files.reject{|path|
+        rejected.include? File.basename(path).sub('.haml', '')
       }
+
+      acc += accepted
     end
 
     if check
@@ -224,7 +234,8 @@ module EntityRESTHelpers
     types.each do |type|
       next if path
       path = locate_server_file(["entity_map", type, action]*"/", resources, 'haml')
-      raise "This action was rejected: #{ action }" if reject_template(path, binding)
+      check_file = locate_server_file(["entity_map", type, action]*"/", resources, 'check')
+      raise "This action was rejected: #{ action }" if reject?(check_file, binding)
     end
 
     raise TemplateMissing, "Template not found for entity map action #{action} (#{field}--#{map.fields.first})" if path.nil?
@@ -245,9 +256,18 @@ module EntityRESTHelpers
     types += ["Default"]
 
     paths = types.inject([]) do |acc,type|
-      acc += glob_all_server_files(["entity_map", type, "*.haml"]*"/", resources).reject{|path|
-        reject_template(path,binding)
+      all_files  = glob_all_server_files(["entity_map", type, "*.haml"]*"/", resources)
+      all_checks = glob_all_server_files(["entity_map", type, "*.check"]*"/", resources)
+      rejected = []
+      all_checks.each do |check_file|
+        rejected << File.basename(check_file).sub('.check', '') if reject?(check_file, binding)
+      end
+
+      accepted = all_files.reject{|path|
+        rejected.include? File.basename(path).sub('.haml', '')
       }
+
+      acc += accepted
     end
 
     if check
@@ -260,8 +280,9 @@ module EntityRESTHelpers
 
     actions.select! do |action|
       begin
-        locate_entity_map_action_template(list, action)
+        locate_entity_map_action_template(map, action)
       rescue Exception
+        Log.exception $!
         false
       end
     end if check

data/share/views/tools/nvd3/multibar.haml

@@ -13,7 +13,6 @@
         .staggerLabels(true)
         .rotateLabels(45)      //Angle to rotate x-axis labels.
         .reduceXTicks(false)   //If 'false', every single x-axis tick label will be rendered.
-     // .rotateLabels(0)      //Angle to rotate x-axis labels.
      // .showControls(true)   //Allow user to switch between 'Grouped' and 'Stacked' mode.
      // .groupSpacing(0.1)    //Distance between each group of bars.
      //;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.8.49
+  version: 1.8.50
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-05 00:00:00.000000000 Z
+date: 2017-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake