hookercookerman-amee 0.0.3 → 0.0.4

data/History.txt

@@ -1 +1,4 @@
-There is none
+== 0.0.1 2009-04-24
+
+* 1 major enhancement:
+  * Initial release

data/Rakefile

@@ -23,7 +23,5 @@ end
 require 'newgem/tasks' # load /tasks/*.rake
 Dir['tasks/**/*.rake'].each { |t| load t }
 
-
-
 # TODO - want other tests/tasks run by default? Add them to the list
-task :default => [:spec, :features]
+# task :default => [:spec, :features]

data/features/data/data_category.feature

@@ -10,8 +10,8 @@ Feature: Get Amee Category
     Then the data category should have: "path" with: ""
     And the data category should have: "name" with: "Root"
     And the data category should have: "uid" with: "CD310BEBAC52"
-    And the data category's data_items should be nil
-    And the data category's data_categories should not be nil
+    And the data category's data_items should be empty
+    And the data category's data_categories should not be empty
     
   Scenario: Get Amee category with path /data/transport/plane/generic
     Given I have a valid amee session

data/features/profile/profile_category.feature

@@ -9,6 +9,6 @@ Feature: Get Amee Profile Category
     
     Then the profile category should have: "total_amount_per_month" with: "0"
     And the profile category should have: "resource_path" with: "/business"
-    And the profile category's profile_items should not be nil
-    And the profile category's profile_categories should not be nil
+    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/lib/amee.rb

@@ -33,5 +33,5 @@ require "amee/profile_api/profile_category"
 require "amee/profile_api/profile"
 
 module Amee
-  VERSION = '0.0.1'
+  VERSION = '0.0.4'
 end

data/lib/amee/data_api/data_category.rb

@@ -35,14 +35,26 @@ module Amee
         item_definition && item_definition.drill_down
       end
       
-      def paginate(options = {})
-
+      def paginate_data_items(options = {})
+        data_items = WillPaginate::Collection.create(
+          options[:page] || 1,
+          options[:per_page] || 10,
+          options[:total] || self.pager["items"]
+        ) do |pager|
+          result = session.api_call(:get, "data_category", self.full_path, 
+            :query => {:itemsPerPage => pager.per_page, :page => pager.current_page}
+          ) do |response|
+            populate_from_hash!(response)
+          end
+          pager.replace(result.data_items)
+        end
       end
       
       def populate!
         session.api_call(:get, "data.category", self.full_path) do |response|
           populate_from_hash!(response)
         end
+        @lazy_loaded = true
       end
       
     end

data/lib/amee/data_api/data_item.rb

@@ -17,6 +17,7 @@ module Amee
         session.api_call(:get, "data.item", self.full_path) do |response|
           populate_from_hash!(response)
         end
+        @lazy_loaded = true
       end
       
       def kg_co2_per_kwh

data/lib/amee/data_api/data_item_value.rb

@@ -7,6 +7,11 @@ module Amee
     
       attr_accessor :display_name, :description, :value, :display_path, :unit, :per_unit, :data_item
       item_populators :item_value_definition => {:class => Amee::DataApi::ItemValueDefinition}
+      
+      
+      def lazy_loaded
+        true
+      end
         
     end
   end

data/lib/amee/data_api/drill_down.rb

@@ -18,6 +18,11 @@ module Amee
       def uid_found?
         choice_name == "uid"
       end
+      
+      def lazy_loaded
+        true
+      end
+      
     end
   end
 end

data/lib/amee/data_api/item_value_definition.rb

@@ -7,6 +7,10 @@ module Amee
     
       attr_accessor :from_profile, :from_data
       item_populators :value_definition => {:class => Amee::DataApi::ValueDefinition}
+      
+      def lazy_loaded
+        true
+      end
     
     end
   end

data/lib/amee/model.rb

@@ -10,6 +10,7 @@ module Amee
       base.__send__(:attr_accessor, :modified)
       base.__send__(:attr_accessor, :created)
       base.__send__(:attr_accessor, :resource_path)
+      base.__send__(:attr_accessor, :lazy_loaded)
       
       base.class_eval do
         class  << base; attr_reader :lazy_populators end
@@ -28,7 +29,7 @@ module Amee
       
       def item_populators(hash)
         @lazy_populators ||= [] << hash.keys
-        populator_getters(hash.keys)
+        populator_item_getter(hash.keys)
         hash.each_pair do |key, value|
           
           define_method("#{key}=") do |definition|
@@ -45,7 +46,7 @@ module Amee
       
       def list_populators(hash)
         @lazy_populators ||= [] << hash.keys
-        populator_getters(hash.keys)
+        populator_lists_getter(hash.keys)
         hash.each_pair do |key, value|
           
           define_method("#{key}=") do |list|
@@ -60,7 +61,18 @@ module Amee
         end
       end
       
-      def populator_getters(pops)
+      def populator_lists_getter(pops)
+        pops.each do |symbol|
+           define_method(symbol) do
+             if !populated? && self.resource_path
+               populate! 
+             end
+             instance_variable_get("@#{symbol}") || []
+           end
+         end
+      end
+      
+      def populator_item_getter(pops)
         pops.each do |symbol|
            define_method(symbol) do
              if !populated? && self.resource_path
@@ -87,11 +99,11 @@ module Amee
       end
       
       def populated?
-        @populated && lazy_populators_populated?
+        @populated && lazy_loaded
       end
       
       def populate!
-        raise NotImplementError, "#{self.class} included me and has not overriden me"
+        raise ::NotImplementedError, "#{self.class} included me and has not overriden me"
       end
       
       def populate_from_hash!(hash)
@@ -115,14 +127,6 @@ module Amee
       def populate_paths(resource_path, path)
         self.resource_path, self.path = resource_path, path
       end
-      
-      # if the all the lazy populators have been set then
-      # we now when are populated!
-      def lazy_populators_populated?
-        if self.class.lazy_populators
-          self.class.lazy_populators.find_all {|pop| !instance_variable_get("@#{pop}").nil?} == self.class.lazy_populators
-        end
-      end
-      
+            
   end
 end

data/lib/amee/profile_api/profile.rb

@@ -34,6 +34,11 @@ module Amee
       def full_path
         "#{self.class.path_prefix}/#{self.uid}"
       end
+      
+      def lazy_loaded
+        true
+      end
+      
     end
   end
 end

data/lib/amee/profile_api/profile_category.rb

@@ -18,6 +18,7 @@ module Amee
         session.api_call(:get, "profile.category", self.full_path) do |response|
           populate_from_hash!(response)
         end
+        @lazy_loaded = true
       end
       
       def profile_uid

data/lib/amee/profile_api/profile_item.rb

@@ -42,6 +42,11 @@ module Amee
         "#{self.class.path_prefix}/#{profile_uid}" + resource_path
       end
       
+      # its be default already totally loaded
+      def lazy_loaded
+        true
+      end
+      
     end
   end
 end

data/tasks/yard.rake

@@ -1,4 +1,4 @@
-require "yard"
-YARD::Rake::YardocTask.new do |t|
-   t.files   = ['lib/**/*.rb']   # optional
-end
+# require "yard"
+# YARD::Rake::YardocTask.new do |t|
+#    t.files   = ['lib/**/*.rb']   # optional
+# end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hookercookerman-amee
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Richard Hooker
@@ -155,7 +155,7 @@ files:
 - tasks/rspec.rake
 - tasks/yard.rake
 has_rdoc: true
-homepage: http://www.amee.com
+homepage: http://github.com/hookercookerman/amee/tree/master
 post_install_message: 
 rdoc_options: 
 - --main