forest_liana 2.5.4 → 2.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffa19543c4688c771f14aec5ae9ebdabdc7085d7
-  data.tar.gz: 4d871b809392f7f2590daf1b101e1a3646de7383
+  metadata.gz: 5214128ae98854ef7c971f1dcab51b1ccaf4ed42
+  data.tar.gz: aa5a5656d07a4156fdf6bd486436c01e93abf23e
 SHA512:
-  metadata.gz: ec682fb2e85cf9adb6c90567b93712834f8927eecded2dcd3790a357106687342f9fa2f04350f456395336d7ec31e7b10a09355205dfdaf31758c4837bec6b28
-  data.tar.gz: 7b97a495d06d1eb3017012a830aed7e2bfed0673259c5d2ce189173241ae3e17aa5bcfe8cb91aa84114bfabf8b011f4c074680e088759c09bf845fd327a9e492
+  metadata.gz: 4465170c5c167630fb5a6cd90c2b723219f375c9b34ed0163cc6cd0b54f417793c4692ca1134d88ee46f482d8d071daae182850487ec99be847061a481a07d78
+  data.tar.gz: '0322564698c541a518da0c69aa8138f4b9733ea5906624d9458cbfe030d0bfcbc9f05d34c4551a4e60a1bdd515435f78df7e9ab631007b307dd9cc666ba812e2'

data/app/helpers/forest_liana/adapter_helper.rb

@@ -1,5 +1,7 @@
 module ForestLiana
   module AdapterHelper
+    ADAPTER_MYSQL2 = 'Mysql2'
+
     def self.format_column_name(table_name, column_name)
       quoted_table_name = ActiveRecord::Base.connection.quote_table_name(table_name)
       quoted_column_name = ActiveRecord::Base.connection.quote_column_name(column_name)
@@ -13,5 +15,35 @@ module ForestLiana
         value
       end
     end
+
+    def self.format_live_query_value_result(result)
+      # NOTICE: The adapters have their own specific format for the live query value chart results.
+      case ActiveRecord::Base.connection.adapter_name
+      when ADAPTER_MYSQL2
+        { 'value' => result.first.first }
+      else
+        result.first
+      end
+    end
+
+    def self.format_live_query_pie_result(result)
+      # NOTICE: The adapters have their own specific format for the live query pie chart results.
+      case ActiveRecord::Base.connection.adapter_name
+      when ADAPTER_MYSQL2
+        result.map { |value| { 'key' => value[0], 'value' => value[1] } }
+      else
+        result.to_a
+      end
+    end
+
+    def self.format_live_query_line_result(result)
+      # NOTICE: The adapters have their own specific format for the live query line chart results.
+      case ActiveRecord::Base.connection.adapter_name
+      when ADAPTER_MYSQL2
+        result.map { |value| { 'key' => value[0], 'value' => value[1] } }
+      else
+        result
+      end
+    end
   end
 end

data/app/services/forest_liana/query_stat_getter.rb

@@ -22,7 +22,7 @@ module ForestLiana
       case @params['type']
       when 'Value'
         if result.count
-          result_line = result.first
+          result_line = ForestLiana::AdapterHelper.format_live_query_value_result(result)
           if result_line
             if !result_line.key?('value')
               raise error_message(result_line, "'value'")
@@ -38,23 +38,27 @@ module ForestLiana
         end
       when 'Pie'
         if result.count
-          result.each do |result_line|
+          values = ForestLiana::AdapterHelper.format_live_query_pie_result(result)
+
+          values.each do |result_line|
             if !result_line.key?('value') || !result_line.key?('key')
               raise error_message(result_line, "'key', 'value'")
             end
           end
 
-          @record = Model::Stat.new(value: result.to_a)
+          @record = Model::Stat.new(value: values)
         end
       when 'Line'
         if result.count
-          result.each do |result_line|
+          values = ForestLiana::AdapterHelper.format_live_query_line_result(result)
+
+          values.each do |result_line|
             if !result_line.key?('value') || !result_line.key?('key')
               raise error_message(result_line, "'key', 'value'")
             end
           end
 
-          result_formatted = result.map do |result_line|
+          result_formatted = values.map do |result_line|
             { label: result_line['key'], values: { value: result_line['value'] }}
           end
 

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "2.5.4"
+  VERSION = "2.5.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 2.5.4
+  version: 2.5.5
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-14 00:00:00.000000000 Z
+date: 2018-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails