amee-analytics 2.1.0 → 2.1.1

data/CHANGELOG.txt

@@ -1,4 +1,10 @@
 = Changelog
 
+== 2.1.1
+  * Add module namespace to TermsList in TermsList sort_by method
+== 2.1.0
+  * Update to support new handling of calculation sets (amee-data-abstraction v2.2)
+== 2.0.0
+  * Upgrade to support Rails 3
 == 1.0.0
   * Initial public release

data/Gemfile

@@ -2,7 +2,7 @@ source "http://rubygems.org"
 
 # Dependencies
 gem "amee-data-abstraction","~> 2.2"
-gem "amee-data-persistence","~> 2.1"
+gem "amee-data-persistence","~> 2.2"
 
 group :development do
   gem "bundler", "~> 1.0.0"

data/Gemfile.lock

@@ -37,7 +37,7 @@ GEM
       amee (~> 4.1.5)
       quantify (~> 2.0.0)
       uuidtools (= 2.1.2)
-    amee-data-persistence (2.1.0)
+    amee-data-persistence (2.2.0)
       activerecord (~> 3.0.10)
       amee-data-abstraction (~> 2.2.0)
     arel (2.0.10)
@@ -108,7 +108,7 @@ PLATFORMS
 
 DEPENDENCIES
   amee-data-abstraction (~> 2.2)
-  amee-data-persistence (~> 2.1)
+  amee-data-persistence (~> 2.2)
   bundler (~> 1.0.0)
   flexmock (~> 0.9.0)
   jeweler (~> 1.6.4)

data/VERSION

@@ -1 +1 @@
-2.1.0
+2.1.1

data/amee-analytics.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{amee-analytics}
-  s.version = "2.1.0"
+  s.version = "2.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{James Hetherington}, %q{Andrew Berkeley}, %q{James Smith}, %q{George Palmer}]
-  s.date = %q{2011-10-19}
+  s.authors = ["James Hetherington", "Andrew Berkeley", "James Smith", "George Palmer"]
+  s.date = %q{2011-10-21}
   s.description = %q{Part of the AMEE AppKit, this gem provides the ability to do mathmatical operations over a set of calculations}
   s.email = %q{help@amee.com}
   s.extra_rdoc_files = [
@@ -39,9 +39,9 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/AMEE/amee-analytics}
-  s.licenses = [%q{MIT}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.6}
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.5.3}
   s.summary = %q{Analytics module for use with AMEE AppKit}
 
   if s.respond_to? :specification_version then
@@ -49,7 +49,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<amee-data-abstraction>, ["~> 2.2"])
-      s.add_runtime_dependency(%q<amee-data-persistence>, ["~> 2.1"])
+      s.add_runtime_dependency(%q<amee-data-persistence>, ["~> 2.2"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rails>, ["~> 3.0.10"])
@@ -59,7 +59,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rdoc>, [">= 0"])
     else
       s.add_dependency(%q<amee-data-abstraction>, ["~> 2.2"])
-      s.add_dependency(%q<amee-data-persistence>, ["~> 2.1"])
+      s.add_dependency(%q<amee-data-persistence>, ["~> 2.2"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rails>, ["~> 3.0.10"])
@@ -70,7 +70,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<amee-data-abstraction>, ["~> 2.2"])
-    s.add_dependency(%q<amee-data-persistence>, ["~> 2.1"])
+    s.add_dependency(%q<amee-data-persistence>, ["~> 2.2"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<rails>, ["~> 3.0.10"])

data/lib/amee/analytics/terms_list_analytics_support.rb

@@ -313,11 +313,11 @@ module AMEE
         # 5. Return map of original (now sorted) Terms
 
         unset_terms, set_terms = self.partition { |term| term.unset? || term.value.nil? }
-        standardized_set_terms = TermsList.new(set_terms).standardize_units
+        standardized_set_terms = AMEE::DataAbstraction::TermsList.new(set_terms).standardize_units
         ordered_set_terms = set_terms.zip(standardized_set_terms).sort! do |term,other_term|
           term[1].send(attr) <=> other_term[1].send(attr)
         end.map {|term_array| term_array[0]}
-        TermsList.new(ordered_set_terms + unset_terms)
+        AMEE::DataAbstraction::TermsList.new(ordered_set_terms + unset_terms)
       end
 
       # Return an instance of <i>TermsList</i> containing only terms labelled

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: amee-analytics
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 2
   - 1
-  - 0
-  version: 2.1.0
+  - 1
+  version: 2.1.1
 platform: ruby
 authors: 
 - James Hetherington
@@ -18,11 +18,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-19 00:00:00 Z
+date: 2011-10-21 00:00:00 +01:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: amee-data-abstraction
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -32,27 +33,27 @@ dependencies:
         - 2
         - 2
         version: "2.2"
-  version_requirements: *id001
-  name: amee-data-abstraction
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  name: amee-data-persistence
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 7
         segments: 
         - 2
-        - 1
-        version: "2.1"
-  version_requirements: *id002
-  name: amee-data-persistence
+        - 2
+        version: "2.2"
   prerelease: false
+  type: :runtime
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  name: bundler
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -63,12 +64,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  version_requirements: *id003
-  name: bundler
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -79,12 +80,12 @@ dependencies:
         - 6
         - 4
         version: 1.6.4
-  version_requirements: *id004
-  name: jeweler
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  name: rails
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -95,12 +96,12 @@ dependencies:
         - 0
         - 10
         version: 3.0.10
-  version_requirements: *id005
-  name: rails
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -111,12 +112,12 @@ dependencies:
         - 6
         - 0
         version: 2.6.0
-  version_requirements: *id006
-  name: rspec
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  name: flexmock
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -127,12 +128,12 @@ dependencies:
         - 9
         - 0
         version: 0.9.0
-  version_requirements: *id007
-  name: flexmock
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -141,12 +142,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id008
-  name: rcov
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: *id008
+- !ruby/object:Gem::Dependency 
+  name: rdoc
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -155,9 +156,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id009
-  name: rdoc
   prerelease: false
+  type: :development
+  requirement: *id009
 description: Part of the AMEE AppKit, this gem provides the ability to do mathmatical operations over a set of calculations
 email: help@amee.com
 executables: []
@@ -188,6 +189,7 @@ files:
 - spec/fixtures/config/calculations/calcs.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+has_rdoc: true
 homepage: http://github.com/AMEE/amee-analytics
 licenses: 
 - MIT
@@ -217,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: Analytics module for use with AMEE AppKit