diaspora_federation 0.3.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 202b522935a3c394944b6578a45868370beff4748994f9bf8fa5cded6dd436b0
-  data.tar.gz: 761667ad6330ccb2088751a0bde704e914b0e590f347938577c19002d0aaf4a4
+  metadata.gz: 55951778511742a4269e05b406ef43ca976410c07e91364896138e3df1cf7019
+  data.tar.gz: 3fed9b6d22ec275798e45a1df2c593835d1750fdac9c68158192a06640b4bcb5
 SHA512:
-  metadata.gz: 1adda0e8a5d0f789a31a589b24775ea2b09e06d3d24116ea29f0a8057680783a8dd79094c7f4c0047c1c064b18d92c2d40b6c9506ab813284c826589f714b9c3
-  data.tar.gz: dcd14ec61c90371f4153094b02d0341838b92d37401cb1354c1845d81cbeaf6b3d32fc883809a88ad35dc6974a5b4d2d6a5f3ed844ab2ddb658c292ca070c6be
+  metadata.gz: 33b62f247e32f32874930b71f907540ae7f0dbf88182d1bd8e5a4c4590dd21eee9c2f9b691d54ed96d5688b9eca5c7523780fbd1b1a89ad7e2ae4ad9ca77c371
+  data.tar.gz: 581f0595fbd988aa146aea231bf80c2f81063c0719c671a83f685b162364922941bc8f68bd55b9a22385f520e0f7e162c66f71802e99703ccd54f03426d79731

data/Changelog.md

