olap-view 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad6e119e533f9e6e87547d9034fe1c8ed9538dfa
-  data.tar.gz: 295119ab17fc3656d1deaef035e63b67dcf0ad36
+  metadata.gz: 9bf3f983abc5489aedc40598978f653bd1403a22
+  data.tar.gz: b78c000d11fa8af6035f22ebfa35229b747afc67
 SHA512:
-  metadata.gz: 1d4b1ae21c375256d58a980d0f8aaa5b9d3f4aec1ff93409820e2a80f47f8d93a2506922a629b6d9162ef1376be4a94d9cd911268c2aec2b35fa63fd32ea5e09
-  data.tar.gz: 5a2579646ee8eaace4a55201e0c5737db1e14cd01f72887668bf6e5b4acf51809927220b45c90c18763c873edc0556783fb1b23461db0e803b1519b4cd76294a
+  metadata.gz: 749bc9fdc3a8d92f96a57c571c9b6f25766ef6d1bdadd2de62f1ac33984b3474b41537e1f262c2463f9f90902efc7097d91dc741d0a2e3d78a366eb99d9f004c
+  data.tar.gz: 643ced8f0f65e03aee65c80e44fb805f3c1a0048a2d45cafd79a92978e5a8b4ce54867523e07b35f6620eb6f8fc2bbd5a0f1f7af7b61883b0457084269bcf5f0

data/README.md

@@ -55,7 +55,7 @@ Olap::View.request MDX_QUERY, {'%DATE%' => '20150530'}
 ```
 
 ### Render Google Chart by MDX
-At the moment only available `:table` and `:piechart` charts.
+At the moment only available `:table`, `:piechart`, `:barchart` and partially `:combochart` charts.
 
 Insert helper menthod to `erb` file: 
 ```ruby
@@ -92,9 +92,11 @@ In `olap_view_chart_by_mdx` and `olap_view_chart_by_xmla` following properties a
 
 `function: "text on JS"` execute ani js code into chart template
 
-`dimention: "Source Name"` aggregate xmla data by dimesion
+`dimension: "Source Name"` aggregate xmla data by dimesion
+
+`merge_dimensions: true` merge dimensions to one table
  
-`measures: "[Measures].[Click]"` remove measure from xmla data
+`measures: "[Measures].[Click]"` show only selected measure from xmla data and sort by order
  
 `options: {}` Google Charts draw options
 

data/lib/olap/view/parse.rb

@@ -12,8 +12,7 @@ class Olap::View::Parse
     index = {}
     response.rows.each{|row|
       label = row[:labels].detect{|label| label[:name] == dimension}
-      values = row[:values].collect{|v|
-        next if !measures.empty? && !measures.include?(v[:measure])
+      values = measures_row(row, measures).collect{|v|
         v.delete :fmt_value
         v
       }.compact
@@ -53,11 +52,15 @@ class Olap::View::Parse
   # *  +:caption+ display name of measure
   #
   def measures_caption measures = []
-    (measures.nil? || measures.empty?) ? response.measures :
-        response.measures.collect{|m|
-          next unless measures.include? m[:name]
-          m
-        }.compact
+    if measures.empty? || measures.nil?
+      response.measures
+    else
+      measures.collect{|measure|
+        next unless col = response.measures.detect{|value| value[:name] == measure}
+        col
+      }.compact
+    end
+
   end
 
   def dimensions_row row, merge_dimensions = false
@@ -77,10 +80,16 @@ class Olap::View::Parse
   end
 
   def measures_row row, measures = []
-    row.collect{|value|
-      next if !measures.empty? && !measures.include?(value[:measure])
-      {type: 'measure', value: value[:value].to_f, fmt_value: value[:fmt_value]}
-    }.compact
+    if measures.empty?
+      row.collect{|value|
+        {type: 'measure', value: value[:value].to_f, fmt_value: value[:fmt_value]}
+      }.compact
+    else
+      measures.collect{|measure|
+        next unless col = row.detect{|value| value[:measure] == measure}
+        {type: 'measure', value: col[:value].to_f, fmt_value: col[:fmt_value]}
+      }.compact
+    end
   end
 
   # Collection of result rows and aggregate collection by dimension and measures

data/lib/olap/view/version.rb

@@ -1,5 +1,5 @@
 module Olap
   module View
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

data/olap-view.gemspec

@@ -17,5 +17,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_runtime_dependency "olap-xmla", '~> 0.0', '>= 0.0.9'
+  spec.add_runtime_dependency "olap-xmla", '~> 0.0', '>= 0.0.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: olap-view
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - stepanovit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-01 00:00:00.000000000 Z
+date: 2016-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -47,7 +47,7 @@ dependencies:
         version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 0.0.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -57,7 +57,7 @@ dependencies:
         version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 0.0.10
 description: Ruby On Rails gem to visualize by Google Charts MDX queries on OLAP databases
   using XMLA connection. Can be used with any XMLA-compliant server, like Olaper or
   Mondrian.