mdquery 0.3.1 → 0.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c3eaf2957a7f30e77e0bad487e3d643fa9df6a3a
+  data.tar.gz: 24e31343bd2a69c521025021e00cd1e78046953e
+SHA512:
+  metadata.gz: 4a00a39261fb7b3771f0b0dd00fb3c72c8f2b49028b95afccfc7d9b7dcb8df712a820e9780c8bfacc6a0f2aef1d6964ffb491620da319610ce6676d636c21fb3
+  data.tar.gz: 4c988df242045b9519b47fff8e45862872eb53c2d4f0eb693bd3ad1a65296ca8542aa2b863cebfc61a372898b47b507d57b07a2d3229b59fede9344b78313718

data/Gemfile

@@ -1,13 +1,13 @@
 source "http://rubygems.org"
 
-gem "activerecord", ">= 3.2.13"
+gem "activerecord", ">= 3.2.18"
 
 group :development do
-  gem "rake", "~> 10.0.3"
-  gem "rspec", "~> 2.13.0"
-  gem "rdoc", "~> 4.0.0"
-  gem "bundler", "~> 1.3.4"
-  gem "jeweler", "~> 1.8.4"
+  gem "rake", "~> 10.3.2"
+  gem "rspec", "~> 2.14.1"
+  gem "rdoc", "~> 4.1.1"
+  gem "bundler", "~> 1.6.3"
+  gem "jeweler", "~> 2.0.1"
 #  gem "rcov", ">= 0"
- gem 'rr', ">= 1.0.4"
+ gem 'rr', ">= 1.1.2"
 end

data/Gemfile.lock

@@ -1,53 +1,92 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    builder (3.0.4)
-    diff-lcs (1.2.1)
-    git (1.2.5)
-    i18n (0.6.1)
-    jeweler (1.8.4)
-      bundler (~> 1.0)
+    activemodel (4.1.1)
+      activesupport (= 4.1.1)
+      builder (~> 3.1)
+    activerecord (4.1.1)
+      activemodel (= 4.1.1)
+      activesupport (= 4.1.1)
+      arel (~> 5.0.0)
+    activesupport (4.1.1)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    addressable (2.3.6)
+    arel (5.0.1.20140414130214)
+    builder (3.2.2)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.2.5)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
+    git (1.2.7)
+    github_api (0.11.3)
+      addressable (~> 2.3)
+      descendants_tracker (~> 0.0.1)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 1.2)
+      multi_json (>= 1.7.5, < 2.0)
+      nokogiri (~> 1.6.0)
+      oauth2
+    hashie (3.0.0)
+    highline (1.6.21)
+    i18n (0.6.9)
+    jeweler (2.0.1)
+      builder
+      bundler (>= 1.0)
       git (>= 1.2.5)
+      github_api
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
       rake
       rdoc
-    json (1.7.7)
-    json (1.7.7-java)
-    multi_json (1.7.1)
-    rake (10.0.3)
-    rdoc (4.0.0)
+    json (1.8.1)
+    json (1.8.1-java)
+    jwt (1.0.0)
+    mini_portile (0.6.0)
+    minitest (5.3.5)
+    multi_json (1.10.1)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
+    nokogiri (1.6.2.1)
+      mini_portile (= 0.6.0)
+    nokogiri (1.6.2.1-java)
+    oauth2 (0.9.4)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    rack (1.5.2)
+    rake (10.3.2)
+    rdoc (4.1.1)
       json (~> 1.4)
-    rr (1.0.4)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
+    rr (1.1.2)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.0)
-    tzinfo (0.3.37)
+    rspec-mocks (2.14.6)
+    thread_safe (0.3.4)
+    thread_safe (0.3.4-java)
+    tzinfo (1.2.1)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   java
   ruby
 
 DEPENDENCIES
-  activerecord (>= 3.2.13)
-  bundler (~> 1.3.4)
-  jeweler (~> 1.8.4)
-  rake (~> 10.0.3)
-  rdoc (~> 4.0.0)
-  rr (>= 1.0.4)
-  rspec (~> 2.13.0)
+  activerecord (>= 3.2.18)
+  bundler (~> 1.6.3)
+  jeweler (~> 2.0.1)
+  rake (~> 10.3.2)
+  rdoc (~> 4.1.1)
+  rr (>= 1.1.2)
+  rspec (~> 2.14.1)

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/lib/mdquery/model.rb

@@ -229,7 +229,7 @@ module MDQuery
 
         select_string = (dimension_select_strings + measure_select_strings).join(",")
 
