blazer 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 135fd38b9d7a75473a1ecf2afd1acf27ff9a6ffb
-  data.tar.gz: 83e0ec15e78191d00b6a81275f60c59dfaff17d8
+  metadata.gz: 2abc84ccb66e4bc713b59739c5ecbed82411375c
+  data.tar.gz: 821d99ac43d210bf09a1bf63ce7cf82701e57acf
 SHA512:
-  metadata.gz: 11fd0afc742cde141f2019cc70de520a95b7222c302dba952807dd91945380db9aeb2334e89eaa7a8f60ebcbfb9ec56faf838a23e12f7a80b9507f1937942aa3
-  data.tar.gz: ac2b8e150d3791aa89d63be8562d6413c30cbd488d5b0dad7a60c813e66ece451adec26b6b2962708ad322495a52c02dd612933769bf14b54d4c4a87612b81de
+  metadata.gz: e4945e0f6fb08913aaa5b3e3b6f9d9244a6408a5e094deff5fb384ecc2745d30eeb943ad7b827de8e3d4ee53035d0c16d58e9fe52b910a219c0739c19605c4ec
+  data.tar.gz: 8eb0e8f3a2b6e155fd9c45c63cbe8a5e176bd45e2dc5c83db60ceb716d2a0cf8da2a368cd13ea15ed255507a5fb6a713b972462bc27745b4aefa12f375424b23

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.0.2
+
+- Fixed error when installing
+- Added `schemas` option
+
 ## 1.0.1
 
 - Added comments to queries

data/README.md

@@ -2,9 +2,9 @@
 
 Explore your data with SQL. Easily create charts and dashboards, and share them with your team.
 
-[Try it out](http://blazer.hero2app.com)
+[Try it out](https://blazerme.herokuapp.com)
 
-[![Screenshot](http://blazer.hero2app.com/assets/screenshot-473b2307ebaf7377645079cbf2badf73.png)](http://blazer.hero2app.com)
+[![Screenshot](https://blazerme.herokuapp.com/assets/screenshot-18d79092e635b4b220f57ff7a1ecea41.png)](https://blazerme.herokuapp.com)
 
 :tangerine: Battle-tested at [Instacart](https://www.instacart.com/opensource)
 
@@ -135,7 +135,7 @@ Create queries with variables.
 SELECT * FROM users WHERE gender = {gender}
 ```
 
-Use `{start_time}` and `{end_time}` for time ranges. [Example](http://blazer.hero2app.com/queries/8-ratings-by-time-range?start_time=1997-10-03T05%3A00%3A00%2B00%3A00&end_time=1997-10-04T04%3A59%3A59%2B00%3A00)
+Use `{start_time}` and `{end_time}` for time ranges. [Example](https://blazerme.herokuapp.com/queries/8-ratings-by-time-range?start_time=1997-10-03T05%3A00%3A00%2B00%3A00&end_time=1997-10-04T04%3A59%3A59%2B00%3A00)
 
 ```sql
 SELECT * FROM ratings WHERE rated_at >= {start_time} AND rated_at <= {end_time}
@@ -143,7 +143,7 @@ SELECT * FROM ratings WHERE rated_at >= {start_time} AND rated_at <= {end_time}
 
 ### Smart Variables
 
-[Example](http://blazer.hero2app.com/queries/9-movies-by-genre)
+[Example](https://blazerme.herokuapp.com/queries/9-movies-by-genre)
 
 Suppose you have the query:
 
@@ -164,7 +164,7 @@ The first column is the value of the variable, and the second column is the labe
 
 ### Linked Columns
 
-[Example](http://blazer.hero2app.com/queries/4-highest-rated-movies) - title column
+[Example](https://blazerme.herokuapp.com/queries/4-highest-rated-movies) - title column
 
 Link results to other pages in your apps or around the web. Specify a column name and where it should link to. You can use the value of the result with `{value}`.
 
@@ -176,7 +176,7 @@ linked_columns:
 
 ### Smart Columns
 
-[Example](http://blazer.hero2app.com/queries/11-users) - occupation_id column
+[Example](https://blazerme.herokuapp.com/queries/11-users) - occupation_id column
 
 Suppose you have the query:
 
@@ -191,6 +191,16 @@ smart_columns:
   city_id: "SELECT id, name FROM cities WHERE id IN {value}"
 ```
 
+### Caching
+
+Blazer can automatically cache results to improve speed.
+
+```yml
+cache: 60 # minutes
+```
+
+Of course, you can force a refresh at any time.
+
 ## Charts
 
 Blazer will automatically generate charts based on the types of the columns returned in your query.
@@ -199,13 +209,13 @@ Blazer will automatically generate charts based on the types of the columns retu
 
 There are two ways to generate line charts.
 
-2+ columns - timestamp, numeric(s) - [Example](http://blazer.hero2app.com/queries/1-new-ratings-per-week)
+2+ columns - timestamp, numeric(s) - [Example](https://blazerme.herokuapp.com/queries/1-new-ratings-per-week)
 
 ```sql
 SELECT date_trunc('week', created_at), COUNT(*) FROM users GROUP BY 1
 ```
 
-3 columns - timestamp, string, numeric - [Example](http://blazer.hero2app.com/queries/7-new-ratings-by-gender-per-month)
+3 columns - timestamp, string, numeric - [Example](https://blazerme.herokuapp.com/queries/7-new-ratings-by-gender-per-month)
 
 
 ```sql
@@ -214,7 +224,7 @@ SELECT date_trunc('week', created_at), gender, COUNT(*) FROM users GROUP BY 1, 2
 
 ### Pie Chart
 
-2 columns - string, numeric - [Example](http://blazer.hero2app.com/queries/2-top-genres)
+2 columns - string, numeric - [Example](https://blazerme.herokuapp.com/queries/2-top-genres)
 
 ```sql
 SELECT gender, COUNT(*) FROM users GROUP BY 1
@@ -222,7 +232,7 @@ SELECT gender, COUNT(*) FROM users GROUP BY 1
 
 ## Dashboards
 
-Create a dashboard with multiple queries. [Example](http://blazer.hero2app.com/dashboards/1-movielens)
+Create a dashboard with multiple queries. [Example](https://blazerme.herokuapp.com/dashboards/1-movielens)
 
 If the query has a chart, the chart is shown. Otherwise, you’ll see a table.
 
@@ -230,7 +240,7 @@ If any queries have variables, they will show up on the dashboard.
 
 ## Checks
 
-Checks give you a centralized place to see the health of your data. [Example](http://blazer.hero2app.com/checks)
+Checks give you a centralized place to see the health of your data. [Example](https://blazerme.herokuapp.com/checks)
 
 Create a query to identify bad rows.
 
@@ -341,7 +351,20 @@ data_sources:
   main:
     url: <%= ENV["BLAZER_DATABASE_URL"] %>
 
-    # timeout: 15 # applies to PostgreSQL only
+    # statement timeout, in seconds
+    # applies to PostgreSQL only
+    # none by default
+    # timeout: 15
+
+    # time to cache results, in minutes
+    # can greatly improve speed
+    # none by default
+    # cache: 60
+
+    # wrap queries in a transaction for safety
+    # not necessary if you use a read-only user
+    # true by default
+    # use_transaction: false
 
     smart_variables:
       # zone_id: "SELECT id, name FROM zones ORDER BY name ASC"
@@ -363,6 +386,9 @@ audit: true
 
 # method name for the user model
 # user_name: name
+
+# email to send checks from
+# from_email: blazer@example.org
 ```
 
 ## TODO

data/app/controllers/blazer/dashboards_controller.rb

@@ -35,7 +35,7 @@ module Blazer
           query = data_source.smart_variables[var]
           if query
             rows, error, cached_at = data_source.run_statement(query)
-            (@smart_vars[var] ||= []).concat rows.map { |v| v.values.reverse }
+            ((@smart_vars[var] ||= []).concat(rows.map { |v| v.values.reverse })).uniq!
             @sql_errors << error if error
           end
         end

data/app/views/blazer/queries/run.html.erb

@@ -8,9 +8,14 @@
   <% end %>
 <% else %>
   <% unless @only_chart %>
-    <% if @cached_at %>
+    <% if @cached_at || @data_source.cache %>
       <p class="text-muted" style="float: right;">
-        Cached <%= time_ago_in_words(@cached_at, include_seconds: true) %> ago
+        <% if @cached_at %>
+          Cached <%= time_ago_in_words(@cached_at, include_seconds: true) %> ago
+        <% elsif !params[:data_source] %>
+          Cached just now
+        <% end %>
+
         <% if @query && !params[:data_source] %>
           <%= link_to "Refresh", refresh_query_path(@query, variable_params), method: :post %>
         <% end %>

data/app/views/blazer/queries/show.html.erb

@@ -142,6 +142,8 @@
         }
       </script>
     <% end %>
+
+    <input type="submit" class="btn btn-success" value="Run" style="vertical-align: top;" />
   </form>
 <% end %>
 

data/lib/blazer.rb

@@ -23,7 +23,14 @@ module Blazer
   end
 
   def self.settings
-    @settings ||= YAML.load(ERB.new(File.read(Rails.root.join("config", "blazer.yml"))).result)
+    @settings ||= begin
+      path = Rails.root.join("config", "blazer.yml").to_s
+      if File.exist?(path)
+        YAML.load(ERB.new(File.read(path)).result)
+      else
+        {}
+      end
+    end
   end
 
   def self.data_sources

data/lib/blazer/data_source.rb

@@ -99,10 +99,13 @@ module Blazer
       ["blazer", "v2", id, Digest::MD5.hexdigest(statement)].join("/")
     end
 
-    def tables
+    def schemas
       default_schema = postgresql? ? "public" : connection_model.connection_config[:database]
-      schema = connection_model.connection_config[:schema] || default_schema
-      rows, error, cached_at = run_statement(connection_model.send(:sanitize_sql_array, ["SELECT table_name, column_name, ordinal_position, data_type FROM information_schema.columns WHERE table_schema = ?", schema]))
+      settings["schemas"] || [connection_model.connection_config[:schema] || default_schema]
+    end
+
+    def tables
+      rows, error, cached_at = run_statement(connection_model.send(:sanitize_sql_array, ["SELECT table_name, column_name, ordinal_position, data_type FROM information_schema.columns WHERE table_schema IN (?)", schemas]))
       Hash[rows.group_by { |r| r["table_name"] }.map { |t, f| [t, f.sort_by { |f| f["ordinal_position"] }.map { |f| f.slice("column_name", "data_type") }] }.sort_by { |t, _f| t }]
     end
 

data/lib/blazer/version.rb

@@ -1,3 +1,3 @@
 module Blazer
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blazer
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-08 00:00:00.000000000 Z
+date: 2015-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -171,3 +171,4 @@ signing_key:
 specification_version: 4
 summary: Share data effortlessly with your team
 test_files: []
+has_rdoc: