rbbt-rest 1.3.32 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: baafff671bbb97e58be46dfcaaee6a3c64b103b4
-  data.tar.gz: d7106534d2b1b70944e2bc875b7cbeadef8c26a6
+  metadata.gz: bf6c08a28e051ad1767c8aea093bd67708841882
+  data.tar.gz: 893924c2c1536c84eaa6d50a4087204bb946131d
 SHA512:
-  metadata.gz: 098f9a74ed00d545f866e0d397a131191c2d14c8078ba09156a7694d253320ebae52268a80808969410cd05b694725af8a08e45bc665b3569876ea19806d5a0a
-  data.tar.gz: d36a5bc597de18f4214be7d0179030e3354080c6b6834132cecd0ed2e2314c4701c8f4650082da8c0ac30a5ca7a3f8157e4ccfc157db9c60d8652c639d6dfb5d
+  metadata.gz: 184d1329afd7ff57ed384bf3a5744728f63eefb8af19ec23e008f93a8fc32e169bf5da51b2935f95310a317bf3c1a353f88348b13af3fa9a2902b434773c4626
+  data.tar.gz: 4eabaeabdf7abdfbaa8df2303cdcb79dd6fa79a8b89b394fa85cf1817bc25b7d02a31e9ec13f09eb1216c84a6a43eccd8f646fed8c8b70a0181768c71416cdf0

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

@@ -94,7 +94,7 @@ module RbbtRESTHelpers
       input_label(id, name, description, default, extra) +
       html_tag("input", nil, html_options.merge(:type => input_type, :name => name, :value => value, :id => id, :step => step))
 
-    when :tsv, :array, :text
+    when :tsv, :array, :text, :file
       value = current.nil? ? default : current
       value = value * "\n" if Array === value
 

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

@@ -1,4 +1,4 @@
-class ActionController
+class EntityActionController
   attr_accessor :entity, :id
   attr_accessor :actions
 
@@ -18,7 +18,7 @@ end
 
 module EntityRESTHelpers
   def default_action_controller(entity, list_id = nil)
-    action_controller = ActionController.new(entity, list_id)
+    action_controller = EntityActionController.new(entity, list_id)
 
     case
     when Array === entity

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

@@ -39,7 +39,7 @@ module EntityRESTHelpers
     entity_type = entity.base_type
     dir = Path.setup(File.join(settings.favourites_dir, user))
 
-    if (file = dir[entity_type]).exists?
+    if (file = dir[entity_type].find).exists?
       entities = Annotated.load_tsv(TSV.open(file))
       entities -= [entity]
       if entities.any?
@@ -70,7 +70,7 @@ module EntityRESTHelpers
 
     dir = Path.setup(File.join(settings.favourite_lists_dir, user))
 
-    if (file = dir[entity_type]).exists?
+    if (file = dir[entity_type].find).exists?
       lists = Open.read(file.find).split("\n")
       lists << list
       Open.write(file, lists.uniq * "\n")
@@ -85,7 +85,7 @@ module EntityRESTHelpers
 
     dir = Path.setup(File.join(settings.favourite_lists_dir, user))
 
-    if (file = dir[entity_type]).exists?
+    if (file = dir[entity_type].find).exists?
       lists = Open.read(file).split("\n")
       lists -= [list]
       if lists.any?

data/lib/rbbt/rest/main.rb

@@ -10,7 +10,8 @@ require 'json'
 module Sinatra
   module RbbtRESTMain
     def add_sass_load_path(path)
-      Sass::Engine::DEFAULT_OPTIONS[:load_paths].unshift path
+      path = path.find if Path === path
+      Sass::Engine::DEFAULT_OPTIONS[:load_paths].unshift path if File.exists? path
     end
 
     def self.registered(base)

data/share/views/compass/_rbbt.sass

@@ -1,4 +1,5 @@
-@import "foundation"
+//@import "foundation"
+@import "grid_system"
 @import "functions"
 @import "colors"
 @import "variables"
@@ -9,3 +10,6 @@
 @import "rbbt/form"
 @import "rbbt/fragment"
 
+@import "style"
+
+

data/share/views/compass/actions.sass

@@ -11,6 +11,8 @@
   ul.actions
     +rbbt_button_list($color_bg: $color_action_controler_bg, $color_item_bg: $color_action_active_bg, $width: 19%)
     li
+      @media #{$only-large}
+        +ellipsis_text
       border: 1px solid $color_action_controler_border
       &.active > a
         color: $magenta

data/share/views/compass/app.sass

@@ -1,6 +1,7 @@
-@import "foundation"
 @import "_rbbt"
 
+@import "style"
+
 @import "user"
 @import "entity_card"
 @import "workflow"
@@ -9,73 +10,7 @@
 @import "actions"
 @import "top_menu"
 @import "help"
-@import "layout"
 @import "figure"
 @import "monitor"
-
-table
-  +rbbt_table
-
-.table_column_selector
-  +table_column_selector
-
-.rbbt_reveal_content
-  +rbbt_reveal_content
-
-.modal
-  +modal
-
-.action_loader > .action_card > .action_parameters
-  margin-top: 0 
-  border-top: none
-
-.action_parameters
-  +action_parameters
-
-.entity_card, .entity_list_card, .entity_map_card, .action_card, .workflow_task
-  +card
-
-  & > .card > .sidebar 
-    h1, h2, h3, h4, h5, h6
-      margin: $indent
-    p
-      margin: $indent
-
-  & > .card > .sidebar dl
-    margin: $vindent $indent 
-    +indented_dl
-    font-weight: normal
-    &.rbbt_accordion
-      margin: 0 0
-
-
-    & > dt, dd
-      border-left: 0
-      border-right: 0
-    dt.next 
-      min-height: 3em
-      font-weight: normal
-      &> span.title
-        margin-left: 3em
-      &> a
-        position: absolute
-        left: $indent
-
-.sidebar
-  overflow-y: hidden
-  overflow-x: hidden
-  p
-    margin-left: $indent
-  ul.entity_list
-    +clean_list
-    margin: $vindent $indent
-    li
-      display: block
-
-a.fragment
-  +fragment
-
-.hide_toggle
-  width: 100%
-  width: 2em
+@import "layout"
 

data/share/views/compass/fonts.sass

@@ -0,0 +1,54 @@
+// From: https://medium.com/@amlinarev/using-sass-compass-vertical-rhythm-to-set-up-typography-defaults-in-a-project-34fe2f1d2c02
+
+@import "compass/typography/vertical_rhythm"
+
+// The base font size
+$base-font-size: 18px
+// Base line height
+$base-line-height: 30px
+// Rhythm unit (Compass vertical rhythm)
+$rhythm-unit: "rem"
+$base-font-family: "Source Sans Pro", "Helvetica Neue", Helvetica, Arial, sans-serif
+$base-font-weight: 400
+
+$tiny-font-size: 10px
+$tiny-font-leading: 0.75
+$small-font-size: 14px
+$small-font-leading: 0.75
+$base-font-size: 18px
+$base-font-leading: 1
+$medium-font-size: 24px
+$medium-font-leading: 1.25
+$large-font-size: 32px
+$large-font-leading: 1.25
+$xlarge-font-size: 43px
+$xlarge-font-leading: 1.5
+
+=typeSize($size)
+  @if ($size == "tiny")
+    +adjust-font-size-to($tiny-font-size)
+    +adjust-leading-to($tiny-font-leading)
+  @if ($size == "small")
+    +adjust-font-size-to($small-font-size)
+    +adjust-leading-to($small-font-leading)
+  @if ($size == "base")
+    +adjust-font-size-to($base-font-size)
+    +adjust-leading-to($base-font-leading)
+  @if ($size == "large")
+    +adjust-font-size-to($large-font-size)
+    +adjust-leading-to($large-font-leading)
+  @if ($size == "xlarge")
+    +adjust-font-size-to($xlarge-font-size)
+    +adjust-leading-to($xlarge-font-leading)
+
+=typeWeight($size)
+  @if ($size == "ultrastrong")
+    font-weight: 900
+  @if ($size == "strong")
+    font-weight: 700
+  @if ($size == "regular")
+    font-weight: 400
+  @if ($size == "light")
+    font-weight: 300
+  @if ($size == "ultralight")
+    font-weight: 200

