rbbt-rest 1.2.0 → 1.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDEwYTAxNGNmZTM1OTk0MTIwM2JiZWRlOGM4NjVlNTE1M2M3MTE0MA==
+    NDZjZjkwNzc2MzI5YmZjMjhhMWY0ODY3NmQwMjI4NTZiZDQ2ZjA5ZQ==
   data.tar.gz: !binary |-
-    NzYzOGQ3M2E3NmRkMzkzMDBlYjMxNjdiYjNhMzFjOGMwZWFkZGFhZg==
+    OWQzNDM0MTA2MDE1OGI4Nzk0ODk1OTQzZGNiYTNiYjNhNThjNGY1YQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZGZlZjJkMjdhZDIxOTVhZjBmOGRhOGFmMDY5Y2I5N2RhODFlM2RiYmE3YjI2
-    ODNhMjJjNTIwNmE2MzA2ZWZjMGFmNzQ2NzkwNmFhMTg4MTBhNTQxYTJiNDEx
-    NzEzNmJmMjRjNjljMDJkOGViOTQ4OWM3YWIwOWEyYmU3YzlkNzE=
+    MWUyYzc0N2NlODZjMzRhMzU1Zjg0YjY2MTkwMzdjMzFiNmI4ODgzYjA4NjI1
+    NTMzNGUwZjM0YWJiMjVkMmM3NzE4YjIwZjMyZmUyZDM0YjJmOWU3OGRlYjA1
+    MDFhZjRmNWQ2MGMwZGY1N2I4NzI3MDNhOTBmMmYwMWIzMThkYzE=
   data.tar.gz: !binary |-
-    OWNhNTk4MjJjZGMxOWE4MmE0MmExMzYyZGFjY2QwMWIyOGQzYzZiOWJkNDU1
-    MjkwNDIxNjFhMGQzNTgxYTM2MWNiMDdmZTllMWI0MDJjMTljMjY0ZWQ4ZTlk
-    ZTQ2ZmM0NzIwODQ3NDg1ZThjZDhlZjEwYmU0YTZjNDJiNjE0ZjQ=
+    ZGEyNDMwMzE3NzBmMmQ2NDIxMmMxYjA1ODc1OWZiMDE2ZDk3Y2NmMjczZDRl
+    OTM5NGJiZWNjOWIxMmViYmI2M2QyN2MxM2ExMDA5MDg5NzUwNWMyN2QxYmFh
+    MGRlZTk2NTg5OTJlYmViYjExYzQ2YWZlYzMzZDZmZTRjOWY3YTY=

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

@@ -17,16 +17,11 @@ module RbbtRESTHelpers
   end
 
   def wait_on(job, layout = nil)
-    ddd "wait"
     3.times do
       sleep 1
     end
-    ddd job.status
-    ddd job.done?
-    ddd job.error?
-    raise RbbtRESTHelpers::Retry if job.done? or job.error?
 
-    ddd "Render"
+    raise RbbtRESTHelpers::Retry if job.done? or job.error?
 
     layout = @layout if layout.nil?
 

data/lib/rbbt/rest/knowledge_base.rb

@@ -11,6 +11,8 @@ module Sinatra
       base.module_eval do
         helpers KnowledgeBaseRESTHelpers
 
+        #{{{ Children
+
         get '/knowledge_base/:name/:database/entity_children/:entity' do
           name = consume_parameter :name
           database = consume_parameter :database
@@ -30,6 +32,7 @@ module Sinatra
           end
         end
 
+        # List children
         post '/knowledge_base/:name/:database/entity_list_children/' do
           name = consume_parameter :name
           database = consume_parameter :database
@@ -55,6 +58,7 @@ module Sinatra
           end
         end
 
+        # Collection children
         post '/knowledge_base/:name/:database/entity_collection_children' do
           name = consume_parameter :name
           database = consume_parameter :database
@@ -86,7 +90,7 @@ module Sinatra
           end
         end
 
-        # Neighbours
+        #{{{ Neighbours
 
         get '/knowledge_base/:name/:database/entity_neighbours/:entity' do
           name = consume_parameter :name
@@ -118,7 +122,7 @@ module Sinatra
 
           entities = entities.split("|")
 
-          kb = get_kb name
+          kb = get_knowledge_base name
 
           children = {}
           entities.each do |entity|
@@ -145,7 +149,7 @@ module Sinatra
 
           entities = JSON.parse(entities)
 
-          kb = get_kb name
+          kb = get_knowledge_base name
 
           neighbours = {}
           entities.each do |type,list|
@@ -179,159 +183,6 @@ module Sinatra
           when :html
           end
         end
-
-        #{{{ OLD
-
-        get '/knowledge_base/entity/:name/:database/:entity' do
-          name = consume_parameter :name
-
-          database = consume_parameter :database
-          entity = consume_parameter :entity
-
-          kb = get_kb name
-          found = kb.identify database, entity
-          raise ParameterException, "Entity #{entity} was not found" unless found
-
-          list = kb.neighbours(database, found).values.select{|l| l.any?}.first.target_entity
-
-          case @format
-          when :json
-            content_type "application/json"
-            halt 200, list_json(list || [])
-          when :html
-            template_render('entity_partials/entity_list', :list => list)
-          end
-        end
-
-        get '/knowledge_base/entities/:name/:database' do
-          name = consume_parameter :name
-          database = consume_parameter :database
-          entities = consume_parameter(:entities).split("|")
-
-          kb = get_kb name
-
-          entity_neighbours = {}
-          entities.each do |entity|
-            found = kb.identify database, entity
-            next unless found
-            list = kb.neighbours(database, found).values.select{|l| l.any?}.first.target_entity
-            entity_neighbours[entity] = list
-          end
-
-          case @format
-          when :json
-            content_type "application/json"
-            hash = {}
-            entity_neighbours.each do |entity, list|
-              hash[entity] = list_hash(list)
-            end
-            halt 200, hash.to_json
-          when :html
-            template_render('entity_partials/entity_list', :list => list)
-          end
-        end
-
-        get '/knowledge_base/entity/:name/:entity' do
-          name = consume_parameter :name
-          database = consume_parameter :database
-          entity = consume_parameter :entity
-
-          kb = get_kb name
-
-          lists = {}
-          kb.all_databases.collect do |database|
-            found = kb.identify database, entity
-            next unless found
-            matches = kb.neighbours(database, found).values.select{|l| l.any?}.first
-            next if matches.nil?
-            lists[database] = matches.target_entity
-          end
-
-          case @format
-          when :json
-            content_type "application/json"
-            halt 200, lists.each{|database,entities| lists[database] = list_hash(entities || []) }.to_json
-          when :html
-            template_render('knowledge_base_partials/knowledge_base_matches', :matches => lists, :knowledge_base => kb)
-          end
-        end
-
-        #{{{ Hash 
-        
-        post '/knowledge_base/associations' do
-          knowledge_base = consume_parameter :knowledge_base
-          knowledge_base = get_knowledge_base(knowledge_base)
-
-          namespace = consume_parameter :namespace
-
-          databases = consume_parameter(:databases) || consume_parameter(:database)
-          databases = databases.nil? ? knowledge_base.all_databases : databases.split("|")
-
-          entities = consume_parameter :entities
-          entities = JSON.parse(entities)
-
-          subset = {}
-          databases.each do |database|
-            subset[database] = knowledge_base.subset(database, entities)
-          end
-
-          case @format
-          when :json
-            content_type "application/json"
-            halt 200, subset.each{|database,entities| subset[database] = list_hash(entities || []) }.to_json
-          when :html
-            template_render('entity_partials/associations', :matches => matches, :entities => entities)
-          end
-        end
-
-        post '/knowledge_base/neighbours' do
-          knowledge_base = consume_parameter :knowledge_base
-          knowledge_base = get_knowledge_base(knowledge_base)
-
-          namespace = consume_parameter :namespace
-
-          database = consume_parameter(:database)
-
-          entities = consume_parameter :entities
-          entities = JSON.parse(entities)
-
-          all_neighbours = {}
-          entities.collect{|source_type,list|
-            list.each do |entity|
-
-              target_type = knowledge_base.target_type(database)
-              source_type = knowledge_base.source_type(database)
-
-              neighbours = knowledge_base.neighbours(database, entity)
-
-              children = neighbours[:children] 
-              if children.any?
-                all_neighbours[target_type] ||= []
-                all_neighbours[target_type].concat children.target
-              end
-
-              parents = neighbours[:parents]
-              if parents and parents.any?
-                all_neighbours[source_type] ||= []
-                all_neighbours[source_type].concat parents.target
-              end
-            end
-          }
-
-          case @format
-          when :json
-            content_type "application/json"
-            halt 200, [].to_json if all_neighbours.empty?
-            entities = {}
-            all_neighbours.each do |type,list|
-              entities[type] = list
-            end
-
-            halt 200, all_neighbours.to_json
-          when :html
-            template_render('entity_partials/neighbours', :matches => matches, :neighbours => all_neighbours)
-          end
-        end
       end
     end
   end

data/share/views/layout.haml

@@ -44,9 +44,6 @@
   - %w(dom_update workflow menu fragment favourites page_type modal reveal actions table list map hide).each do |file|
     - record_js "/js-find/rbbt/#{ file }"
 
-  - %w(knowledge_base).each do |file|
-    - record_js "/js-find/rbbt/#{ file }"
-
   - record_js "/js-find/app"
 
 

metadata

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