rubiks 0.1.2 → 0.1.3

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.1.3
+* Add allMemberName to hierarchy
+
 ## 0.1.2
 * Use just the name attribute for JSON
 

data/lib/rubiks/hierarchy.rb

@@ -11,7 +11,7 @@ module ::Rubiks
 
     def all_member_name(new_value=nil)
       @all_member_name = new_value.to_s if new_value.present?
-      @all_member_name ||= true
+      @all_member_name ||= @options[:all_member_name] || 'All'
     end
 
     def has_all(new_value=nil)
@@ -32,6 +32,7 @@ module ::Rubiks
 
       xml_attrs = default_xml_attributes.merge(:hasAll => has_all.to_s)
       xml_attrs[:primaryKey] = 'id' unless degenerate?
+      xml_attrs[:allMemberName] = all_member_name if has_all
       builder.hierarchy(xml_attrs) do
         builder.table(:name => table) unless degenerate?
         levels.each{ |level| level.to_xml(builder) }

data/lib/rubiks/version.rb

@@ -1,3 +1,3 @@
 module ::Rubiks
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/spec/examples/simple_mondrian_schema_spec.rb

@@ -32,7 +32,7 @@ describe 'A simple Mondrian schema' do
       <cube name="Transactions">
         <table name="view_transactions"/>
         <dimension name="Date" foreignKey="date_id" type="TimeDimension">
-          <hierarchy name="YQMWD" hasAll="true" primaryKey="id">
+          <hierarchy name="YQMWD" hasAll="true" primaryKey="id" allMemberName="All">
             <table name="view_dates"/>
             <level name="Year" column="year" levelType="TimeYears" type="Numeric"/>
             <level name="Quarter" column="quarter" levelType="TimeQuarters" type="Numeric"/>
@@ -42,7 +42,7 @@ describe 'A simple Mondrian schema' do
           </hierarchy>
         </dimension>
         <dimension name="Account" foreignKey="account_id">
-          <hierarchy name="Account Type" hasAll="true" primaryKey="id">
+          <hierarchy name="Account Type" hasAll="true" primaryKey="id" allMemberName="All">
             <table name="view_accounts"/>
             <level name="Asset Liability" column="asset_liability"/>
             <level name="Account Type" column="account_type"/>

data/spec/rubiks/hierarchy_spec.rb

@@ -8,7 +8,7 @@ describe ::Rubiks::Hierarchy do
   it { should respond_to :level }
 
   its(:to_xml) { should be_equivalent_to(Nokogiri::XML(<<-XML)) }
-    <hierarchy name="Default" primaryKey="id" hasAll="true">
+    <hierarchy name="Default" primaryKey="id" hasAll="true" allMemberName="All">
       <table name="view_defaults"/>
     </hierarchy>
   XML

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubiks
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -165,7 +165,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3404389561601353712
+      hash: -1824235013384327224
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -174,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3404389561601353712
+      hash: -1824235013384327224
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25