data/share/views/compass/functions.sass

@@ -6,7 +6,8 @@
 
 =clean_list($inline: true)
   list-style: none
-  margin: 0
+  margin-left: 0
+  padding-left: 0
   @if ($inline)
     & > li
       display: inline-block

data/share/views/compass/grid_system.sass

@@ -0,0 +1,51 @@
+// Make sure the charset is set appropriately
+@charset "UTF-8"
+
+// This includes all of the foundation global elements that are needed to work with any of the other files.
+
+$legacy-support-for-ie7: false !default
+$legacy-support-for-ie6: false !default
+
+$breakpoint: 1024px
+
+$small-screen: 1024px
+$medium-screen: 1280px 
+$large-screen: 1440px 
+
+$not-small: "only screen and (min-width: #{$small-screen})" 
+$only-small: "only screen and (max-width: #{$small-screen})" 
+
+$only-large: "only screen and (min-width: #{$small-screen})" 
+$not-large: "only screen and (max-width: #{$small-screen})" 
+
+$row-width: auto 
+$column-gutter: 30px
+$total-columns: 12
+
+$indent: 15px
+$vindent: 22px
+
+=clear_fix()
+  &:before, &:after 
+    content: " "
+    display: table
+  &:after 
+    clear: both
+
+
+=css-triangle($a,$b,$c)
+
+@import "zen"
+
+
+$zen-column-count: 12
+$zen-gutter-width: 30px
+
+=grid_row() 
+  @include zen-clear()
+  @include zen-grid-container()
+  overflow: visible !important
+
+=grid_column($size:1, $float:left, $last_column:false)
+  @include zen-grid-item($size,1,$float)
+

data/share/views/compass/layout.sass

@@ -1,11 +1,16 @@
+@import "compass/css3/box-sizing"
+body *
+  @include box-sizing(border-box)
+
+.menu_item
+  +_rbbt_menu_item
+
 $gap: 12px
 body
   margin: 0
-  font-size: 14px !important
-  +clearfix
  
   #content
-    +clearfix
+    +clear_fix
     min-height: 900px
     margin-left: $indent
     margin-right: $indent
@@ -125,11 +130,6 @@ ul.list_comparison
       display: inline-block
       color: gray
 
-a[href]
-  &:not([href^=\/])
-    &:not([href^='#'])
-      &:after
-        content: '\2192'
 
 
 .action_loader
@@ -139,3 +139,69 @@ a[href]
   table.wide, table.flip
     +responsive_table
 
+table
+  +rbbt_table
+
+.table_column_selector
+  +table_column_selector
+
+.rbbt_reveal_content
+  +rbbt_reveal_content
+
+.modal
+  +modal
+
+.action_loader > .action_card > .action_parameters
+  margin-top: 0 
+  border-top: none
+
+.action_parameters
+  +action_parameters
+
+.entity_card, .entity_list_card, .entity_map_card, .action_card, .workflow_task
+  +card
+
+  & > .card > .sidebar 
+    h1, h2, h3, h4, h5, h6
+      margin: $indent
+    p
+      margin: $indent
+
+  & > .card > .sidebar dl
+    margin: $vindent $indent 
+    +indented_dl
+    font-weight: normal
+    &.rbbt_accordion
+      margin: 0 0
+
+
+    & > dt, dd
+      border-left: 0
+      border-right: 0
+    dt.next 
+      min-height: 3em
+      font-weight: normal
+      &> span.title
+        margin-left: 3em
+      &> a
+        position: absolute
+        left: $indent
+
+.sidebar
+  overflow-y: hidden
+  overflow-x: hidden
+  p
+    margin-left: $indent
+  ul.entity_list
+    +clean_list
+    margin: $vindent $indent
+    li
+      display: block
+
+a.fragment
+  +fragment
+
+.hide_toggle
+  width: 100%
+  width: 2em
+

