vega 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 854e0601118f529798b5850bc36babaff268a6df96932da17c3e3f9f96330234
-  data.tar.gz: 50359706b33864f64a18e0db734eb4c3209b6f225aabaab3553cf6bfd583219f
+  metadata.gz: 30bfea4df021c4f5b65530adbc1c83f5a07f5bf323faf0b25e817f9b8e2d56b7
+  data.tar.gz: 06ab9a178a4edfea2a0360a95dd33eca2e3197bbdd196bb764c52114028ea511
 SHA512:
-  metadata.gz: 388eab29e442fcf3a33788b0a59522be829ef43dd5a56a7fd06a0f803c929be6bae6b72421ad2dc11cecb8ba3382d7e445ba4f2d822577a6f2622328911e70c7
-  data.tar.gz: 683e03f32841bf0605c310cd31fd545ca2110f8c85b46a10391e90204676ac08e8b7b753061d14f9f27758b208daa06f0039b5786367b27e4a2b95651f0cb6ea
+  metadata.gz: f6e7098cdb5660031ab98e3838c9bb68d25bf338614fd41e0fe2b31588aef2c4953cce0059a61c0338075533de5a17076a050cf75ff95e52a2a0d46611dd6954
+  data.tar.gz: 9d79099d412b36555e9cacb5594d5022706760ea05a880606920b326b77a09f2d373433dc1f82dde49d451c3a76f035f8b6d7de1c197a1361c8735faee90919f

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 0.2.1 (2021-10-24)
+
+- Added support for `nil` height
+- Fixed source map warnings
+
+## 0.2.0 (2021-10-23)
+
+- Added experimental support for `importmap-rails`
+- Updated Vega to 5.21.0, Vega-Lite to 5.1.1, and Vega-Embed to 6.19.1
+
+## 0.1.3 (2021-03-14)
+
+- Added Vega-Interpreter
+
+## 0.1.2 (2021-02-09)
+
+- Updated Vega to 5.19.1, Vega-Lite to 4.17.0, and Vega-Embed to 6.15.1
+
 ## 0.1.1 (2020-09-27)
 
 - Added `repeat`, `resolve`, `spec` and `selection` methods

data/LICENSE.txt

@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2020, Andrew Kane.
+Copyright (c) 2020-2021, Andrew Kane.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/README.md

@@ -2,11 +2,11 @@
 
 Interactive charts for Ruby, powered by [Vega](https://vega.github.io/vega/) and [Vega-Lite](https://vega.github.io/vega-lite/)
 
-[See what’s possible](https://vega.github.io/vega-lite/examples/)
+[See it in action](https://vega.dokkuapp.com)
 
 Works with Rails, iRuby, and other frameworks
 
-[![Build Status](https://travis-ci.org/ankane/vega.svg?branch=master)](https://travis-ci.org/ankane/vega)
+[![Build Status](https://github.com/ankane/vega-ruby/workflows/build/badge.svg?branch=master)](https://github.com/ankane/vega-ruby/actions)
 
 ## Installation
 
@@ -18,11 +18,24 @@ gem 'vega'
 
 The follow the instructions for how you plan to use it:
 
+- [Rails 7 / Importmap](#rails-7--importmap) (experimental)
 - [Rails 6 / Webpacker](#rails-6--webpacker)
 - [Rails 5 / Sprockets](#rails-5--sprockets)
 - [iRuby](#iruby)
 - [Other](#other)
 
+### Rails 7 / Importmap
+
+Add to `app/javascript/application.js`:
+
+```js
+import "vega"
+import "vega-lite"
+import "vega-embed"
+
+window.dispatchEvent(new Event("vega:load"));
+```
+
 ### Rails 6 / Webpacker
 
 Run:
@@ -56,9 +69,9 @@ No additional set up is needed.
 For Sinatra and other web frameworks, include the Vega JavaScript files on pages with charts:
 
 ```html
-<script src="https://cdn.jsdelivr.net/npm/vega@5.16.1"></script>
-<script src="https://cdn.jsdelivr.net/npm/vega-lite@4.16.2"></script>
-<script src="https://cdn.jsdelivr.net/npm/vega-embed@6.12.2"></script>
+<script src="https://cdn.jsdelivr.net/npm/vega@5.21.0"></script>
+<script src="https://cdn.jsdelivr.net/npm/vega-lite@5.1.1"></script>
+<script src="https://cdn.jsdelivr.net/npm/vega-embed@6.19.1"></script>
 ```
 
 ## Getting Started
@@ -85,7 +98,7 @@ Vega.lite
   .data([{city: "A", sales: 28}, {city: "B", sales: 55}, {city: "C", sales: 43}])
   .mark(type: "bar", tooltip: true)
   .encoding(
-    x: {field: "city", type: "ordinal"},
+    x: {field: "city", type: "nominal"},
     y: {field: "sales", type: "quantitative"}
   )
 ```
@@ -294,7 +307,7 @@ You can also create a specification by hand
 
 ```ruby
 spec = {
-  "$schema" => "https://vega.github.io/schema/vega-lite/v4.json",
+  "$schema" => "https://vega.github.io/schema/vega-lite/v5.json",
   "data" => {"url" => "https://www.example.com"},
   # ...
 }
@@ -318,24 +331,52 @@ Get the spec for a chart
 chart.spec
 ```
 
+## Content Security Policy (CSP)
+
+By default, the Vega parser uses the Function constructor, which [can cause issues with CSP](https://vega.github.io/vega/usage/interpreter/).
+
+For Rails 7 / Importmap, add to `app/javascript/application.js`:
+
+```js
+import "vega-interpreter"
+```
+
+For Rails 6 / Webpacker, run:
+
+```sh
+yarn add vega-interpreter
+```
+
+For Rails 5 / Sprockets, add to `app/assets/javascripts/application.js`:
+
+```js
+//= require vega-interpreter
+```
+
+And set embed options for your charts
+
+```ruby
+embed_options(ast: true)
+```
+
 ## History
 
-View the [changelog](https://github.com/ankane/vega/blob/master/CHANGELOG.md)
+View the [changelog](https://github.com/ankane/vega-ruby/blob/master/CHANGELOG.md)
 
 ## Contributing
 
 Everyone is encouraged to help improve this project. Here are a few ways you can help:
 
-- [Report bugs](https://github.com/ankane/vega/issues)
-- Fix bugs and [submit pull requests](https://github.com/ankane/vega/pulls)
+- [Report bugs](https://github.com/ankane/vega-ruby/issues)
+- Fix bugs and [submit pull requests](https://github.com/ankane/vega-ruby/pulls)
 - Write, clarify, or fix documentation
 - Suggest or add new features
 
 To get started with development:
 
 ```sh
-git clone https://github.com/ankane/vega.git
-cd vega
+git clone https://github.com/ankane/vega-ruby.git
+cd vega-ruby
 bundle install
 bundle exec rake test
 ```

data/config/importmap.rb

@@ -0,0 +1 @@
+pin_all_from File.expand_path("../vendor/assets/javascripts", __dir__)

data/lib/vega/engine.rb

@@ -1,5 +1,16 @@
 module Vega
   class Engine < ::Rails::Engine
     # for assets
+
+    # for importmap
+    if defined?(Importmap)
+      initializer "vega.importmap", after: "importmap" do |app|
+        app.importmap.draw(Engine.root.join("config/importmap.rb"))
+        app.config.assets.precompile << "vega-embed.js"
+        app.config.assets.precompile << "vega-interpreter.js"
+        app.config.assets.precompile << "vega-lite.js"
+        app.config.assets.precompile << "vega.js"
+      end
+    end
   end
 end

data/lib/vega/lite_chart.rb

@@ -11,7 +11,7 @@ module Vega
       :transform, :layer, :hconcat, :vconcat, :concat
 
     def initialize
-      @schema = "https://vega.github.io/schema/vega-lite/v4.json"
+      @schema = "https://vega.github.io/schema/vega-lite/v5.json"
       super()
     end
 

data/lib/vega/spec.rb

@@ -11,7 +11,14 @@ module Vega
       output = <<~EOS
         #{html}
         <script>
-          #{js}
+          (function() {
+            var createChart = function() { #{js} };
+            if ("vegaEmbed" in window) {
+              createChart();
+            } else {
+              window.addEventListener("vega:load", createChart, true);
+            }
+          })();
         </script>
       EOS
       output.respond_to?(:html_safe) ? output.html_safe : output
@@ -25,12 +32,13 @@ module Vega
         <script>
           require.config({
             paths: {
-              'vega': 'https://cdn.jsdelivr.net/npm/vega@5.16.1?noext',
-              'vega-lite': 'https://cdn.jsdelivr.net/npm/vega-lite@4.16.2?noext',
-              'vega-embed': 'https://cdn.jsdelivr.net/npm/vega-embed@6.12.2?noext'
+              'vega': 'https://cdn.jsdelivr.net/npm/vega@5.21.0/build/vega.min',
+              'vega-util': 'https://cdn.jsdelivr.net/npm/vega-util@1.17.0/build/vega-util.min',
+              'vega-lite': 'https://cdn.jsdelivr.net/npm/vega-lite@5.1.1/build/vega-lite.min',
+              'vega-embed': 'https://cdn.jsdelivr.net/npm/vega-embed@6.19.1/build/vega-embed.min'
             }
           });
-          require(['vega', 'vega-lite', 'vega-embed'], function(vega, vegaLite, vegaEmbed) {
+          require(['vega', 'vega-util', 'vega-lite', 'vega-embed'], function(vega, vegaUtil, vegaLite, vegaEmbed) {
             #{js}
           });
         </script>
@@ -44,6 +52,7 @@ module Vega
       id = "chart-#{SecureRandom.hex(16)}" # 2**128 values
       width = @spec["width"].is_a?(Integer) ? "#{@spec["width"]}px" : "100%"
       height = @spec["height"].is_a?(Integer) ? "#{@spec["height"]}px" : "300px"
+      height = "auto" if @spec["height"].nil?
 
       # user can override with usermeta: {embedOptions: ...}
       embed_options = {actions: false}

data/lib/vega/version.rb

@@ -1,3 +1,3 @@
 module Vega
-  VERSION = "0.1.1"
+  VERSION = "0.2.1"
 end

data/licenses/LICENSE-vega-interpreter.txt

@@ -0,0 +1,27 @@
+Copyright (c) 2015-2018, University of Washington Interactive Data Lab
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors
+  may be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/licenses/LICENSE-vega.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2015-2018, University of Washington Interactive Data Lab
+Copyright (c) 2015-2021, University of Washington Interactive Data Lab
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without