diaspora_federation 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: af0fdb0f1947dce9a20099a76921b58ad265032c
-  data.tar.gz: 45a617bd5cf74ccbba10a73372c5b8aad8ec5e55
+SHA256:
+  metadata.gz: 35131d74a51b0fc8445843fb59db5f48f964d7462f892d4c1324eaaa34ad927d
+  data.tar.gz: dcc6e003cffe457597d42a0659fc85a52355834f966ca05ccef8cafae57a42dd
 SHA512:
-  metadata.gz: 044a46b0f3d099863f7d7a6496bcdefa54a63c58689563a4fc74d96d42bcc49cb340089821836342a1c1801c7797ad4b8a926976299235dc5722499e95f92969
-  data.tar.gz: 392b7a4b746d01ab534a9ea164c956a3b2cbea6817489baf3829d253caae3dee979f260755b9b1a7ebbb546bfb76d4fd62cea80c460fe0be06639e9035ba710f
+  metadata.gz: ae87265e272332d979019e06c2bcade0bed570da326213efc5ddc3f7a5c3c4dac573d0bdf7b0836827cd68325ecde557fc959daa55b647e71cc07cc28d48d79b
+  data.tar.gz: 56c39d7011b5c8ed4e10270682cf9d7ed57b3765e8dbee6d1fd3d2a55630fe9c804eb1ac47147771ea2ce5730805ba8cdb7408dd950ba60c824e35abbed200d6

data/Changelog.md

