w3c_api 0.1.1 → 0.1.3

data/lib/w3c_api/client.rb

@@ -7,185 +7,153 @@ require_relative 'hal'
 
 module W3cApi
   class Client
-    def specifications(options = {})
-      Hal.instance.register.fetch(:specification_index)
+    # Specification methods
+    def specifications(options = nil)
+      fetch_resource(:specification_index, **(options || {}))
     end
 
     def specification(shortname, options = {})
-      Hal.instance.register.fetch(:specification_resource, shortname: shortname)
+      fetch_resource(:specification_resource, shortname: shortname, **options)
     end
 
     def specification_versions(shortname, options = {})
-      Hal.instance.register.fetch(:specification_resource_version_index, shortname: shortname)
+      fetch_resource(:specification_resource_version_index,
+                     shortname: shortname, **options)
     end
 
     def specification_version(shortname, version, options = {})
-      Hal.instance.register.fetch(:specification_resource_version_resource, shortname: shortname, version: version)
+      fetch_resource(
+        :specification_resource_version_resource,
+        shortname: shortname,
+        version: version,
+        **options
+      )
     end
 
     def specifications_by_status(status, options = {})
-      Hal.instance.register.fetch(:specification_by_status_index, status: status)
+      fetch_resource(:specification_by_status_index, status: status, **options)
     end
 
-    def specification_supersedes(shortname, options = {})
-      Hal.instance.register.fetch(:specification_supersedes_index, shortname: shortname)
+    %w[supersedes superseded_by editors deliverers].each do |method_suffix|
+      define_method("specification_#{method_suffix}") do |shortname, options = {}|
+        fetch_resource(:"specification_#{method_suffix}_index",
+                       shortname: shortname, **options)
+      end
     end
 
-    def specification_superseded_by(shortname, options = {})
-      Hal.instance.register.fetch(:specification_superseded_by_index, shortname: shortname)
+    def specification_version_editors(shortname, version, options = {})
+      fetch_resource(:specification_version_editors_index,
+                     shortname: shortname, version: version, **options)
     end
 
-    # New methods for editors and deliverers
-
-    def specification_editors(shortname, options = {})
-      Hal.instance.register.fetch(:specification_editors_index, shortname: shortname)
-    end
-
-    def specification_deliverers(shortname, options = {})
-      Hal.instance.register.fetch(:specification_deliverers_index, shortname: shortname)
+    def specification_version_deliverers(shortname, version, options = {})
+      fetch_resource(:specification_version_deliverers_index,
+                     shortname: shortname, version: version, **options)
     end
 
     # Series methods
-
     def series(options = {})
-      Hal.instance.register.fetch(:serie_index)
+      fetch_resource(:serie_index, **options)
     end
 
     def series_by_shortname(shortname, options = {})
-      Hal.instance.register.fetch(:serie_resource, shortname: shortname)
+      fetch_resource(:serie_resource, shortname: shortname, **options)
     end
 
     def series_specifications(shortname, options = {})
-      Hal.instance.register.fetch(:serie_specification_resource, shortname: shortname)
+      fetch_resource(:serie_specification_resource,
+                     shortname: shortname, **options)
     end
 
-    # Group methods
+    def series_current_specification(shortname, options = {})
+      fetch_resource(:serie_current_specification_resource,
+                     shortname: shortname, **options)
+    end
 
+    # Group methods
     def groups(options = {})
-      Hal.instance.register.fetch(:group_index)
+      fetch_resource(:group_index, **options)
     end
 
     def group(id, options = {})
-      Hal.instance.register.fetch(:group_resource, id: id)
-    end
-
-    def group_specifications(id, options = {})
-      Hal.instance.register.fetch(:group_specifications_index, id: id)
-    end
-
-    def group_users(id, options = {})
-      Hal.instance.register.fetch(:group_users_index, id: id)
+      fetch_resource(:group_resource, id: id, **options)
     end
 
-    def group_charters(id, options = {})
-      Hal.instance.register.fetch(:group_charters_index, id: id)
-    end
-
-    def group_chairs(id, options = {})
-      Hal.instance.register.fetch(:group_chairs_index, id: id)
-    end
-
-    def group_team_contacts(id, options = {})
-      Hal.instance.register.fetch(:group_team_contacts_index, id: id)
-    end
-
-    def group_participations(id, options = {})
-      Hal.instance.register.fetch(:group_participations_index, id: id)
+    %w[specifications users charters chairs team_contacts participations].each do |resource|
+      define_method("group_#{resource}") do |id, options = {}|
+        fetch_resource(:"group_#{resource}_index", id: id, **options)
+      end
     end
 
     # User methods
-
-    # def users(options = {})
-    #   raise ArgumentError,
-    #         'The W3C API does not support fetching all users. You must provide a specific user ID with the user method.'
-    # end
-
     def user(hash, options = {})
-      Hal.instance.register.fetch(:user_resource, hash: hash)
-    end
-
-    def user_groups(hash, options = {})
-      Hal.instance.register.fetch(:user_groups_index, hash: hash)
+      fetch_resource(:user_resource, hash: hash, **options)
     end
 
-    def user_affiliations(hash, options = {})
-      Hal.instance.register.fetch(:user_affiliations_index, hash: hash)
-    end
-
-    def user_participations(hash, options = {})
-      Hal.instance.register.fetch(:user_participations_index, hash: hash)
-    end
-
-    def user_chair_of_groups(hash, options = {})
-      Hal.instance.register.fetch(:user_chair_of_groups_index, hash: hash)
-    end
-
-    def user_team_contact_of_groups(hash, options = {})
-      Hal.instance.register.fetch(:user_team_contact_of_groups_index, hash: hash)
-    end
-
-    def user_specifications(hash, options = {})
-      Hal.instance.register.fetch(:user_specifications_index, hash: hash)
+    %w[groups affiliations participations chair_of_groups
+       team_contact_of_groups specifications].each do |resource|
+      define_method("user_#{resource}") do |hash, options = {}|
+        fetch_resource(:"user_#{resource}_index", hash: hash, **options)
+      end
     end
 
     # Translation methods
-
     def translations(options = {})
-      Hal.instance.register.fetch(:translation_index)
+      fetch_resource(:translation_index, **options)
     end
 
     def translation(id, options = {})
-      Hal.instance.register.fetch(:translation_resource, id: id)
+      fetch_resource(:translation_resource, id: id, **options)
     end
 
     # Affiliation methods
-
     def affiliations(options = {})
-      Hal.instance.register.fetch(:affiliation_index)
+      fetch_resource(:affiliation_index, **options)
     end
 
     def affiliation(id, options = {})
-      Hal.instance.register.fetch(:affiliation_resource, id: id)
+      fetch_resource(:affiliation_resource, id: id, **options)
     end
 
-    def affiliation_participants(id, options = {})
-      Hal.instance.register.fetch(:affiliation_participants_index, id: id)
-    end
-
-    def affiliation_participations(id, options = {})
-      Hal.instance.register.fetch(:affiliation_participations_index, id: id)
+    %w[participants participations].each do |resource|
+      define_method("affiliation_#{resource}") do |id, options = {}|
+        fetch_resource(:"affiliation_#{resource}_index", id: id, **options)
+      end
     end
 
     # Ecosystem methods
-
     def ecosystems(options = {})
-      Hal.instance.register.fetch(:ecosystem_index)
-    end
-
-    def ecosystem(id, options = {})
-      Hal.instance.register.fetch(:ecosystem_resource, id: id)
-    end
-
-    def ecosystem_groups(shortname, options = {})
-      Hal.instance.register.fetch(:ecosystem_groups_index, shortname: shortname)
+      fetch_resource(:ecosystem_index, **options)
     end
 
-    def ecosystem_evangelists(shortname, options = {})
-      Hal.instance.register.fetch(:ecosystem_evangelists_index, shortname: shortname)
+    def ecosystem(shortname, options = {})
+      fetch_resource(:ecosystem_resource, shortname: shortname, **options)
     end
 
-    def ecosystem_member_organizations(shortname, options = {})
-      Hal.instance.register.fetch(:ecosystem_member_organizations_index, shortname: shortname)
+    %w[groups evangelists member_organizations].each do |resource|
+      define_method("ecosystem_#{resource}") do |shortname, options = {}|
+        fetch_resource(:"ecosystem_#{resource}_index",
+                       shortname: shortname, **options)
+      end
     end
 
     # Participation methods
-
     def participation(id, options = {})
-      Hal.instance.register.fetch(:participation_resource, id: id)
+      fetch_resource(:participation_resource, id: id, **options)
     end
 
     def participation_participants(id, options = {})
-      Hal.instance.register.fetch(:participation_participants_index, id: id)
+      fetch_resource(:participation_participants_index, id: id, **options)
+    end
+
+    private
+
+    def fetch_resource(resource_key, **params)
+      if params.any?
+        Hal.instance.register.fetch(resource_key, **params)
+      else
+        Hal.instance.register.fetch(resource_key)
+      end
     end
   end
 end

data/lib/w3c_api/commands/specification_version.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'thor'
+require_relative 'output_formatter'
+
+module W3cApi
+  module Commands
+    class SpecificationVersion < Thor
+      include OutputFormatter
+
+      desc 'editors', 'Fetch editors of a specification version'
+      option :shortname, type: :string, required: true, desc: 'Specification shortname'
+      option :version, type: :string, required: true, desc: 'Specification version'
+      option :format, type: :string, default: 'yaml', enum: %w[json yaml], desc: 'Output format'
+      def editors
+        client = W3cApi::Client.new
+        result = client.specification_version_editors(options[:shortname], options[:version])
+        output_results(result, options[:format])
+      rescue StandardError => e
+        puts "Error: #{e.message}"
+        exit 1
+      end
+
+      desc 'deliverers', 'Fetch deliverers (working groups) of a specification version'
+      option :shortname, type: :string, required: true, desc: 'Specification shortname'
+      option :version, type: :string, required: true, desc: 'Specification version'
+      option :format, type: :string, default: 'yaml', enum: %w[json yaml], desc: 'Output format'
+      def deliverers
+        client = W3cApi::Client.new
+        result = client.specification_version_deliverers(options[:shortname], options[:version])
+        output_results(result, options[:format])
+      rescue StandardError => e
+        puts "Error: #{e.message}"
+        exit 1
+      end
+    end
+  end
+end