diaspora_federation 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ba82f5232ef44f9731f00859c5a32fa8163570e
-  data.tar.gz: 01c7f76df999d4a0f476cf7c0ddbbc4f1a86ef0a
+  metadata.gz: e56eee6e871dc16abaa0da7c604f9f9143e71871
+  data.tar.gz: 224950a212f0264c89ef06f9424562890402f241
 SHA512:
-  metadata.gz: 49abed4f800587ea9f0a671cd1eccc74a3df06b58f9039e61a7540b8e809cf54b4b49f6e8d075e6fe943ffd687d10c2d0e48e250878d080e0c6370ff27979ee6
-  data.tar.gz: 36c5a25c0744fda688707de4d0c469d90989a3fb016e1af39e030efa38dddc3d4b6c9a89be21d52245950f41b59fb030c8c5eeda3a96e8475cdfa6ff3057c2b7
+  metadata.gz: 5312e34a58235295100cb3ab411c9d98f02a176eb269d9a17e1dc1d4ba3f758c4709aa4be7412beb69d46f16f4c5b9a0fc26f9064d7d19e3c0412a1415b2a7cd
+  data.tar.gz: c8d038df9fb247670cbdc94385e80a758fc03a2ef2e37a3a9dd26ebc6c42973fa83234a2e2173110a0f74524a7ec256d0b54f8f31f8062d1286422c8afe6be4a

data/Changelog.md

@@ -1,3 +1,9 @@
+# 0.1.3
+
+## Refactor
+
+* Improve handling of `xml_order` in relayables [36a787d](https://github.com/diaspora/diaspora_federation/commit/36a787dd87f9770e16fbc1bbc0a6c0d6f059e727) [ba129aa](https://github.com/diaspora/diaspora_federation/commit/ba129aafa38f978f69565d39b7a881a245b03bab) [41de99b](https://github.com/diaspora/diaspora_federation/commit/41de99bd5e4ed2779d574183a58f9ac9550c658a)
+
 # 0.1.2
 
 ## Refactor

data/lib/diaspora_federation/entities/relayable.rb

@@ -72,7 +72,7 @@ module DiasporaFederation
       # @param [Hash] additional_xml_elements additional xml elements
       # @see DiasporaFederation::Entity#initialize
       def initialize(data, xml_order=nil, additional_xml_elements={})
-        @xml_order = xml_order
+        @xml_order = xml_order.try(:reject) {|name| name =~ /signature/ }
         @additional_xml_elements = additional_xml_elements
 
         super(data)
@@ -153,7 +153,7 @@ module DiasporaFederation
       # @return [Hash] sorted xml elements with updated signatures
       def xml_elements
         xml_data = super.merge(additional_xml_elements)
-        signature_order.map {|element| [element, xml_data[element]] }.to_h.tap do |xml_elements|
+        signature_order.map {|element| [element, xml_data[element] || ""] }.to_h.tap do |xml_elements|
           xml_elements[:author_signature] = author_signature || sign_with_author
           xml_elements[:parent_author_signature] = parent_author_signature || sign_with_parent_author_if_available.to_s
         end
@@ -162,7 +162,12 @@ module DiasporaFederation
       # The order for signing
       # @return [Array]
       def signature_order
-        xml_order.nil? ? self.class::LEGACY_SIGNATURE_ORDER : xml_order.reject {|name| name =~ /signature/ }
+        if xml_order
+          prop_names = self.class.class_props.keys.map(&:to_s)
+          xml_order.map {|name| prop_names.include?(name) ? name.to_sym : name }
+        else
+          self.class::LEGACY_SIGNATURE_ORDER
+        end
       end
 
       # @return [String] signature data string

data/lib/diaspora_federation/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diaspora_federation
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Benjamin Neff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-14 00:00:00.000000000 Z
+date: 2016-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -214,4 +214,3 @@ signing_key:
 specification_version: 4
 summary: diaspora* federation library
 test_files: []
-has_rdoc: