activeproject 0.3.0 → 0.5.0

data/lib/active_project/resources/issue.rb

@@ -2,34 +2,122 @@
 
 module ActiveProject
   module Resources
-    # Represents an Issue (e.g., Jira Issue, Trello Card, Basecamp Todo)
-    class Issue < BaseResource
+    # Whether it's a Jira ticket, Trello card, GitHub Issue, or Basecamp Todo
+    class Issue < PersistableResource
       def_members :id, :key, :title, :description, :status, :assignees,
                   :reporter, :project_id, :created_at, :updated_at, :due_on,
                   :priority, :adapter_source
 
-      # Saves the issue (creates if new, updates if existing).
-      # Placeholder - Full implementation requires attribute tracking and adapter delegation.
-      # @return [Boolean] true if save was successful, false otherwise.
+      def initialize(adapter, attributes = {})
+        super
+        @initial_title = attributes[:title]
+      end
+
+      # Persist the record, creating it if it does not yet exist.
       def save
-        raise NotImplementedError, "#save not yet implemented for #{self.class.name}"
+        unless project_id
+          raise ActiveProject::NotImplementedError,
+                "#save not supported on transient records"
+        end
+
+        attrs = to_h.slice(:title, :description, :status, :assignees,
+                           :reporter, :due_on, :priority)
+
+        if @adapter.is_a?(ActiveProject::Adapters::JiraAdapter)
+          if id.nil? # first persist ⇒ create_issue
+            attrs.delete(:title)                  # remove :title entirely
+            attrs[:summary] = @initial_title      # use the ORIGINAL title
+          elsif attrs.key?(:title) # later saves ⇒ update_issue
+            attrs[:summary] = attrs.delete(:title)
+          end
+        end
+
+        attrs.delete(:status) unless @adapter.status_known?(project_id, attrs[:status])
+
+        fresh =
+          if id.nil?
+            adapter.create_issue(project_id, attrs)
+          else
+            adapter_update_issue(id, attrs)
+          end
+
+        copy_from(fresh)
+        true
+      end
+
+      # Update attributes and persist them.
+      def update(attributes = {})
+        unless project_id && id
+          raise ActiveProject::NotImplementedError,
+                "#update not supported on transient records"
+        end
+        unless attributes.is_a?(Hash)
+          raise ActiveProject::NotImplementedError,
+                "attributes must be a Hash"
+        end
+
+        ident = key || id
+        adapter_update_issue(ident, attributes)
+        copy_from(adapter_find_issue(ident))
+        true
       end
 
-      # Updates the issue with the given attributes and saves it.
-      # Placeholder - Full implementation requires attribute tracking and adapter delegation.
-      # @param attributes [Hash] Attributes to update.
-      # @return [Boolean] true if update was successful, false otherwise.
-      def update(attributes)
-        # Basic implementation could be:
-        # attributes.each { |k, v| instance_variable_set("@#{k}", v) if respond_to?(k) } # Need setters or direct ivar access
-        # save
-        raise NotImplementedError, "#update not yet implemented for #{self.class.name}"
+      # Delete remote record.
+      def delete
+        raise "project_id missing – can't destroy" unless project_id
+        raise "id missing – record not persisted"  if id.nil?
+
+        adapter_delete_issue(id)
+        freeze
+        true
       end
+      alias destroy delete
 
-      # Returns an association proxy for accessing comments on this issue.
-      # @return [AssociationProxy<Resources::Comment>]
+      # Lazy association proxy for comments.
       def comments
-        AssociationProxy.new(owner: self, adapter: @adapter, association_name: :comments)
+        AssociationProxy.new(owner: self, adapter: adapter, association_name: :comments)
+      end
+
+      private
+
+      def copy_from(other)
+        self.class.members.each { |m| public_send("#{m}=", other.public_send(m)) }
+      end
+
+      # Adapter-aware update_issue call that handles different signatures
+      def adapter_update_issue(issue_id, attrs)
+        case @adapter
+        when ActiveProject::Adapters::BasecampAdapter
+          @adapter.update_issue(issue_id, attrs, { project_id: project_id })
+        when ActiveProject::Adapters::GithubProjectAdapter
+          @adapter.update_issue(project_id, issue_id, attrs)
+        else
+          # Jira, Trello, GithubRepo: (id, attrs, context)
+          @adapter.update_issue(issue_id, attrs, {})
+        end
+      end
+
+      # Adapter-aware find_issue call that handles different signatures
+      def adapter_find_issue(issue_id)
+        case @adapter
+        when ActiveProject::Adapters::BasecampAdapter
+          @adapter.find_issue(issue_id, { project_id: project_id })
+        else
+          @adapter.find_issue(issue_id, {})
+        end
+      end
+
+      # Adapter-aware delete_issue call that handles different signatures
+      def adapter_delete_issue(issue_id)
+        case @adapter
+        when ActiveProject::Adapters::BasecampAdapter
+          @adapter.delete_issue(issue_id, { project_id: project_id })
+        when ActiveProject::Adapters::GithubProjectAdapter
+          @adapter.delete_issue(project_id, issue_id)
+        else
+          # Jira, Trello, GithubRepo: (id, context)
+          @adapter.delete_issue(issue_id, {})
+        end
       end
     end
   end

data/lib/active_project/resources/persistable_resource.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module ActiveProject
+  module Resources
+    class PersistableResource < BaseResource
+      # Indicates if the resource has been persisted (typically by checking for an ID)
+      def persisted?
+        !id.nil? # Assumes an 'id' member
+      end
+
+      # These are now expected to be implemented by concrete subclasses
+      # like Issue and Comment, or this class could provide a template
+      # that calls conventionally named adapter methods.
+      def save
+        raise NotImplementedError, "#{self.class.name} must implement #save"
+      end
+
+      def update(attributes)
+        raise NotImplementedError, "#{self.class.name} must implement #update"
+      end
+
+      def delete
+        raise NotImplementedError, "#{self.class.name} must implement #delete"
+      end
+      alias destroy delete
+
+      protected
+
+      # Common logic for copying attributes after an API call
+      def copy_from(other_resource)
+        # Ensure it's the same type of resource before copying
+        return unless other_resource.is_a?(self.class)
+
+        self.class.members.each do |member_name|
+          setter_method = "#{member_name}="
+          # Check if both the current resource and the other resource can handle this member
+          if respond_to?(setter_method) && other_resource.respond_to?(member_name)
+            public_send(setter_method, other_resource.public_send(member_name))
+          end
+        end
+        # Optionally, update raw_data as well if it's part of the contract
+        # @raw_data = other_resource.raw_data if other_resource.respond_to?(:raw_data)
+        self # Return self for chaining or assignment
+      end
+    end
+  end
+end

data/lib/active_project/resources/project.rb

@@ -3,7 +3,7 @@
 module ActiveProject
   module Resources
     # Represents a Project (e.g., Jira Project, Trello Board, Basecamp Project)
-    class Project < BaseResource
+    class Project < PersistableResource
       def_members :id, :key, :name, :adapter_source
       # raw_data and adapter are inherited from BaseResource
 

data/lib/active_project/status_mapper.rb

