adhoq 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e44fcb3a79e299b2a337652f8439d58cd4babe71
-  data.tar.gz: 5312feb5fee5890cae4b27f48c541a36b937ef0e
+  metadata.gz: 02a157e9e5f920c790dacf15b8922fc3788e72f5
+  data.tar.gz: 29ed73191c4f2446ee01b1c9d4963ad232c982a4
 SHA512:
-  metadata.gz: 19546d4c89ab4cbb7da38b46e02a7cc4bfe091d1d00bbd3110d186a26586f929cdccdab8bf2bf12f322cfaf052297d102eefcfe3660c47012da952a0464baae9
-  data.tar.gz: 914e24aabd3a6a896c62e3c276642f8a6ba37d85d8d6f285363e5c1dbf6b4a3025f714f065989475b4042edfb8ab513ef2462974fb45214fa754c5f640ef345e
+  metadata.gz: 930398b399c5a821fe2374ddc37c1563224d14a03add9a0523af2b0fa427801ca345d6c894674445fac1178f7be07aeed6a747a006883da1168d191370c9bdcb
+  data.tar.gz: c0e698cfd0ca88aff00437bd88c6fdeaf9ddeb72b6b8b3528638dea83cab0678b704100c1156920185f21d34d3557252f1bfb1d7501df7a7f5440f45e63d51ef

data/README.md

