metric_system 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1483853542b6eb79dc9c7a0e349591d2ee14d52
-  data.tar.gz: 9f50ee6bc48e72b83002aaf165576ce586414873
+  metadata.gz: 3c313b1e1c7d585f73c1210c3fb3bc610268d804
+  data.tar.gz: 26cf80941ed294412d5afb60e79b883ae13e2fa8
 SHA512:
-  metadata.gz: 422740c79d19c46fce188e3b33d6cdbf45fc34c79ab37cda1560dfeae0aed607411b6678d0a6085ba6e0569249ec50ac91967fa8bb5bce38bdb048195cfa60b4
-  data.tar.gz: 03deb35f0a2baa9a5842de40355cd8118120a49ec371e900491d458455bab093acbac6bfecc2dd1a34829bbb5122ce47294593ff7c40e3d120959d732bd34475
+  metadata.gz: 1c2b87a70402f5f6090c33f39228c0762777abedbd9f0d27caee1092442a6943a782576a45a48e84b6aec0ce54b4db7080abb9dbbf1a0759575274f0262f847c
+  data.tar.gz: a8e41c77e9810bed3d53e7bbd6c3e30c167d1ffac75c09d41d7955e6b737534cf2f1d0e618d667e5fd979d0398002caf80fc9730c3a94fa6249cb504aa3ec317

data/lib/metric_system.rb

@@ -23,7 +23,7 @@ module MetricSystem
   end
 
   extend Forwardable
-  delegate [:aggregate, :select, :print, :run, :ask, :register] => :"@target"
+  delegate [:aggregate, :select, :print, :run, :ask] => :"@target"
   delegate [:transaction] => :"@target"
   delegate [:add_event] => :"@target"
   delegate [:quit_server!] => :"@target"

data/lib/metric_system/database.rb

@@ -1,12 +1,15 @@
 class MetricSystem::Database
-  def initialize(path)
+  def initialize(path, readonly = false)
     require_relative "./sqlite3_extensions"
     open path
+
+    exec "PRAGMA query_only = 1" if readonly # This might or might not work.
+    @db.readonly = !!readonly
   end
 
   extend Forwardable
 
-  delegate [:exec, :select, :transaction, :rollback, :print, :run, :ask, :register] => :"@db"
+  delegate [:exec, :select, :transaction, :rollback, :print, :run, :ask, :register, :readonly?] => :"@db"
 
   PERIODS = [
     [ :year,   31536000, "strftime('%Y-01-01',          starts_at, 'unixepoch')" ],
@@ -103,7 +106,7 @@ class MetricSystem::Database
         aggregate_for_period :period => period, :source => :counters, :dest => :aggregated_counters, :aggregate => "sum"
       end
 
-      @db.exec "DELETE FROM counters"
+      exec "DELETE FROM counters"
     end
 
     transaction do
@@ -111,7 +114,7 @@ class MetricSystem::Database
         aggregate_for_period :period => period, :source => :gauges, :dest => :aggregated_gauges, :aggregate => "CAST(sum AS FLOAT) / count"
       end
 
-      @db.exec "DELETE FROM gauges"
+      exec "DELETE FROM gauges"
     end
   end
 
@@ -128,7 +131,7 @@ class MetricSystem::Database
     # sql expression to calculate value from sum and count of event values
     aggregate = source == :gauges ? "CAST(sum AS FLOAT) / count" : "sum"
 
-    @db.exec <<-SQL
+    exec <<-SQL
       CREATE TEMPORARY TABLE batch AS
         SELECT name, starts_at, SUM(sum) AS sum, SUM(count) AS count FROM
         (
@@ -157,7 +160,7 @@ class MetricSystem::Database
                       FROM batch;
     SQL
 
-    @db.exec <<-SQL
+    exec <<-SQL
       DROP TABLE batch;
     SQL
   end

data/lib/metric_system/version.rb

@@ -1,3 +1,3 @@
 module MetricSystem
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/metric_system/web.rb

@@ -1,27 +1,43 @@
 require 'sinatra/base'
 require 'to_js'
-
-module GoogleCharts
-  extend self
-
-  def convert(results)
-    results.description.to_js
-  end
-
-  private
-
-end
+require 'metric_system/database'
 
 class MetricSystem::Web < Sinatra::Base
   set :environment, :development
   set :raise_errors, true
   set :views, "#{File.dirname(__FILE__)}/web"
   set :dump_errors, true
+  set :database, nil
+
+  def self.register_query(name, query)
+    registry[name] = query
+  end
+
+  def self.registry
+    @registry ||= {}
+  end
+
+  # return a database for the current thread
+  def self.connection
+    Thread.current[:"MetricSystem::Web.database"] ||= MetricSystem::Database.new(self.database, :readonly)
+  end
+
+  def self.select(query, *args)
+    expect! query => [ String, Symbol ]
+
+    if query.is_a?(Symbol)
+      expect! query => registry.keys
+      query = registry.fetch(query)
+    end
+
+    result = connection.select query, *args #period: "month"
+    result.data_table.to_js
+  end
 
   helpers do
     def select(query, *args)
       @result_cache ||= {}
-      @result_cache[query] ||= MetricSystem.database.select(query, *args).data_table.to_js
+      @result_cache[[query, args]] ||= self.class.select(query, *args, params)
     end
   end
 

data/lib/metric_system/web/dashboard.erb

@@ -116,22 +116,18 @@
       <div>
         <h3>Table</h3>
         <div class="google-visualization">
-          <%=
-            select "SELECT date(starts_at), value FROM aggregates WHERE period='day'"
-          %>
+          <%= select "SELECT date(starts_at), value FROM aggregates WHERE period=:period" %>
         </div>
       </div>
       <div>
         <h3>Pie Chart</h3>
-        <div class="google-visualization" data-src="/value_by_day_name.js" data-chart="pie">
+        <div class="google-visualization" data-src="/value_by_day_name.js?period=month" data-chart="pie">
         </div>
       </div>
       <div>
         <h3>Area Chart</h3>
         <div class="google-visualization" data-chart="area">
-          <%=
-            select "SELECT date(starts_at), value FROM aggregates WHERE period='day'"
-          %>
+          <%= select "SELECT date(starts_at), value FROM aggregates WHERE period=:period" %>
         </div>
       </div>
       <div>

data/lib/sqlite3/database_extension.rb

@@ -1,6 +1,16 @@
 class SQLite3::Database
+  def readonly?
+    @readonly
+  end
+
+  def readonly=(readonly)
+    @readonly = readonly
+  end
+
   # execute multiple SQL statements at once.
   def exec(sql, *args)
+    raise "Cannot run nondestructive query: #{sql}" if readonly?
+
     args = prepare_arguments(args)
 
     while sql =~ /\S/ do
@@ -22,15 +32,14 @@ class SQLite3::Database
   private
 
   def query(sql)
-    expect! sql => [ String, Symbol ]
-
-    if sql.is_a?(Symbol)
-      expect! sql => registry.keys
-      sql = registry.fetch(sql)
-    end
+    expect! sql => String
 
     @queries ||= {}
-    @queries[sql] ||= SQLite3::Query.new sql, prepare(sql)
+    query = @queries[sql] ||= begin
+      query = SQLite3::Query.new sql, prepare(sql)
+      raise "Cannot run nondestructive query: #{sql}" if readonly? && query.destructive?
+      query
+    end
   end
 
   def prepare_arguments(args)
@@ -72,14 +81,4 @@ class SQLite3::Database
     end
     puts "=" * log_sql.length
   end
-
-  # -- query registry
-
-  def registry
-    @registry ||= {}
-  end
-
-  def register(name, query)
-    registry[name] = query
-  end
 end

data/lib/sqlite3/query.rb

@@ -1,12 +1,43 @@
+class SQLite3::MissingParameters < RuntimeError
+end
+
 class SQLite3::Query
+
+  # all parameters in the query, as Symbols.
+  attr :parameters
+
   def initialize(sql, statement)
     expect! statement => SQLite3::Statement
 
     @sql, @statement = sql, statement
+    @parameters = @sql.scan(/:([a-z]+)/).map(&:first).map(&:to_sym)
+  end
+
+  def destructive?
+    @sql !~ /\A\S*SELECT/i
   end
 
   def run(*args)
-    # STDERR.puts "Q: #{@sql} #{args.map(&:inspect).join(", ")}"
+    if parameters.length > 0
+      named_args = {}
+
+      if args.last.is_a?(Hash)
+        args.pop.each do |name, value|
+          named_args[name.to_sym] = value
+        end
+      end
+
+      missing = parameters - named_args.keys
+      unless missing.empty?
+        raise SQLite3::MissingParameters, "Missing parameter(s): #{missing.inspect}"
+      end
+
+      named_args = named_args.select do |name, value|
+        parameters.include?(name)
+      end
+      args << named_args
+    end
+
     @statement.execute *args
   end
 
@@ -44,6 +75,8 @@ class SQLite3::Query
       { cols: cols, rows: rows }
     end
 
+    private
+
     def convert_record(record, cols)
       values = cols.map do |col|
         id, type = col.values_at(:id, :type)

data/test/benchmark.rb

@@ -30,7 +30,7 @@ benchmark "Building metric_system" do
       MetricSystem.transaction do
         1.upto(TICKS_PER_DAY) do |step|
           time = midnight + distance * step
-          STDERR.print "."
+          # STDERR.print "."
           MetricSystem.count "clicks", 1, time
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metric_system
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - radiospiel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-12 00:00:00.000000000 Z
+date: 2014-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: expectation