amee 4.2.0 → 4.3.0

data/.rvmrc

@@ -0,0 +1 @@
+rvm 1.8.7@amee-ruby

data/Appraisals

@@ -0,0 +1,14 @@
+appraise "rails2.3" do
+  gem "activesupport", "~> 2.3.0"
+  gem "activerecord", "~> 2.3.0"
+end
+
+appraise "rails3.0" do
+  gem "activesupport", "~> 3.0.0"
+  gem "activerecord", "~> 3.0.0"
+end
+
+appraise "rails3.1" do
+  gem "activesupport", "~> 3.1.0"
+  gem "activerecord", "~> 3.1.0"
+end

data/Gemfile

@@ -1,17 +1,18 @@
 source "http://rubygems.org"
 
-gem "activesupport", "~> 3.0"
+gem "appraisal"
+
+gem "activesupport", ">= 2.3.11"
 gem "json"
 gem "log4r"
 gem "nokogiri", "~> 1.4.4"
 
-group :development do
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.6.4"
-  gem 'rspec', '2.6.0'
-  gem 'flexmock', '> 0.8.6'
-  gem 'memcache-client'
-  gem 'rcov'
-  gem 'rdoc'
-  gem 'activerecord', "~> 3.0" # To test Rails integration
-end
+# Appraisal doesn't like group blocks, so we add individually for now.
+gem "bundler", "~> 1.0.0",        :group => :development
+gem "jeweler", "~> 1.6.4",        :group => :development
+gem 'rspec', '2.6.0',             :group => :development
+gem 'flexmock', '> 0.8.6',        :group => :development
+gem 'memcache-client',            :group => :development
+gem 'rcov',                       :group => :development
+gem 'rdoc',                       :group => :development
+gem 'activerecord', ">= 2.3.11",  :group => :development

data/Gemfile.lock

@@ -12,6 +12,9 @@ GEM
       tzinfo (~> 0.3.29)
     activesupport (3.1.1)
       multi_json (~> 1.0)
+    appraisal (0.4.0)
+      bundler
+      rake
     arel (2.2.1)
     builder (3.0.0)
     diff-lcs (1.1.3)
@@ -45,8 +48,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 3.0)
-  activesupport (~> 3.0)
+  activerecord (>= 2.3.11)
+  activesupport (>= 2.3.11)
+  appraisal
   bundler (~> 1.0.0)
   flexmock (> 0.8.6)
   jeweler (~> 1.6.4)

data/Rakefile

@@ -1,7 +1,9 @@
 # encoding: utf-8
 
 require 'rubygems'
-require 'bundler'
+require 'bundler/setup'
+require 'appraisal'
+
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
@@ -72,7 +74,7 @@ require 'rcov/rcovtask'
 desc "Generate code coverage"
 RSpec::Core::RakeTask.new(:coverage) do |t|
   t.rcov = true
-  t.rcov_opts = ['--exclude', 'spec']
+  t.rcov_opts = ['--exclude', 'spec,/*ruby*,/*gems*']
 end
 
 require 'rdoc/task'

data/VERSION

@@ -1 +1 @@
-4.2.0
+4.3.0

data/amee.gemspec

