olap4r 0.1.0 → 0.1.1

data/Gemfile.lock

@@ -11,6 +11,7 @@ GEM
       rdoc
     jruby-openssl (0.7.7)
       bouncy-castle-java (>= 1.5.0146.1)
+    json (1.7.3)
     json (1.7.3-java)
     olap4r-mondrian (0.1.0)
     olap4r-xmla (0.1.0)
@@ -29,6 +30,7 @@ GEM
 
 PLATFORMS
   java
+  ruby
 
 DEPENDENCIES
   bundler (~> 1.1.0)

data/README.md

@@ -1,5 +1,7 @@
 # olap4r
 
+olap4r is a Ruby wrapper for olap4j library. It was open-sourced as a part of [data visualization and reporting tool - Rubbi](http://rubbi.net).
+
 ## Examples
 
 Create connection:

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/olap4r/query_builder.rb

@@ -1,7 +1,7 @@
 module Olap
   class QueryBuilder
     def initialize
-      @select = { :columns => [], :rows => [] }
+      @select = {:columns => [], :rows => []}
       @from = nil
       @conditions = []
     end
@@ -49,13 +49,16 @@ module Olap
       field
     end
 
+    def extract_hierarchy(field)
+      field.match(/\[([^\]]+)\]/)[0]
+    end
+
     def build_axis axis
       return nil if @select[axis].empty?
 
       hierarchies = {}
       @select[axis].each do |field|
-        hierarchy = field.match(/\[([^\]]+)\]/)[0]
-
+        hierarchy = extract_hierarchy(field)
         hierarchies[hierarchy] = [] if hierarchies[hierarchy].nil?
         hierarchies[hierarchy].push field
       end
@@ -102,12 +105,26 @@ module Olap
       crossjoined
     end
 
+    def build_conditions
+      filters_by_hierarchy = @conditions.inject({}) { |hash, c|
+        hierarchy = extract_hierarchy(c)
+        if !hash[hierarchy] then
+          hash[hierarchy] = [c]
+        else
+          hash[hierarchy] << c
+        end
+        hash
+      }
+      filters_by_hierarchy.collect { |k, v| (v.size > 1) ? "{#{v.join(', ')}}" : v }.join(' * ')
+    end
+
     def build_query
       query = []
 
       columns = build_axis :columns
       rows = build_axis :rows
 
+
       unless rows.nil? && columns.nil?
         query << "SELECT"
 
@@ -119,7 +136,7 @@ module Olap
       end
 
       query << "FROM #{@from}" unless @from.nil?
-      query << "WHERE ( #{@conditions.join ", "} )" if @conditions.any?
+      query << "WHERE ( #{build_conditions} )" if @conditions.any?
 
       query.join " "
     end
@@ -128,4 +145,4 @@ module Olap
       field.scan(/\[([^\]]*)\]/).length
     end
   end
-end
+end

data/olap4r.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "olap4r"
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Filip Tepper"]
-  s.date = "2012-08-20"
+  s.date = "2012-10-22"
   s.description = "olap4j wrapper for JRuby"
   s.email = "filip@tepper.pl"
   s.extra_rdoc_files = [

data/spec/connection_spec.rb

@@ -95,6 +95,24 @@ shared_examples_for "an Olap::Connection driver" do
       end
     end
 
+	context "#execute query with conditions" do
+	  let(:cellset) { connection.execute "SELECT { [Department] } ON COLUMNS, \
+					{ [Position] } ON ROWS \
+			FROM [HR] \
+			WHERE ( {[Time].[1997].[Q1], [Time].[1997].[Q2], [Time].[1998].[Q1]} \
+					* {[Employees].[Sheri Nowmer].[Maya Gutierrez], [Employees].[Sheri Nowmer].[Darren Stanz]} \
+					* [Pay Type].[Hourly]  \
+					* [Store Type].[Small Grocery] )" }
+					
+	  it "returns Olap::CellSet instance for successful queries" do
+       	cellset.should be_a(Olap::CellSet)
+      end
+      
+      it "returns cellset formatted values" do
+        cellset.values(:value).should =~ [[10.309]]
+      end
+    end
+
     context "#execute" do
       let(:cellset) { connection.execute "SELECT [Measures].[Unit Sales] ON COLUMNS, [Store] ON ROWS FROM [Sales]" }
 

data/spec/query_builder_spec.rb

@@ -109,7 +109,13 @@ describe Olap::QueryBuilder do
 
     it "adds multiple where conditions" do
       query_builder.where "[Measures].[Unit Sales]", "[Store].[All Stores]"
-      query_builder.to_s.should == "WHERE ( [Measures].[Unit Sales], [Store].[All Stores] )"
+      query_builder.to_s.should == "WHERE ( [Measures].[Unit Sales] * [Store].[All Stores] )"
+    end
+
+
+    it "adds multiple where conditions correctly for conditions from the same dimension" do
+      query_builder.where "[Measures].[Unit Sales]", "[Store].[All Stores].[USA]", "[Store].[All Stores].[Canada]"
+      query_builder.to_s.should == "WHERE ( [Measures].[Unit Sales] * {[Store].[All Stores].[USA], [Store].[All Stores].[Canada]} )"
     end
 
     it "builds the whole query with chaining" do

metadata

@@ -2,7 +2,7 @@
 name: olap4r
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
   - Filip Tepper
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-20 00:00:00 Z
+date: 2012-10-22 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: jruby-openssl