nocebo/diaspora_federation
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #97 from SuperTux88/fix-optional-aware-validator

Browse source 
Fix optional aware validator
This commit is contained in:
Benjamin Neff 2018-02-17 17:33:45 +01:00
commit 9c8d814605
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
10 changed files with 30 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/diaspora_federation/discovery/h_card.rb
View file

@ -48,7 +48,7 @@ module DiasporaFederation
# @!attribute [r] nickname
# The first part of the diaspora* ID
# @return [String] nickname
property :nickname, :string, default: nil
property :nickname, :string, optional: true
# @!attribute [r] full_name
# @return [String] display name of the user
@ -60,7 +60,7 @@ module DiasporaFederation
# installations).
#
# @return [String] link to the pod
property :url, :string, default: nil
property :url, :string, optional: true
# @!attribute [r] public_key
# When a user is created on the pod, the pod MUST generate a pgp keypair

8
lib/diaspora_federation/discovery/web_finger.rb
View file

@ -44,7 +44,7 @@ module DiasporaFederation
# @!attribute [r] profile_url
# @return [String] link to the users profile
property :profile_url, :string, default: nil
property :profile_url, :string, optional: true
# @!attribute [r] atom_url
# This atom feed is an Activity Stream of the user's public posts. diaspora*
@ -55,18 +55,18 @@ module DiasporaFederation
# Note that this feed MAY also be made available through the PubSubHubbub
# mechanism by supplying a <link rel="hub"> in the atom feed itself.
# @return [String] atom feed url
property :atom_url, :string, default: nil
property :atom_url, :string, optional: true
# @!attribute [r] salmon_url
# @note could be nil
# @return [String] salmon endpoint url
# @see https://cdn.rawgit.com/salmon-protocol/salmon-protocol/master/draft-panzer-salmon-00.html#SMLR
# Panzer draft for Salmon, paragraph 3.3
property :salmon_url, :string, default: nil
property :salmon_url, :string, optional: true
# @!attribute [r] subscribe_url
# This url is used to find another user on the home-pod of the user in the webfinger.
property :subscribe_url, :string, default: nil
property :subscribe_url, :string, optional: true
# +hcard_url+ link relation
REL_HCARD = "http://microformats.org/profile/hcard".freeze

2
lib/diaspora_federation/entities/account_migration.rb
View file

@ -43,7 +43,7 @@ module DiasporaFederation
# Returns diaspora* ID of the new person identity.
# @return [String] diaspora* ID of the new person identity
def new_identity
profile.author
profile.author if profile
end
# @return [String] string representation of this object

2
lib/diaspora_federation/test/factories.rb
View file

@ -41,7 +41,7 @@ module DiasporaFederation
Fabricator(:account_migration_entity, class_name: DiasporaFederation::Entities::AccountMigration) do
author { Fabricate.sequence(:diaspora_id) }
profile { Fabricate(:profile_entity) }
profile {|attrs| Fabricate(:profile_entity, author: attrs[:author]) }
old_identity { Fabricate.sequence(:diaspora_id) }
end

2
lib/diaspora_federation/validators/conversation_validator.rb
View file

@ -9,7 +9,7 @@ module DiasporaFederation
rule :subject, [:not_empty, length: {maximum: 255}]
rule :participants, diaspora_id_list: {minimum: 2}
rule :participants, [:not_empty, diaspora_id_list: {minimum: 2}]
rule :messages, :not_nil
end
end

2
lib/diaspora_federation/validators/event_participation_validator.rb
View file

@ -6,7 +6,7 @@ module DiasporaFederation
include RelayableValidator
rule :status, regular_expression: {regex: /\A(accepted|declined|tentative)\z/}
rule :status, [:not_empty, regular_expression: {regex: /\A(accepted|declined|tentative)\z/}]
end
end
end

6
lib/diaspora_federation/validators/optional_aware_validator.rb
View file

@ -13,10 +13,8 @@ module DiasporaFederation
private
def optional_props
entity_name = self.class.name.split("::").last.sub("Validator", "")
return [] unless Entities.const_defined?(entity_name)
Entities.const_get(entity_name).optional_props
return [] unless @obj.class.respond_to?(:optional_props)
@obj.class.optional_props
end
end
end

27
spec/lib/diaspora_federation/validators/optional_aware_validator_spec.rb
View file

@ -1,47 +1,46 @@
module DiasporaFederation
describe Validators::OptionalAwareValidator do
let(:entity_data) {
{test1: "abc", test2: true, test7: "abc", multi: []}
}
def entity_stub(additional_data={})
allow_any_instance_of(Entities::TestComplexEntity).to receive(:freeze)
allow_any_instance_of(Entities::TestComplexEntity).to receive(:validate)
entity_data = {test1: "abc", test2: true, test3: nil, test4: nil, test5: nil, test6: nil, test7: "abc", multi: []}
Entities::TestComplexEntity.new(entity_data.merge(additional_data))
end
it "validates a valid object" do
validator = Validators::TestComplexEntityValidator.new(OpenStruct.new(entity_data))
validator = Validators::TestComplexEntityValidator.new(entity_stub)
expect(validator).to be_valid
expect(validator.errors).to be_empty
end
it "fails when a mandatory property is invalid" do
["ab", nil].each do |val|
entity = OpenStruct.new(entity_data.merge(test1: val))
validator = Validators::TestComplexEntityValidator.new(entity)
validator = Validators::TestComplexEntityValidator.new(entity_stub(test1: val))
expect(validator).not_to be_valid
expect(validator.errors).to include(:test1)
end
end
it "fails when an optional property is invalid" do
entity = OpenStruct.new(entity_data.merge(test7: "ab"))
validator = Validators::TestComplexEntityValidator.new(entity)
validator = Validators::TestComplexEntityValidator.new(entity_stub(test7: "ab"))
expect(validator).not_to be_valid
expect(validator.errors).to include(:test7)
end
it "allows an optional property to be nil" do
entity = OpenStruct.new(entity_data.merge(test7: nil))
validator = Validators::TestComplexEntityValidator.new(entity)
validator = Validators::TestComplexEntityValidator.new(entity_stub(test7: nil))
expect(validator).to be_valid
expect(validator.errors).to be_empty
end
it "doesn't ignore 'not_nil' rules for an optional property" do
entity = OpenStruct.new(entity_data.merge(multi: nil))
validator = Validators::TestComplexEntityValidator.new(entity)
validator = Validators::TestComplexEntityValidator.new(entity_stub(multi: nil))
expect(validator).not_to be_valid
expect(validator.errors).to include(:multi)
end
it "doesn't fail when there is no entity for this validator" do
entity = OpenStruct.new(entity_data.merge(test1: nil))
it "doesn't fail when the entity doesn't have optional props" do
entity = OpenStruct.new(test1: nil)
validator = Validators::TestUnknownEntityValidator.new(entity)
expect(validator).not_to be_valid
expect(validator.errors).to include(:test1)

2
spec/lib/diaspora_federation/validators/web_finger_validator_spec.rb
View file

@ -27,7 +27,7 @@ module DiasporaFederation
describe "##{prop}" do
it_behaves_like "a property with a value validation/restriction" do
let(:property) { prop }
let(:wrong_values) { ["", "https://asdf$%.com", "example.com"] }
let(:wrong_values) { %w[https://asdf$.com example.com] }
let(:correct_values) { [nil] }
end

6
spec/support/shared_validator_specs.rb
View file

@ -1,6 +1,8 @@
def entity_stub(entity, data={})
OpenStruct.new(Fabricate.schematic(entity).options[:class_name].default_values
.merge(Fabricate.attributes_for(entity)).merge(data))
entity_class = Fabricate.schematic(entity).options[:class_name]
allow_any_instance_of(entity_class).to receive(:freeze)
allow_any_instance_of(entity_class).to receive(:validate)
entity_class.new(Fabricate.attributes_for(entity).merge(data))
end
ALPHANUMERIC_RANGE = [*"0".."9", *"A".."Z", *"a".."z"].freeze