data/share/views/compass/rbbt/form.sass

@@ -15,6 +15,7 @@
     margin-top: 0 
     
   .input
+    position: relative
     min-width: 900px * 0.3
     max-width: 100% !important
     +grid-column
@@ -52,7 +53,7 @@
       +ellipsis_text
       max-width: 70%
 
-    &.array, &.tsv, &.text
+    &.array, &.tsv, &.text, &.file
       width: 99%
       textarea
         width: 100%
@@ -61,7 +62,6 @@
     &.submit:last-child
       @media #{$only-large}
         width: 99%
-      float: right
       clear: both
       min-height: 0
       text-align: right

data/share/views/compass/rbbt/menu.sass

@@ -109,11 +109,12 @@
 
 //{{{ Menus 
 =rbbt_menu($color_bg: $color_menu_bg, $color_text: $color_menu_text,  $color_item_bg: $color_menu_item_bg, $color_item_text: $color_menu_item_text, $color_content_bg: $color_menu_content_bg, $color_content_text: $color_menu_content_text, $z-index: $z-index_menu_content)
-  +clearfix
+  +clear_fix
   margin: 0
   border: 1px solid $color_menu_border
   background-color: $color_bg
   position: relative
+  //overflow: visible !important
   & > dt
     +rbbt_menu_item($color_item_bg, $color_item_text)
     float: left
@@ -122,7 +123,7 @@
     +rbbt_menu_content($color_content_bg, $color_content_text, $z-index: $z-index)
 
 =rbbt_vertical_menu($height: 500px, $color_bg: $color_menu_bg, $color_text: $color_menu_text,  $color_item_bg: $color_menu_item_bg, $color_item_text: $color_menu_item_text, $color_content_bg: lighten($color_menu_content_bg, 55), $color_content_text: $color_menu_content_text, $z-index: $z-index_menu_content)
-  +clearfix
+  +clear_fix
   margin: 0
   height: $height
   background-color: $color_bg
@@ -146,7 +147,7 @@
 
 
 =rbbt_accordion($color_bg: $color_menu_bg, $color_text: $color_menu_text,  $color_item_bg: $color_menu_item_bg, $color_item_text: $color_menu_item_text, $color_content_bg: lighten($color_menu_content_bg, 55), $color_content_text: $color_menu_content_text, $z-index: $z-index_menu_content)
-  +clearfix
+  +clear_fix
   clear: both 
   margin: 0
   background-color: $color_bg
@@ -157,7 +158,7 @@
     +rbbt_accordion_menu_content($color_content_bg, $color_content_text, $z-index)
 
 =rbbt_tabs($color_bg: $color_menu_bg, $color_text: $color_menu_text,  $color_item_bg: $color_menu_item_bg, $color_item_text: $color_menu_item_text, $color_content_bg: lighten($color_menu_content_bg, 55), $color_content_text: $color_menu_content_text, $color_border: $color_menu_border, $z-index: $z-index_menu_content)
-  +clearfix
+  +clear_fix
   border: 1px solid $color_border
   background-color: $color_bg
   position: relative
@@ -169,7 +170,7 @@
 
 =rbbt_button_list($color_bg: $color_menu_bg, $color_text: $color_menu_text,  $color_item_bg: $color_menu_item_bg, $color_item_text: $color_menu_item_text, $color_item_border: $color_menu_border, $width: auto, $padding: 1px 3px, $margin: 4px)
   +grid_row
-  +clearfix
+  +clear_fix
   background-color: $color_bg
   margin: 0
   padding-top: $margin