@@ -1,3 +1,19 @@
+# 0.2.5
+
+## Features
+
+* Add `full_name` to `Profile` entity [#100](https://github.com/diaspora/diaspora_federation/pull/100)
+* Add `Embed` entity [#101](https://github.com/diaspora/diaspora_federation/pull/101)
+
+## Refactor
+
+* Include `web+` prefix in `diaspora://` URL parsing [#108](https://github.com/diaspora/diaspora_federation/pull/108)
+
+## Bug fixes
+
+* Various bug fixes in the `federation_entities.json` [#102](https://github.com/diaspora/diaspora_federation/pull/102) [#104](https://github.com/diaspora/diaspora_federation/pull/104) [#107](https://github.com/diaspora/diaspora_federation/pull/107)
+* Allow fetching of entities with dot in the GUID [#106](https://github.com/diaspora/diaspora_federation/pull/106)
+
 # 0.2.4
 
 ## Features

data/README.md

@@ -6,7 +6,6 @@
 
 [![Code Climate](https://codeclimate.com/github/diaspora/diaspora_federation/badges/gpa.svg)](https://codeclimate.com/github/diaspora/diaspora_federation)
 [![Test Coverage](https://codeclimate.com/github/diaspora/diaspora_federation/badges/coverage.svg)](https://codeclimate.com/github/diaspora/diaspora_federation/coverage)
-[![Dependency Status](https://gemnasium.com/diaspora/diaspora_federation.svg)](https://gemnasium.com/diaspora/diaspora_federation)
 [![Inline docs](https://inch-ci.org/github/diaspora/diaspora_federation.svg?branch=master)](https://inch-ci.org/github/diaspora/diaspora_federation)
 [![Gem Version](https://badge.fury.io/rb/diaspora_federation.svg)](https://badge.fury.io/rb/diaspora_federation)
 
@@ -38,25 +37,31 @@ Configure the engine in ```config/initializers/diaspora_federation.rb```:
 ```ruby
 DiasporaFederation.configure do |config|
   # the pod url
-  config.server_uri = AppConfig.pod_uri
+  config.server_uri = URI("http://localhost:3000")
+
+  # ... other settings
 
   config.define_callbacks do
     on :fetch_person_for_webfinger do |diaspora_id|
       person = Person.find_local_by_diaspora_id(diaspora_id)
       if person
         DiasporaFederation::Discovery::WebFinger.new(
-          # ...
+          # ... copy person attributes to WebFinger object
         )
       end
     end
 
     on :fetch_person_for_hcard do |guid|
-      # ...
+      # ... fetch hcard information
     end
+
+    # ... other callbacks
   end
 end
 ```
 
+The available config settings can be found [here](https://www.rubydoc.info/gems/diaspora_federation/DiasporaFederation#class_attr_details) and the callbacks are listed [here](https://www.rubydoc.info/gems/diaspora_federation/DiasporaFederation#define_callbacks-class_method) in the gem documentation.
+
 ## Contributing
 
 See [our contribution guide](/CONTRIBUTING.md) for more information on how to contribute to the diaspora\* federation library.

data/lib/diaspora_federation/discovery/host_meta.rb

@@ -1,4 +1,3 @@
-
 module DiasporaFederation
   module Discovery
     # Generates and parses Host Meta documents.

data/lib/diaspora_federation/entities.rb

@@ -30,6 +30,7 @@ require "diaspora_federation/entities/poll_answer"
 require "diaspora_federation/entities/poll"
 require "diaspora_federation/entities/poll_participation"
 
+require "diaspora_federation/entities/embed"
 require "diaspora_federation/entities/location"
 
 require "diaspora_federation/entities/event"

data/lib/diaspora_federation/entities/embed.rb

@@ -0,0 +1,44 @@
+module DiasporaFederation
+  module Entities
+    # This entity is used to specify embed information about an URL that should be embedded.
+    #
+    # @see Validators::EmbedValidator
+    class Embed < Entity
+      # @!attribute [r] url
+      #   URL that should be embedded.
+      #   @return [String] url
+      property :url, :string, optional: true
+
+      # @!attribute [r] title
+      #   The title of the embedded URL.
+      #   @return [String] title
+      property :title, :string, optional: true
+
+      # @!attribute [r] description
+      #   The description of the embedded URL.
+      #   @return [String] description
+      property :description, :string, optional: true
+
+      # @!attribute [r] image
+      #   The image of the embedded URL.
+      #   @return [String] image
+      property :image, :string, optional: true
+
+      # @!attribute [r] nothing
+      #   True, if nothing should be embedded.
+      #   @return [String] nothing
+      property :nothing, :boolean, optional: true
+
+      # @return [String] string representation of this object
+      def to_s
+        "Embed#{":#{url}" if url}"
+      end
+
+      def validate
+        super
+
+        raise ValidationError, "Either 'url' must be set or 'nothing' must be 'true'" unless nothing ^ url
+      end
+    end
+  end
+end

data/lib/diaspora_federation/entities/profile.rb

@@ -19,6 +19,10 @@ module DiasporaFederation
       #   @return [Time] edited time
       property :edited_at, :timestamp, optional: true
 
+      # @!attribute [r] full_name
+      #   @return [String] display name of the user
+      property :full_name, :string, optional: true
+
       # @!attribute [r] first_name
       #   @deprecated We decided to only use one name field, these should be removed
       #     in later iterations (will affect older diaspora* installations).

data/lib/diaspora_federation/entities/status_message.rb

@@ -36,6 +36,11 @@ module DiasporaFederation
       #   @return [Entities::Event] event
       entity :event, Entities::Event, optional: true
 
+      # @!attribute [r] embed
+      #   Optional embed information of an URL that should be embedded in the status message
+      #   @return [Entities::Embed] embed
+      entity :embed, Entities::Embed, optional: true
+
       private
 
       def validate

data/lib/diaspora_federation/federation/diaspora_url_parser.rb

@@ -6,7 +6,7 @@ module DiasporaFederation
 
       # Regex to find diaspora:// URLs
       DIASPORA_URL_REGEX = %r{
-        diaspora://
+        (?:web\+)?diaspora://
         (#{Validation::Rule::DiasporaId::DIASPORA_ID_REGEX})/
         (#{Entity::ENTITY_NAME_REGEX})/
         (#{Validation::Rule::Guid::VALID_CHARS})

data/lib/diaspora_federation/salmon/aes.rb

@@ -19,7 +19,7 @@ module DiasporaFederation
       # @param [String] iv AES initialization vector
       # @return [String] base64 encoded ciphertext
       # @raise [ArgumentError] if any of the arguments is missing or not the correct type
-      def self.encrypt(data, key, iv)
+      def self.encrypt(data, key, iv) # rubocop:disable Naming/UncommunicativeMethodParamName
         raise ArgumentError unless data.instance_of?(String) &&
                                    key.instance_of?(String) &&
                                    iv.instance_of?(String)
@@ -41,7 +41,7 @@ module DiasporaFederation
       # @param [String] iv AES initialization vector
       # @return [String] decrypted plain message
       # @raise [ArgumentError] if any of the arguments is missing or not the correct type
-      def self.decrypt(ciphertext, key, iv)
+      def self.decrypt(ciphertext, key, iv) # rubocop:disable Naming/UncommunicativeMethodParamName
         raise ArgumentError unless ciphertext.instance_of?(String) &&
                                    key.instance_of?(String) &&
                                    iv.instance_of?(String)

data/lib/diaspora_federation/validators.rb

@@ -46,6 +46,7 @@ require "diaspora_federation/validators/account_migration_validator"
 require "diaspora_federation/validators/comment_validator"
 require "diaspora_federation/validators/contact_validator"
 require "diaspora_federation/validators/conversation_validator"
+require "diaspora_federation/validators/embed_validator"
 require "diaspora_federation/validators/event_participation_validator"
 require "diaspora_federation/validators/event_validator"
 require "diaspora_federation/validators/h_card_validator"

data/lib/diaspora_federation/validators/embed_validator.rb

@@ -0,0 +1,13 @@
+module DiasporaFederation
+  module Validators
+    # This validates a {Entities::Embed}.
+    class EmbedValidator < OptionalAwareValidator
+      include Validation
+
+      rule :url, :URI
+      rule :title, length: {maximum: 255}
+      rule :description, length: {maximum: 65_535}
+      rule :image, URI: %i[host path]
+    end
+  end
+end

data/lib/diaspora_federation/validators/profile_validator.rb

@@ -8,6 +8,7 @@ module DiasporaFederation
 
       # The name must not contain a semicolon because of mentions.
       # @{<full_name> ; <diaspora_id>}
+      rule :full_name, regular_expression: {regex: /\A[^;]{,70}\z/}
       rule :first_name, regular_expression: {regex: /\A[^;]{,32}\z/}
       rule :last_name, regular_expression: {regex: /\A[^;]{,32}\z/}
 

data/lib/diaspora_federation/version.rb

@@ -1,4 +1,4 @@
 module DiasporaFederation
   # the gem version
-  VERSION = "0.2.4".freeze
+  VERSION = "0.2.5".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diaspora_federation
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Benjamin Neff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-18 00:00:00.000000000 Z
+date: 2018-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -19,7 +19,7 @@ dependencies:
         version: 0.9.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 0.9.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
@@ -126,6 +126,7 @@ files:
 - lib/diaspora_federation/entities/comment.rb
 - lib/diaspora_federation/entities/contact.rb
 - lib/diaspora_federation/entities/conversation.rb
+- lib/diaspora_federation/entities/embed.rb
 - lib/diaspora_federation/entities/event.rb
 - lib/diaspora_federation/entities/event_participation.rb
 - lib/diaspora_federation/entities/like.rb
@@ -182,6 +183,7 @@ files:
 - lib/diaspora_federation/validators/comment_validator.rb
 - lib/diaspora_federation/validators/contact_validator.rb
 - lib/diaspora_federation/validators/conversation_validator.rb
+- lib/diaspora_federation/validators/embed_validator.rb
 - lib/diaspora_federation/validators/event_participation_validator.rb
 - lib/diaspora_federation/validators/event_validator.rb
 - lib/diaspora_federation/validators/h_card_validator.rb
@@ -231,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: diaspora* federation library