blazer 1.8.0 → 1.8.2

data/lib/blazer/data_source.rb

@@ -4,24 +4,13 @@ module Blazer
   class DataSource
     extend Forwardable
 
-    attr_reader :id, :settings, :adapter, :adapter_instance
+    attr_reader :id, :settings
 
     def_delegators :adapter_instance, :schema, :tables, :preview_statement, :reconnect, :cost, :explain, :cancel
 
     def initialize(id, settings)
       @id = id
       @settings = settings
-
-      unless settings["url"] || Rails.env.development? || settings["adapter"] == "bigquery"
-        raise Blazer::Error, "Empty url for data source: #{id}"
-      end
-
-      @adapter_instance =
-        if Blazer.adapters[adapter]
-          Blazer.adapters[adapter].new(self)
-        else
-          raise Blazer::Error, "Unknown adapter"
-        end
     end
 
     def adapter
@@ -154,9 +143,23 @@ module Blazer
 
     protected
 
+    def adapter_instance
+      @adapter_instance ||= begin
+        unless settings["url"] || Rails.env.development? || ["bigquery", "athena"].include?(settings["adapter"])
+          raise Blazer::Error, "Empty url for data source: #{id}"
+        end
+
+        unless Blazer.adapters[adapter]
+          raise Blazer::Error, "Unknown adapter"
+        end
+
+        Blazer.adapters[adapter].new(self)
+      end
+    end
+
     def run_statement_helper(statement, comment, run_id)
       start_time = Time.now
-      columns, rows, error = @adapter_instance.run_statement(statement, comment)
+      columns, rows, error = adapter_instance.run_statement(statement, comment)
       duration = Time.now - start_time
 
       cache_data = nil
@@ -165,7 +168,7 @@ module Blazer
         cache_data = Marshal.dump([columns, rows, error, cache ? Time.now : nil]) rescue nil
       end
 
-      if cache && cache_data && @adapter_instance.cachable?(statement)
+      if cache && cache_data && adapter_instance.cachable?(statement)
         Blazer.cache.write(statement_cache_key(statement), cache_data, expires_in: cache_expires_in.to_f * 60)
       end
 
@@ -183,7 +186,7 @@ module Blazer
     def detect_adapter
       schema = settings["url"].to_s.split("://").first
       case schema
-      when "mongodb", "presto"
+      when "mongodb", "presto", "cassandra"
         schema
       else
         "sql"

data/lib/blazer/engine.rb

@@ -12,22 +12,7 @@ module Blazer
       Blazer.user_name = Blazer.settings["user_name"] if Blazer.settings["user_name"]
       Blazer.from_email = Blazer.settings["from_email"] if Blazer.settings["from_email"]
       Blazer.before_action = Blazer.settings["before_action"] if Blazer.settings["before_action"]
-
-      Blazer.user_class ||= Blazer.settings.key?("user_class") ? Blazer.settings["user_class"] : (User rescue nil)
-      Blazer.user_method = Blazer.settings["user_method"]
-      if Blazer.user_class
-        Blazer.user_method ||= "current_#{Blazer.user_class.to_s.downcase.singularize}"
-      end
-
       Blazer.check_schedules = Blazer.settings["check_schedules"] if Blazer.settings.key?("check_schedules")
-
-      if Blazer.user_class
-        options = Blazer::BELONGS_TO_OPTIONAL.merge(class_name: Blazer.user_class.to_s)
-        Blazer::Query.belongs_to :creator, options
-        Blazer::Dashboard.belongs_to :creator, options
-        Blazer::Check.belongs_to :creator, options
-      end
-
       Blazer.cache ||= Rails.cache
 
       Blazer.anomaly_checks = Blazer.settings["anomaly_checks"] || false

data/lib/blazer/version.rb

@@ -1,3 +1,3 @@
 module Blazer
-  VERSION = "1.8.0"
+  VERSION = "1.8.2"
 end

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: blazer
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-01 00:00:00.000000000 Z
+date: 2018-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: chartkick
   requirement: !ruby/object:Gem::Requirement
@@ -87,9 +101,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitattributes"
 - ".gitignore"
 - CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
+- ISSUE_TEMPLATE.md
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -140,6 +157,7 @@ files:
 - app/models/blazer/dashboard.rb
 - app/models/blazer/dashboard_query.rb
 - app/models/blazer/query.rb
+- app/models/blazer/record.rb
 - app/views/blazer/_nav.html.erb
 - app/views/blazer/_variables.html.erb
 - app/views/blazer/check_mailer/failing_checks.html.erb
@@ -163,9 +181,12 @@ files:
 - blazer.gemspec
 - config/routes.rb
 - lib/blazer.rb
+- lib/blazer/adapters/athena_adapter.rb
 - lib/blazer/adapters/base_adapter.rb
 - lib/blazer/adapters/bigquery_adapter.rb
+- lib/blazer/adapters/cassandra_adapter.rb
 - lib/blazer/adapters/drill_adapter.rb
+- lib/blazer/adapters/druid_adapter.rb
 - lib/blazer/adapters/elasticsearch_adapter.rb
 - lib/blazer/adapters/mongodb_adapter.rb
 - lib/blazer/adapters/presto_adapter.rb
@@ -201,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Explore your data with SQL. Easily create charts and dashboards, and share