@@ -1,3 +1,8 @@
+# 1.0.0
+
+* Add rails 7 support [#126](https://github.com/diaspora/diaspora_federation/pull/126)
+* Add faraday 2 support [#126](https://github.com/diaspora/diaspora_federation/pull/126)
+
 # 0.3.0
 
 ## Breaking changes
@@ -14,6 +19,10 @@
 * Add faraday 1.x support [#116](https://github.com/diaspora/diaspora_federation/pull/116)
 * Add support for up to ruby 3.1 [#121](https://github.com/diaspora/diaspora_federation/pull/121)
 
+# 0.2.8
+
+* Re-release which allows rails 6 to be used
+
 # 0.2.7
 
 ## Features

data/lib/diaspora_federation/discovery/discovery.rb

@@ -38,8 +38,8 @@ module DiasporaFederation
         # Validates if the diaspora* ID matches the diaspora* ID in the webfinger response
         return if diaspora_id == clean_diaspora_id(webfinger.acct_uri)
 
-        raise DiscoveryError, "diaspora* ID does not match: Wanted #{diaspora_id} but got" \
-                              " #{clean_diaspora_id(webfinger.acct_uri)}"
+        raise DiscoveryError, "diaspora* ID does not match: Wanted #{diaspora_id} but got " \
+                              "#{clean_diaspora_id(webfinger.acct_uri)}"
       end
 
       def clean_diaspora_id(diaspora_id)

data/lib/diaspora_federation/discovery/xrd_document.rb

@@ -136,10 +136,7 @@ module DiasporaFederation
 
       private
 
-      # rubocop:disable Layout/EmptyLinesAroundAttributeAccessor Style/AccessorGrouping
-      attr_reader :expires
-      attr_reader :subject
-      # rubocop:enable Layout/EmptyLinesAroundAttributeAccessor Style/AccessorGrouping
+      attr_reader :expires, :subject
 
       NS = {xrd: XMLNS}.freeze
 

data/lib/diaspora_federation/entities/relayable.rb

@@ -131,7 +131,7 @@ module DiasporaFederation
         data = super
         order = signature_order
         order += %i[author_signature] unless author == parent.root.author
-        order.map {|element| [element, data[element].to_s] }.to_h
+        order.to_h {|element| [element, data[element].to_s] }
       end
 
       def signature_order=(order)

data/lib/diaspora_federation/entity.rb

@@ -77,7 +77,7 @@ module DiasporaFederation
     # Nested entities are also converted to a Hash.
     # @return [Hash] entity data (mostly equal to the hash used for initialization).
     def to_h
-      enriched_properties.map {|key, value|
+      enriched_properties.to_h {|key, value|
         type = self.class.class_props[key]
 
         if type.instance_of?(Symbol) || value.nil?
@@ -87,7 +87,7 @@ module DiasporaFederation
         elsif type.instance_of?(Array)
           [key, value.map(&:to_h)]
         end
-      }.to_h
+      }
     end
 
     # Returns the XML representation for this entity constructed out of
@@ -273,7 +273,7 @@ module DiasporaFederation
     end
 
     def normalized_properties
-      properties.map {|name, value| [name, normalize_property(name, value)] }.to_h
+      properties.to_h {|name, value| [name, normalize_property(name, value)] }
     end
 
     def normalize_property(name, value)

data/lib/diaspora_federation/federation/sender.rb

@@ -26,7 +26,7 @@ module DiasporaFederation
       def self.private(sender_id, obj_str, targets)
         hydra = HydraWrapper.new(sender_id, obj_str)
         targets.each {|url, json| hydra.insert_enc_magic_env_request(url, json) }
-        hydra.send.map {|url| [url, targets[url]] }.to_h
+        hydra.send.to_h {|url| [url, targets[url]] }
       end
     end
   end

data/lib/diaspora_federation/http_client.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "faraday"
-require "faraday_middleware"
+require "faraday/follow_redirects"
 
 module DiasporaFederation
   # A wrapper for {https://github.com/lostisland/faraday Faraday}
@@ -32,7 +32,8 @@ module DiasporaFederation
       }
 
       @connection = Faraday::Connection.new(options) do |builder|
-        builder.response :follow_redirects, limit: DiasporaFederation.http_redirect_limit
+        builder.use Faraday::FollowRedirects::Middleware, limit: DiasporaFederation.http_redirect_limit
+
         builder.adapter Faraday.default_adapter
       end
 

data/lib/diaspora_federation/parsers/json_parser.rb

@@ -17,7 +17,7 @@ module DiasporaFederation
       private
 
       def parse_entity_data(entity_data)
-        hash = entity_data.map {|key, value|
+        hash = entity_data.to_h {|key, value|
           property = entity_type.class_props.keys.find {|name| name.to_s == key }
           if property
             type = entity_type.class_props[property]
@@ -25,7 +25,7 @@ module DiasporaFederation
           else
             [key, value]
           end
-        }.to_h
+        }
 
         [hash]
       end
@@ -49,9 +49,7 @@ module DiasporaFederation
       end
 
       def from_json_sanity_validation(json_hash)
-        missing = %w[entity_type entity_data].map {|prop|
-          prop if json_hash[prop].nil?
-        }.compact.join(", ")
+        missing = %w[entity_type entity_data].select {|prop| json_hash[prop].nil? }.join(", ")
         raise DeserializationError, "Required properties are missing in JSON object: #{missing}" unless missing.empty?
 
         assert_parsability_of(json_hash["entity_type"])

data/lib/diaspora_federation/parsers/xml_parser.rb

@@ -14,7 +14,7 @@ module DiasporaFederation
       def parse(root_node)
         from_xml_sanity_validation(root_node)
 
-        hash = root_node.element_children.uniq(&:name).map {|child|
+        hash = root_node.element_children.uniq(&:name).to_h {|child|
           property, type = find_property_for(child.name)
           if property
             value = parse_element_from_node(child.name, type, root_node)
@@ -22,7 +22,7 @@ module DiasporaFederation
           else
             [child.name, child.text]
           end
-        }.to_h
+        }
 
         [hash]
       end

data/lib/diaspora_federation/properties_dsl.rb

@@ -57,7 +57,7 @@ module DiasporaFederation
     # resolved on each call
     # @return [Hash] default values
     def default_values
-      optional_props.map {|name| [name, nil] }.to_h.merge(default_props).transform_values {|prop|
+      optional_props.to_h {|name| [name, nil] }.merge(default_props).transform_values {|prop|
         prop.respond_to?(:call) ? prop.call : prop
       }
     end
@@ -65,7 +65,7 @@ module DiasporaFederation
     # @param [Hash] data entity data
     # @return [Hash] hash with resolved aliases
     def resolv_aliases(data)
-      data.map {|name, value|
+      data.to_h {|name, value|
         if class_prop_aliases.has_key? name
           prop_name = class_prop_aliases[name]
           raise InvalidData, "only use '#{name}' OR '#{prop_name}'" if data.has_key? prop_name
@@ -74,7 +74,7 @@ module DiasporaFederation
         else
           [name, value]
         end
-      }.to_h
+      }
     end
 
     private

data/lib/diaspora_federation/version.rb

@@ -2,5 +2,5 @@
 
 module DiasporaFederation
   # the gem version
-  VERSION = "0.3.0"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,43 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: diaspora_federation
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Benjamin Neff
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-13 00:00:00.000000000 Z
+date: 2022-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
+  name: faraday-follow_redirects
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement