diaspora_federation 0.1.9 → 0.2.0

data/lib/diaspora_federation/validators/conversation_validator.rb

@@ -4,7 +4,7 @@ module DiasporaFederation
     class ConversationValidator < Validation::Validator
       include Validation
 
-      rule :author, %i(not_empty diaspora_id)
+      rule :author, %i[not_empty diaspora_id]
       rule :guid, :guid
 
       rule :subject, [:not_empty, length: {maximum: 255}]

data/lib/diaspora_federation/validators/event_validator.rb

@@ -4,7 +4,7 @@ module DiasporaFederation
     class EventValidator < Validation::Validator
       include Validation
 
-      rule :author, %i(not_empty diaspora_id)
+      rule :author, %i[not_empty diaspora_id]
 
       rule :guid, :guid
 

data/lib/diaspora_federation/validators/h_card_validator.rb

@@ -2,14 +2,11 @@ module DiasporaFederation
   module Validators
     # This validates a {Discovery::HCard}.
     #
-    # @todo activate guid and public key validation after all pod have it in
-    #   the hcard.
-    #
     # @note
     class HCardValidator < Validation::Validator
       include Validation
 
-      # rule :guid, :guid
+      rule :guid, :guid
 
       # The name must not contain a semicolon because of mentions.
       # @{<full_name> ; <diaspora_id>}
@@ -22,7 +19,7 @@ module DiasporaFederation
       rule :photo_medium_url, [:not_nil, URI: [:path]]
       rule :photo_small_url, [:not_nil, URI: [:path]]
 
-      # rule :exported_key, :public_key
+      rule :public_key, :public_key
 
       rule :searchable, :boolean
     end

data/lib/diaspora_federation/validators/message_validator.rb

@@ -4,7 +4,7 @@ module DiasporaFederation
     class MessageValidator < Validation::Validator
       include Validation
 
-      rule :author, %i(not_empty diaspora_id)
+      rule :author, %i[not_empty diaspora_id]
       rule :guid, :guid
       rule :conversation_guid, :guid
 

data/lib/diaspora_federation/validators/participation_validator.rb

@@ -4,7 +4,7 @@ module DiasporaFederation
     class ParticipationValidator < Validation::Validator
       include Validation
 
-      rule :author, %i(not_empty diaspora_id)
+      rule :author, %i[not_empty diaspora_id]
       rule :guid, :guid
       rule :parent_guid, :guid
       rule :parent_type, [:not_empty, regular_expression: {regex: /\APost\z/}]

data/lib/diaspora_federation/validators/person_validator.rb

@@ -6,9 +6,9 @@ module DiasporaFederation
 
       rule :guid, :guid
 
-      rule :author, %i(not_empty diaspora_id)
+      rule :author, %i[not_empty diaspora_id]
 
-      rule :url, %i(not_nil URI)
+      rule :url, %i[not_nil URI]
 
       rule :profile, :not_nil
 

data/lib/diaspora_federation/validators/photo_validator.rb

@@ -6,7 +6,7 @@ module DiasporaFederation
 
       rule :guid, :guid
 
-      rule :author, %i(not_empty diaspora_id)
+      rule :author, %i[not_empty diaspora_id]
 
       rule :public, :boolean
 

data/lib/diaspora_federation/validators/profile_validator.rb

@@ -23,7 +23,7 @@ module DiasporaFederation
       rule :location, length: {maximum: 255}
 
       rule :searchable, :boolean
-
+      rule :public, :boolean
       rule :nsfw, :boolean
 
       rule :tag_string, tag_count: {maximum: 5}

data/lib/diaspora_federation/validators/related_entity_validator.rb

@@ -4,7 +4,7 @@ module DiasporaFederation
     class RelatedEntityValidator < Validation::Validator
       include Validation
 
-      rule :author, %i(not_empty diaspora_id)
+      rule :author, %i[not_empty diaspora_id]
       rule :local, :boolean
       rule :public, :boolean
     end

data/lib/diaspora_federation/validators/relayable_validator.rb

@@ -6,7 +6,7 @@ module DiasporaFederation
       # @param [Validation::Validator] validator the validator in which it is included
       def self.included(validator)
         validator.class_eval do
-          rule :author, %i(not_empty diaspora_id)
+          rule :author, %i[not_empty diaspora_id]
           rule :guid, :guid
           rule :parent_guid, :guid
           rule :parent, :not_nil

data/lib/diaspora_federation/validators/reshare_validator.rb

@@ -4,11 +4,11 @@ module DiasporaFederation
     class ReshareValidator < Validation::Validator
       include Validation
 
-      rule :root_author, %i(not_empty diaspora_id)
+      rule :root_author, %i[not_empty diaspora_id]
 
       rule :root_guid, :guid
 
-      rule :author, %i(not_empty diaspora_id)
+      rule :author, %i[not_empty diaspora_id]
 
       rule :guid, :guid
 

data/lib/diaspora_federation/validators/retraction_validator.rb

@@ -4,7 +4,7 @@ module DiasporaFederation
     class RetractionValidator < Validation::Validator
       include Validation
 
-      rule :author, %i(not_empty diaspora_id)
+      rule :author, %i[not_empty diaspora_id]
 
       rule :target_guid, :guid
       rule :target_type, :not_empty

data/lib/diaspora_federation/validators/rules/boolean.rb

@@ -20,8 +20,8 @@ module Validation
         if value.is_a?(String)
           true if value =~ /\A(true|false|t|f|yes|no|y|n|1|0)\z/i
         elsif value.is_a?(Integer)
-          true if value == 1 || value == 0
-        elsif [true, false].include? value
+          true if [1, 0].include?(value)
+        elsif [true, false].include?(value)
           true
         else
           false

data/lib/diaspora_federation/validators/status_message_validator.rb

@@ -4,7 +4,7 @@ module DiasporaFederation
     class StatusMessageValidator < Validation::Validator
       include Validation
 
-      rule :author, %i(not_empty diaspora_id)
+      rule :author, %i[not_empty diaspora_id]
 
       rule :guid, :guid
 

data/lib/diaspora_federation/validators/web_finger_validator.rb

@@ -9,12 +9,11 @@ module DiasporaFederation
 
       rule :acct_uri, :not_empty
 
-      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, URI: %i(host path)
-      rule :atom_url, URI: %i(host path)
-      rule :salmon_url, URI: %i(host path)
+      rule :hcard_url, [:not_nil, URI: %i[host path]]
+      rule :seed_url, %i[not_nil URI]
+      rule :profile_url, URI: %i[host path]
+      rule :atom_url, URI: %i[host path]
+      rule :salmon_url, URI: %i[host path]
     end
   end
 end

data/lib/diaspora_federation/validators.rb

@@ -41,6 +41,7 @@ require "diaspora_federation/validators/relayable_validator"
 
 # types
 require "diaspora_federation/validators/account_deletion_validator"
+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"
@@ -61,8 +62,3 @@ require "diaspora_federation/validators/reshare_validator"
 require "diaspora_federation/validators/retraction_validator"
 require "diaspora_federation/validators/status_message_validator"
 require "diaspora_federation/validators/web_finger_validator"
-
-# deprecated
-require "diaspora_federation/validators/relayable_retraction_validator"
-require "diaspora_federation/validators/request_validator"
-require "diaspora_federation/validators/signed_retraction_validator"

data/lib/diaspora_federation/version.rb

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

data/lib/diaspora_federation.rb

@@ -1,3 +1,6 @@
+require "nokogiri"
+require "openssl"
+
 require "diaspora_federation/version"
 
 require "diaspora_federation/logging"
@@ -10,6 +13,7 @@ require "diaspora_federation/validators"
 require "diaspora_federation/http_client"
 
 require "diaspora_federation/entities"
+require "diaspora_federation/parsers"
 
 require "diaspora_federation/discovery"
 require "diaspora_federation/salmon"
@@ -19,7 +23,7 @@ require "diaspora_federation/federation"
 module DiasporaFederation
   extend Logging
 
-  @callbacks = Callbacks.new %i(
+  @callbacks = Callbacks.new %i[
     fetch_person_for_webfinger
     fetch_person_for_hcard
     save_person_after_webfinger
@@ -32,7 +36,7 @@ module DiasporaFederation
     fetch_public_entity
     fetch_person_url_to
     update_pod
-  )
+  ]
 
   # defaults
   @http_concurrency = 20

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diaspora_federation
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Benjamin Neff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-30 00:00:00.000000000 Z
+date: 2017-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -39,7 +39,7 @@ dependencies:
         version: 0.9.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: 0.9.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
@@ -121,6 +121,7 @@ files:
 - lib/diaspora_federation/discovery/xrd_document.rb
 - lib/diaspora_federation/entities.rb
 - lib/diaspora_federation/entities/account_deletion.rb
+- lib/diaspora_federation/entities/account_migration.rb
 - lib/diaspora_federation/entities/comment.rb
 - lib/diaspora_federation/entities/contact.rb
 - lib/diaspora_federation/entities/conversation.rb
@@ -143,6 +144,7 @@ files:
 - lib/diaspora_federation/entities/request.rb
 - lib/diaspora_federation/entities/reshare.rb
 - lib/diaspora_federation/entities/retraction.rb
+- lib/diaspora_federation/entities/signable.rb
 - lib/diaspora_federation/entities/signed_retraction.rb
 - lib/diaspora_federation/entities/status_message.rb
 - lib/diaspora_federation/entity.rb
@@ -157,6 +159,12 @@ files:
 - lib/diaspora_federation/federation/sender/hydra_wrapper.rb
 - lib/diaspora_federation/http_client.rb
 - lib/diaspora_federation/logging.rb
+- lib/diaspora_federation/parsers.rb
+- lib/diaspora_federation/parsers/base_parser.rb
+- lib/diaspora_federation/parsers/json_parser.rb
+- lib/diaspora_federation/parsers/relayable_json_parser.rb
+- lib/diaspora_federation/parsers/relayable_xml_parser.rb
+- lib/diaspora_federation/parsers/xml_parser.rb
 - lib/diaspora_federation/properties_dsl.rb
 - lib/diaspora_federation/salmon.rb
 - lib/diaspora_federation/salmon/aes.rb
@@ -166,8 +174,10 @@ files:
 - lib/diaspora_federation/salmon/magic_envelope.rb
 - lib/diaspora_federation/salmon/slap.rb
 - lib/diaspora_federation/salmon/xml_payload.rb
+- lib/diaspora_federation/schemas/federation_entities.json
 - lib/diaspora_federation/validators.rb
 - lib/diaspora_federation/validators/account_deletion_validator.rb
+- lib/diaspora_federation/validators/account_migration_validator.rb
 - lib/diaspora_federation/validators/comment_validator.rb
 - lib/diaspora_federation/validators/contact_validator.rb
 - lib/diaspora_federation/validators/conversation_validator.rb
@@ -185,9 +195,7 @@ files:
 - lib/diaspora_federation/validators/poll_validator.rb
 - lib/diaspora_federation/validators/profile_validator.rb
 - lib/diaspora_federation/validators/related_entity_validator.rb
-- lib/diaspora_federation/validators/relayable_retraction_validator.rb
 - lib/diaspora_federation/validators/relayable_validator.rb
-- lib/diaspora_federation/validators/request_validator.rb
 - lib/diaspora_federation/validators/reshare_validator.rb
 - lib/diaspora_federation/validators/retraction_validator.rb
 - lib/diaspora_federation/validators/rules/birthday.rb
@@ -198,14 +206,9 @@ files:
 - lib/diaspora_federation/validators/rules/not_nil.rb
 - lib/diaspora_federation/validators/rules/public_key.rb
 - lib/diaspora_federation/validators/rules/tag_count.rb
-- lib/diaspora_federation/validators/signed_retraction_validator.rb
 - lib/diaspora_federation/validators/status_message_validator.rb
 - lib/diaspora_federation/validators/web_finger_validator.rb
 - lib/diaspora_federation/version.rb
-- lib/tasks/build.rake
-- lib/tasks/diaspora_federation_tasks.rake
-- lib/tasks/rails4.rake
-- lib/tasks/tests.rake
 homepage: https://github.com/diaspora/diaspora_federation
 licenses:
 - AGPL-3.0

data/lib/diaspora_federation/validators/relayable_retraction_validator.rb

@@ -1,15 +0,0 @@
-module DiasporaFederation
-  module Validators
-    # This validates a {Entities::RelayableRetraction}.
-    # @deprecated The {Entities::RelayableRetraction} will be replaced with {Entities::Retraction}.
-    class RelayableRetractionValidator < Validation::Validator
-      include Validation
-
-      rule :target_guid, :guid
-      rule :target_type, :not_empty
-      rule :target, :not_nil
-
-      rule :author, %i(not_empty diaspora_id)
-    end
-  end
-end

data/lib/diaspora_federation/validators/request_validator.rb

@@ -1,12 +0,0 @@
-module DiasporaFederation
-  module Validators
-    # This validates a {Entities::Request}.
-    # @deprecated The {Entities::Request} will be replaced with {Entities::Contact}.
-    class RequestValidator < Validation::Validator
-      include Validation
-
-      rule :author, %i(not_empty diaspora_id)
-      rule :recipient, %i(not_empty diaspora_id)
-    end
-  end
-end

data/lib/diaspora_federation/validators/signed_retraction_validator.rb

@@ -1,15 +0,0 @@
-module DiasporaFederation
-  module Validators
-    # This validates a {Entities::SignedRetraction}.
-    # @deprecated The {Entities::RelayableRetraction} will be replaced with {Entities::Retraction}.
-    class SignedRetractionValidator < Validation::Validator
-      include Validation
-
-      rule :target_guid, :guid
-      rule :target_type, :not_empty
-      rule :target, :not_nil
-
-      rule :author, %i(not_empty diaspora_id)
-    end
-  end
-end

data/lib/tasks/build.rake

@@ -1,14 +0,0 @@
-desc "Build gem into the pkg directory"
-task build: :test do
-  FileUtils.rm_rf("pkg")
-  Dir["*.gemspec"].each do |gemspec|
-    system "gem build #{gemspec}"
-  end
-  FileUtils.mkdir_p("pkg")
-  FileUtils.mv(Dir["*.gem"], "pkg")
-end
-
-desc "Tags version, pushes to remote, and pushes gem"
-task release: :build do
-  sh "ls pkg/diaspora_federation-*-*.gem | xargs -n 1 gem push"
-end

data/lib/tasks/diaspora_federation_tasks.rake

@@ -1,4 +0,0 @@
-# desc "Explaining what the task does"
-# task :diaspora_federation do
-#   # Task goes here
-# end

data/lib/tasks/rails4.rake

@@ -1,15 +0,0 @@
-if defined?(RSpec)
-  namespace :rails4 do
-    desc "Run all specs that generate fixtures for rspec with rails 4"
-    RSpec::Core::RakeTask.new(:generate_fixtures) do |t|
-      t.rspec_opts = ["--tag fixture4"]
-    end
-
-    desc "Run all specs in spec directory (exluding controller specs)"
-    RSpec::Core::RakeTask.new(:spec) do |task|
-      task.pattern = FileList["spec/**/*_spec.rb"].exclude("spec/controllers/**/*_spec.rb")
-    end
-
-    task test: %w(spec:prepare_db generate_fixtures spec)
-  end
-end

data/lib/tasks/tests.rake

@@ -1,18 +0,0 @@
-if defined?(RSpec)
-  namespace :spec do
-    task prepare_db: %w(db:create db:test:load)
-    task :prepare_fixtures do
-      ENV["NO_COVERAGE"] = "true"
-      Rake::Task["spec:generate_fixtures"].invoke
-      ENV["NO_COVERAGE"] = "false"
-    end
-
-    desc "Prepare for rspec"
-    task prepare: %w(db:environment:set prepare_db prepare_fixtures)
-
-    desc "Run all specs that generate fixtures for rspec"
-    RSpec::Core::RakeTask.new(:generate_fixtures) do |t|
-      t.rspec_opts = ["--tag fixture"]
-    end
-  end
-end