From 667d848d1a7d01a9f405fa348a1b3e753ac85d2e Mon Sep 17 00:00:00 2001
From: walther <walther@datawheel.us>
Date: Mon, 22 Oct 2018 16:40:49 -0400
Subject: [PATCH 1/3] initialize mondrian connection in config.ru and pass to
 APIHelpers @@olap

---
 lib/mondrian_rest/api_helpers.rb | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/mondrian_rest/api_helpers.rb b/lib/mondrian_rest/api_helpers.rb
index 99b03f0..640445a 100644
--- a/lib/mondrian_rest/api_helpers.rb
+++ b/lib/mondrian_rest/api_helpers.rb
@@ -4,15 +4,13 @@ class PropertyError < StandardError
   end
 
   module APIHelpers
-    @@olap = nil
+    @@olap = nil # env['mondrian-olap.conn']
     @@mdx_parser = nil
 
     def olap
-      if @@olap.nil?
-        @@olap = Mondrian::OLAP::Connection.new(env['mondrian-olap.params'])
-        @@olap.connect
-      end
       @@olap
+      if @@olap.nil?
+        raise 'Please create mondrian connection and .connect in config.ru'
     end
 
     ##

From 43c74be1a49642b171e729d6c6cbacd0f77237de Mon Sep 17 00:00:00 2001
From: Walther Chen <walther.chen@gmail.com>
Date: Mon, 22 Oct 2018 17:00:23 -0400
Subject: [PATCH 2/3] forgot end for if

---
 lib/mondrian_rest/api_helpers.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/mondrian_rest/api_helpers.rb b/lib/mondrian_rest/api_helpers.rb
index 640445a..90c5ecc 100644
--- a/lib/mondrian_rest/api_helpers.rb
+++ b/lib/mondrian_rest/api_helpers.rb
@@ -11,6 +11,7 @@ def olap
       @@olap
       if @@olap.nil?
         raise 'Please create mondrian connection and .connect in config.ru'
+      end
     end
 
     ##

From 62be4ec46cd8ba239c1992465f63e96a69ac6cde Mon Sep 17 00:00:00 2001
From: walther <walther@datawheel.us>
Date: Tue, 23 Oct 2018 13:59:04 -0400
Subject: [PATCH 3/3] change refernces from  to

---
 lib/mondrian_rest/api_helpers.rb | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/lib/mondrian_rest/api_helpers.rb b/lib/mondrian_rest/api_helpers.rb
index 90c5ecc..7fb1993 100644
--- a/lib/mondrian_rest/api_helpers.rb
+++ b/lib/mondrian_rest/api_helpers.rb
@@ -8,32 +8,31 @@ module APIHelpers
     @@mdx_parser = nil
 
     def olap
-      @@olap
       if @@olap.nil?
         raise 'Please create mondrian connection and .connect in config.ru'
       end
+      @@olap
     end
 
     ##
     # Returns an instance of org.olap4j.mdx.parser.MdxParser
     def mdx_parser
       if @@mdx_parser.nil?
-        @@mdx_parser = olap.raw_connection.getParserFactory
-                       .createMdxParser(olap.raw_connection)
+        raise 'Please create mondrian mdx parser'
       end
       @@mdx_parser
     end
 
     def olap_flush
-      if olap.connected?
-        olap.flush_schema_cache
-        olap.close
+      if @@olap.connected?
+        @@olap.flush_schema_cache
+        @@olap.close
       end
-      olap.connect
+      @@olap.connect
     end
 
     def get_cube_or_404(name)
-      cube = olap.cube(name)
+      cube = @@olap.cube(name)
       error!('Not found', 404) if cube.nil?
       cube
     end