hookercookerman-amee 0.1.3 → 0.1.4

data/Manifest.txt

@@ -3,6 +3,7 @@ LICENSE.txt
 Manifest.txt
 README.rdoc
 Rakefile
+amee.gemspec
 features/config.feature
 features/data/data_category.feature
 features/data/data_item.feature
@@ -29,6 +30,7 @@ features/step_definitions/profile_steps.rb
 features/support/amee/auth/response.json
 features/support/amee/data.json
 features/support/amee/data/transport/car/generic.json
+features/support/amee/data/transport/car/generic/E57D6E2828EB.json
 features/support/amee/data/transport/car/generic/drill.json
 features/support/amee/data/transport/car/generic/drill?fuel=diesel&size=large.json
 features/support/amee/data/transport/car/generic/drill?fuel=diesel.json
@@ -40,11 +42,12 @@ features/support/amee/data_category_with_data_items.json
 features/support/amee/profiles.json
 features/support/amee/profiles/155DD3C63646/transport/motorcycle/generic/D47C465B8157.json
 features/support/amee/profiles/155DD3C63646/transport/motorcycle/generic/D47C465B8157?distance=400&representation=true.json
+features/support/amee/profiles/180D73DA5229/home.json
 features/support/amee/profiles/48B97680BCCF/home/energy/quantity/response.json
 features/support/amee/profiles/7C7D68C2A7CD/home.json
-features/support/amee/profiles/BB1BDB4FDD77/home/energy/quantity/920B54ED665B.json
 features/support/amee/profiles/E0BCB3704D15.json
 features/support/amee/profiles/E0BCB3704D15/Business.json
+features/support/amee/profiles/F38ECBD56D59/home/energy/quantity/5891C88F29FA.json
 features/support/amee/profiles/profile.json
 features/support/env.rb
 init.rb
@@ -76,4 +79,4 @@ spec/session_spec.rb
 spec/spec.opts
 spec/spec_helper.rb
 tasks/rspec.rake
-tasks/yard.rake
+tasks/yard.rake

data/README.rdoc

@@ -7,6 +7,7 @@ Amee is a Ruby wrapper over the "AMEE carbon calculator"[http://www.amee.com]
 * Idiomatic Ruby
 * Concrete classes and methods modeling Amee data, so it's easy for a Rubyist to understand what's available
 * Cucumber Features and specs
+* AMEE API 2.0 Support
 
 == DOCUMENTATION
 

data/amee.gemspec

@@ -0,0 +1,54 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{amee}
+  s.version = '0.1.4'
+  
+  s.homepage = 'http://github.com/hookercookerman/amee/tree/master'
+  s.description = %q{Its a gem to interact with the amee api}
+  s.summary = %q{Amee}
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Richard Hooker"]
+  s.date = %q{2009-04-24}
+
+  s.email = ["richard.hooker@dynamic50.com"]
+  s.extra_rdoc_files = ["History.txt", "LICENSE.txt", "Manifest.txt", "README.rdoc"]
+  s.files = ["History.txt", "LICENSE.txt", "Manifest.txt", "README.rdoc", "Rakefile", "amee.gemspec", "features/config.feature", "features/data/data_category.feature", "features/data/data_item.feature", "features/data/data_item_value.feature", "features/data/drill_down.feature", "features/development.feature", "features/profile/create.profile.feature", "features/profile/create.profile_item.feature", "features/profile/delete.profile.feature", "features/profile/delete.profile_item.feature", "features/profile/get.profile.feature", "features/profile/profile_category.feature", "features/profile/profile_item.feature", "features/profile/profiles.feature", "features/profile/update.profile_item.feature", "features/session/reauthenticate.feature", "features/step_definitions/amee_steps.rb", "features/step_definitions/common_steps.rb", "features/step_definitions/config_steps.rb", "features/step_definitions/data_steps.rb", "features/step_definitions/profile_category_steps.rb", "features/step_definitions/profile_item_steps.rb", "features/step_definitions/profile_steps.rb", "features/support/amee/auth/response.json", "features/support/amee/data.json", "features/support/amee/data/transport/car/generic.json", "features/support/amee/data/transport/car/generic/E57D6E2828EB.json", "features/support/amee/data/transport/car/generic/drill.json", "features/support/amee/data/transport/car/generic/drill?fuel=diesel&size=large.json", "features/support/amee/data/transport/car/generic/drill?fuel=diesel.json", "features/support/amee/data/transport/plane/generic.json", "features/support/amee/data/transport/plane/generic/FFC7A05D54AD.json", "features/support/amee/data/transport/plane/generic/FFC7A05D54AD/kgCO2PerPassengerJourney.json", "features/support/amee/data_category.json", "features/support/amee/data_category_with_data_items.json", "features/support/amee/profiles.json", "features/support/amee/profiles/155DD3C63646/transport/motorcycle/generic/D47C465B8157.json", "features/support/amee/profiles/155DD3C63646/transport/motorcycle/generic/D47C465B8157?distance=400&representation=true.json", "features/support/amee/profiles/180D73DA5229/home.json", "features/support/amee/profiles/48B97680BCCF/home/energy/quantity/response.json", "features/support/amee/profiles/7C7D68C2A7CD/home.json", "features/support/amee/profiles/E0BCB3704D15.json", "features/support/amee/profiles/E0BCB3704D15/Business.json", "features/support/amee/profiles/F38ECBD56D59/home/energy/quantity/5891C88F29FA.json", "features/support/amee/profiles/profile.json", "features/support/env.rb", "init.rb", "lib/amee.rb", "lib/amee/config.rb", "lib/amee/data_api/data_category.rb", "lib/amee/data_api/data_item.rb", "lib/amee/data_api/data_item_value.rb", "lib/amee/data_api/drill_down.rb", "lib/amee/data_api/item_definition.rb", "lib/amee/data_api/item_value_definition.rb", "lib/amee/data_api/value_definition.rb", "lib/amee/logging.rb", "lib/amee/model.rb", "lib/amee/parser.rb", "lib/amee/profile_api/profile.rb", "lib/amee/profile_api/profile_category.rb", "lib/amee/profile_api/profile_item.rb", "lib/amee/service.rb", "lib/amee/session.rb", "lib/amee/utils/string.rb", "script/console", "script/destroy", "script/generate", "script/txt2html", "spec/amee_spec.rb", "spec/service_spec.rb", "spec/session_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "tasks/rspec.rake", "tasks/yard.rake"]
+  s.has_rdoc = true
+  s.rdoc_options = ['--main', 'README.rdoc']
+  s.rdoc_options << '--inline-source' << '--charset=UTF-8'
+
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{amee}
+  s.rubygems_version = %q{1.3.2}
+
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<newgem>, [">= 1.3.0"])
+      s.add_development_dependency(%q<hoe>, [">= 1.8.0"])
+      s.add_development_dependency(%q<fakeweb>, [">= 0"])
+      s.add_runtime_dependency(%q<httparty>, ["= 0.4.3"])
+      s.add_runtime_dependency(%q<wycats-moneta>, [">= 0"])
+      s.add_runtime_dependency(%q<mislav-will_paginate>, [">= 2.2.3"])
+    else
+      s.add_dependency(%q<fakeweb>, [">= 0"])
+      s.add_dependency(%q<newgem>, [">= 1.3.0"])
+      s.add_dependency(%q<hoe>, [">= 1.8.0"])
+      s.add_dependency(%q<httparty>, ["= 0.4.3"])
+      s.add_dependency(%q<wycats-moneta>, [">= 0"])
+      s.add_dependency(%q<mislav-will_paginate>, [">= 2.2.3"])
+    end
+  else
+    s.add_dependency(%q<mislav-will_paginate>, [">= 2.2.3"])
+    s.add_dependency(%q<fakeweb>, [">= 0"])
+    s.add_dependency(%q<httparty>, ["= 0.4.3"])
+    s.add_dependency(%q<wycats-moneta>, [">= 0"])
+    s.add_dependency(%q<newgem>, [">= 1.3.0"])
+    s.add_dependency(%q<hoe>, [">= 1.8.0"])
+  end
+end

data/features/data/data_item.feature

@@ -5,15 +5,15 @@ Feature: Get Amee DataItem
   I want to be able to get amee data items
   
   
-  Scenario: Get Amee Date Item with path /data/transport/plane/generic/FFC7A05D54AD
+  Scenario: Get Amee Date Item with path /data/transport/car/generic/E57D6E2828EB
     Given I have a valid amee session
-    When I ask the session for: get_data_item with path: "/data/transport/plane/generic/FFC7A05D54AD"
+    When I ask the session for: get_data_item with path: "/data/transport/car/generic/E57D6E2828EB"
     
     Then the data item should have: "path" with: ""
-    And the data item should have: "name" with: "FFC7A05D54AD"
-    And the data item should have: "uid" with: "FFC7A05D54AD"
+    And the data item should have: "name" with: "E57D6E2828EB"
+    And the data item should have: "uid" with: "E57D6E2828EB"
     And the data item's item_values should not be nil
     And the data item's choices should not be nil
     
-    And the data item's item_definition: drill_down should be "type,size"
-    And the data item's item_definition: name should be "Plane Generic"
+    And the data item's item_definition: drill_down should be "fuel, size"
+    And the data item's item_definition: name should be "Car Generic"

data/features/profile/get.profile.feature

@@ -10,4 +10,5 @@ Feature: Get Amee Profiles
     Then the amee profile should have: "uid" with: "E0BCB3704D15"
     And the amee profile should have: "name" with: "E0BCB3704D15"
     And the amee profile should have: "path" with: "E0BCB3704D15"
+    And the amee profile should have: "total_amount" with: "10"
     And the amee profile profile_categories should not be empty

data/features/profile/profile_category.feature

@@ -3,12 +3,12 @@ Feature: Get Amee Profile Category
   As a amee developer
   I want to be able to get profile data categories
   
-  Scenario: Get Amee profile category with path /profiles/E0BCB3704D15/Business
+  Scenario: Get Amee profile category with path /profiles/180D73DA5229/Home
     Given I have a valid amee session
-    When I ask the session for: get_profile_category with path: "/profiles/E0BCB3704D15/business"
+    When I ask the session for: get_profile_category with path: "/profiles/180D73DA5229/home"
     
-    Then the profile category should have: "total_amount_per_month" with: "0"
-    And the profile category should have: "resource_path" with: "/business"
+    Then the profile category should have: "total_amount" with: "0"
+    And the profile category should have: "resource_path" with: "/home"
     And the profile category's profile_items should be empty
     And the profile category's profile_categories should not be empty
     And the profile category's data_category should not be nil

data/features/profile/profile_item.feature

@@ -4,12 +4,14 @@ Feature: Getting Amee Profile Item
   As a amee developer
   I want to be able to get profile items
   
-  Scenario: Get Amee profile item with path /profiles/BB1BDB4FDD77/home/energy/quantity/920B54ED665B
+  Scenario: Get Amee profile item with path /profiles/F38ECBD56D59/home/energy/quantity/5891C88F29FA 
     Given I have a valid amee session
-    When I ask the session for: get_profile_item with path: "/profiles/BB1BDB4FDD77/home/energy/quantity/920B54ED665B"
+    When I ask the session for: get_profile_item with path: "/profiles/F38ECBD56D59/home/energy/quantity/5891C88F29FA"
     
-    Then the profile item should have: "amount_per_month" with: "2.055"
-    And the profile item should have: "resource_path" with: "/home/energy/quantity/920B54ED665B"
-    And the profile item should have: "valid_from" with: "20090301"
-    And the profile item should have: "end" with: "false"
-    And the profile item's item_values should not be nil
+    Then the profile item should have: "co2_value" with: "24.66"
+    And the profile item should have: "co2_unit" with: "kg/year"
+    And the profile item should have: "resource_path" with: "/home/energy/quantity/5891C88F29FA"
+    And the profile item should have: "start_date" with: "Thu Mar 19 16:51:00 UTC 2009"
+    And the profile item should have: "end_date" with: ""
+    And the profile item's item_values should not be nil
+    And the profile item's item_definition should not be nil

data/features/support/amee/data/transport/car/generic/E57D6E2828EB.json

@@ -0,0 +1,317 @@
+
+{
+    "apiVersion":"2.0",
+    "path":"/transport/car/generic/E57D6E2828EB",
+    
+"userValueChoices":
+
+    {
+        "choices":
+        [
+            {
+                "name":"airconFull",
+                "value":"false"
+            },
+            
+
+            {
+                "name":"tyresUnderinflated",
+                "value":"false"
+            },
+            
+
+            {
+                "name":"country",
+                "value":""
+            },
+            
+
+            {
+                "name":"regularlyServiced",
+                "value":"true"
+            },
+            
+
+            {
+                "name":"useTypicalDistance",
+                "value":"false"
+            },
+            
+
+            {
+                "name":"ownFuelConsumption",
+                "value":"0"
+            },
+            
+
+            {
+                "name":"occupants",
+                "value":"-1"
+            },
+            
+
+            {
+                "name":"distance",
+                "value":""
+            },
+            
+
+            {
+                "name":"ecoDriving",
+                "value":"false"
+            },
+            
+
+            {
+                "name":"airconTypical",
+                "value":"true"
+            },
+            
+
+            {
+                "name":"fuelConsumption",
+                "value":"0"
+            }
+        ],
+        
+"name":"userValueChoices"
+    },
+    
+"dataItem":
+    {
+        "uid":"E57D6E2828EB",
+        "startDate":"2009-04-25T11:19:00+01:00",
+        
+"dataCategory":
+        {
+            "uid":"87E55DA88017",
+            "name":"Generic",
+            "path":"generic"
+        },
+        
+"itemValues":
+
+        [
+            {
+                "itemValueDefinition":
+
+                {
+                    "uid":"42ACBD690E88",
+                    "name":"Fuel",
+                    "path":"fuel",
+                    "valueDefinition":
+
+                    {
+                        "uid":"CCEB59CACE1B",
+                        "environment":
+                        {
+                            "uid":"5F5887BCF726"
+                        },
+                        "created":"2007-07-27 09:30:44.0",
+                        "description":"",
+                        "name":"text",
+                        "valueType":"TEXT",
+                        "modified":"2007-07-27 09:30:44.0"
+                    }
+                },
+                "perUnit":"",
+                "uid":"DBA7380574E2",
+                "startDate":"2009-03-17T18:37:16Z",
+                "unit":"",
+                "name":"Fuel",
+                "value":"average",
+                "path":"fuel",
+                "displayPath":"fuel",
+                "displayName":"Fuel"
+            },
+            {
+                "itemValueDefinition":
+                {
+                    "uid":"6C4B0FA03C9A",
+                    "name":"Source",
+                    "path":"source",
+                    "valueDefinition":
+                    {
+                        "uid":"CCEB59CACE1B",
+                        "environment":
+                        {
+                            "uid":"5F5887BCF726"
+                        },
+                        "created":"2007-07-27 09:30:44.0",
+                        "description":"",
+                        "name":"text",
+                        "valueType":"TEXT",
+                        "modified":"2007-07-27 09:30:44.0"
+                    }
+                },
+                "perUnit":"",
+                "uid":"D61A0F06129F",
+                "startDate":"2009-03-17T18:37:16Z",
+                "unit":"",
+                "name":"Source",
+                "value":"defra/amee 2008",
+                "path":"source",
+                "displayPath":"source",
+                "displayName":"Source"
+            },
+            {
+                "itemValueDefinition":
+                {
+                    "uid":"B6B71F9F4E94",
+                    "name":"kgCO2 Per Km",
+                    "path":"kgCO2PerKm",
+                    "valueDefinition":
+                    {
+                        "uid":"996AE5477B3F",
+                        "environment":
+                        {
+                            "uid":"5F5887BCF726"
+                        },
+                        "created":"2007-07-27 09:30:44.0",
+                        "description":"",
+                        "name":"kgCO2PerKm",
+                        "valueType":"DECIMAL",
+                        "modified":"2007-07-27 09:30:44.0"
+                    }
+                    
+
+                },
+                
+"perUnit":"",
+                "uid":"17AB08B56256",
+                "startDate":"2009-03-17T18:37:16Z",
+                "unit":"",
+                "name":"kgCO2 Per Km",
+                "value":"0.2042",
+                "path":"kgCO2PerKm",
+                "displayPath":"kgCO2PerKm",
+                "displayName":"kgCO2 Per Km"
+            },
+            {
+                "itemValueDefinition":
+                {
+                    "uid":"C6AA71697CCF",
+                    "name":"Size",
+                    "path":"size",
+                    "valueDefinition":
+                    {
+                        "uid":"CCEB59CACE1B",
+                        "environment":
+                        {
+                            "uid":"5F5887BCF726"
+                        },
+                        "created":"2007-07-27 09:30:44.0",
+                        "description":"",
+                        "name":"text",
+                        "valueType":"TEXT",
+                        "modified":"2007-07-27 09:30:44.0"
+                    }
+                },
+                "perUnit":"",
+                "uid":"A2EA5A78A1E5",
+                "startDate":"2009-03-17T18:37:16Z",
+                "unit":"",
+                "name":"Size",
+                "value":"average",
+                "path":"size",
+                "displayPath":"size",
+                "displayName":"Size"
+            },
+            {
+                "itemValueDefinition":
+                {
+                    "uid":"3F29C69329AF",
+                    "name":"kgCO2 Per Km US",
+                    "path":"kgCO2PerKmUS",
+                    "valueDefinition":
+                    {
+                        "uid":"996AE5477B3F",
+                        "environment":
+                        {
+                            "uid":"5F5887BCF726"
+                        },
+                        "created":"2007-07-27 09:30:44.0",
+                        "description":"",
+                        "name":"kgCO2PerKm",
+                        "valueType":"DECIMAL",
+                        "modified":"2007-07-27 09:30:44.0"
+                    }
+                },
+                "perUnit":"",
+                "uid":"F473DC8D9F34",
+                "startDate":"2009-03-17T18:37:16Z",
+                "unit":"",
+                "name":"kgCO2 Per Km US",
+                "value":"0.2700",
+                "path":"kgCO2PerKmUS",
+                "displayPath":"kgCO2PerKmUS",
+                "displayName":"kgCO2 Per Km US"
+            },
+            {
+                "itemValueDefinition":
+                {
+                    "perUnit":"year",
+                    "uid":"C6B80EC6B6A4",
+                    "unit":"km",
+                    "name":"Typical distance",
+                    "path":"typicalDistance",
+                    "valueDefinition":
+                    {
+                        "uid":"45433E48B39F",
+                        "environment":
+                        {
+                            "uid":"5F5887BCF726"
+                        },
+                        "created":"2007-07-27 09:30:44.0",
+                        "description":"",
+                        "name":"amount",
+                        "valueType":"DECIMAL",
+                        "modified":"2007-07-27 09:30:44.0"
+                    }
+                },
+                "perUnit":"year",
+                "uid":"1AB167FFFD51",
+                "startDate":"2009-03-17T18:37:16Z",
+                "unit":"km",
+                "name":"Typical distance",
+                "value":"14481",
+                "path":"typicalDistance",
+                "displayPath":"typicalDistance",
+                "displayName":"Typical distance"
+            }
+        ],
+        "environment":
+        {
+            "uid":"5F5887BCF726",
+            "itemsPerFeed":10,
+            "created":"2007-07-27 09:30:44.0",
+            "description":"",
+            "name":"AMEE",
+            "owner":"",
+            "path":"",
+            "itemsPerPage":10,
+            "modified":"2007-07-27 09:30:44.0"
+        },
+        "created":"2009-03-17 18:37:16.0",
+        "name":"E57D6E2828EB",
+        "path":"",
+        "itemDefinition":
+        {
+            "uid":"123C4A18B5D6",
+            "environment":
+            {
+                "uid":"5F5887BCF726"
+            },
+            "created":"2007-07-27 09:30:44.0",
+            "name":"Car Generic",
+            "drillDown":"fuel,
+            size",
+            "modified":"2007-07-27 09:30:44.0"
+        },
+        "endDate":"",
+        "label":"average,
+         average",
+        "modified":"2009-04-25 11:19:18.0"
+    },
+    "amountPerMonth":0
+}

data/features/support/amee/profiles/180D73DA5229/home.json

@@ -0,0 +1,88 @@
+{
+  "apiVersion":"2.0",
+  "pager":{},
+  "profileCategories":[
+    {
+      "uid":"427DFCC65E52",
+      "name":"Appliances",
+      "path":"appliances"
+    },
+    {
+      "uid":"30BA55A0C472",
+      "name":"Energy",
+      "path":"energy"
+    },
+    {
+      "uid":"A46ECFA19333",
+      "name":"Heating",
+      "path":"heating"
+    },
+    {
+      "uid":"150266DD4434",
+      "name":"Lighting",
+      "path":"lighting"
+    },
+    {
+      "uid":"6553150F96CE",
+      "name":"Waste",
+      "path":"waste"
+    },
+    {
+      "uid":"07362DCC9E7B",
+      "name":"Water",
+      "path":"water"
+    }
+  ],
+  "dataCategory":{
+    "uid":"BBA3AC3E795E",
+    "dataCategory":{
+      "uid":"CD310BEBAC52",
+      "name":"Root",
+      "path":""
+    },
+    "environment":{
+      "uid":"5F5887BCF726",
+      "itemsPerFeed":10,
+      "description":"",
+      "name":"AMEE",
+      "owner":"",
+      "path":"",
+      "itemsPerPage":10
+    },
+    "created":"2007-07-27 09:30:44.0",
+    "name":"Home",
+    "path":"home",
+    "modified":"2007-07-27 09:30:44.0"
+  },
+  "environment":{
+    "uid":"5F5887BCF726",
+    "itemsPerFeed":10,
+    "created":"2007-07-27 09:30:44.0",
+    "description":"",
+    "name":"AMEE",
+    "owner":"",
+    "path":"",
+    "itemsPerPage":10,
+    "modified":"2007-07-27 09:30:44.0"
+  },
+  "totalAmount":"0",
+  "path":"/home",
+  "profileItemActions":{
+    "allowCreate":true,
+    "allowView":true,
+    "allowList":true,
+    "allowModify":true,
+    "allowDelete":true
+  },
+  "actions":{
+    "allowCreate":true,
+    "allowView":true,
+    "allowList":true,
+    "allowModify":true,
+    "allowDelete":true
+  },
+  "profileItems":{},
+  "profile":{
+    "uid":"180D73DA5229"
+  }
+}

data/features/support/amee/profiles/E0BCB3704D15.json

@@ -1,19 +1,18 @@
-{"dataCategory":{"name":"Root","uid":"CD310BEBAC52","path":""},
-"profile":{"modified":"2009-01-19 20:54:35.0","name":"E0BCB3704D15","uid":"E0BCB3704D15",
-"permission":{"modified":"2009-01-19 20:54:35.0",
-"group":{"name":"amee","uid":"AC65FFA5F9D9"},
-"auth":{"username":"whateverman","uid":"5861D2B0ABBD"},
-"uid":"5FEF6A85F47F","environmentUid":"5F5887BCF726","created":"2009-01-19 20:54:35.0"},
-"path":"E0BCB3704D15","environment":{"uid":"5F5887BCF726"},"created":"2009-01-19 20:54:35.0"},
-"profileDate":"200904","path":"","totalAmountPerMonth":"0",
-"children":{
-"profileItems":{},
-"pager":{},
-"dataCategories":[{"name":"Business","uid":"99B121BB416C","path":"business"},
-{"name":"Home","uid":"BBA3AC3E795E","path":"home"},{"name":"Import","uid":"85A9172C31AF","path":"import"},
-{"name":"Metadata","uid":"9E5362EAB0E7","path":"metadata"},
-{"name":"Personal","uid":"A0CF90F6C0B9","path":"personal"},
-{"name":"Planet","uid":"6FF29F7DACDA","path":"planet"},
-{"name":"Test","uid":"6153F468BE05","path":"test"},
-{"name":"Transport","uid":"263FC0186834","path":"transport"},
-{"name":"User","uid":"2957AE9B6E6B","path":"user"}]}}
+{"apiVersion":"2.0","pager":{},
+"profileCategories":[
+{"uid":"99B121BB416C","name":"Business","path":"business"},
+{"uid":"BBA3AC3E795E","name":"Home","path":"home"},
+{"uid":"85A9172C31AF","name":"Import","path":"import"},
+{"uid":"9E5362EAB0E7","name":"Metadata","path":"metadata"},
+{"uid":"A0CF90F6C0B9","name":"Personal","path":"personal"},
+{"uid":"6FF29F7DACDA","name":"Planet","path":"planet"},
+{"uid":"6153F468BE05","name":"Test","path":"test"},
+{"uid":"263FC0186834","name":"Transport","path":"transport"},
+{"uid":"2957AE9B6E6B","name":"User","path":"user"}],"dataCategory":
+{"uid":"CD310BEBAC52",
+"environment":{"uid":"5F5887BCF726","itemsPerFeed":10,"description":"","name":"AMEE","owner":"","path":"","itemsPerPage":10},"created":"2007-07-27 09:30:44.0","name":"Root","path":"","modified":"2007-07-27 09:30:44.0"},"environment":{"uid":"5F5887BCF726","itemsPerFeed":10,"created":"2007-07-27 09:30:44.0","description":"","name":"AMEE","owner":"","path":"","itemsPerPage":10,"modified":"2007-07-27 09:30:44.0"},
+"totalAmount":"10","path":"","profileItems":{},
+"profile":{"uid":"E0BCB3704D15",
+"environment":{"uid":"5F5887BCF726"},"created":"2009-04-27 13:02:49.0","name":"E0BCB3704D15","path":"E0BCB3704D15","permission":{"uid":"F197E63C4046","created":"2009-04-27 13:02:49.0","group":{"uid":"AC65FFA5F9D9","name":"amee"},"environmentUid":"5F5887BCF726",
+"auth":{"uid":"5861D2B0ABBD","username":"hookercookerman"},
+"modified":"2009-04-27 13:02:49.0"},"modified":"2009-04-27 13:02:49.0"}}

data/features/support/amee/profiles/F38ECBD56D59/home/energy/quantity/5891C88F29FA.json

@@ -0,0 +1,326 @@
+{
+  "apiVersion":"2.0",
+  "profileItem":{
+    "uid":"5891C88F29FA",
+    "itemValues":[
+      {
+        "itemValueDefinition":{
+          "uid":"E0EFED6FD7E6",
+          "name":"Payment frequency",
+          "path":"paymentFrequency",
+          "valueDefinition":{
+            "uid":"CCEB59CACE1B",
+            "environment":{
+              "uid":"5F5887BCF726"
+            },
+            "created":"2007-07-27 09:30:44.0",
+            "description":"",
+            "name":"text",
+            "valueType":"TEXT",
+            "modified":"2007-07-27 09:30:44.0"
+          }
+        },
+        "perUnit":"",
+        "uid":"920C22CBEDAD",
+        "unit":"",
+        "name":"Payment frequency",
+        "value":"",
+        "path":"paymentFrequency",
+        "displayPath":"paymentFrequency",
+        "displayName":"Payment frequency"
+      },
+      {
+        "itemValueDefinition":{
+          "uid":"63005554AE8A",
+          "name":"Green tariff",
+          "path":"greenTariff",
+          "valueDefinition":{
+            "uid":"CCEB59CACE1B",
+            "environment":{
+              "uid":"5F5887BCF726"
+            },
+            "created":"2007-07-27 09:30:44.0",
+            "description":"",
+            "name":"text",
+            "valueType":"TEXT",
+            "modified":"2007-07-27 09:30:44.0"
+          }
+        },
+        "perUnit":"",
+        "uid":"DEFDAC177202",
+        "unit":"",
+        "name":"Green tariff",
+        "value":"",
+        "path":"greenTariff",
+        "displayPath":"greenTariff",
+        "displayName":"Green tariff"
+      },
+      {
+        "itemValueDefinition":{
+          "uid":"527AADFB3B65",
+          "name":"Season",
+          "path":"season",
+          "valueDefinition":{
+            "uid":"CCEB59CACE1B",
+            "environment":{
+              "uid":"5F5887BCF726"
+            },
+            "created":"2007-07-27 09:30:44.0",
+            "description":"",
+            "name":"text",
+            "valueType":"TEXT",
+            "modified":"2007-07-27 09:30:44.0"
+          }
+        },
+        "perUnit":"",
+        "uid":"F4BB17BC1D5E",
+        "unit":"",
+        "name":"Season",
+        "value":"",
+        "path":"season",
+        "displayPath":"season",
+        "displayName":"Season"
+      },
+      {
+        "itemValueDefinition":{
+          "uid":"1740E500BDAB",
+          "choices":"true=true, false=false",
+          "name":"Includes Heating",
+          "path":"includesHeating",
+          "valueDefinition":{
+            "uid":"CCEB59CACE1B",
+            "environment":{
+              "uid":"5F5887BCF726"
+            },
+            "created":"2007-07-27 09:30:44.0",
+            "description":"",
+            "name":"text",
+            "valueType":"TEXT",
+            "modified":"2007-07-27 09:30:44.0"
+          }
+        },
+        "perUnit":"",
+        "uid":"7381C23DE6CD",
+        "unit":"",
+        "name":"Includes Heating",
+        "value":"false",
+        "path":"includesHeating",
+        "displayPath":"includesHeating",
+        "displayName":"Includes Heating"
+      },
+      {
+        "itemValueDefinition":{
+          "perUnit":"year",
+          "uid":"666C77B224B3",
+          "unit":"kg",
+          "name":"Mass Per Time",
+          "path":"massPerTime",
+          "valueDefinition":{
+            "uid":"45433E48B39F",
+            "environment":{
+              "uid":"5F5887BCF726"
+            },
+            "created":"2007-07-27 09:30:44.0",
+            "description":"",
+            "name":"amount",
+            "valueType":"DECIMAL",
+            "modified":"2007-07-27 09:30:44.0"
+          }
+        },
+        "perUnit":"year",
+        "uid":"DE2A903C5340",
+        "unit":"kg",
+        "name":"Mass Per Time",
+        "value":"0",
+        "path":"massPerTime",
+        "displayPath":"massPerTime",
+        "displayName":"Mass Per Time"
+      },
+      {
+        "itemValueDefinition":{
+          "perUnit":"year",
+          "uid":"BFD215C4CAB1",
+          "unit":"kWh",
+          "name":"Energy Consumption",
+          "path":"energyConsumption",
+          "valueDefinition":{
+            "uid":"45433E48B39F",
+            "environment":{
+              "uid":"5F5887BCF726"
+            },
+            "created":"2007-07-27 09:30:44.0",
+            "description":"",
+            "name":"amount",
+            "valueType":"DECIMAL",
+            "modified":"2007-07-27 09:30:44.0"
+          }
+        },
+        "perUnit":"month",
+        "uid":"BF3EF6F0E1F4",
+        "unit":"kWh",
+        "name":"Energy Consumption",
+        "value":"10",
+        "path":"energyConsumption",
+        "displayPath":"energyConsumption",
+        "displayName":"Energy Consumption"
+      },
+      {
+        "itemValueDefinition":{
+          "perUnit":"year",
+          "uid":"A9B493A4A1A6",
+          "unit":"kWh",
+          "name":"Current Reading",
+          "path":"currentReading",
+          "valueDefinition":{
+            "uid":"45433E48B39F",
+            "environment":{
+              "uid":"5F5887BCF726"
+            },
+            "created":"2007-07-27 09:30:44.0",
+            "description":"",
+            "name":"amount",
+            "valueType":"DECIMAL",
+            "modified":"2007-07-27 09:30:44.0"
+          }
+        },
+        "perUnit":"year",
+        "uid":"FA5A119E335C",
+        "unit":"kWh",
+        "name":"Current Reading",
+        "value":"0",
+        "path":"currentReading",
+        "displayPath":"currentReading",
+        "displayName":"Current Reading"
+      },
+      {
+        "itemValueDefinition":{
+          "perUnit":"year",
+          "uid":"4C689DEF0A41",
+          "unit":"kWh",
+          "name":"Last Reading",
+          "path":"lastReading",
+          "valueDefinition":{
+            "uid":"45433E48B39F",
+            "environment":{
+              "uid":"5F5887BCF726"
+            },
+            "created":"2007-07-27 09:30:44.0",
+            "description":"",
+            "name":"amount",
+            "valueType":"DECIMAL",
+            "modified":"2007-07-27 09:30:44.0"
+          }
+        },
+        "perUnit":"year",
+        "uid":"8CC9C901561B",
+        "unit":"kWh",
+        "name":"Last Reading",
+        "value":"0",
+        "path":"lastReading",
+        "displayPath":"lastReading",
+        "displayName":"Last Reading"
+      },
+      {
+        "itemValueDefinition":{
+          "perUnit":"year",
+          "uid":"7BBABF4C2E9E",
+          "unit":"L",
+          "name":"Volume Per Time",
+          "path":"volumePerTime",
+          "valueDefinition":{
+            "uid":"45433E48B39F",
+            "environment":{
+              "uid":"5F5887BCF726"
+            },
+            "created":"2007-07-27 09:30:44.0",
+            "description":"",
+            "name":"amount",
+            "valueType":"DECIMAL",
+            "modified":"2007-07-27 09:30:44.0"
+          }
+        },
+        "perUnit":"year",
+        "uid":"933C7A656B8D",
+        "unit":"L",
+        "name":"Volume Per Time",
+        "value":"0",
+        "path":"volumePerTime",
+        "displayPath":"volumePerTime",
+        "displayName":"Volume Per Time"
+      },
+      {
+        "itemValueDefinition":{
+          "perUnit":"year",
+          "uid":"F0ED40C7EF8F",
+          "name":"Number of deliveries",
+          "path":"deliveries",
+          "valueDefinition":{
+            "uid":"45433E48B39F",
+            "environment":{
+              "uid":"5F5887BCF726"
+            },
+            "created":"2007-07-27 09:30:44.0",
+            "description":"",
+            "name":"amount",
+            "valueType":"DECIMAL",
+            "modified":"2007-07-27 09:30:44.0"
+          }
+        },
+        "perUnit":"year",
+        "uid":"3D9CE047FE24",
+        "unit":"",
+        "name":"Number of deliveries",
+        "value":"",
+        "path":"deliveries",
+        "displayPath":"deliveries",
+        "displayName":"Number of deliveries"
+      }
+    ],
+    "dataCategory":{
+      "uid":"A92693A99BAD",
+      "name":"Quantity",
+      "path":"quantity"
+    },
+    "startDate":"2009-03-19T16:51:00Z",
+    "itemDefinition":{
+      "uid":"212C818D8F16",
+      "name":"Energy Quantity",
+      "drillDown":"type"
+    },
+    "endDate":"",
+    "dataItem":{
+      "uid":"66056991EE23",
+      "Label":"gas"
+    },
+    "modified":"2009-03-19T16:51:33Z",
+    "amount":{
+      "unit":"kg/year",
+      "value":24.66
+    },
+    "environment":{
+      "uid":"5F5887BCF726",
+      "itemsPerFeed":10,
+      "description":"",
+      "name":"AMEE",
+      "owner":"",
+      "path":"",
+      "itemsPerPage":10
+    },
+    "created":"2009-03-19T16:51:33Z",
+    "name":null,
+    "profile":{
+      "uid":"F38ECBD56D59"
+    }
+  },
+  "path":"/home/energy/quantity/5891C88F29FA",
+  "actions":{
+    "allowCreate":true,
+    "allowView":true,
+    "allowList":true,
+    "allowModify":true,
+    "allowDelete":true
+  },
+  "profile":{
+    "uid":"F38ECBD56D59"
+  }
+}

data/lib/amee/data_api/data_item.rb

@@ -8,7 +8,7 @@ module Amee
       self.path_prefix  = "/data"
 
           
-      attr_accessor :start_date, :end_date, :label, :choices, :kg_c_o2_per_k_wh, :source
+      attr_accessor :start_date, :end_date, :label, :choices, :kg_c_o2_per_k_wh, :source, :amount_per_month
       list_populators :item_values => {:class => Amee::DataApi::DataItemValue}      
       item_populators :data_category => {:class => Amee::DataApi::DataCategory},
                         :item_definition => {:class => Amee::DataApi::ItemDefinition}

data/lib/amee/parser.rb

@@ -55,11 +55,7 @@ module Amee
   
   class ProfileCategory < Parser
     def self.process(data)
-      profile_categories = {"profile_categories" => data["children"].delete("dataCategories")}
-      profile_items = {"profile_items" => data["children"]["profileItems"].delete("rows")} if data["children"]["profileItems"]
-      profile_items["profile_items"].each{ |profile_item| profile_item.merge!({"profile" => data["profile"]})} if profile_items && profile_items["profile_items"]
-      data.merge(profile_items).merge(profile_categories).
-      merge({"resource_path" => data["path"]})
+      data.merge({"resource_path" => data["path"]})
     end
   end
   
@@ -93,9 +89,9 @@ module Amee
   
   class GetProfile < Parser
     def self.process(data)
-      categories = {"profile_categories" => data["children"].delete("dataCategories")}
-      categories["profile_categories"].each{|profile_category| profile_category.merge!({"profile" => data["profile"]})}
-      data["profile"].merge(categories).
+      data["profile"].merge({"profile_categories" => data["profileCategories"]}).
+      merge({"profile_items" => data["profileItems"]}).
+      merge({"total_amount" => data["totalAmount"]}).
       merge({"resource_path" => data["path"]})
     end
   end

data/lib/amee/profile_api/profile.rb

@@ -6,7 +6,7 @@ module Amee
       include ::Amee::Model
       self.path_prefix = "/profiles"
       
-      attr_accessor :profile_date, :amount_per_month
+      attr_accessor :total_amount
       list_populators :profile_categories => {:class => Amee::ProfileApi::ProfileCategory}
       item_populators :data_category => {:class => Amee::DataApi::DataCategory}
          
@@ -14,9 +14,9 @@ module Amee
          self.from_hash(session.new_profile, session)
        end
       
-      def create_profile_data_item(path_or_category, data_item_uid, params = {})
-        path = full_path + path_or_category.is_a?(String) ? "/#{path_or_category}" : "/#{path_or_category.full_path}"
-        Amee::ProfileApi::ProfileDataItem.create(session, path, data_item_uid, params)
+      def create_profile_item(path_or_category, data_item_uid, params = {})
+        path = full_path + (path_or_category.is_a?(String) ? "#{path_or_category}" : "#{path_or_category.full_path}")
+        Amee::ProfileApi::ProfileItem.create(session, path, data_item_uid, params)
       end
       
       def get_profile_item(path, options = {})

data/lib/amee/profile_api/profile_category.rb

@@ -7,7 +7,7 @@ module Amee
       self.path_prefix = "/profiles"
       
       
-      attr_accessor :profile, :total_amount_per_month, :total_amount, :pager
+      attr_accessor :profile, :total_amount, :pager
       
       list_populators :profile_items => {:class => Amee::ProfileApi::ProfileItem},
                       :profile_categories => {:class => Amee::ProfileApi::ProfileCategory}

data/lib/amee/profile_api/profile_item.rb

@@ -7,7 +7,7 @@ module Amee
       self.path_prefix = "/profiles"
       
       attr_accessor :end, :amount, :data_item, :profile, :valid_from, :start_date, :end_date
-      attr_accessor :data_item_label, :data_item_uid, :amount_per_month, :total_amount
+      attr_accessor :data_item_label, :data_item_uid, :total_amount
       
       list_populators :item_values => {:class => Amee::DataApi::DataItemValue}   
       item_populators :data_category => {:class => Amee::DataApi::DataCategory},
@@ -15,7 +15,7 @@ module Amee
         
       
       def self.create(session, path, data_item_uid, fields ={})
-        hash = session.create_profile_data_category(path, data_item_uid, :fields => fields)
+        hash = session.create_profile_item(path, data_item_uid, {:fields => fields, :hash_response => true})
         self.from_hash(hash, session)
       end
       

data/lib/amee/session.rb

@@ -159,6 +159,7 @@ module Amee
       @cache.clear
       api_call(:post, "profile_item", path, 
         :query => {:dataItemUid => uid, :representation => "full"}.merge(options[:fields])) do |response|
+          return response if options[:hash_response]
           Amee::ProfileApi::ProfileItem.from_hash(response, self)
         end
     end

data/lib/amee.rb

@@ -10,7 +10,10 @@ rescue LoadError
   require "json/pure"
 end
 
+gem  "httparty", "~>0.4.3"
 require "httparty"
+
+gem "wycats-moneta", "~>0.5.0"
 require "moneta"
 require "moneta/memory"
 
@@ -33,5 +36,5 @@ require "amee/profile_api/profile_category"
 require "amee/profile_api/profile"
 
 module Amee
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hookercookerman-amee
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Richard Hooker
@@ -90,6 +90,7 @@ files:
 - Manifest.txt
 - README.rdoc
 - Rakefile
+- amee.gemspec
 - features/config.feature
 - features/data/data_category.feature
 - features/data/data_item.feature
@@ -116,6 +117,7 @@ files:
 - features/support/amee/auth/response.json
 - features/support/amee/data.json
 - features/support/amee/data/transport/car/generic.json
+- features/support/amee/data/transport/car/generic/E57D6E2828EB.json
 - features/support/amee/data/transport/car/generic/drill.json
 - features/support/amee/data/transport/car/generic/drill?fuel=diesel&size=large.json
 - features/support/amee/data/transport/car/generic/drill?fuel=diesel.json
@@ -127,11 +129,12 @@ files:
 - features/support/amee/profiles.json
 - features/support/amee/profiles/155DD3C63646/transport/motorcycle/generic/D47C465B8157.json
 - features/support/amee/profiles/155DD3C63646/transport/motorcycle/generic/D47C465B8157?distance=400&representation=true.json
+- features/support/amee/profiles/180D73DA5229/home.json
 - features/support/amee/profiles/48B97680BCCF/home/energy/quantity/response.json
 - features/support/amee/profiles/7C7D68C2A7CD/home.json
-- features/support/amee/profiles/BB1BDB4FDD77/home/energy/quantity/920B54ED665B.json
 - features/support/amee/profiles/E0BCB3704D15.json
 - features/support/amee/profiles/E0BCB3704D15/Business.json
+- features/support/amee/profiles/F38ECBD56D59/home/energy/quantity/5891C88F29FA.json
 - features/support/amee/profiles/profile.json
 - features/support/env.rb
 - init.rb

data/features/support/amee/profiles/BB1BDB4FDD77/home/energy/quantity/920B54ED665B.json

@@ -1,201 +0,0 @@
-{
-  "profileItem":{
-    "uid":"920B54ED665B",
-    "itemValues":[
-    {
-      "itemValueDefinition":{
-        "uid":"51D072825D41",
-        "name":"kg Per Month",
-        "path":"kgPerMonth",
-        "valueDefinition":{
-          "uid":"36A771FC1D1A",
-          "name":"kg",
-          "valueType":"DECIMAL"
-        }
-      },
-      "uid":"869D6084EB9C",
-      "name":"kg Per Month",
-      "value":"0",
-      "path":"kgPerMonth"
-    },
-    {
-      "itemValueDefinition":{
-        "uid":"4DF458FD0E4D",
-        "name":"kWh Per Month",
-        "path":"kWhPerMonth",
-        "valueDefinition":{
-          "uid":"26A5C97D3728",
-          "name":"kWh",
-          "valueType":"DECIMAL"
-        }
-      },
-      "uid":"CFA69C6E4D3F",
-      "name":"kWh Per Month",
-      "value":"10",
-      "path":"kWhPerMonth"
-    },
-    {
-      "itemValueDefinition":{
-        "uid":"C9B7E19269A5",
-        "name":"Litres Per Month",
-        "path":"litresPerMonth",
-        "valueDefinition":{
-          "uid":"06B8CFC5A521",
-          "name":"litre",
-          "valueType":"DECIMAL"
-        }
-      },
-      "uid":"A5E88E093F9F",
-      "name":"Litres Per Month",
-      "value":"0",
-      "path":"litresPerMonth"
-    },
-    {
-      "itemValueDefinition":{
-        "uid":"8A468E75C8E8",
-        "name":"kWh reading current",
-        "path":"kWhReadingCurrent",
-        "valueDefinition":{
-          "uid":"45433E48B39F",
-          "name":"amount",
-          "valueType":"DECIMAL"
-        }
-      },
-      "uid":"335A93429B77",
-      "name":"kWh reading current",
-      "value":"0",
-      "path":"kWhReadingCurrent"
-    },
-    {
-      "itemValueDefinition":{
-        "uid":"2328DC7F23AE",
-        "name":"kWh reading last",
-        "path":"kWhReadingLast",
-        "valueDefinition":{
-          "uid":"45433E48B39F",
-          "name":"amount",
-          "valueType":"DECIMAL"
-        }
-      },
-      "uid":"38FAFEE33F01",
-      "name":"kWh reading last",
-      "value":"0",
-      "path":"kWhReadingLast"
-    },
-    {
-      "itemValueDefinition":{
-        "uid":"E0EFED6FD7E6",
-        "name":"Payment frequency",
-        "path":"paymentFrequency",
-        "valueDefinition":{
-          "uid":"CCEB59CACE1B",
-          "name":"text",
-          "valueType":"TEXT"
-        }
-      },
-      "uid":"EBC261EDC5D2",
-      "name":"Payment frequency",
-      "value":"",
-      "path":"paymentFrequency"
-    },
-    {
-      "itemValueDefinition":{
-        "uid":"63005554AE8A",
-        "name":"Green tariff",
-        "path":"greenTariff",
-        "valueDefinition":{
-          "uid":"CCEB59CACE1B",
-          "name":"text",
-          "valueType":"TEXT"
-        }
-      },
-      "uid":"3D90D411DC4B",
-      "name":"Green tariff",
-      "value":"",
-      "path":"greenTariff"
-    },
-    {
-      "itemValueDefinition":{
-        "uid":"527AADFB3B65",
-        "name":"Season",
-        "path":"season",
-        "valueDefinition":{
-          "uid":"CCEB59CACE1B",
-          "name":"text",
-          "valueType":"TEXT"
-        }
-      },
-      "uid":"67D489724500",
-      "name":"Season",
-      "value":"",
-      "path":"season"
-    },
-    {
-      "itemValueDefinition":{
-        "uid":"1740E500BDAB",
-        "name":"Includes Heating",
-        "path":"includesHeating",
-        "valueDefinition":{
-          "uid":"CCEB59CACE1B",
-          "name":"text",
-          "valueType":"TEXT"
-        }
-      },
-      "uid":"A0C15D226883",
-      "name":"Includes Heating",
-      "value":"false",
-      "path":"includesHeating"
-    },
-    {
-      "itemValueDefinition":{
-        "uid":"AA1D1C349119",
-        "name":"Number of deliveries",
-        "path":"numberOfDeliveries",
-        "valueDefinition":{
-          "uid":"45433E48B39F",
-          "name":"amount",
-          "valueType":"DECIMAL"
-        }
-      },
-      "uid":"FCABCD89A8D8",
-      "name":"Number of deliveries",
-      "value":"",
-      "path":"numberOfDeliveries"
-    }
-    ],
-    "dataCategory":{
-      "uid":"A92693A99BAD",
-      "name":"Quantity",
-      "path":"quantity"
-    },
-    "itemDefinition":{
-      "uid":"212C818D8F16"
-    },
-    "dataItem":{
-      "uid":"66056991EE23"
-    },
-    "modified":"2009-03-19 15:25:40.0",
-    "environment":{
-      "uid":"5F5887BCF726"
-    },
-    "created":"2009-03-19 15:25:40.0",
-    "name":"920B54ED665B",
-    "validFrom":"20090301",
-    "end":"false",
-    "amountPerMonth":2.055,
-    "profile":{
-      "uid":"BB1BDB4FDD77"
-    }
-  },
-  "path":"/home/energy/quantity/920B54ED665B",
-  "actions":{
-    "allowCreate":true,
-    "allowView":true,
-    "allowList":true,
-    "allowModify":true,
-    "allowDelete":true
-  },
-  "profile":{
-    "uid":"BB1BDB4FDD77"
-  }
-}