Improve Bokeh Layout

.gitignore

@@ -110,5 +110,5 @@ win-64
 .cache/
 
 # generated coffeescript
-/bokehjs/test/test_common/defaults/models_defaults.coffee
-/bokehjs/test/test_common/defaults/widgets_defaults.coffee
+/bokehjs/test/common/generated_defaults/models_defaults.coffee
+/bokehjs/test/common/generated_defaults/widgets_defaults.coffee

.travis.yml

@@ -73,7 +73,7 @@ script:
     #
     # Run integration tests only once (Py 3.4)
     - if [[ -z "$TRAVIS_TAG" && "$GROUP" == integration && -n "${SAUCELABS}" ]]; then travis_start_sauce_connect; fi
-    - if [[ -z "$TRAVIS_TAG" && "$GROUP" == integration && -n "${SAUCELABS}" ]]; then py.test -m integration --driver SauceLabs --html=tests/pytest-report.html -n4 --upload; fi  # Run the integration tests on saucelabs
+    - if [[ -z "$TRAVIS_TAG" && "$GROUP" == integration && -n "${SAUCELABS}" ]]; then py.test -m integration --driver SauceLabs --html=tests/pytest-report.html -n4 -r3 --upload; fi  # Run the integration tests on saucelabs
     - if [[ -z "$TRAVIS_TAG" && "$GROUP" == integration && -n "${SAUCELABS}" ]]; then travis_stop_sauce_connect; fi
     - if [[ -z "$TRAVIS_TAG" && "$GROUP" == integration && -z "${SAUCELABS}" ]]; then py.test -m integration --driver Firefox; fi
     #

bokeh/charts/builder.py

@@ -66,15 +66,11 @@ def create_and_build(builder_class, *data, **kws):
     builder = builder_class(*data, **builder_kws)
 
     # create a chart to return, since there isn't one already
-    chart_kws = { k:v for k,v in kws.items() if k not in builder_props}
+    chart_kws = {k: v for k, v in kws.items() if k not in builder_props}
     chart = Chart(**chart_kws)
     chart.add_builder(builder)
     chart.start_plot()
 
-    curdoc()._current_plot = chart # TODO (havocp) store this on state, not doc?
-    if curstate().autoadd:
-        curdoc().add_root(chart)
-
     return chart
 
 

bokeh/charts/chart.py

@@ -87,13 +87,14 @@ class Chart(Plot):
     What kind of scale to use for the y-axis.
     """)
 
-    title_text_font_size = Override(default={ 'value' : '14pt' })
-
-    responsive = Override(default=False)
-
     _defaults = defaults
 
-    __deprecated_attributes__ = ('filename', 'server', 'notebook', 'width', 'height', 'xgrid', 'ygrid', 'legend')
+    __deprecated_attributes__ = (
+        'filename', 'server', 'notebook', 'width', 'height', 'xgrid', 'ygrid', 'legend'
+        'background_fill', 'border_fill', 'logo', 'tools',
+        'title_text_baseline', 'title_text_align', 'title_text_alpha', 'title_text_color',
+        'title_text_font_style', 'title_text_font_size', 'title_text_font', 'title_standoff'
+    )
 
     _xgrid = True
     _ygrid = True
@@ -133,10 +134,6 @@ def __init__(self, *args, **kwargs):
             if k in kwargs:
                 setattr(self, k, kwargs[k])
 
-        # TODO (bev) have to force serialization of overriden defaults on subtypes for now
-        self.title_text_font_size = "10pt"
-        self.title_text_font_size = "14pt"
-
         self._glyphs = []
         self._built = False
 
@@ -147,7 +144,8 @@ def __init__(self, *args, **kwargs):
         self._scales = defaultdict(list)
         self._tooltips = []
 
-        self.create_tools(self._tools)
+        if hasattr(self, '_tools'):
+            self.create_tools(self._tools)
 
     def add_renderers(self, builder, renderers):
         self.renderers += renderers
@@ -198,7 +196,7 @@ def create_tools(self, tools):
             # in case tools == False just exit
             return
 
-        if len(self.tools) == 0:
+        if len(self.toolbar.tools) == 0:
             # if no tools customization let's create the default tools
             tool_objs = _process_tools_arg(self, tools)
             self.add_tools(*tool_objs)
@@ -209,9 +207,8 @@ def start_plot(self):
         self.create_axes()
         self.create_grids(self._xgrid, self._ygrid)
 
-        # Add tools if supposed to
-        if self.tools:
-            self.create_tools(self.tools)
+        if self.toolbar.tools:
+            self.create_tools(self._tools)
 
         if len(self._tooltips) > 0:
             self.add_tools(HoverTool(tooltips=self._tooltips))

bokeh/charts/tests/test_chart.py

@@ -50,10 +50,10 @@ def setUp(self):
 
     def test_title(self):
         self.chart.title = "new_title"
-        self.assertEqual(self.chart.title, "new_title")
+        self.assertEqual(self.chart.title.text, "new_title")
 
     def test_responsive(self):
-        self.assertEqual(self.chart.responsive, True)
+        self.assertEqual(self.chart.responsive, 'width_ar')
 
     def check_chart_elements(self, expected_tools):
         self.assertIsInstance(self.chart.left[0], LinearAxis)
@@ -162,6 +162,7 @@ def test_defaults():
     assert c1.tools
     assert c2.tools == c3.tools == []
 
+
 def test_charts_theme_validation():
     from bokeh.plotting import figure
     p = figure()

bokeh/client/session.py

@@ -271,11 +271,14 @@ def push(self, document=None):
         if self._document is None:
             self._attach_document(doc)
 
-
-    def show(self, browser=None, new="tab"):
+    def show(self, obj=None, browser=None, new="tab"):
         """ Open a browser displaying this session.
 
         Args:
