From 60dbd41819e876814732ba5222c8641596108e20 Mon Sep 17 00:00:00 2001 From: Raimonds Simanovskis Date: Sat, 12 Nov 2011 18:22:34 +0200 Subject: [PATCH] updated to Rails 3.1.1 and mondrian-olap latest 0.3.0 version --- Gemfile | 7 +- Gemfile.lock | 147 ++++++++++++++++------------- README.md | 7 +- config/environments/development.rb | 1 - 4 files changed, 89 insertions(+), 73 deletions(-) diff --git a/Gemfile b/Gemfile index 868d525..f35b551 100644 --- a/Gemfile +++ b/Gemfile @@ -1,9 +1,6 @@ source 'http://rubygems.org' -gem 'rails', '3.0.7' - -gem 'arel', '2.0.9' -gem 'rake', '0.8.7' +gem 'rails', '3.1.1' gem 'haml' gem 'json' @@ -17,7 +14,7 @@ platforms :jruby do gem 'mondrian-olap', :git => 'git://github.com/rsim/mondrian-olap.git' - gem 'kirk', '~> 0.2.0.beta.4' + gem 'kirk', '~> 0.2.0.beta.7' end group :development, :test do diff --git a/Gemfile.lock b/Gemfile.lock index 60bbe9d..e8350bd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,102 +1,117 @@ GIT remote: git://github.com/rsim/mondrian-olap.git - revision: 5a328a4a8c0403ebc31001edb060d6fa86373f5c + revision: c7d975d5e21031bbdff0a972b95ae26d32f23006 specs: - mondrian-olap (0.1.0) - nokogiri (~> 1.5.0.beta.4) + mondrian-olap (0.3.0) + nokogiri (~> 1.5.0) GEM remote: http://rubygems.org/ specs: - abstract (1.0.0) - actionmailer (3.0.7) - actionpack (= 3.0.7) - mail (~> 2.2.15) - actionpack (3.0.7) - activemodel (= 3.0.7) - activesupport (= 3.0.7) - builder (~> 2.1.2) - erubis (~> 2.6.6) - i18n (~> 0.5.0) - rack (~> 1.2.1) - rack-mount (~> 0.6.14) - rack-test (~> 0.5.7) - tzinfo (~> 0.3.23) - activemodel (3.0.7) - activesupport (= 3.0.7) - builder (~> 2.1.2) - i18n (~> 0.5.0) - activerecord (3.0.7) - activemodel (= 3.0.7) - activesupport (= 3.0.7) - arel (~> 2.0.2) - tzinfo (~> 0.3.23) - activerecord-jdbc-adapter (1.1.1) - activeresource (3.0.7) - activemodel (= 3.0.7) - activesupport (= 3.0.7) - activesupport (3.0.7) - arel (2.0.9) + actionmailer (3.1.1) + actionpack (= 3.1.1) + mail (~> 2.3.0) + actionpack (3.1.1) + activemodel (= 3.1.1) + activesupport (= 3.1.1) + builder (~> 3.0.0) + erubis (~> 2.7.0) + i18n (~> 0.6) + rack (~> 1.3.2) + rack-cache (~> 1.1) + rack-mount (~> 0.8.2) + rack-test (~> 0.6.1) + sprockets (~> 2.0.2) + activemodel (3.1.1) + activesupport (= 3.1.1) + builder (~> 3.0.0) + i18n (~> 0.6) + activerecord (3.1.1) + activemodel (= 3.1.1) + activesupport (= 3.1.1) + arel (~> 2.2.1) + tzinfo (~> 0.3.29) + activerecord-jdbc-adapter (1.2.0) + activeresource (3.1.1) + activemodel (= 3.1.1) + activesupport (= 3.1.1) + activesupport (3.1.1) + multi_json (~> 1.0) + arel (2.2.1) awesome_print (0.4.0) bouncy-castle-java (1.5.0146.1) - builder (2.1.2) - erubis (2.6.6) - abstract (>= 1.0.0) - haml (3.1.1) - i18n (0.5.0) + builder (3.0.0) + erubis (2.7.0) + haml (3.1.3) + hike (1.2.1) + i18n (0.6.0) jdbc-mysql (5.1.13) jruby-openssl (0.7.4) bouncy-castle-java - json (1.5.1-java) - kirk (0.2.0.beta.4-java) - mail (2.2.19) - activesupport (>= 2.3.6) + json (1.6.1-java) + kirk (0.2.0.beta.7-java) + mail (2.3.0) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) - mime-types (1.16) + mime-types (1.17.2) + multi_json (1.0.3) nifty-generators (0.4.6) - nokogiri (1.5.0.beta.4-java) - polyglot (0.3.1) - rack (1.2.3) - rack-mount (0.6.14) + nokogiri (1.5.0-java) + polyglot (0.3.3) + rack (1.3.5) + rack-cache (1.1) + rack (>= 0.4) + rack-mount (0.8.3) rack (>= 1.0.0) - rack-test (0.5.7) + rack-ssl (1.3.2) + rack + rack-test (0.6.1) rack (>= 1.0) - rails (3.0.7) - actionmailer (= 3.0.7) - actionpack (= 3.0.7) - activerecord (= 3.0.7) - activeresource (= 3.0.7) - activesupport (= 3.0.7) + rails (3.1.1) + actionmailer (= 3.1.1) + actionpack (= 3.1.1) + activerecord (= 3.1.1) + activeresource (= 3.1.1) + activesupport (= 3.1.1) bundler (~> 1.0) - railties (= 3.0.7) - railties (3.0.7) - actionpack (= 3.0.7) - activesupport (= 3.0.7) + railties (= 3.1.1) + railties (3.1.1) + actionpack (= 3.1.1) + activesupport (= 3.1.1) + rack-ssl (~> 1.3.2) rake (>= 0.8.7) - thor (~> 0.14.4) - rake (0.8.7) - simple_form (1.4.0) + rdoc (~> 3.4) + thor (~> 0.14.6) + rake (0.9.2.2) + rdoc (3.11) + json (~> 1.4) + simple_form (1.5.2) + actionpack (~> 3.0) + activemodel (~> 3.0) + sprockets (2.0.3) + hike (~> 1.2) + rack (~> 1.0) + tilt (~> 1.1, != 1.3.0) thor (0.14.6) - treetop (1.4.9) + tilt (1.3.3) + treetop (1.4.10) + polyglot polyglot (>= 0.3.1) - tzinfo (0.3.27) + tzinfo (0.3.31) PLATFORMS java DEPENDENCIES activerecord-jdbc-adapter - arel (= 2.0.9) awesome_print haml jdbc-mysql jruby-openssl json - kirk (~> 0.2.0.beta.4) + kirk (~> 0.2.0.beta.7) mondrian-olap! nifty-generators - rails (= 3.0.7) - rake (= 0.8.7) + rails (= 3.1.1) simple_form diff --git a/README.md b/README.md index 4d98fe1..0f93a13 100644 --- a/README.md +++ b/README.md @@ -62,6 +62,11 @@ Go to `http://localhost:3000/mdx/builder` and try following queries rows('[Products].children').crossjoin('[Customers].[Canada]', '[Customers].[USA]'). where('[Time].[1997].[Q1]') + olap.from('Sales'). + columns('[Measures].[Unit Sales]', '[Measures].[Store Sales]'). + rows('[Products].children'). + where('[Time].[1997].[Q1].[1]', '[Time].[1997].[Q1].[2]').crossjoin('[Customers].[USA].[CA]', '[Customers].[USA].[OR]') + olap.from('Sales'). columns('[Measures].[Unit Sales]', '[Measures].[Store Sales]'). rows('[Products].children').crossjoin('[Customers].[Canada]', '[Customers].[USA]').nonempty. @@ -110,7 +115,7 @@ Cube queries You can try following cube queries in `rails console` - cube = olap.cube('Sales') + cube = Dwh.olap.cube('Sales') cube.dimension_names # => ['Measures', 'Customers', 'Products', 'Time'] cube.dimensions # => array of dimension objects cube.dimension('Customers') # => customers dimension object diff --git a/config/environments/development.rb b/config/environments/development.rb index 98eed5b..db1ee31 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -11,7 +11,6 @@ # Show full error reports and disable caching config.consider_all_requests_local = true - config.action_view.debug_rjs = true config.action_controller.perform_caching = false # Don't care if the mailer can't send