mondrian-olap 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33377438a5e2533d61b3304824a4e0aefe545f68
-  data.tar.gz: 13ef2ecd466795a07f43252231e4e7ad586c1e45
+  metadata.gz: 62331aaa1c73a54c6adde925d5ee226ed05e73c6
+  data.tar.gz: 9c1f2557b90a4b1f9cb26da6358eaa36a1d33d79
 SHA512:
-  metadata.gz: c0ac6bc10f6ed6b4725d0991131402735e50c9c4cbc3de016a8714c7ceca5ce420ce9b5090fe006ae5495f0e8add0cf4f4cbb773b2f3da35767481e60b04a7d4
-  data.tar.gz: b7a47e4872dd58434b05e8d07b99d06d73d1ef023be953b4be00a5de2bd6c18db6e943496cecf1b3cad0fab60a5e3850b1084b7e31896533df3d1e6f2112d03c
+  metadata.gz: dedc6bee9ea5e9fb01f00a6de70c6d35edaa5ff6c30b80e7553db2cf30099b153056ac1979286bc4114c866c3d6e71d63723d7ce17026ee8d92e86ecf36d24cd
+  data.tar.gz: 8b39386fd21332b74baf56c47cabba12667f0d8231f99f24d8a3fd690de9a556d4e65048549ca59e53f26340b49a212b3e365d9e516ef4b90935fd42ab409015

data/Changelog.md

@@ -1,3 +1,16 @@
+### 0.7.0 / 2015-12-12
+
+* New features
+  * upgraded to latest the latest Mondrian version 3.11
+  * removed Java 6 support
+  * fixes for JRuby 9.0 support
+  * added a query builder method "distinct"
+* Improvements
+  * added annotations for dimension_usage and virtual_cube_dimension schema elements
+* Bug fixes
+  * fixed the order of axis aliases - columns, rows, pages, chapters, sections
+
+
 ### 0.6.0 / 2014-11-10
 
 * New features

data/LICENSE.txt

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2010-2014 Raimonds Simanovskis
+Copyright (c) 2010-2015 Raimonds Simanovskis
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -105,7 +105,7 @@ require "jdbc/mysql"
 
 olap = Mondrian::OLAP::Connection.create(
   driver: 'mysql',
-  host: 'localhost,
+  host: 'localhost',
   database: 'mondrian_test',
   username: 'mondrian_user',
   password: 'secret',
@@ -270,9 +270,9 @@ See more examples of data access roles in `spec/connection_role_spec.rb`.
 REQUIREMENTS
 ------------
 
-mondrian-olap gem is compatible with JRuby version 1.7 and Java 6, 7 or 8 VM. mondrian-olap works only with JRuby and not with other Ruby implementations as it includes Mondrian OLAP Java libraries.
+mondrian-olap gem is compatible with JRuby versions 1.7 and 9.0 and Java 7 or 8 VM. mondrian-olap works only with JRuby and not with other Ruby implementations as it includes Mondrian OLAP Java libraries.
 
-mondrian-olap supports MySQL, PostgreSQL, Oracle, LucidDB and Microsoft SQL Server databases as well as other databases that are supported by Mondrian OLAP engine (using jdbc_driver and jdbc_url connection parameters). When using MySQL, PostgreSQL or LucidDB databases then install jdbc-mysql, jdbc-postgres or jdbc-luciddb gem and require "jdbc/mysql", "jdbc/postgres" or "jdbc/luciddb" to load the corresponding JDBC database driver. When using Oracle then include Oracle JDBC driver (`ojdbc6.jar` for Java 6) in `CLASSPATH` or copy to `JRUBY_HOME/lib` or require it in application manually. When using SQL Server you can choose between the jTDS or Microsoft JDBC drivers. If you use jTDS require "jdbc/jtds". If you use the Microsoft JDBC driver include `sqljdbc.jar` or `sqljdbc4.jar` in `CLASSPATH` or copy to `JRUBY_HOME/lib` or require it in application manually.
+mondrian-olap supports MySQL, PostgreSQL, Oracle, LucidDB and Microsoft SQL Server databases as well as other databases that are supported by Mondrian OLAP engine (using jdbc_driver and jdbc_url connection parameters). When using MySQL, PostgreSQL or LucidDB databases then install jdbc-mysql, jdbc-postgres or jdbc-luciddb gem and require "jdbc/mysql", "jdbc/postgres" or "jdbc/luciddb" to load the corresponding JDBC database driver. When using Oracle then include Oracle JDBC driver (`ojdbc7.jar` for Java 7) in `CLASSPATH` or copy to `JRUBY_HOME/lib` or require it in application manually. When using SQL Server you can choose between the jTDS or Microsoft JDBC drivers. If you use jTDS require "jdbc/jtds". If you use the Microsoft JDBC driver include `sqljdbc.jar` or `sqljdbc4.jar` in `CLASSPATH` or copy to `JRUBY_HOME/lib` or require it in application manually.
 
 INSTALL
 -------

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.7.0

data/lib/mondrian/olap/query.rb

@@ -34,7 +34,7 @@ module Mondrian
         end
       end
 
-      AXIS_ALIASES = %w(columns rows pages sections chapters)
+      AXIS_ALIASES = %w(columns rows pages chapters sections)
       AXIS_ALIASES.each_with_index do |axis, i|
         class_eval <<-RUBY, __FILE__, __LINE__ + 1
           def #{axis}(*axis_members)
@@ -73,6 +73,12 @@ module Mondrian
         self
       end
 
+      def distinct
+        raise ArgumentError, "cannot use distinct method before axis method" unless @current_set
+        @current_set.replace [:distinct, @current_set.clone]
+        self
+      end
+
       def filter(condition, options={})
         raise ArgumentError, "cannot use filter method before axis or with_set method" unless @current_set
         @current_set.replace [:filter, @current_set.clone, condition]
@@ -309,6 +315,8 @@ module Mondrian
             "EXCEPT(#{members_to_mdx(members[1])}, #{members_to_mdx(members[2])})"
           when :nonempty
             "NON EMPTY #{members_to_mdx(members[1])}"
+          when :distinct
+            "DISTINCT(#{members_to_mdx(members[1])})"
           when :filter
             as_alias = members[3] ? " AS #{members[3]}" : nil
             "FILTER(#{members_to_mdx(members[1])}#{as_alias}, #{members[2]})"

data/lib/mondrian/olap/result.rb

@@ -333,7 +333,7 @@ module Mondrian
 
         def self.parse_return_fields(result, params)
           return_field_names = []
-          return_expressions = nil
+          return_expressions = []
           nonempty_columns = []
 
           if params[:return] || params[:nonempty]
@@ -354,10 +354,10 @@ module Mondrian
 
                 case level_or_member
                 when Java::MondrianOlap::Level
-                  Java::MondrianMdx::LevelExpr.new level_or_member
+                  level_or_member
                 when Java::MondrianOlap::Member
                   raise ArgumentError, "cannot use calculated member #{return_field} as return field" if level_or_member.isCalculated
-                  Java::mondrian.mdx.MemberExpr.new level_or_member
+                  level_or_member
                 else
                   raise ArgumentError, "return field #{return_field} should be level or measure"
                 end

data/lib/mondrian/olap/schema.rb

@@ -115,6 +115,7 @@ module Mondrian
           # Required in a private Dimension or a DimensionUsage, but not in a public Dimension.
           :foreign_key
         data_dictionary_names :usage_prefix, :foreign_key # values in XML will be uppercased when using Oracle driver
+        elements :annotations
 
         def initialize(name = nil, attributes = {}, parent = nil)
           super
@@ -347,6 +348,7 @@ module Mondrian
           :cube_name,
           # Whether this dimension is visible in the user-interface. Default true.
           :visible
+        elements :annotations
       end
 
       class VirtualCubeMeasure < SchemaElement

data/spec/query_spec.rb

@@ -179,6 +179,13 @@ describe "Query" do
       end
     end
 
+    describe "distinct" do
+      it "should limit to set of distinct tuples" do
+        @query.rows('[Product].children').distinct.nonempty.columns('[Measures].[Unit Sales]', '[Measures].[Store Sales]')
+        @query.rows.should == [:nonempty, [:distinct, ["[Product].children"]]]
+      end
+    end
+
     describe "order" do
       it "should order by one measure" do
         @query.rows('[Product].children').order('[Measures].[Unit Sales]', :bdesc)
@@ -784,12 +791,14 @@ describe "Query" do
     end if %w(mysql postgresql).include? MONDRIAN_DRIVER
 
     it "should return table names" do
-      @drill_through.table_names.should == [
+      # ignore calculated customer full name column name which is shown differently on each database
+      @drill_through.table_names[0..12].should == [
         "time", "time", "time", "time", "time",
         "product_classes", "product_classes", "product_classes", "product_classes", "products", "products",
-        "customers", "customers", "", "customers",
-        "customers",
-        "sales"
+        "customers", "customers"
+      ]
+      @drill_through.table_names[14..16].should == [
+        "customers", "customers", "sales"
       ]
     end if %w(mysql postgresql).include? MONDRIAN_DRIVER
 

data/spec/spec_helper.rb

@@ -67,7 +67,7 @@ end
 puts "==> Using #{MONDRIAN_DRIVER} driver"
 
 require 'mondrian/olap'
-require 'spec/support/matchers/be_like'
+require_relative 'support/matchers/be_like'
 
 RSpec.configure do |config|
   config.include Matchers

metadata

@@ -1,25 +1,25 @@
 --- !ruby/object:Gem::Specification
 name: mondrian-olap
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Raimonds Simanovskis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-11-10 00:00:00.000000000 Z
+date: 2015-12-12 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
@@ -28,12 +28,12 @@ dependencies:
   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
@@ -42,12 +42,12 @@ dependencies:
   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
@@ -56,12 +56,12 @@ dependencies:
   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
@@ -70,12 +70,12 @@ dependencies:
   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
@@ -84,12 +84,12 @@ dependencies:
   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
@@ -98,12 +98,12 @@ dependencies:
   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
@@ -112,12 +112,12 @@ dependencies:
   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
@@ -126,12 +126,12 @@ dependencies:
   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
@@ -140,26 +140,26 @@ dependencies:
   name: activerecord
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.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
@@ -168,12 +168,12 @@ dependencies:
   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
@@ -182,12 +182,12 @@ dependencies:
   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
@@ -196,12 +196,12 @@ dependencies:
   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
@@ -210,18 +210,20 @@ dependencies:
   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
+description: 'JRuby gem for performing multidimensional queries of relational database
+  data using Mondrian OLAP Java library
+
+  '
 email:
 - raimonds.simanovskis@gmail.com
 executables: []
@@ -235,22 +237,22 @@ files:
 - README.md
 - VERSION
 - lib/mondrian-olap.rb
-- lib/mondrian/olap.rb
 - lib/mondrian/jars/commons-collections-3.2.1.jar
 - lib/mondrian/jars/commons-dbcp-1.4.jar
 - lib/mondrian/jars/commons-io-2.2.jar
 - lib/mondrian/jars/commons-logging-1.1.1.jar
 - lib/mondrian/jars/commons-math-1.1.jar
 - lib/mondrian/jars/commons-pool-1.5.7.jar
-- lib/mondrian/jars/commons-vfs-20100924-pentaho.jar
+- lib/mondrian/jars/commons-vfs2-2.1-20150824.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.17.jar
 - lib/mondrian/jars/log4j.properties
-- lib/mondrian/jars/mondrian-3.8.0.0-209.jar
+- lib/mondrian/jars/mondrian-3.11.0.0-353.jar
 - lib/mondrian/jars/olap4j-1.2.0.jar
+- lib/mondrian/olap.rb
 - lib/mondrian/olap/connection.rb
 - lib/mondrian/olap/cube.rb
 - lib/mondrian/olap/error.rb
@@ -263,13 +265,13 @@ files:
 - spec/connection_role_spec.rb
 - spec/connection_spec.rb
 - spec/cube_spec.rb
+- spec/fixtures/MondrianTest.xml
+- spec/fixtures/MondrianTestOracle.xml
 - 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:
@@ -281,17 +283,17 @@ 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: 2.1.9
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: JRuby API for Mondrian OLAP Java library
@@ -299,11 +301,11 @@ test_files:
 - spec/connection_role_spec.rb
 - spec/connection_spec.rb
 - spec/cube_spec.rb
+- spec/fixtures/MondrianTest.xml
+- spec/fixtures/MondrianTestOracle.xml
 - 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