mondrian-olap 0.3.0 → 0.5.0

data/spec/spec_helper.rb

@@ -1,18 +1,22 @@
-require "rubygems"
-require "bundler"
-Bundler.setup(:default, :development)
-
-$:.unshift(File.dirname(__FILE__) + '/../lib')
-
+require 'rdoc'
 require 'rspec'
 require 'active_record'
+require 'activerecord-jdbc-adapter'
+require 'coffee-script'
+require 'rhino'
+require 'pry'
+
+# autoload corresponding JDBC driver during require 'jdbc/...'
+Java::JavaLang::System.setProperty("jdbc.driver.autoload", "true")
 
-DATABASE_HOST     = ENV['DATABASE_HOST']     || 'localhost'
-DATABASE_USER     = ENV['DATABASE_USER']     || 'mondrian_test'
-DATABASE_PASSWORD = ENV['DATABASE_PASSWORD'] || 'mondrian_test'
-DATABASE_NAME     = ENV['DATABASE_NAME']     || 'mondrian_test'
-DATABASE_INSTANCE = ENV['DATABASE_INSTANCE']
 MONDRIAN_DRIVER   = ENV['MONDRIAN_DRIVER']   || 'mysql'
+env_prefix = MONDRIAN_DRIVER.upcase
+
+DATABASE_HOST     = ENV["#{env_prefix}_DATABASE_HOST"]     || ENV['DATABASE_HOST']     || 'localhost'
+DATABASE_USER     = ENV["#{env_prefix}_DATABASE_USER"]     || ENV['DATABASE_USER']     || 'mondrian_test'
+DATABASE_PASSWORD = ENV["#{env_prefix}_DATABASE_PASSOWRD"] || ENV['DATABASE_PASSWORD'] || 'mondrian_test'
+DATABASE_NAME     = ENV["#{env_prefix}_DATABASE_NAME"]     || ENV['DATABASE_NAME']     || 'mondrian_test'
+DATABASE_INSTANCE = ENV["#{env_prefix}_DATABASE_INSTANCE"] || ENV['DATABASE_INSTANCE']
 
 case MONDRIAN_DRIVER
 when 'mysql'
@@ -23,7 +27,6 @@ when 'postgresql'
   JDBC_DRIVER = 'org.postgresql.Driver'
 when 'oracle'
   require 'active_record/connection_adapters/oracle_enhanced_adapter'
-  DATABASE_NAME = ENV['DATABASE_NAME'] || 'orcl'
   CATALOG_FILE = File.expand_path('../fixtures/MondrianTestOracle.xml', __FILE__)
 when 'mssql'
   require 'jdbc/jtds'
@@ -33,7 +36,7 @@ when 'sqlserver'
 when 'luciddb'
   require 'jdbc/luciddb'
   CATALOG_FILE = File.expand_path('../fixtures/MondrianTestOracle.xml', __FILE__)
-  
+
   # Hack to disable :text type for LucidDB
   require 'arjdbc/jdbc/type_converter'
   ActiveRecord::ConnectionAdapters::JdbcTypeConverter::AR_TO_JDBC_TYPES.delete(:text)
@@ -64,7 +67,7 @@ end
 puts "==> Using #{MONDRIAN_DRIVER} driver"
 
 require 'mondrian/olap'
-require 'support/matchers/be_like'
+require 'spec/support/matchers/be_like'
 
 RSpec.configure do |config|
   config.include Matchers