@@ -0,0 +1,145 @@
+# frozen_string_literal: true
+
+module ActiveProject
+  # Handles bidirectional status mapping between platform-specific statuses
+  # and normalized ActiveProject status symbols.
+  #
+  # Supports:
+  # - Standard status symbols (:open, :in_progress, :closed, :blocked, :on_hold)
+  # - Platform-specific status preservation
+  # - Configurable status mappings per adapter
+  # - Fallback to standard status normalization
+  class StatusMapper
+    # Standard ActiveProject status symbols with their meanings
+    STANDARD_STATUSES = {
+      open: "New, unstarted work",
+      in_progress: "Currently being worked on",
+      blocked: "Waiting on external dependency",
+      on_hold: "Temporarily paused",
+      closed: "Completed or resolved"
+    }.freeze
+
+    # Default mapping rules for common status patterns
+    DEFAULT_MAPPINGS = {
+      # Open/New statuses
+      /^(new|open|todo|to do|backlog|ready|created)$/i => :open,
+
+      # In Progress statuses
+      /^(in progress|in_progress|active|working|started|doing)$/i => :in_progress,
+
+      # Blocked statuses
+      /^(blocked|waiting|pending|on hold|on_hold|paused)$/i => :blocked,
+
+      # Closed statuses
+      /^(done|closed|completed|finished|resolved|fixed)$/i => :closed
+    }.freeze
+
+    attr_reader :adapter_type, :custom_mappings
+
+    # @param adapter_type [Symbol] The adapter type (:jira, :trello, etc.)
+    # @param custom_mappings [Hash] Custom status mappings from configuration
+    def initialize(adapter_type, custom_mappings = {})
+      @adapter_type = adapter_type
+      @custom_mappings = custom_mappings || {}
+    end
+
+    # Converts a platform-specific status to a normalized status symbol.
+    # @param platform_status [String, Symbol] The platform-specific status
+    # @param context [Hash] Optional context (e.g., project_id for project-specific mappings)
+    # @return [Symbol] Normalized status symbol
+    def normalize_status(platform_status, context = {})
+      return platform_status if STANDARD_STATUSES.key?(platform_status.to_sym)
+
+      # Try custom mappings first
+      if custom_mappings.is_a?(Hash)
+        # Support project-specific mappings (for Trello, GitHub)
+        project_mappings = custom_mappings[context[:project_id]] || custom_mappings
+
+        # Check direct mapping
+        if project_mappings[platform_status.to_s]
+          return project_mappings[platform_status.to_s].to_sym
+        end
+      end
+
+      # Fall back to pattern matching
+      status_str = platform_status.to_s.strip
+      DEFAULT_MAPPINGS.each do |pattern, normalized_status|
+        return normalized_status if status_str.match?(pattern)
+      end
+
+      # If no mapping found, return as symbol for platform-specific handling
+      platform_status.to_s.downcase.tr(" -", "_").to_sym
+    end
+
+    # Converts a normalized status symbol back to platform-specific status.
+    # @param normalized_status [Symbol] The normalized status symbol
+    # @param context [Hash] Optional context for platform-specific conversion
+    # @return [String, Symbol] Platform-specific status representation
+    def denormalize_status(normalized_status, context = {})
+      # If it's already a standard status, delegate to adapter-specific logic
+      return normalized_status if STANDARD_STATUSES.key?(normalized_status.to_sym)
+
+      # Try reverse lookup in custom mappings
+      if custom_mappings.is_a?(Hash)
+        project_mappings = custom_mappings[context[:project_id]] || custom_mappings
+
+        # Find the platform status that maps to this normalized status
+        project_mappings.each do |platform_status, mapped_status|
+          return platform_status if mapped_status.to_sym == normalized_status.to_sym
+        end
+      end
+
+      # Default: return the status as-is for platform handling
+      normalized_status
+    end
+
+    # Checks if a status is known/valid for the given context.
+    # @param status [Symbol, String] The status to check
+    # @param context [Hash] Optional context for validation
+    # @return [Boolean] true if the status is valid
+    def status_known?(status, context = {})
+      # Handle nil status
+      return false if status.nil?
+
+      # Standard statuses are always known
+      return true if STANDARD_STATUSES.key?(status.to_sym)
+
+      # Check custom mappings
+      if custom_mappings.is_a?(Hash)
+        project_mappings = custom_mappings[context[:project_id]] || custom_mappings
+        return true if project_mappings.key?(status.to_s)
+      end
+
+      # Check if it matches any default patterns
+      status_str = status.to_s.strip
+      DEFAULT_MAPPINGS.any? { |pattern, _| status_str.match?(pattern) }
+    end
+
+    # Returns all valid statuses for the given context.
+    # @param context [Hash] Optional context
+    # @return [Array<Symbol>] Array of valid status symbols
+    def valid_statuses(context = {})
+      statuses = STANDARD_STATUSES.keys.dup
+
+      # Add custom mapped statuses
+      if custom_mappings.is_a?(Hash)
+        project_mappings = custom_mappings[context[:project_id]] || custom_mappings
+        project_mappings.each do |platform_status, normalized_status|
+          statuses << normalized_status.to_sym
+          statuses << platform_status.to_s.downcase.tr(" -", "_").to_sym
+        end
+      end
+
+      statuses.uniq
+    end
+
+    # Creates a status mapper instance from adapter configuration.
+    # @param adapter_type [Symbol] The adapter type
+    # @param config [ActiveProject::Configurations::BaseAdapterConfiguration] Adapter config
+    # @return [StatusMapper] Configured status mapper
+    def self.from_config(adapter_type, config)
+      status_mappings = config.respond_to?(:status_mappings) ? config.status_mappings : {}
+      new(adapter_type, status_mappings)
+    end
+  end
+end

data/lib/active_project/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveProject
-  VERSION = "0.3.0"
+  VERSION = "0.5.0"
 end

data/lib/active_project/webhook_event.rb

@@ -4,17 +4,39 @@ module ActiveProject
   # Represents a standardized event parsed from a webhook payload.
   # Using Struct for simplicity for now. Could be a full class inheriting BaseResource if needed.
   WebhookEvent = Struct.new(
-    :event_type,        # Symbol representing the event (e.g., :issue_created, :comment_added)
-    :object_kind,       # Symbol representing the type of object involved (e.g., :issue, :comment)
-    :event_object_id,   # String or Integer ID of the primary object (renamed from object_id)
-    :object_key,        # String key/slug of the primary object (if applicable, e.g., Jira issue key)
-    :project_id,        # String or Integer ID of the associated project/board/bucket
-    :actor,             # User resource or Hash representing the user who triggered the event
-    :timestamp,         # Time object representing when the event occurred
-    :adapter_source,    # Symbol identifying the source adapter (e.g., :jira, :trello, :basecamp)
-    :changes,           # Hash detailing specific changes (if applicable, e.g., for updates)
-    :object_data,       # Optional: Hash containing more detailed data about the object
-    :raw_data,          # The original, parsed webhook payload hash
+    :source,          # Symbol representing the source platform (e.g., :github, :jira, :trello)
+    :webhook_type,    # Symbol representing the adapter type (e.g., :github_repo, :github_project, :jira, :basecamp)
+    :type,            # Symbol representing the event type (e.g., :issue_created, :comment_added)
+    :resource_type,   # Symbol representing the type of resource involved (e.g., :issue, :comment)
+    :resource_id,     # String ID of the primary resource
+    :project_id,      # String ID of the associated project/repository
+    :actor,           # User resource representing the user who triggered the event (optional)
+    :timestamp,       # Time object representing when the event occurred (optional)
+    :data,            # Hash containing event-specific data (e.g., issue, comment, changes)
+    :raw_data,        # The original, parsed webhook payload hash (optional)
     keyword_init: true
-  )
+  ) do
+    # For backward compatibility
+    alias_method :event_type, :type
+    alias_method :object_kind, :resource_type
+    alias_method :event_object_id, :resource_id
+    alias_method :adapter_source, :source
+    alias_method :object_data, :data
+
+    # Additional aliases that might be expected
+    def object_key
+      data&.dig(:object_key) || data&.dig("object_key")
+    end
+
+    def changes
+      changes_data = data&.dig(:changes) || data&.dig("changes")
+      changes_data.nil? || changes_data.empty? ? nil : changes_data
+    end
+
+    # Helper method to get the resource object
+    def resource
+      return data[resource_type] if data && data.key?(resource_type)
+      nil
+    end
+  end
 end

data/lib/activeproject.rb

@@ -1,8 +1,12 @@
+# frozen_string_literal: true
+
 require "zeitwerk"
 require "concurrent"
 require_relative "active_project/errors"
 require_relative "active_project/version"
 require_relative "active_project/railtie" if defined?(Rails::Railtie)
+require "active_support/concern"
+require "active_support/core_ext/class/attribute"
 
 module ActiveProject
   class << self
@@ -65,19 +69,18 @@ module ActiveProject
           raise ArgumentError, error_message
         end
 
-        adapter_class_name = "ActiveProject::Adapters::#{adapter_type.to_s.capitalize}Adapter"
+        adapter_class_name = "ActiveProject::Adapters::#{adapter_type.to_s.classify}Adapter"
 
         begin
           require "active_project/adapters/#{adapter_type}_adapter"
-        rescue LoadError => e
-          error_message = "Could not load adapter '#{adapter_type}'.\n"
-          error_message += "Make sure you have defined the class #{adapter_class_name} in active_project/adapters/#{adapter_type}_adapter.rb"
-          raise LoadError, error_message
+        rescue LoadError
+          raise LoadError, "Could not load adapter '#{adapter_type}'. " \
+                          "Expected class #{adapter_class_name} in adapters/#{adapter_type}_adapter.rb"
         end
 
         begin
           adapter_class = Object.const_get(adapter_class_name)