@@ -60,6 +60,7 @@ Edit initialization file in `config/initializers/adhoq.rb`
 
 ```ruby
 Adhoq.configure do |config|
+  # if not set, use :on_the_fly.(default)
   config.storage       = [:local_file, Rails.root + './path/to/store/report/files']
   config.authorization = ->(controller) { controller.signed_in? }
 end

data/app/assets/stylesheets/adhoq/adhoq.css.sass

@@ -7,13 +7,16 @@ $short-span:  $font-size-base / 2
 
 // engine styles
 
-.new-execution form.form-inline
-  .form-group.report_format
+.new-execution form
+  .form-group.report_format, .form-group.query_parameters
     margin-right: $font-size-base
 
     label
       margin-right: $short-span
 
+  .query_parameter
+    margin-bottom: $short-span
+
 #main > section > .page-header, #main > section > form.query-form .page-header
   margin-top: 0
 

data/app/controllers/adhoq/executions_controller.rb

@@ -13,7 +13,7 @@ module Adhoq
     private
 
     def synced_create
-      @execution = current_query.execute!(params[:execution][:report_format])
+      @execution = current_query.execute!(params[:execution][:report_format], query_parameters)
 
       if @execution.report.on_the_fly?
         respond_report(@execution.report)
@@ -23,7 +23,7 @@ module Adhoq
     end
 
     def asynced_create
-      Adhoq::ExecuteJob.perform_later(current_query, params[:execution][:report_format])
+      Adhoq::ExecuteJob.perform_later(current_query, params[:execution][:report_format], query_parameters)
       redirect_to current_query
     end
 
@@ -42,5 +42,9 @@ module Adhoq
     def async_execution?
       Adhoq.config.async_execution? && !Adhoq.current_storage.is_a?(Adhoq::Storage::OnTheFly)
     end
+
+    def query_parameters
+      params[:parameters] || HashWithIndifferentAccess.new
+    end
   end
 end

data/app/controllers/adhoq/previews_controller.rb

@@ -4,7 +4,9 @@ module Adhoq
 
     def create
       begin
-        @result = Adhoq::Executor.new(params[:query]).execute
+        query = Adhoq::Query.new(query: params[:query])
+        raw_query = query.substitute_query(params[:parameters] || {})
+        @result = Adhoq::Executor.new(raw_query).execute
       rescue ActiveRecord::StatementInvalid => @statement_invalid
         render 'statement_invalid', status: :unprocessable_entity
       end

data/app/controllers/adhoq/queries_controller.rb

@@ -29,6 +29,11 @@ module Adhoq
       redirect_to @query
     end
 
+    def destroy
+      Adhoq::Query.find(params[:id]).destroy!
+      redirect_to action: :index
+    end
+
     private
 
     def query_attributes

data/app/helpers/adhoq/application_helper.rb

@@ -30,5 +30,9 @@ module Adhoq
     def table_order_key(ar_class)
       ar_class.primary_key || ar_class.columns.first.name
     end
+
+    def query_parameter_field(name)
+      text_field_tag "parameters[#{name}]", nil, class: "form-control"
+    end
   end
 end

data/app/models/adhoq/query.rb

@@ -4,11 +4,33 @@ module Adhoq
 
     has_many :executions, dependent: :destroy, inverse_of: :query
 
-    def execute!(report_format)
+    PARAMETER_PATTERN = /\$(?<name>\w+)|\${(?<name>\w+)}/i.freeze
+
+    def execute!(report_format, query_parameters = {})
       executions.create! {|exe|
         exe.report_format = report_format
-        exe.raw_sql       = query
+        exe.raw_sql       = substitute_query(query_parameters)
       }.tap(&:generate_report!)
     end
+
+    def parameters
+      return @parameters if @parameters
+
+      @parameters = query.scan(PARAMETER_PATTERN).each_with_object([]) do |(match1, match2), arr|
+        name = match1 || match2
+
+        arr << name.downcase
+      end
+    end
+
+    def substitute_query(query_parameters)
+      return query if parameters.empty?
+
+      query_parameters = query_parameters.with_indifferent_access
+      query.gsub(PARAMETER_PATTERN) do |_, arr|
+        name = Regexp.last_match["name"]
+        query_parameters[name]
+      end
+    end
   end
 end

data/app/views/adhoq/queries/_query.html.slim

@@ -6,6 +6,8 @@ section.query
         = link_to [:edit, query], class: 'btn btn-default btn-sm' do
           i.fa.fa-pencil.fa-pad-r
           | Edit
+      .pull-right
+        = link_to 'Delete', query, class: 'btn btn-default btn-sm', :method => :delete, data: { confirm: 'Are you sure?' }
       .clearfix
       small= "Updated at #{l(query.updated_at, format: :short)}"
   p.description= query.description
@@ -17,10 +19,17 @@ section.query
 
   section.new-execution
     h2 Create report
-    = form_for [query, query.executions.build], html: {class: 'form-inline', role: 'form'} do |f|
-      .form-group.report_format
+    = form_for [query, query.executions.build], html: {role: 'form'} do |f|
+      .form-inline.form-group.report_format
         = f.label  :report_format
         = f.select :report_format, f.object.supported_formats, {}, class: 'form-control'
+      - if query.parameters.present?
+        h4 Query parameters
+        .form-group.query_parameters
+          - query.parameters.each do |param_name|
+            .form-inline.query_parameter
+              = label_tag "parameters_#{param_name}", "#{param_name}"
+              = query_parameter_field(param_name)
       .form-group
         = f.submit 'Create report', class: 'btn btn-default'
 

data/lib/adhoq/configuration.rb

@@ -3,7 +3,9 @@ module Adhoq
   class Configuration
     include ActiveSupport::Configurable
 
-    config_accessor :storage
+    config_accessor :storage do
+      [:on_the_fly]
+    end
 
     config_accessor :authorization
     config_accessor :authorization_failure_action

data/lib/adhoq/version.rb

@@ -1,3 +1,3 @@
 module Adhoq
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/models/adhoq/query_spec.rb

@@ -1,4 +1,32 @@
 module Adhoq
   RSpec.describe Query, type: :model do
+    describe "#parameters" do
+      it "returns query parameter Array of Hash" do
+        query = Query.new(query: "SELECT * FROM users where created_at > '$time' AND activated = ${activated}")
+        expect(query.parameters).to eq [
+          "time",
+          "activated",
+        ]
+      end
+    end
+
+    describe "#substitute_query" do
+      it "returns query string with parameter binding" do
+        query = Query.new(query: "SELECT * FROM users where created_at > '$time' AND activated = ${activated}")
+        substitute = query.substitute_query({
+          time: "2010-10-01 10:00:00",
+          activated: "1",
+        })
+        expect(substitute).to eq "SELECT * FROM users where created_at > '2010-10-01 10:00:00' AND activated = 1"
+      end
+
+      context "query doesn't need parameter" do
+        it "returns query string" do
+          query = Query.new(query: "SELECT * FROM users")
+          substitute = query.substitute_query({})
+          expect(substitute).to eq "SELECT * FROM users"
+        end
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adhoq
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Kyosuke MOROHASHI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-16 00:00:00.000000000 Z
+date: 2015-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails