bridgetown_directus 0.1.3 → 0.3.0

data/lib/bridgetown_directus.rb

@@ -2,36 +2,38 @@
 
 require "bridgetown"
 require_relative "bridgetown_directus/utils"
-require_relative "bridgetown_directus/api_client"
+require_relative "bridgetown_directus/client"
+require_relative "bridgetown_directus/data_mapper"
+require_relative "bridgetown_directus/configuration"
 require_relative "bridgetown_directus/builder"
 
 module BridgetownDirectus
   # Bridgetown initializer for the plugin
-  Bridgetown.initializer :bridgetown_directus do |config, api_url:, token:, collection:, mappings:|
-    config.bridgetown_directus ||= {}
-    config.bridgetown_directus.api_url ||= api_url || ENV.fetch("DIRECTUS_API_URL")
-    config.bridgetown_directus.token ||= token || ENV.fetch("DIRECTUS_API_TOKEN")
+  Bridgetown.initializer :bridgetown_directus do |config|
+    # Only assign config.bridgetown_directus if not already set
+    config.bridgetown_directus ||= Configuration.new
 
-    # Access collection and mappings from the bridgetown.config.yml
-    config.bridgetown_directus.collection ||= config.directus.collection
-    config.bridgetown_directus.mappings ||= config.directus.mappings
-    config.bridgetown_directus.translations ||= config.directus["translations"]
+    # Set up configuration directly (leave to user initializer if possible)
+    config.bridgetown_directus.api_url ||= ENV["DIRECTUS_API_URL"]
+    config.bridgetown_directus.token ||= ENV["DIRECTUS_API_TOKEN"] || ENV["DIRECTUS_TOKEN"]
 
     # Register the builder
     config.builder BridgetownDirectus::Builder
+  end
+
+  class Configuration
+    attr_accessor :api_url, :token
+    attr_reader :collections
 
-    # Log translations status
-    if config.bridgetown_directus.translations["enabled"]
-      translatable_fields = config.bridgetown_directus.translations["fields"] || []
-      Bridgetown.logger.info "Directus translations enabled for fields: #{translatable_fields.join(', ')}"
-    else
-      Bridgetown.logger.info "Directus translations are disabled"
+    def initialize
+      @collections = {}
     end
 
-    # Validate Directus config before proceeding
-    unless config.bridgetown_directus.api_url && config.bridgetown_directus.token
-      Bridgetown.logger.error "Invalid Directus configuration detected. Please check your API URL and token."
-      raise "Directus configuration invalid"
+    def register_collection(name, &block)
+      collection = CollectionConfig.new(name)
+      collection.instance_eval(&block) if block_given?
+      @collections[name] = collection
+      collection
     end
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown_directus
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Munkun
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-21 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bridgetown
@@ -16,20 +15,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 2.0.0.beta4
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 2.0.0.beta4
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -120,14 +119,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
@@ -156,13 +155,17 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description:
 email: development@munkun.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
+- ".github/workflows/release-please.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
+- ".release-please-config.json"
+- ".release-please-manifest.json"
 - ".rubocop.yml"
 - CHANGELOG.md
 - Gemfile
@@ -171,9 +174,13 @@ files:
 - Rakefile
 - bridgetown.automation.rb
 - bridgetown_directus.gemspec
+- example/bridgetown.config.yml
+- example/config/initializers.rb
 - lib/bridgetown_directus.rb
-- lib/bridgetown_directus/api_client.rb
 - lib/bridgetown_directus/builder.rb
+- lib/bridgetown_directus/client.rb
+- lib/bridgetown_directus/configuration.rb
+- lib/bridgetown_directus/data_mapper.rb
 - lib/bridgetown_directus/utils.rb
 - lib/bridgetown_directus/version.rb
 - package.json
@@ -185,7 +192,6 @@ metadata:
   bug_tracker_uri: https://github.com/munkun-estudio/bridgetown_directus/issues
   changelog_uri: https://github.com/munkun-estudio/bridgetown_directus/releases
   homepage_uri: https://github.com/munkun-estudio/bridgetown_directus
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -200,8 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.18
-signing_key:
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Use Directus as headless CMS for Bridgetown
 test_files: []

data/lib/bridgetown_directus/api_client.rb

@@ -1,57 +0,0 @@
-# frozen_string_literal: true
-
-module BridgetownDirectus
-  class APIClient
-    def initialize(site)
-      @site = site
-      @api_url = site.config.bridgetown_directus.api_url
-      @api_token = site.config.bridgetown_directus.token
-
-      raise StandardError, "Invalid Directus configuration: missing API token or URL" if @api_token.nil? || @api_url.nil?
-    end
-
-    # Main method to fetch posts
-    def fetch_posts
-      Utils.log_directus "Request URL: #{@api_url}/items/#{@site.config.bridgetown_directus.collection}"
-
-      response = connection.get("/items/#{@site.config.bridgetown_directus.collection}") do |req|
-        req.params['filter'] = { status: { _eq: "published" } }.to_json
-        req.params['fields'] = '*,translations.*'
-      end
-
-      if response.success?
-        JSON.parse(response.body)  # Return the parsed posts
-      elsif response.status == 401
-        raise RuntimeError, "Unauthorized access to Directus API"
-      else
-        raise "Error fetching posts: #{response.status} - #{response.body}"
-      end
-    rescue Faraday::TimeoutError
-      raise Faraday::TimeoutError, "The request to fetch posts timed out"
-    rescue JSON::ParserError
-      raise JSON::ParserError, "The response from Directus was not valid JSON"
-    end
-
-    # Setup Faraday connection with authorization headers
-    def connection
-      Faraday.new(url: @api_url) do |faraday|
-        faraday.options.timeout = 5
-        faraday.options.open_timeout = 2
-        faraday.headers['Authorization'] = "Bearer #{@api_token}"
-        faraday.headers['Content-Type'] = 'application/json'
-        faraday.adapter Faraday.default_adapter
-      end
-    end
-
-    # New method for validating the data structure
-    private def validate_posts_data(posts_data)
-      if posts_data.is_a?(Hash) && posts_data.key?("data") && posts_data["data"].is_a?(Array)
-        posts_data["data"]
-      elsif posts_data.is_a?(Array)
-        posts_data
-      else
-        raise "Invalid posts data structure: #{posts_data.inspect}"
-      end
-    end
-  end
-end