@@ -4,20 +4,21 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{amee}
-  s.version = "4.2.0"
+  s.name = "amee"
+  s.version = "4.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Smith", "James Hetherington", "Andrew Hill", "Andrew Berkeley"]
-  s.date = %q{2011-11-17}
-  s.default_executable = %q{ameesh}
-  s.email = %q{james@floppy.org.uk}
+  s.date = "2011-12-23"
+  s.email = "james@floppy.org.uk"
   s.executables = ["ameesh"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.txt"
   ]
   s.files = [
+    ".rvmrc",
+    "Appraisals",
     "CHANGELOG.txt",
     "Gemfile",
     "Gemfile.lock",
@@ -25,7 +26,6 @@ Gem::Specification.new do |s|
     "README.txt",
     "Rakefile",
     "VERSION",
-    "amee-ruby.gemspec",
     "amee.example.yml",
     "amee.gemspec",
     "bin/ameesh",
@@ -36,6 +36,13 @@ Gem::Specification.new do |s|
     "examples/view_data_category.rb",
     "examples/view_data_item.rb",
     "examples/view_profile_item.rb",
+    "gemfiles/rails2.3.gemfile",
+    "gemfiles/rails2.3.gemfile.lock",
+    "gemfiles/rails3.0.gemfile",
+    "gemfiles/rails3.0.gemfile.lock",
+    "gemfiles/rails3.1.gemfile",
+    "gemfiles/rails3.1.gemfile.lock",
+    "init.rb",
     "lib/amee.rb",
     "lib/amee/collection.rb",
     "lib/amee/config.rb",
@@ -70,6 +77,7 @@ Gem::Specification.new do |s|
     "lib/amee/v3/item_value_definition_list.rb",
     "lib/amee/v3/meta_helper.rb",
     "lib/amee/v3/return_value_definition.rb",
+    "rails/init.rb",
     "spec/amee_config_spec.rb",
     "spec/amee_spec.rb",
     "spec/cache_spec.rb",
@@ -83,6 +91,7 @@ Gem::Specification.new do |s|
     "spec/fixtures/AD63A83B4D41.json",
     "spec/fixtures/AD63A83B4D41.xml",
     "spec/fixtures/BD88D30D1214.xml",
+    "spec/fixtures/config/amee.yml",
     "spec/fixtures/create_item.json",
     "spec/fixtures/create_item.xml",
     "spec/fixtures/data.json",
@@ -95,10 +104,12 @@ Gem::Specification.new do |s|
     "spec/fixtures/empty_return_value_definition_list.xml",
     "spec/fixtures/itemdef.xml",
     "spec/fixtures/itemdef_441BF4BEA15B.xml",
+    "spec/fixtures/itemdef_B4DA9E4AD5F2.xml",
     "spec/fixtures/itemdef_no_usages.xml",
     "spec/fixtures/itemdef_one_usage.xml",
     "spec/fixtures/ivdlist.xml",
     "spec/fixtures/ivdlist_BD88D30D1214.xml",
+    "spec/fixtures/ivdlist_one_usage.xml",
     "spec/fixtures/parse_test.xml",
     "spec/fixtures/rails_config.yml",
     "spec/fixtures/return_value_definition.xml",
@@ -124,17 +135,18 @@ Gem::Specification.new do |s|
     "spec/v3/item_value_definition_spec.rb",
     "spec/v3/return_value_definition_spec.rb"
   ]
-  s.homepage = %q{http://github.com/AMEE/amee-ruby}
+  s.homepage = "http://github.com/AMEE/amee-ruby"
   s.licenses = ["BSD 3-Clause"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Ruby interface to the AMEE carbon calculator}
+  s.rubygems_version = "1.8.10"
+  s.summary = "Ruby interface to the AMEE carbon calculator"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, ["~> 3.0"])
+      s.add_runtime_dependency(%q<appraisal>, [">= 0"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 2.3.11"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_runtime_dependency(%q<log4r>, [">= 0"])
       s.add_runtime_dependency(%q<nokogiri>, ["~> 1.4.4"])
@@ -145,9 +157,10 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<memcache-client>, [">= 0"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, [">= 0"])
-      s.add_development_dependency(%q<activerecord>, ["~> 3.0"])
+      s.add_development_dependency(%q<activerecord>, [">= 2.3.11"])
     else
-      s.add_dependency(%q<activesupport>, ["~> 3.0"])
+      s.add_dependency(%q<appraisal>, [">= 0"])
+      s.add_dependency(%q<activesupport>, [">= 2.3.11"])
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<log4r>, [">= 0"])
       s.add_dependency(%q<nokogiri>, ["~> 1.4.4"])
@@ -158,10 +171,11 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<memcache-client>, [">= 0"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<rdoc>, [">= 0"])
-      s.add_dependency(%q<activerecord>, ["~> 3.0"])
+      s.add_dependency(%q<activerecord>, [">= 2.3.11"])
     end
   else
-    s.add_dependency(%q<activesupport>, ["~> 3.0"])
+    s.add_dependency(%q<appraisal>, [">= 0"])
+    s.add_dependency(%q<activesupport>, [">= 2.3.11"])
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<log4r>, [">= 0"])
     s.add_dependency(%q<nokogiri>, ["~> 1.4.4"])
@@ -172,7 +186,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<memcache-client>, [">= 0"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<rdoc>, [">= 0"])
-    s.add_dependency(%q<activerecord>, ["~> 3.0"])
+    s.add_dependency(%q<activerecord>, [">= 2.3.11"])
   end
 end
 

data/gemfiles/rails2.3.gemfile

@@ -0,0 +1,18 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "appraisal"
+gem "json"
+gem "log4r"
+gem "nokogiri", "~> 1.4.4"
+gem "bundler", "~> 1.0.0", :group=>:development
+gem "jeweler", "~> 1.6.4", :group=>:development
+gem "rspec", "2.6.0", :group=>:development
+gem "flexmock", "> 0.8.6", :group=>:development
+gem "memcache-client", :group=>:development
+gem "rcov", :group=>:development
+gem "rdoc", :group=>:development
+gem "activesupport", "~> 2.3.0"
+gem "activerecord", "~> 2.3.0"
+

data/gemfiles/rails2.3.gemfile.lock