+            obj (LayoutDOM object, optional) : a Layout (Row/Column),
+                Plot or Widget object to display. The object will be added
+                to the session's document.
+
             browser (str, optional) : browser to show with (default: None)
                 For systems that support it, the **browser** argument allows
                 specifying which browser to display in, e.g. "safari", "firefox",
@@ -288,6 +291,8 @@ def show(self, browser=None, new="tab"):
                 opens a new tab. If **new** is 'window', then opens a new window.
 
         """
+        if obj and obj not in self.document.roots:
+            self.document.add_root(obj)
         show_session(session=self)
 
     @classmethod

bokeh/core/_templates/file.html

@@ -24,6 +24,17 @@
         <title>{{ title if title else "Bokeh Plot" }}</title>
         {{ bokeh_css }}
         {{ bokeh_js }}
+        <style>
+          html {
+            width: 100%;
+            height: 100%;
+          }
+          body {
+            width: 90%;
+            height: 100%;
+            margin: auto;
+          }
+        </style>
     </head>
     <body>
         {{ plot_div|indent(8) }}

bokeh/core/enums.py

@@ -179,3 +179,5 @@ def enumeration(*values, **kwargs):
 #: Specify sorting directions
 SortDirection = enumeration("ascending", "descending")
 
+#: Responsive types
+Responsive = enumeration("box", "width_ar", "height_ar", "box_ar", "fixed")

bokeh/core/properties.py

@@ -420,8 +420,8 @@ def _get_default(self, obj):
         return default
 
     def _real_set(self, obj, old, value, hint=None):
-        # Currently as of Bokeh 0.11.1, all hinted events modify in place. However this may 
-        # need refining later if this assumption changes. 
+        # Currently as of Bokeh 0.11.1, all hinted events modify in place. However this may
+        # need refining later if this assumption changes.
         unchanged = self.descriptor.matches(value, old) and (hint is None)
         if unchanged:
             return
@@ -1855,3 +1855,36 @@ def transform(self, value):
             value = tuple(int(v) if i < 3 else v for i, v in enumerate(value))
 
         return value
+
+class Responsive(Either):
+
+    def __init__(self, default=None, help=None):
+        types = (Enum(enums.Responsive), Bool)
+        super(Responsive, self).__init__(*types, default=default, help=help)
+
+    def transform(self, value):
+        """ Transform True to width_ar mode and False to fixed
+        """
+        if value is True:
+            responsive = 'width_ar'
+        elif value is False:
+            responsive = 'fixed'
+        else:
+            responsive = value
+        return responsive
+
+
+class TitleProp(Either):
+
+    def __init__(self, default=None, help=None):
+        types = (Instance('bokeh.models.annotations.Title'), String)
+        super(TitleProp, self).__init__(*types, default=default, help=help)
+
+    def transform(self, value):
+        if isinstance(value, str):
+            if value == "":
+                return None
+            else:
+                from bokeh.models.annotations import Title
+                value = Title(text=value)
+        return value

bokeh/core/tests/test_properties.py

@@ -8,7 +8,10 @@
     HasProps, NumberSpec, ColorSpec, Bool, Int, Float, Complex, String,
     Regex, List, Dict, Tuple, Array, Instance, Any, Interval, Either,
     Enum, Color, Align, DashPattern, Size, Percent, Angle, AngleSpec,
-    DistanceSpec, Override, Include, MinMaxBounds)
+    DistanceSpec, Override, Include, MinMaxBounds, Responsive, TitleProp)
+
+from bokeh.models import Plot
+from bokeh.models.annotations import Title
 
 class Basictest(unittest.TestCase):
 
@@ -1445,13 +1448,39 @@ def test_MinMaxBounds_with_datetime(self):
         # Invalid values
         self.assertFalse(prop.is_valid((datetime.date(2012, 10, 1), 22)))
 
+
 def test_HasProps_clone():
-    from bokeh.models import Plot
     p1 = Plot(plot_width=1000)
     c1 = p1.properties_with_values(include_defaults=False)
     p2 = p1._clone()
     c2 = p2.properties_with_values(include_defaults=False)
     assert c1 == c2
 
-if __name__ == "__main__":
-    unittest.main()
+
+def test_responsive_transforms_true_into_width():
+    class Foo(HasProps):
+        responsive = Responsive
+    f = Foo(responsive=True)
+    assert f.responsive == 'width_ar'
+
+
+def test_responsive_transforms_false_into_fixed():
+    class Foo(HasProps):
+        responsive = Responsive
+    f = Foo(responsive=False)
+    assert f.responsive == 'fixed'
+
+
+def test_titleprop_transforms_string_into_title_object():
+    class Foo(HasProps):
+        title = TitleProp
+    f = Foo(title="hello")
+    assert isinstance(f.title, Title)
+    assert f.title.text == "hello"
+
+
+def test_titleprop_transforms_empty_string_into_None():
+    class Foo(HasProps):
+        title = TitleProp
+    f = Foo(title="")
+    assert f.title is None

bokeh/document.py

@@ -401,6 +401,11 @@ def add_root(self, model):
         if model in self._roots:
             return
         self._push_all_models_freeze()
+        # TODO(bird) Should we do some kind of reporting of how many LayoutDOM
+        # items are in the document roots. In vanilla bokeh cases e.g.
+        # output_file, output_server more than one LayoutDOM is probably not
+        # going to go well. But in embedded cases, you may well want more than
+        # one.
         try:
             self._roots.append(model)
         finally: