mondrian 0.0.1 → 0.1.0

data/README.md

@@ -56,7 +56,7 @@ Here is example how to define OLAP schema and its mapping to relational database
     require "rubygems"
     require "mondrian"
 
-    schema = Mondrian::OLAP::Schema.define do
+    schema = Mondrian::Schema.define do
       cube 'Sales' do
         table 'sales'
         dimension 'Customers', :foreign_key => 'customer_id' do

data/lib/mondrian/schema.rb

@@ -49,7 +49,8 @@ module Mondrian
     public
 
     attributes :name, :description
-    elements :cube
+    #dimension must be first in order for dimension_usage to work
+    elements :dimension, :cube
 
     class Cube < SchemaElement
       attributes :name, :description,
@@ -60,7 +61,7 @@ module Mondrian
         :cache,
         # Whether element is enabled - if true, then the Cube is realized otherwise it is ignored.
         :enabled
-      elements :table, :view, :dimension, :measure, :calculated_member
+      elements :table, :view, :dimension, :dimension_usage, :measure, :calculated_member
     end
 
     class Table < SchemaElement
@@ -81,7 +82,7 @@ module Mondrian
     end
 
     class Dimension < SchemaElement
-      attributes :name, :description,
+      attributes :name, :description, :high_cardinality,
         # The dimension's type may be one of "Standard" or "Time".
         # A time dimension will allow the use of the MDX time functions (WTD, YTD, QTD, etc.).
         # Use a standard dimension if the dimension is not a time-related dimension.
@@ -90,10 +91,26 @@ module Mondrian
         # The name of the column in the fact table which joins to the leaf level of this dimension.
         # Required in a private Dimension or a DimensionUsage, but not in a public Dimension.
         :foreign_key
-      data_dictionary_names :foreign_key # values in XML will be uppercased when using Oracle driver
+      data_dictionary_names :foreign_key, :high_cardinality # values in XML will be uppercased when using Oracle driver
       elements :hierarchy
     end
 
+    class DimensionUsage < SchemaElement
+      # Name of the source dimension. Must be a dimension in this schema. Case-sensitive.
+      attributes :source,
+        # Name of the level to join to. If not specified, joins to the lowest level of the dimension.
+        :level,
+        # If present, then this is prepended to the Dimension column names during the building of collapse dimension aggregates allowing 
+        # 1) different dimension usages to be disambiguated during aggregate table recognition and 
+        # 2) multiple shared dimensions that have common column names to be disambiguated.
+        :usage_prefix,
+        # The name of the column in the fact table which joins to the leaf level of this dimension.
+        # Required in a private Dimension or a DimensionUsage, but not in a public Dimension.
+        :foreign_key
+
+      data_dictionary_names :foreign_key, :usage_prefix #values in XML will be uppercased when using Oracle driver
+    end
+
     class Hierarchy < SchemaElement
       attributes :name, :description,
         # Whether this hierarchy has an 'all' member.

data/lib/mondrian/version.rb

@@ -1,3 +1,3 @@
 module Mondrian
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/spec/mondrian/schema_spec.rb

@@ -7,6 +7,28 @@ describe Mondrian::Schema do
       @schema = Mondrian::Schema.new
     end
 
+
+    describe "dimension cube order" do
+      it "should render dimensions before cubes" do
+        @schema.define do
+          cube 'Sales' do
+            dimension_usage :usage_prefix => "Test", :source => 'Gender'
+          end
+          dimension "Gender"
+        end
+        @schema.to_xml.should be_equivalent_to <<-XML
+         <?xml version="1.0"?>
+         <Schema name="default">
+           <Dimension name="Gender"/>
+           <Cube name="Sales">
+             <DimensionUsage usagePrefix="Test" source="Gender"/>
+           </Cube>
+         </Schema>
+        XML
+      end
+
+    end
+
     describe "root element" do
       it "should render to XML" do
         @schema.to_xml.should be_equivalent_to <<-XML
@@ -363,6 +385,24 @@ describe Mondrian::Schema do
 
     end
 
+    describe "DimensionUsage" do
+      it "should render to XML" do
+        @schema.define do
+          cube 'Sales' do
+            dimension_usage :usage_prefix => "Test", :source => 'Gender'
+          end
+        end
+        @schema.to_xml.should be_equivalent_to <<-XML
+        <?xml version="1.0"?>
+        <Schema name="default">
+          <Cube name="Sales">
+            <DimensionUsage source="Gender" usagePrefix="Test">
+          </Cube>
+        </Schema>
+        XML
+      end
+    end
+
     describe "Measure" do
       it "should render XML" do
         @schema.define do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mondrian
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70299408441660 !ruby/object:Gem::Requirement
+  requirement: &70350923495220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70299408441660
+  version_requirements: *70350923495220
 description: Schema DSL for mondrian
 email:
 - scott.ellard@gmail.com