rubiks 0.1.5 → 0.1.6

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.1.6
+* Added controls to flush the schema cache and reset the mondrian connection
+
 ## 0.1.5
 * Better error messages
 

data/lib/rubiks.rb

@@ -20,11 +20,16 @@ module ::Rubiks
   autoload :CalculatedMeasure, 'rubiks/calculated_measure'
 
   def self.connection
-    raise 'No connection has been specified - try requiring rubiks/mondrian'
+    Rubiks::Mondrian.connection
+  end
+
+  def self.clear_cache
+    ::Rubiks::Mondrian.flush_schema_cache
+    ::Rubiks::Mondrian.reset_connection
   end
 
   def self.execute(query)
-    connection.execute(query)
+    ::Rubiks::Mondrian.connection.execute(query)
   end
 
   def self.schema

data/lib/rubiks/mondrian.rb

@@ -8,10 +8,6 @@ Dir[File.expand_path('../mondrian/jars/*.jar', __FILE__)].each{ |jar| require ja
 Java::mondrian.olap4j.MondrianOlap4jDriver
 
 module ::Rubiks
-  def self.connection
-    @connection ||= ::Rubiks::Mondrian.connection
-  end
-
   module Mondrian
     def self.connection
       @connection ||= ::Rubiks::Mondrian::Connection.create(
@@ -40,5 +36,21 @@ module ::Rubiks
         end
       end
     end
+
+    def self.execute(query)
+      connection.execute(query)
+    end
+
+    # After the cache is flushed we must reset the connection
+    def self.flush_schema_cache
+      connection.flush_schema_cache
+    end
+
+    def self.reset_connection
+      connection.close
+      @connection = ::Rubiks::Mondrian::Connection.create(
+        config.merge(:catalog_content => ::Rubiks.schema.to_xml)
+      )
+    end
   end
 end

data/lib/rubiks/mondrian/connection.rb

@@ -83,6 +83,14 @@ module ::Rubiks
         end
       end
 
+      # Will affect only the next created connection. If it is necessary to clear all schema cache then
+      # flush_schema_cache should be called, then close and then new connection should be created.
+      def flush_schema_cache
+        unwrapped_connection = @raw_connection.unwrap(Java::MondrianOlap::Connection.java_class)
+        raw_cache_control = unwrapped_connection.getCacheControl(nil)
+        raw_cache_control.flushSchemaCache
+      end
+
       private
 
       def connection_string

data/lib/rubiks/version.rb

@@ -1,3 +1,3 @@
 module ::Rubiks
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubiks
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-01 00:00:00.000000000 Z
+date: 2013-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -85,7 +85,6 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
-- .rvmrc
 - .travis.yml
 - .yardopts
 - CHANGELOG.md
@@ -165,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1745448191205175885
+      hash: -2941452672752005346
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -174,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1745448191205175885
+      hash: -2941452672752005346
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25

data/.rvmrc

@@ -1 +0,0 @@
-rvm use 1.9.3