@@ -0,0 +1,50 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activerecord (2.3.14)
+      activesupport (= 2.3.14)
+    activesupport (2.3.14)
+    appraisal (0.4.0)
+      bundler
+      rake
+    diff-lcs (1.1.3)
+    flexmock (0.9.0)
+    git (1.2.5)
+    jeweler (1.6.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+    json (1.6.1)
+    log4r (1.1.9)
+    memcache-client (1.8.5)
+    nokogiri (1.4.7)
+    rake (0.9.2.2)
+    rcov (0.9.11)
+    rdoc (3.11)
+      json (~> 1.4)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 2.3.0)
+  activesupport (~> 2.3.0)
+  appraisal
+  bundler (~> 1.0.0)
+  flexmock (> 0.8.6)
+  jeweler (~> 1.6.4)
+  json
+  log4r
+  memcache-client
+  nokogiri (~> 1.4.4)
+  rcov
+  rdoc
+  rspec (= 2.6.0)

data/gemfiles/rails3.0.gemfile

@@ -0,0 +1,18 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "appraisal"
+gem "json"
+gem "log4r"
+gem "nokogiri", "~> 1.4.4"
+gem "bundler", "~> 1.0.0", :group=>:development
+gem "jeweler", "~> 1.6.4", :group=>:development
+gem "rspec", "2.6.0", :group=>:development
+gem "flexmock", "> 0.8.6", :group=>:development
+gem "memcache-client", :group=>:development
+gem "rcov", :group=>:development
+gem "rdoc", :group=>:development
+gem "activesupport", "~> 3.0.0"
+gem "activerecord", "~> 3.0.0"
+

data/gemfiles/rails3.0.gemfile.lock

@@ -0,0 +1,61 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.0.10)
+      activesupport (= 3.0.10)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
+      arel (~> 2.0.10)
+      tzinfo (~> 0.3.23)
+    activesupport (3.0.10)
+    appraisal (0.4.0)
+      bundler
+      rake
+    arel (2.0.10)
+    builder (2.1.2)
+    diff-lcs (1.1.3)
+    flexmock (0.9.0)
+    git (1.2.5)
+    i18n (0.5.0)
+    jeweler (1.6.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+    json (1.6.1)
+    log4r (1.1.9)
+    memcache-client (1.8.5)
+    nokogiri (1.4.7)
+    rake (0.9.2.2)
+    rcov (0.9.11)
+    rdoc (3.11)
+      json (~> 1.4)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    tzinfo (0.3.31)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 3.0.0)
+  activesupport (~> 3.0.0)
+  appraisal
+  bundler (~> 1.0.0)
+  flexmock (> 0.8.6)
+  jeweler (~> 1.6.4)
+  json
+  log4r
+  memcache-client
+  nokogiri (~> 1.4.4)
+  rcov
+  rdoc
+  rspec (= 2.6.0)

data/gemfiles/rails3.1.gemfile

@@ -0,0 +1,18 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "appraisal"
+gem "json"
+gem "log4r"
+gem "nokogiri", "~> 1.4.4"
+gem "bundler", "~> 1.0.0", :group=>:development
+gem "jeweler", "~> 1.6.4", :group=>:development
+gem "rspec", "2.6.0", :group=>:development
+gem "flexmock", "> 0.8.6", :group=>:development
+gem "memcache-client", :group=>:development
+gem "rcov", :group=>:development
+gem "rdoc", :group=>:development
+gem "activesupport", "~> 3.1.0"
+gem "activerecord", "~> 3.1.0"
+

data/gemfiles/rails3.1.gemfile.lock

@@ -0,0 +1,63 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    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)
+    activesupport (3.1.1)
+      multi_json (~> 1.0)
+    appraisal (0.4.0)
+      bundler
+      rake
+    arel (2.2.1)
+    builder (3.0.0)
+    diff-lcs (1.1.3)
+    flexmock (0.9.0)
+    git (1.2.5)
+    i18n (0.6.0)
+    jeweler (1.6.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+    json (1.6.1)
+    log4r (1.1.9)
+    memcache-client (1.8.5)
+    multi_json (1.0.3)
+    nokogiri (1.4.7)
+    rake (0.9.2.2)
+    rcov (0.9.11)
+    rdoc (3.11)
+      json (~> 1.4)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    tzinfo (0.3.31)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 3.1.0)
+  activesupport (~> 3.1.0)
+  appraisal
+  bundler (~> 1.0.0)
+  flexmock (> 0.8.6)
+  jeweler (~> 1.6.4)
+  json
+  log4r
+  memcache-client
+  nokogiri (~> 1.4.4)
+  rcov
+  rdoc
+  rspec (= 2.6.0)