amee 4.1.0 → 4.1.1

data/VERSION

@@ -1 +1 @@
-4.1.0
+4.1.1

data/amee.gemspec

@@ -4,14 +4,13 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{amee}
-  s.version = "4.1.0"
+  s.name = "amee"
+  s.version = "4.1.1"
 
   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-09-29}
-  s.default_executable = %q{ameesh}
-  s.email = %q{james@floppy.org.uk}
+  s.date = "2011-09-29"
+  s.email = "james@floppy.org.uk"
   s.executables = ["ameesh"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -123,11 +122,11 @@ 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

data/lib/amee.rb

@@ -59,8 +59,8 @@ require 'amee/config'
 if defined?(Rails)
   require 'amee/rails'
   ActiveRecord::Base.send :include, AMEE::Rails
-
-
+  
+  amee_config = "config/amee.yml"
   if File.exist? amee_config
     $AMEE_CONFIG = AMEE::Config.setup(amee_config, Rails.env)
   else  

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: amee
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: 
   segments: 
   - 4
   - 1
-  - 0
-  version: 4.1.0
+  - 1
+  version: 4.1.1
 platform: ruby
 authors: 
 - James Smith
@@ -18,12 +18,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-29 00:00:00 +01:00
-default_executable: ameesh
+date: 2011-09-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -35,11 +32,11 @@ dependencies:
         - 0
         - 10
         version: 3.0.10
-  name: activesupport
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  name: activesupport
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -49,11 +46,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: json
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  name: json
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -63,11 +60,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: log4r
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  name: log4r
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -80,11 +77,11 @@ dependencies:
         - 3
         - 1
         version: 1.4.3.1
-  name: nokogiri
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  name: nokogiri
   prerelease: false
-  type: :development
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -96,11 +93,11 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  name: bundler
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  name: bundler
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -112,11 +109,11 @@ dependencies:
         - 6
         - 4
         version: 1.6.4
-  name: jeweler
   version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  name: jeweler
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -128,11 +125,11 @@ dependencies:
         - 6
         - 0
         version: 2.6.0
-  name: rspec
   version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -144,11 +141,11 @@ dependencies:
         - 8
         - 6
         version: 0.8.6
-  name: flexmock
   version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  name: flexmock
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -158,11 +155,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: memcache-client
   version_requirements: *id009
-- !ruby/object:Gem::Dependency 
+  name: memcache-client
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -172,11 +169,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rcov
   version_requirements: *id010
-- !ruby/object:Gem::Dependency 
+  name: rcov
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -186,11 +183,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rdoc
   version_requirements: *id011
-- !ruby/object:Gem::Dependency 
+  name: rdoc
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -202,8 +199,10 @@ dependencies:
         - 0
         - 10
         version: 3.0.10
-  name: activerecord
   version_requirements: *id012
+  name: activerecord
+  prerelease: false
+  type: :development
 description: 
 email: james@floppy.org.uk
 executables: 
@@ -318,7 +317,6 @@ files:
 - spec/v3/item_definition_spec.rb
 - spec/v3/item_value_definition_spec.rb
 - spec/v3/return_value_definition_spec.rb
-has_rdoc: true
 homepage: http://github.com/AMEE/amee-ruby
 licenses: 
 - BSD 3-Clause
@@ -348,7 +346,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Ruby interface to the AMEE carbon calculator