hookercookerman-amee 0.1.8 → 0.1.9

data/Manifest.txt

@@ -3,7 +3,7 @@ LICENSE.txt
 Manifest.txt
 README.rdoc
 Rakefile
-amee.gemspec
+amee.gemspec.old
 features/config.feature
 features/data/data_category.feature
 features/data/data_item.feature
@@ -45,6 +45,7 @@ features/support/amee/profiles/155DD3C63646/transport/motorcycle/generic/D47C465
 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/response.json
 features/support/amee/profiles/E0BCB3704D15.json
 features/support/amee/profiles/E0BCB3704D15/Business.json
 features/support/amee/profiles/F38ECBD56D59/home/energy/quantity/5891C88F29FA.json

data/amee.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{amee}
-  s.version = '0.1.8'
+  s.version = '0.1.9'
   
   s.homepage = 'http://github.com/hookercookerman/amee/tree/master'
   s.description = %q{Its a gem to interact with the amee api}
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   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.files = ["History.txt", "LICENSE.txt", "Manifest.txt", "README.rdoc", "Rakefile", "amee.gemspec", "features/config.feature", "features/support/amee/profiles/BB1BDB4FDD77/home/energy/quantity/response.json", "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'

data/features/profile/create.profile_item.feature

@@ -7,7 +7,11 @@ Feature: Create Amee Profile Item
     Given I have a valid amee session
     
     # representation=full&energyConsumption=10&energyConsumptionUnit=kWh&dataItemUid=66056991EE23&energyConsumptionPerUnit=month&name=representation
-    When I create a profile item with uid: "48B97680BEGG" the path: "/profiles/48B97680BCCF/home/energy/quantity"
+    When I create a profile item with data_item_uid: "66056991EE23" the path: "/profiles/BB1BDB4FDD77/home/energy/quantity"
     
     # need to redo
-    Then the profile item should have: "uid" with: "D47C465B8157"
+    Then the profile category should have: "total_co2_value" with: "24.660000"
+    And the profile category should have: "resource_path" with: "/home/energy/quantity"
+    And the profile category's profile_items should not be empty
+    And the profile category's profile_categories should be empty
+    And the profile category's data_category should not be nil

data/features/step_definitions/profile_item_steps.rb

@@ -18,11 +18,11 @@ Then(/^the profile item's (\S+) should not (?:be|have) (?:an? )?(.*)/) do |metho
   @models["profile_item"].send(method).should_not send("be_#{predicate.gsub(' ', '_')}")
 end
 
-When(/^I create a profile item with uid: \"(\S+)\" the path: \"(.*)\"/) do |uid, path|
-  FakeWeb.register_uri(:post, "http://stage.amee.com#{path}?type=dontmatter&dataItemUid=48B97680BEGG&representation=full",
-  :file => File.join(AMEE_FIXTURE_PATH, "/profiles/155DD3C63646/transport/motorcycle/generic/D47C465B8157.json")
+When(/^I create a profile item with data_item_uid: \"(\S+)\" the path: \"(.*)\"/) do |uid, path|
+  FakeWeb.register_uri(:post, "http://stage.amee.com#{path}?kWhPerMonth=10&dataItemUid=66056991EE23&representation=full",
+  :file => File.join(AMEE_FIXTURE_PATH, "/profiles/BB1BDB4FDD77/home/energy/quantity/response.json")
    )
-  @models["profile_item"] = @amee_session.create_profile_item(path, uid, :fields => {:type => "dontmatter"})
+  @models["profile_category"] = @amee_session.create_profile_item(path, uid, :fields => {:kWhPerMonth => "10"})
 end
 
 When(/^I update the profile item with: distance=400$/) do

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

@@ -0,0 +1,361 @@
+{
+  "apiVersion":"2.0",
+  "profileCategories":[],
+  "dataCategory":{
+    "uid":"A92693A99BAD",
+    "dataCategory":{
+      "uid":"30BA55A0C472",
+      "name":"Energy",
+      "path":"energy"
+    },
+    "environment":{
+      "uid":"5F5887BCF726",
+      "itemsPerFeed":10,
+      "description":"",
+      "name":"AMEE",
+      "owner":"",
+      "path":"",
+      "itemsPerPage":10
+    },
+    "created":"2007-07-27 09:30:44.0",
+    "name":"Quantity",
+    "path":"quantity",
+    "itemDefinition":{
+      "uid":"212C818D8F16",
+      "environment":{
+        "uid":"5F5887BCF726"
+      },
+      "created":"2007-07-27 09:30:44.0",
+      "name":"Energy Quantity",
+      "drillDown":"type",
+      "modified":"2007-07-27 09:30:44.0"
+    },
+    "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":{
+    "unit":"kg/year",
+    "value":"24.660000"
+  },
+  "path":"/home/energy/quantity",
+  "profileItemActions":{
+    "allowCreate":true,
+    "allowView":true,
+    "allowList":true,
+    "allowModify":true,
+    "allowDelete":true
+  },
+  "actions":{
+    "allowCreate":true,
+    "allowView":true,
+    "allowList":true,
+    "allowModify":true,
+    "allowDelete":true
+  },
+  "profileItems":[
+    {
+      "amount":{
+        "unit":"kg/year",
+        "value":24.66
+      },
+      "uid":"68582CECB4E3",
+      "startDate":"2009-03-19T17:22:00Z",
+      "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":"BBA06ECA7254",
+          "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":"5CF0E5A0CDB7",
+          "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":"2C8532649037",
+          "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":"E048B8558FB5",
+          "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":"1FFABB35FFC8",
+          "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":"E821A09B7FE4",
+          "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":"8A9F0C4199BC",
+          "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":"72C4C271906B",
+          "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":"0B32AB913D31",
+          "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":"67F41DBE5315",
+          "unit":"",
+          "name":"Number of deliveries",
+          "value":"",
+          "path":"deliveries",
+          "displayPath":"deliveries",
+          "displayName":"Number of deliveries"
+        }
+      ],
+      "created":"2009-03-19T17:22:09Z",
+      "name":"representation",
+      "endDate":"",
+      "dataItem":{
+        "uid":"66056991EE23",
+        "Label":"gas"
+      },
+      "modified":"2009-03-19T17:22:09Z"
+    }
+  ],
+  "profile":{
+    "uid":"48B97680BCCF"
+  }
+}

data/lib/amee/parser.rb

@@ -99,7 +99,7 @@ module Amee
   
   class CreateProfileItem < Parser
     def self.process(data)
-      data["profileItem"].merge({"resource_path" => data["path"]})
+      data.merge({"resource_path" => data["path"]})
     end
   end
   

data/lib/amee/profile_api/profile.rb

@@ -16,7 +16,7 @@ module Amee
       
       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)
+        session.create_profile_item(path, data_item_uid, params)
       end
       
       def get_profile_item(path, options = {})

data/lib/amee/profile_api/profile_item.rb

@@ -14,6 +14,8 @@ module Amee
                       :item_definition => {:class => Amee::DataApi::ItemDefinition}
         
       
+      # @todo This currently will not work as profile data_item brings back a profile_category
+      #       How stupid is that!
       def self.create(session, path, data_item_uid, fields ={})
         hash = session.create_profile_item(path, data_item_uid, {:fields => fields, :hash_response => true})
         self.from_hash(hash, session)

data/lib/amee/session.rb

@@ -155,13 +155,15 @@ module Amee
       end
     end
     
-    # @return [String] locaion of the new resource
+    # @return [Amee::ProfileApi::ProfileCategory]
     def create_profile_item(path, uid, options = {})
       @cache.clear
-      api_call(:post, "profile_item", path, 
+      api_call(:post, "create.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)
+          Amee::ProfileApi::ProfileCategory.from_hash(response, self) do |profile_category|
+            profile_category.lazy_loaded = true
+          end
         end
     end
     

data/lib/amee.rb

@@ -36,5 +36,5 @@ require "amee/profile_api/profile_category"
 require "amee/profile_api/profile"
 
 module Amee
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hookercookerman-amee
 version: !ruby/object:Gem::Version 
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors: 
 - Richard Hooker
@@ -92,6 +92,7 @@ files:
 - Rakefile
 - amee.gemspec
 - features/config.feature
+- features/support/amee/profiles/BB1BDB4FDD77/home/energy/quantity/response.json
 - features/data/data_category.feature
 - features/data/data_item.feature
 - features/data/data_item_value.feature