-        rescue NameError => e
+        rescue NameError
           error_message = "Could not find adapter class #{adapter_class_name}.\n"
           error_message += "Make sure you have defined the class correctly in active_project/adapters/#{adapter_type}_adapter.rb"
           raise NameError, error_message

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeproject
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Abdelkader Boudih
@@ -30,49 +30,77 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '9.0'
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: async
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.35'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.35'
 - !ruby/object:Gem::Dependency
-  name: faraday-retry
+  name: async-http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.92'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.92'
 - !ruby/object:Gem::Dependency
-  name: async
+  name: async-http-faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.22'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.22'
 - !ruby/object:Gem::Dependency
-  name: async-http
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: faraday-retry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -86,13 +114,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: async-http-faraday
+  name: async-safe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -133,7 +161,26 @@ files:
 - lib/active_project/adapters/basecamp/projects.rb
 - lib/active_project/adapters/basecamp/webhooks.rb
 - lib/active_project/adapters/basecamp_adapter.rb
-- lib/active_project/adapters/http_client.rb
+- lib/active_project/adapters/fizzy/columns.rb
+- lib/active_project/adapters/fizzy/comments.rb
+- lib/active_project/adapters/fizzy/connection.rb
+- lib/active_project/adapters/fizzy/issues.rb
+- lib/active_project/adapters/fizzy/projects.rb
+- lib/active_project/adapters/fizzy_adapter.rb
+- lib/active_project/adapters/github_project.rb
+- lib/active_project/adapters/github_project/comments.rb
+- lib/active_project/adapters/github_project/connection.rb
+- lib/active_project/adapters/github_project/helpers.rb
+- lib/active_project/adapters/github_project/issues.rb
+- lib/active_project/adapters/github_project/projects.rb
+- lib/active_project/adapters/github_project/webhooks.rb
+- lib/active_project/adapters/github_project_adapter.rb
+- lib/active_project/adapters/github_repo/connection.rb
+- lib/active_project/adapters/github_repo/issues.rb
+- lib/active_project/adapters/github_repo/projects.rb
+- lib/active_project/adapters/github_repo/webhooks.rb
+- lib/active_project/adapters/github_repo_adapter.rb
+- lib/active_project/adapters/jira/attribute_normalizer.rb
 - lib/active_project/adapters/jira/comments.rb
 - lib/active_project/adapters/jira/connection.rb
 - lib/active_project/adapters/jira/issues.rb
@@ -141,7 +188,6 @@ files:
 - lib/active_project/adapters/jira/transitions.rb
 - lib/active_project/adapters/jira/webhooks.rb
 - lib/active_project/adapters/jira_adapter.rb
-- lib/active_project/adapters/pagination.rb
 - lib/active_project/adapters/trello/comments.rb
 - lib/active_project/adapters/trello/connection.rb
 - lib/active_project/adapters/trello/issues.rb
@@ -153,15 +199,27 @@ files:
 - lib/active_project/async.rb
 - lib/active_project/configuration.rb
 - lib/active_project/configurations/base_adapter_configuration.rb
+- lib/active_project/configurations/basecamp_configuration.rb
+- lib/active_project/configurations/fizzy_configuration.rb
+- lib/active_project/configurations/github_configuration.rb
+- lib/active_project/configurations/jira_configuration.rb
 - lib/active_project/configurations/trello_configuration.rb
+- lib/active_project/connections/base.rb
+- lib/active_project/connections/graph_ql.rb
+- lib/active_project/connections/http_client.rb
+- lib/active_project/connections/pagination.rb
+- lib/active_project/connections/rest.rb
+- lib/active_project/error_mapper.rb
 - lib/active_project/errors.rb
 - lib/active_project/railtie.rb
 - lib/active_project/resource_factory.rb
 - lib/active_project/resources/base_resource.rb
 - lib/active_project/resources/comment.rb
 - lib/active_project/resources/issue.rb
+- lib/active_project/resources/persistable_resource.rb
 - lib/active_project/resources/project.rb
 - lib/active_project/resources/user.rb
+- lib/active_project/status_mapper.rb
 - lib/active_project/version.rb
 - lib/active_project/webhook_event.rb
 - lib/activeproject.rb
@@ -185,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 4.0.1
 specification_version: 4
 summary: A standardized Ruby interface for multiple project management APIs (Jira,
   Basecamp, Trello, etc.).