moco-ruby 1.0.0.alpha → 1.1.0

data/lib/moco/entities/holiday.rb

@@ -5,7 +5,7 @@ module MOCO
   # Provides methods for holiday-specific associations
   class Holiday < BaseEntity
     # Override entity_path to match API path
-    def entity_path
+    def self.entity_path
       "users/holidays"
     end
 

data/lib/moco/entities/project.rb

@@ -7,29 +7,46 @@ module MOCO
       association(:customer, "Company")
     end
 
+    def leader
+      # Use the association method to fetch the leader
+      association(:leader, "User")
+    end
+
+    def co_leader
+      # Use the association method to fetch the co_leader
+      association(:co_leader, "User")
+    end
+
     # Fetches activities associated with this project.
     def activities
       # Use the has_many method to fetch activities
       has_many(:activities)
     end
 
+    # Fetches expenses associated with this project.
+    def expenses
+      # Don't cache the proxy - create a fresh one each time
+      # This ensures we get fresh data when expenses are created/updated/deleted
+      MOCO::NestedCollectionProxy.new(client, self, :expenses, "Expense")
+    end
+
     # Fetches tasks associated with this project.
     def tasks
-      # Check if tasks are already loaded in attributes
-      if attributes[:tasks].is_a?(Array) && attributes[:tasks].all? { |t| t.is_a?(MOCO::Task) }
-        # If tasks are already loaded, create a NestedCollectionProxy with the loaded tasks
-        @_tasks_proxy ||= begin
-          require_relative "../nested_collection_proxy"
-          proxy = MOCO::NestedCollectionProxy.new(client, self, :tasks, "Task")
-          # We need to manually set the loaded records since we already have them
-          proxy.instance_variable_set(:@records, attributes[:tasks])
-          proxy.instance_variable_set(:@loaded, true)
-          proxy
-        end
-      else
-        # Otherwise, use has_many with nested=true
-        has_many(:tasks, nil, nil, true)
+      # If tasks are already embedded in the attributes (e.g., from projects.assigned),
+      # return them directly instead of making a new API call
+      embedded_tasks = attributes[:tasks]
+      if embedded_tasks.is_a?(Array) && embedded_tasks.all? { |t| t.is_a?(MOCO::Task) }
+        return embedded_tasks
       end
+
+      # Otherwise, create a proxy for fetching tasks via API
+      # Don't cache the proxy - create a fresh one each time
+      # This ensures we get fresh data when tasks are created/updated/deleted
+      MOCO::NestedCollectionProxy.new(client, self, :tasks, "Task")
+    end
+
+    def to_s
+      "Project #{identifier} \"#{name}\" (#{id})"
     end
 
     def active?

data/lib/moco/entities/web_hook.rb

@@ -5,7 +5,7 @@ module MOCO
   # Provides methods for webhook-specific operations
   class WebHook < BaseEntity
     # Override entity_path to match API path
-    def entity_path
+    def self.entity_path
       "account/web_hooks"
     end
 

data/lib/moco/entity_collection.rb

@@ -14,8 +14,8 @@ module MOCO
       @entity_class_name = entity_class_name
     end
 
-    def all(params = {})
-      collection.all(params)
+    def all
+      collection.all
     end
 
     def find(id)
@@ -31,7 +31,7 @@ module MOCO
     end
 
     def each(&)
-      all.each(&)
+      collection.each(&)
     end
 
     def first

data/lib/moco/nested_collection_proxy.rb

@@ -12,9 +12,12 @@ module MOCO
     end
 
     # Override determine_base_path to include the parent's path
+    # For nested resources, we ignore any custom entity_path and just use simple pluralization
     def determine_base_path(path_or_entity_name)
       parent_type = ActiveSupport::Inflector.underscore(parent.class.name.split("::").last)
-      "#{parent_type.pluralize}/#{parent.id}/#{super}"
+      # Use simple tableized name, not entity_path (which might include 'projects/' prefix)
+      nested_path = ActiveSupport::Inflector.tableize(path_or_entity_name.to_s)
+      "#{parent_type.pluralize}/#{parent.id}/#{nested_path}"
     end
 
     # Create a new entity in this nested collection