@@ -73,6 +76,8 @@ end
 CATALOG_FILE = File.expand_path('../fixtures/MondrianTest.xml', __FILE__) unless defined?(CATALOG_FILE)
 
 CONNECTION_PARAMS = {
+  # uncomment to test PostgreSQL SSL connection
+  # :properties => {'ssl'=>'true','sslfactory'=>'org.postgresql.ssl.NonValidatingFactory'},
   :driver   => MONDRIAN_DRIVER,
   :host     => DATABASE_HOST,
   :database => DATABASE_NAME,
@@ -80,7 +85,7 @@ CONNECTION_PARAMS = {
   :password => DATABASE_PASSWORD
 }
 
-case MONDRIAN_DRIVER 
+case MONDRIAN_DRIVER
 when 'oracle'
   AR_CONNECTION_PARAMS = {
     :adapter  => 'oracle_enhanced',
@@ -107,7 +112,8 @@ when 'mssql'
     :driver   => JDBC_DRIVER,
     :url      => url,
     :username => CONNECTION_PARAMS[:username],
-    :password => CONNECTION_PARAMS[:password]
+    :password => CONNECTION_PARAMS[:password],
+    :connection_alive_sql => 'SELECT 1'
   }
 when 'sqlserver'
   url = "jdbc:sqlserver://#{CONNECTION_PARAMS[:host]};databaseName=#{CONNECTION_PARAMS[:database]};"
@@ -117,10 +123,13 @@ when 'sqlserver'
     :driver   => JDBC_DRIVER,
     :url      => url,
     :username => CONNECTION_PARAMS[:username],
-    :password => CONNECTION_PARAMS[:password]
+    :password => CONNECTION_PARAMS[:password],
+    :connection_alive_sql => 'SELECT 1'
   }
 else
   AR_CONNECTION_PARAMS = {
+    # uncomment to test PostgreSQL SSL connection
+    # :properties => CONNECTION_PARAMS[:properties],
     :adapter  => 'jdbc',
     :driver   => JDBC_DRIVER,
     :url      => "jdbc:#{MONDRIAN_DRIVER}://#{CONNECTION_PARAMS[:host]}/#{CONNECTION_PARAMS[:database]}",

data/spec/support/matchers/be_like.rb

@@ -1,11 +1,11 @@
 module Matchers
   class BeLike
     def initialize(expected)
-      @expected = expected.gsub(/>\s*\n\s*/, '>').gsub(/\s+/, ' ').strip
+      @expected = expected.gsub(/>\s*\n\s*/, '> ').gsub(/\s+/, ' ').strip
     end
 
     def matches?(actual)
-      @actual = actual.gsub(/>\s*\n\s*/, '>').gsub(/\s+/, ' ').strip
+      @actual = actual.gsub(/>\s*\n\s*/, '> ').gsub(/\s+/, ' ').strip
       @expected == @actual
     end
 

metadata

@@ -1,249 +1,308 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mondrian-olap
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.3.0
+version: !ruby/object:Gem::Version
+  version: 0.5.0
 platform: ruby
-authors: 
-  - Raimonds Simanovskis
-autorequire: 
+authors:
+- Raimonds Simanovskis
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2011-11-12 00:00:00 Z
-dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: nokogiri
-    version_requirements: &id001 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ~>
-          - !ruby/object:Gem::Version 
-            version: 1.5.0
-    requirement: *id001
-    prerelease: false
-    type: :runtime
-  - !ruby/object:Gem::Dependency 
-    name: jruby-openssl
-    version_requirements: &id002 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0"
-    requirement: *id002
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: jeweler
-    version_requirements: &id003 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ~>
-          - !ruby/object:Gem::Version 
-            version: 1.5.2
-    requirement: *id003
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: rdoc
-    version_requirements: &id004 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0"
-    requirement: *id004
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: rspec
-    version_requirements: &id005 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ~>
-          - !ruby/object:Gem::Version 
-            version: "2.5"
-    requirement: *id005
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: autotest
-    version_requirements: &id006 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0"
-    requirement: *id006
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: jdbc-mysql
-    version_requirements: &id007 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0"
-    requirement: *id007
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: jdbc-postgres
-    version_requirements: &id008 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0"
-    requirement: *id008
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: jdbc-luciddb
-    version_requirements: &id009 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0"
-    requirement: *id009
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: jdbc-jtds
-    version_requirements: &id010 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0"
-    requirement: *id010
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: activerecord
-    version_requirements: &id011 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 3.0.10
-    requirement: *id011
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: activerecord-jdbc-adapter
-    version_requirements: &id012 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 1.1.1
-    requirement: *id012
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: activerecord-oracle_enhanced-adapter
-    version_requirements: &id013 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0"
-    requirement: *id013
-    prerelease: false
-    type: :development
+date: 2013-11-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: bundler
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rake
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rspec
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: jdbc-mysql
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: jdbc-postgres
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: jdbc-luciddb
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: jdbc-jtds
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.8
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.8
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: activerecord-jdbc-adapter
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: activerecord-oracle_enhanced-adapter
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: pry
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: therubyrhino
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: coffee-script
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :development
 description: |
   JRuby gem for performing multidimensional queries of relational database data using Mondrian OLAP Java library
-
-email: raimonds.simanovskis@gmail.com
+email:
+- raimonds.simanovskis@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-  - LICENSE-Mondrian.html
-  - LICENSE.txt
-  - README.rdoc
-files: 
-  - .rspec
-  - Changelog.md
-  - Gemfile
-  - LICENSE-Mondrian.html
-  - LICENSE.txt
-  - README.rdoc
-  - RUNNING_TESTS.rdoc
-  - Rakefile
-  - VERSION
-  - lib/mondrian-olap.rb
-  - lib/mondrian/jars/commons-collections-3.1.jar
-  - lib/mondrian/jars/commons-dbcp-1.2.1.jar
-  - lib/mondrian/jars/commons-logging-1.0.4.jar
-  - lib/mondrian/jars/commons-math-1.0.jar
-  - lib/mondrian/jars/commons-pool-1.2.jar
-  - lib/mondrian/jars/commons-vfs-1.0.jar
-  - lib/mondrian/jars/eigenbase-properties.jar
-  - lib/mondrian/jars/eigenbase-resgen.jar
-  - lib/mondrian/jars/eigenbase-xom.jar
-  - lib/mondrian/jars/javacup.jar
-  - lib/mondrian/jars/log4j-1.2.8.jar
-  - lib/mondrian/jars/log4j.properties
-  - lib/mondrian/jars/mondrian.jar
-  - lib/mondrian/jars/olap4j.jar
-  - lib/mondrian/olap.rb
-  - lib/mondrian/olap/connection.rb
-  - lib/mondrian/olap/cube.rb
-  - lib/mondrian/olap/query.rb
-  - lib/mondrian/olap/result.rb
-  - lib/mondrian/olap/schema.rb
-  - lib/mondrian/olap/schema_element.rb
-  - mondrian-olap.gemspec
-  - spec/connection_spec.rb
-  - spec/cube_spec.rb
-  - spec/fixtures/MondrianTest.xml
-  - spec/fixtures/MondrianTestOracle.xml
-  - spec/query_spec.rb
-  - spec/rake_tasks.rb
-  - spec/schema_definition_spec.rb
-  - spec/spec_helper.rb
-  - spec/support/matchers/be_like.rb
+extra_rdoc_files:
+- README.md
+files:
+- Changelog.md
+- LICENSE-Mondrian.html
+- LICENSE.txt
+- README.md
+- VERSION
+- lib/mondrian-olap.rb
+- lib/mondrian/olap.rb
+- lib/mondrian/jars/commons-collections-3.2.jar
+- lib/mondrian/jars/commons-dbcp-1.2.1.jar
+- lib/mondrian/jars/commons-logging-1.1.1.jar
+- lib/mondrian/jars/commons-math-1.1.jar
+- lib/mondrian/jars/commons-pool-1.2.jar
+- lib/mondrian/jars/commons-vfs-1.0.jar
+- lib/mondrian/jars/eigenbase-properties-1.1.2.jar
+- lib/mondrian/jars/eigenbase-resgen-1.3.1.jar
+- lib/mondrian/jars/eigenbase-xom-1.3.1.jar
+- lib/mondrian/jars/javacup-10k.jar
+- lib/mondrian/jars/log4j-1.2.14.jar
+- lib/mondrian/jars/log4j.properties
+- lib/mondrian/jars/mondrian.jar
+- lib/mondrian/jars/olap4j-1.0.1.539.jar
+- lib/mondrian/olap/connection.rb
+- lib/mondrian/olap/cube.rb
+- lib/mondrian/olap/error.rb
+- lib/mondrian/olap/query.rb
+- lib/mondrian/olap/result.rb
+- lib/mondrian/olap/schema.rb
+- lib/mondrian/olap/schema_element.rb
+- lib/mondrian/olap/schema_udf.rb
+- lib/mondrian/olap/version.rb
+- spec/connection_role_spec.rb
+- spec/connection_spec.rb
+- spec/cube_spec.rb
+- spec/mondrian_spec.rb
+- spec/query_spec.rb
+- spec/rake_tasks.rb
+- spec/schema_definition_spec.rb
+- spec/spec_helper.rb
+- spec/fixtures/MondrianTest.xml
+- spec/fixtures/MondrianTestOracle.xml
+- spec/support/matchers/be_like.rb
 homepage: http://github.com/rsim/mondrian-olap
-licenses: []
-
-post_install_message: 
+licenses:
+- MIT
+metadata: {}
+post_install_message:
 rdoc_options: []
-
-require_paths: 
-  - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 2
-        segments: 
-          - 0
-        version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.8.9
-signing_key: 
-specification_version: 3
+rubyforge_project:
+rubygems_version: 2.1.9
+signing_key:
+specification_version: 4
 summary: JRuby API for Mondrian OLAP Java library
-test_files: 
-  - spec/connection_spec.rb
-  - spec/cube_spec.rb
-  - spec/query_spec.rb
-  - spec/rake_tasks.rb
-  - spec/schema_definition_spec.rb
-  - spec/spec_helper.rb
-  - spec/support/matchers/be_like.rb
+test_files:
+- spec/connection_role_spec.rb
+- spec/connection_spec.rb
+- spec/cube_spec.rb
+- spec/mondrian_spec.rb
+- spec/query_spec.rb
+- spec/rake_tasks.rb
+- spec/schema_definition_spec.rb
+- spec/spec_helper.rb
+- spec/fixtures/MondrianTest.xml
+- spec/fixtures/MondrianTestOracle.xml
+- spec/support/matchers/be_like.rb