-        group_string = region_segment_models.map(&:group_by_column).join(",")
+        group_string = (1..region_segment_models.length).to_a.join(",")
 
         narrowed_scope.select(select_string).group(group_string)
       end

data/mdquery.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "mdquery"
-  s.version = "0.3.1"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mccraigmccraig"]
-  s.date = "2013-03-20"
+  s.date = "2014-06-25"
   s.description = "provides a DSL for simply specifying and executing segmented multi-dimensional queries on your active-record-3 models"
   s.email = "mccraigmccraig@gmail.com"
   s.extra_rdoc_files = [
@@ -42,37 +42,37 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/mccraigmccraig/mdquery"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
+  s.rubygems_version = "2.0.3"
   s.summary = "simple multi-dimensional queries on top of active-record-3"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>, [">= 3.2.13"])
-      s.add_development_dependency(%q<rake>, ["~> 10.0.3"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.13.0"])
-      s.add_development_dependency(%q<rdoc>, ["~> 4.0.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.3.4"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
-      s.add_development_dependency(%q<rr>, [">= 1.0.4"])
+      s.add_runtime_dependency(%q<activerecord>, [">= 3.2.18"])
+      s.add_development_dependency(%q<rake>, ["~> 10.3.2"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.14.1"])
+      s.add_development_dependency(%q<rdoc>, ["~> 4.1.1"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.6.3"])
+      s.add_development_dependency(%q<jeweler>, ["~> 2.0.1"])
+      s.add_development_dependency(%q<rr>, [">= 1.1.2"])
     else
-      s.add_dependency(%q<activerecord>, [">= 3.2.13"])
-      s.add_dependency(%q<rake>, ["~> 10.0.3"])
-      s.add_dependency(%q<rspec>, ["~> 2.13.0"])
-      s.add_dependency(%q<rdoc>, ["~> 4.0.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.3.4"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
-      s.add_dependency(%q<rr>, [">= 1.0.4"])
+      s.add_dependency(%q<activerecord>, [">= 3.2.18"])
+      s.add_dependency(%q<rake>, ["~> 10.3.2"])
+      s.add_dependency(%q<rspec>, ["~> 2.14.1"])
+      s.add_dependency(%q<rdoc>, ["~> 4.1.1"])
+      s.add_dependency(%q<bundler>, ["~> 1.6.3"])
+      s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
+      s.add_dependency(%q<rr>, [">= 1.1.2"])
     end
   else
-    s.add_dependency(%q<activerecord>, [">= 3.2.13"])
-    s.add_dependency(%q<rake>, ["~> 10.0.3"])
-    s.add_dependency(%q<rspec>, ["~> 2.13.0"])
-    s.add_dependency(%q<rdoc>, ["~> 4.0.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.3.4"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
-    s.add_dependency(%q<rr>, [">= 1.0.4"])
+    s.add_dependency(%q<activerecord>, [">= 3.2.18"])
+    s.add_dependency(%q<rake>, ["~> 10.3.2"])
+    s.add_dependency(%q<rspec>, ["~> 2.14.1"])
+    s.add_dependency(%q<rdoc>, ["~> 4.1.1"])
+    s.add_dependency(%q<bundler>, ["~> 1.6.3"])
+    s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
+    s.add_dependency(%q<rr>, [">= 1.1.2"])
   end
 end
 

data/spec/mdquery/model_spec.rb

@@ -375,9 +375,9 @@ module MDQuery
           select_string = "foofoo as foo,barbar as bar,count(*) as count"
 
           # group_string
-          mock(dim0sm0).group_by_column{"foo"}
-          mock(dim1sm0).group_by_column{"bar"}
-          group_string = "foo,bar"
+          # mock(dim0sm0).group_by_column{"foo"}
+          # mock(dim1sm0).group_by_column{"bar"}
+          group_string = "1,2"
 
           scope_n3 = Object.new
           query = Object.new

metadata

@@ -1,128 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: mdquery
 version: !ruby/object:Gem::Version
-  version: 0.3.1
-  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors:
 - mccraigmccraig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-20 00:00:00.000000000 Z
+date: 2014-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: 3.2.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: 3.2.18
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: 10.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: 10.3.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.1.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: 1.6.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: 1.6.3
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.1.2
 description: provides a DSL for simply specifying and executing segmented multi-dimensional
   queries on your active-record-3 models
 email: mccraigmccraig@gmail.com
@@ -156,29 +141,25 @@ files:
 homepage: http://github.com/mccraigmccraig/mdquery
 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
       version: '0'
-      segments:
-      - 0
-      hash: 2205263928275995703
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: simple multi-dimensional queries on top of active-record-3
 test_files: []