activeproject 0.0.0 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f3323a59c15ce296050ec1c7b231416d2cac1aa6f78fe133c8d7d2fd3ebb639
-  data.tar.gz: 0f60e5b29d28e3adca3ce7e26df63929ed3c0d4b898887213823cd284efa365a
+  metadata.gz: 7b69a05303fa485956e8bdf7e56984aa5690df8f4bb7b9119253d760f0940916
+  data.tar.gz: 45dab21a69a42325b067f01510f47e16f9b8c9ebb312b11793e1b0c447f563a6
 SHA512:
-  metadata.gz: 756f9f83b0f443ceb6d426514d79c7c7cca5c8f6b410ab6fbad9469426354735d706d0b00be102a1f36ec4dcb4a7ee04d8b110c6aaaeda3ac8ccce2b61695623
-  data.tar.gz: 5397faf8bae3c5fe4ab86a98360de55c92237270806ac3372cdf7cff08742fa857ccff9f4a139998116ce366cd321df5afab6d81368a78970822de853d43c68c
+  metadata.gz: fcd6726cf79cfa6819ecfe3de62d5502d94317bfbb824a4f5e4c3579b836fa65a06ee408ff69f601d1e9ba47b7d3d45848e326e48608b413a7431b87e208dbff
+  data.tar.gz: 23191e09bd239c8fc21552c64520de969e70875fbedcb514449dbe1fe4f157cc204b150eb45a9b71ddb0af0edf0774fc4934ba1deb9cafe5202ca64b1245d7e2

data/README.md

@@ -18,7 +18,7 @@ The ActiveProject gem aims to solve this by providing a unified, opinionated int
 
 The initial focus is on integrating with platforms primarily via their **REST APIs**:
 
-*   **Jira (Cloud & Server):** REST API (v2/v3)
+*   **Jira (Cloud & Server):** REST API (v3)
 *   **Basecamp (v3+):** REST API
 *   **Trello:** REST API
 
@@ -69,29 +69,49 @@ $ gem install activeproject
 
 ### Configuration
 
-Configure the adapters in an initializer (e.g., `config/initializers/active_project.rb`):
+Configure multiple adapters, optionally with named instances (default is `:primary`):
 
 ```ruby
 ActiveProject.configure do |config|
-  # Configure Jira Adapter
+  # Primary Jira instance (default name :primary)
   config.add_adapter(:jira,
     site_url: ENV.fetch('JIRA_SITE_URL'),
-    username: ENV.fetch('JIRA_USERNAME'), # Your Jira email
+    username: ENV.fetch('JIRA_USERNAME'),
     api_token: ENV.fetch('JIRA_API_TOKEN')
   )
 
+  # Secondary Jira instance
+  config.add_adapter(:jira, :secondary,
+    site_url: ENV.fetch('JIRA_SECOND_SITE_URL'),
+    username: ENV.fetch('JIRA_SECOND_USERNAME'),
+    api_token: ENV.fetch('JIRA_SECOND_API_TOKEN')
+  )
 
-  # Configure Basecamp Adapter
+  # Basecamp primary instance
   config.add_adapter(:basecamp,
     account_id: ENV.fetch('BASECAMP_ACCOUNT_ID'),
     access_token: ENV.fetch('BASECAMP_ACCESS_TOKEN')
   )
 
-  # Configure other adapters later (e.g., :trello, :basecamp)
-  # config.add_adapter(:trello, key: '...', token: '...')
+  # Trello primary instance
+  config.add_adapter(:trello,
+    key: ENV.fetch('TRELLO_KEY'),
+    token: ENV.fetch('TRELLO_TOKEN')
+  )
 end
 ```
 
+### Accessing adapters
+
+Fetch a specific adapter instance:
+
+```ruby
+jira_primary = ActiveProject.adapter(:jira) # defaults to :primary
+jira_secondary = ActiveProject.adapter(:jira, :secondary)
+basecamp = ActiveProject.adapter(:basecamp) # defaults to :primary
+trello = ActiveProject.adapter(:trello) # defaults to :primary
+```
+
 ### Basic Usage (Jira Example)
 
 ```ruby
@@ -215,80 +235,6 @@ rescue => e
 end
 ```
 
-
-
-### Webhook Handling
-
-The gem provides helpers for parsing webhook payloads and verifying signatures (where applicable), but you need to implement your own webhook receiver endpoint (e.g., a Rails controller action).
-
-```ruby
-# Example Rails Controller Action
-class WebhooksController < ApplicationController
-  # Disable CSRF protection for webhook endpoints
-  skip_before_action :verify_authenticity_token
-
-  def jira_webhook
-    adapter = ActiveProject.adapter(:jira)
-    request_body = request.body.read
-
-    # Verification (if applicable and implemented for your Jira setup)
-    # signature = request.headers['X-Jira-Signature'] # Example header
-    # unless adapter.verify_webhook_signature(request_body, signature)
-    #   render plain: 'Invalid signature', status: :unauthorized
-    #   return
-    # end
-
-    # Parse the event
-    event = adapter.parse_webhook(request_body, request.headers)
-
-    if event
-      puts "Received Jira Event: #{event.event_type} for #{event.object_kind} #{event.object_key || event.object_id}"
-      # Process the event (e.g., queue a background job)
-      # handle_event(event)
-    else
-      puts "Received unhandled or unparseable Jira webhook"
-    end
-
-    head :ok # Respond to Jira quickly
-  end
-
-  def trello_webhook
-    adapter = ActiveProject.adapter(:trello)
-    request_body = request.body.read
-    signature = request.headers['X-Trello-Webhook'] # Trello signature header
-    callback_url = request.original_url # The URL Trello sent the webhook to
-    trello_api_secret = ENV.fetch('TRELLO_API_SECRET') # You need your secret
-
-    # Verification (Manual comparison using the helper)
-    expected_signature = ActiveProject::Adapters::TrelloAdapter.compute_webhook_signature(
-      callback_url,
-      request_body,
-      trello_api_secret
-    )
-
-    unless ActiveSupport::SecurityUtils.secure_compare(signature, expected_signature)
-      render plain: 'Invalid Trello signature', status: :unauthorized
-      return
-    end
-
-    # Parse the event
-    event = adapter.parse_webhook(request_body)
-
-    if event
-      puts "Received Trello Event: #{event.event_type} for #{event.object_kind} #{event.object_id}"
-      # Process the event
-    else
-      puts "Received unhandled or unparseable Trello webhook"
-    end
-
-    head :ok
-  end
-
-  # Add similar actions for other adapters like Basecamp
-
-end
-```
-
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
@@ -297,7 +243,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/seuros/activeproject.
+Bug reports and pull requests are welcome on GitHub at https://github.com/seuros/active_project.
 
 ## License
 

data/lib/active_project/adapters/base.rb

@@ -122,13 +122,6 @@ module ActiveProject
       def connected?
         raise NotImplementedError, "#{self.class.name} must implement #connected?"
       end
-
-
-      # Placeholder comments for data structures (to be defined elsewhere)
-      # Example:
-      # Project = Struct.new(:id, :key, :name, :adapter_source, keyword_init: true)
-      # Issue = Struct.new(:id, :key, :title, :description, :status, :assignee, :project_id, :adapter_source, keyword_init: true)
-      # Comment = Struct.new(:id, :body, :author, :created_at, :issue_id, :adapter_source, keyword_init: true)
     end
   end
 end

data/lib/active_project/adapters/basecamp_adapter.rb

@@ -97,9 +97,10 @@ module ActiveProject
       def find_project(project_id)
         path = "projects/#{project_id}.json"
         project_data = make_request(:get, path)
+        return nil unless project_data
 
         # Raise NotFoundError if the project is trashed
-        if project_data["status"] == "trashed"
+        if project_data && project_data["status"] == "trashed"
           raise NotFoundError, "Basecamp project ID #{project_id} is trashed."
         end
 
@@ -182,8 +183,8 @@ module ActiveProject
       # @param project_id [String, Integer] The ID of the project to recover.
       # @return [Boolean] true if recovery was successful (API returns 204).
       def untrash_project(project_id)
-        path = "projects/#{project_id}/trash/recover.json"
-        make_request(:put, path)
+        path = "projects/#{project_id}.json"
+        make_request(:put, path, { "status": "active" }.to_json)
         true # Return true if make_request doesn't raise an error
       end
 
@@ -193,9 +194,6 @@ module ActiveProject
         true # Return true if make_request doesn't raise an error
       end
 
-
-
-
       # Lists To-dos within a specific project.
       # @param project_id [String, Integer] The ID of the Basecamp project.
       # @param options [Hash] Optional options. Accepts :todolist_id.
@@ -449,15 +447,9 @@ module ActiveProject
       # Helper method for making requests.
       def make_request(method, path, body = nil, query_params = {})
         full_path = path.start_with?("/") ? path[1..] : path
-        # Removed debug puts for cleaner output
-        # puts "[DEBUG BC Request] Method: #{method.upcase}"
-        # puts "[DEBUG BC Request] Path: #{full_path}"
-        # puts "[DEBUG BC Request] Body: #{body.inspect}"
-        # puts "[DEBUG BC Request] Query Params: #{query_params.inspect}"
 
         response = @connection.run_request(method, full_path, body, nil) do |req|
           req.params.update(query_params) unless query_params.empty?
-          # puts "[DEBUG BC Request] Headers: #{req.headers.inspect}"
         end
         return nil if response.status == 204 # Handle No Content for POST/DELETE completion
         JSON.parse(response.body) if response.body && !response.body.empty?
@@ -469,10 +461,6 @@ module ActiveProject
       def handle_faraday_error(error)
         status = error.response_status
         body = error.response_body
-        # Removed debug puts for cleaner output
-        # puts "[DEBUG BC Response] Status: #{error.response_status}"
-        # puts "[DEBUG BC Response] Headers: #{error.response_headers.inspect}"
-        # puts "[DEBUG BC Response] Body: #{error.response_body.inspect}"
 
         parsed_body = JSON.parse(body) rescue { "error" => body }
         message = parsed_body["error"] || parsed_body["message"] || "Unknown Basecamp Error"
@@ -520,7 +508,7 @@ module ActiveProject
           status: status,
           assignees: assignees, # Use mapped User resources
           reporter: reporter, # Use mapped User resource
-          project_id: project_id.to_i,
+          project_id: project_id,
           created_at: todo_data["created_at"] ? Time.parse(todo_data["created_at"]) : nil,
           updated_at: todo_data["updated_at"] ? Time.parse(todo_data["updated_at"]) : nil,
           due_on: todo_data["due_on"] ? Date.parse(todo_data["due_on"]) : nil,

data/lib/active_project/adapters/jira_adapter.rb

