diaspora_federation 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6fb6d319c4da3c247e0215f53e4cbc01be44bab
-  data.tar.gz: c1b7abc5e4ee6c7ab0304f0e31cab3c3b1c7e498
+  metadata.gz: 2605f2fbbad193258093de0d499941cbc231c853
+  data.tar.gz: 507864a736becfae27431510fc757905ac7cb0a8
 SHA512:
-  metadata.gz: e9307f19b1d29a5428115101edf46849c3f0a992beb2ca294cf216c07018414cb1e27e300ea7505a37c777378188019d1a5d6151f699d78a2c9c2be47f5da913
-  data.tar.gz: 5e1efb1c1551e1b1716455337044507ad77223368e6b0e16381a1a6f421acec0a4c9ddf50e739f205d9f207c7acc3afb7d1bce2617633428da16c3b64d9c6072
+  metadata.gz: be545dfa7000d5b11bef50fba8cbb7dcd43be46d4a470fda1935aae1bf122e36c4e79b4706b7deda83eb8692f6a861a156a2e9960a7f7bef628460a513c61ed7
+  data.tar.gz: 0ef3cb5ea273720b9258f0851051745e385367907f8733019de8b413a29a0b0f6a65968e234bb716119c9776536d04281be19062a081447b7a7f68737cbc5287

data/lib/diaspora_federation/discovery/host_meta.rb

@@ -84,7 +84,7 @@ module DiasporaFederation
       # @param [Hash] data extracted data
       # @return [String] webfinger url
       def self.webfinger_url_from_xrd(data)
-        link = data[:links].find {|l| (l[:rel] == "lrdd" && l[:type] == "application/xrd+xml") }
+        link = data[:links].find {|l| l[:rel] == "lrdd" }
         return link[:template] unless link.nil?
       end
       private_class_method :webfinger_url_from_xrd

data/lib/diaspora_federation/discovery/web_finger.rb

@@ -41,6 +41,7 @@ module DiasporaFederation
       property :acct_uri
 
       # @!attribute [r] alias_url
+      #   @note could be nil
       #   @return [String] link to the users profile
       property :alias_url
 
@@ -68,6 +69,7 @@ module DiasporaFederation
       property :atom_url
 
       # @!attribute [r] salmon_url
+      #   @note could be nil
       #   @return [String] salmon endpoint url
       #   @see http://salmon-protocol.googlecode.com/svn/trunk/draft-panzer-salmon-00.html#SMLR
       #     Panzer draft for Salmon, paragraph 3.3
@@ -154,7 +156,7 @@ module DiasporaFederation
 
         new(
           acct_uri:    data[:subject],
-          alias_url:   clean_alias(data[:aliases].first),
+          alias_url:   parse_alias(data[:aliases]),
           hcard_url:   parse_link(links, REL_HCARD),
           seed_url:    parse_link(links, REL_SEED),
           profile_url: parse_link(links, REL_PROFILE),
@@ -176,7 +178,7 @@ module DiasporaFederation
       # @raise [InvalidData] if the given XML string is invalid or incomplete
       def self.parse_xml_and_validate(webfinger_xml)
         XrdDocument.xml_data(webfinger_xml).tap do |data|
-          valid = data.key?(:subject) && data.key?(:aliases) && data.key?(:links)
+          valid = data.key?(:subject) && data.key?(:links)
           raise InvalidData, "webfinger xml is incomplete" unless valid
         end
       end
@@ -218,11 +220,16 @@ module DiasporaFederation
       end
       private_class_method :parse_link
 
-      # @deprecated remove this, when all pods use this gem for generation
-      def self.clean_alias(alias_string)
-        alias_string.gsub(/\A"|"\Z/, "")
+      # this method is used to parse the alias_url from the XML.
+      # * redmatrix has sometimes no alias, return nil
+      # * old pods had quotes around the alias url, this can be removed later
+      # * friendica has two aliases and the first is with "acct:": return only an URL starting with http (or https)
+      def self.parse_alias(aliases)
+        return nil unless aliases
+        # TODO: Old pods had quotes around alias. Remove the +map+ in next line, when all pods use this gem
+        aliases.map {|a| a.gsub(/\A"|"\Z/, "") }.find {|a| a.start_with?("http") }
       end
-      private_class_method :parse_link
+      private_class_method :parse_alias
     end
   end
 end

data/lib/diaspora_federation/validators/web_finger_validator.rb

@@ -9,12 +9,12 @@ module DiasporaFederation
 
       rule :acct_uri, :not_empty
 
-      rule :alias_url, [:not_nil, URI: %i(host path)]
+      rule :alias_url, URI: %i(host path)
       rule :hcard_url, [:not_nil, URI: %i(host path)]
       rule :seed_url, %i(not_nil URI)
       rule :profile_url, [:not_nil, URI: %i(host path)]
       rule :atom_url, [:not_nil, URI: %i(host path)]
-      rule :salmon_url, [:not_nil, URI: %i(host path)]
+      rule :salmon_url, URI: %i(host path)
     end
   end
 end

data/lib/diaspora_federation/version.rb

@@ -1,4 +1,4 @@
 module DiasporaFederation
   # the gem version
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diaspora_federation
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Benjamin Neff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-10 00:00:00.000000000 Z
+date: 2015-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 description: This gem provides the functionality for de-/serialization and de-/encryption
   of Entities in the protocols used for communication among the various installations
   of Diaspora*