@@ -68,7 +68,7 @@ module ActiveProject
 
           projects_data.each do |project_data|
             all_projects << Resources::Project.new(self, # Pass adapter instance
-              id: project_data["id"]&.to_i, # Convert to integer
+              id: project_data["id"], # Convert to integer
               key: project_data["key"],
               name: project_data["name"],
               adapter_source: :jira,
@@ -94,13 +94,12 @@ module ActiveProject
         project_data = make_request(:get, path)
 
         Resources::Project.new(self, # Pass adapter instance
-          id: project_data["id"]&.to_i, # Convert to integer
+          id: project_data["id"].to_i, # Convert to integer
           key: project_data["key"],
           name: project_data["name"],
           adapter_source: :jira,
           raw_data: project_data
         )
-        # Note: make_request handles raising NotFoundError on 404
       end
 
       # Creates a new project in Jira.
@@ -549,9 +548,9 @@ module ActiveProject
 
       # Maps raw Jira issue data hash to an Issue resource.
       def map_issue_data(issue_data)
-        fields = issue_data["fields"]
+        fields = issue_data && issue_data["fields"]
         # Ensure assignee is mapped correctly into an array
-        assignee_user = map_user_data(fields["assignee"])
+        assignee_user = fields && map_user_data(fields["assignee"])
         assignees_array = assignee_user ? [ assignee_user ] : []
 
         Resources::Issue.new(self, # Pass adapter instance

data/lib/active_project/adapters/trello_adapter.rb

@@ -14,7 +14,6 @@ module ActiveProject
     # API Docs: https://developer.atlassian.com/cloud/trello/rest/
     class TrelloAdapter < Base
       BASE_URL = "https://api.trello.com/1/"
-      USER_AGENT = "ActiveProject Gem (github.com/seuros/activeproject)"
 
       # Computes the expected Trello webhook signature.
       # @param callback_url [String] The exact URL registered for the webhook.

data/lib/active_project/association_proxy.rb

@@ -18,7 +18,7 @@ module ActiveProject
       # Add other associations like :project for an issue?
       else raise "Unknown association: #{association_name}"
       end
-    end # End initialize
+    end
 
     # --- Proxy Methods ---
 

data/lib/active_project/configuration.rb

@@ -16,44 +16,52 @@ module ActiveProject
 
     def initialize
       @adapter_configs = {}
+      @user_agent = "ActiveProject Gem (github.com/seuros/active_project)"
     end
-      @user_agent = "ActiveProject Gem (github.com/seuros/activeproject)"
 
     # Adds or updates the configuration for a specific adapter.
     # If a block is given and a specific configuration class exists for the adapter,
     # an instance of that class is yielded to the block. Otherwise, a basic
     # configuration object is created from the options hash.
     #
-    # @param name [Symbol] The name of the adapter (e.g., :jira, :trello).
+    # @param adapter_type [Symbol] The name of the adapter (e.g., :basecamp, :jira, :trello).
+    # @param instance_name [Symbol, Hash] The name of the adapter instance (default: :primary) or options hash.
     # @param options [Hash] Configuration options for the adapter (e.g., site, api_key, token).
     # @yield [BaseAdapterConfiguration] Yields an adapter-specific configuration object if a block is given.
-    def add_adapter(name, options = {}, &block)
-      unless name.is_a?(Symbol)
-        raise ArgumentError, "Adapter name must be a Symbol (e.g., :jira)"
+    def add_adapter(adapter_type, instance_name = :primary, options = {}, &block)
+      unless adapter_type.is_a?(Symbol)
+        raise ArgumentError, "Adapter type must be a Symbol (e.g., :basecamp)"
       end
 
-      config_class = ADAPTER_CONFIG_CLASSES[name]
+      # Handle the case where instance_name is actually the options hash
+      if instance_name.is_a?(Hash) && options.empty?
+        options = instance_name
+        instance_name = :primary
+      end
+
+      key = "#{adapter_type}_#{instance_name}".to_sym
+
+      config_class = ADAPTER_CONFIG_CLASSES[adapter_type]
 
-      # Use specific config class if block is given and class exists
       if block && config_class
         adapter_config_obj = config_class.new(options)
-        yield adapter_config_obj # Allow block to modify the specific config object
-        @adapter_configs[name] = adapter_config_obj.freeze
-      # Use specific config class if no block but class exists (handles options like status_mappings passed directly)
+        yield adapter_config_obj
+        @adapter_configs[key] = adapter_config_obj.freeze
       elsif config_class
-         adapter_config_obj = config_class.new(options)
-         @adapter_configs[name] = adapter_config_obj.freeze
-      # Fallback to base config class if no specific class or no block
+        adapter_config_obj = config_class.new(options)
+        @adapter_configs[key] = adapter_config_obj.freeze
       else
-        @adapter_configs[name] = Configurations::BaseAdapterConfiguration.new(options).freeze
+        @adapter_configs[key] = Configurations::BaseAdapterConfiguration.new(options).freeze
       end
     end
 
     # Retrieves the configuration object for a specific adapter.
-    # @param name [Symbol] The name of the adapter.
+    # @param adapter_type [Symbol] The name of the adapter (e.g., :jira, :trello).
+    # @param instance_name [Symbol] The name of the adapter instance (default: :primary).
     # @return [BaseAdapterConfiguration, nil] The configuration object or nil if not found.
-    def adapter_config(name)
-      @adapter_configs[name]
+    def adapter_config(adapter_type, instance_name = :primary)
+      key = "#{adapter_type}_#{instance_name}".to_sym
+      @adapter_configs[key]
     end
   end
 end

data/lib/active_project/resources/comment.rb

@@ -1,16 +1,11 @@
 # frozen_string_literal: true
 
-require_relative "base_resource"
-
 module ActiveProject
   module Resources
     # Represents a Comment on an Issue
     class Comment < BaseResource
       def_members :id, :body, :author, :created_at, :updated_at, :issue_id,
                   :adapter_source
-      # raw_data and adapter are inherited from BaseResource
-
-      # Add comment-specific methods here later (e.g., save, update, delete)
     end
   end
 end

data/lib/active_project/resources/issue.rb

@@ -34,8 +34,6 @@ module ActiveProject
       def comments
         AssociationProxy.new(owner: self, adapter: @adapter, association_name: :comments)
       end
-
-      # Add issue-specific methods here later (e.g., comments association, save, update)
     end
   end
 end

data/lib/active_project/resources/project.rb

@@ -13,8 +13,6 @@ module ActiveProject
       def issues
         AssociationProxy.new(owner: self, adapter: @adapter, association_name: :issues)
       end
-
-      # Add project-specific methods here later (e.g., issues association)
     end
   end
 end

data/lib/active_project/resources/user.rb

@@ -7,7 +7,6 @@ module ActiveProject
     # Represents a User
     class User < BaseResource
       def_members :id, :name, :email, :adapter_source
-      # raw_data and adapter are inherited from BaseResource
     end
   end
 end

data/lib/active_project/version.rb

@@ -1,3 +1,3 @@
 module ActiveProject
-  VERSION = "0.0.0"
+  VERSION = "0.1.0"
 end

data/lib/activeproject.rb

@@ -1,4 +1,5 @@
 require "zeitwerk"
+require "concurrent"
 require_relative "active_project/errors"
 require_relative "active_project/version"
 
@@ -14,6 +15,11 @@ module ActiveProject
       yield(configuration)
     end
 
+    # Resets all cached adapters, forcing them to be re-initialized with current configuration
+    # @return [void]
+    def reset_adapters
+      adapter_registry.clear if defined?(@adapter_registry) && @adapter_registry
+    end
 
     # Returns the configured User-Agent string, including the gem version.
     # @return [String] The User-Agent string.
@@ -23,33 +29,79 @@ module ActiveProject
     end
 
     # Returns a memoized instance of the requested adapter.
-    # @param adapter_name [Symbol] The name of the adapter (e.g., :jira, :trello).
-    # @return [Adapters::Base] An instance of the requested adapter.
+    # Thread-safe implementation using Concurrent::Map for the adapter registry.
+    # @param adapter_type [Symbol] The name of the adapter (e.g., :jira, :trello).
+    # @param instance_name [Symbol] The name of the adapter instance (default: :primary).
+    # @return [ActiveProject::Adapters::Base] An instance of a specific adapter class that inherits from Base.
     # @raise [ArgumentError] if the adapter configuration is missing or invalid.
     # @raise [LoadError] if the adapter class cannot be found.
-    def adapter(adapter_name)
-      @adapters ||= {}
-      @adapters[adapter_name] ||= begin
-        config = configuration.adapter_config(adapter_name)
+    # @raise [NameError] if the adapter class cannot be found after loading the file.
+    def adapter(adapter_type, instance_name = :primary)
+      key = "#{adapter_type}_#{instance_name}".to_sym
+
+      adapter_registry.fetch_or_store(key) do
+        config = configuration.adapter_config(adapter_type, instance_name)
 
         unless config.is_a?(ActiveProject::Configurations::BaseAdapterConfiguration)
-          raise ArgumentError, "Configuration for adapter ':#{adapter_name}' not found or invalid. Use ActiveProject.configure."
+          available_configs = list_available_configurations
+
+          error_message = "Configuration for adapter ':#{adapter_type}' (instance ':#{instance_name}') not found or invalid.\n\n"
+
+          if available_configs.empty?
+            error_message += "No adapters are currently configured. "
+          else
+            error_message += "Available configurations:\n"
+            available_configs.each do |adapter_key, config_type|
+              error_message += "  * #{adapter_key} (#{config_type})\n"
+            end
+          end
+
+          error_message += "\nTo configure, use:\n"
+          error_message += "  ActiveProject.configure do |config|\n"
+          error_message += "    config.add_adapter :#{adapter_type}, :#{instance_name}, { your_options_here }\n"
+          error_message += "  end"
+
+          raise ArgumentError, error_message
         end
 
-        # Use string-based constant lookup with the full namespace path
-        adapter_class_name = "ActiveProject::Adapters::#{adapter_name.to_s.capitalize}Adapter"
+        adapter_class_name = "ActiveProject::Adapters::#{adapter_type.to_s.capitalize}Adapter"
 
-        # Ensure the adapter class is loaded
-        require "active_project/adapters/#{adapter_name}_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
+        end
 
-        # Get the constant with the full path
-        adapter_class = Object.const_get(adapter_class_name)
+        begin
+          adapter_class = Object.const_get(adapter_class_name)
+        rescue NameError => e
+          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
+        end
 
         adapter_class.new(config: config)
-      rescue LoadError, NameError => e
-        raise LoadError, "Could not find adapter class #{adapter_class_name}: #{e.message}"
       end
     end
+
+    # Lists all available configurations in the format adapter_name:instance_name
+    # @return [Hash] A hash mapping configuration keys to their configuration types
+    private def list_available_configurations
+      result = {}
+      configuration.adapter_configs.each do |key, config|
+        config_type = config.class.name.split("::").last
+        result[key] = config_type
+      end
+      result
+    end
+
+    # Returns a thread-safe map that stores adapter instances
+    # @return [Concurrent::Map] Thread-safe hash implementation
+    private def adapter_registry
+      @adapter_registry ||= Concurrent::Map.new
+    end
   end
 end
 

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeproject
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.1.0
 platform: ruby
 authors:
 - Abdelkader Boudih
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-07 00:00:00.000000000 Z
+date: 2025-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -35,14 +36,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: faraday-retry
   requirement: !ruby/object:Gem::Requirement
@@ -101,12 +102,13 @@ files:
 - lib/active_project/version.rb
 - lib/active_project/webhook_event.rb
 - lib/activeproject.rb
-homepage: https://github.com/seuros/activeproject
+homepage: https://github.com/seuros/active_project
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/seuros/activeproject
-  source_code_uri: https://github.com/seuros/activeproject
+  homepage_uri: https://github.com/seuros/active_project
+  source_code_uri: https://github.com/seuros/active_project
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -121,7 +123,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: A standardized Ruby interface for multiple project management APIs (Jira,
   Basecamp, Trello, etc.).