diaspora_federation 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6f8165c74d07b264d4640c1c7cb2178683ca2e4
-  data.tar.gz: 816f20ba2c9153d90e842eafad3bb142d92e08cd
+  metadata.gz: e6fb6d319c4da3c247e0215f53e4cbc01be44bab
+  data.tar.gz: c1b7abc5e4ee6c7ab0304f0e31cab3c3b1c7e498
 SHA512:
-  metadata.gz: 00875c9f376ab19ff864b186ef930328616b488979cbbc5347392e0fc6560aba9910353606a91ae17a83daaaa870fd977e0ac4fb087604b90f52801f72e649c4
-  data.tar.gz: 244808bf9d7432b323559e65efe2454ff90c31cbb08ea18ad61e63b6908d70e0c59140836f850eb70e8cee2e24586a4c56745f06b47034c2c7281fc72d2868c4
+  metadata.gz: e9307f19b1d29a5428115101edf46849c3f0a992beb2ca294cf216c07018414cb1e27e300ea7505a37c777378188019d1a5d6151f699d78a2c9c2be47f5da913
+  data.tar.gz: 5e1efb1c1551e1b1716455337044507ad77223368e6b0e16381a1a6f421acec0a4c9ddf50e739f205d9f207c7acc3afb7d1bce2617633428da16c3b64d9c6072

data/lib/diaspora_federation/validators.rb

@@ -1,5 +1,6 @@
 require "validation"
 require "validation/rule/regular_expression"
+require "validation/rule/length"
 require "validation/rule/not_empty"
 require "validation/rule/uri"
 
@@ -18,7 +19,6 @@ require "diaspora_federation/validators/rules/birthday"
 require "diaspora_federation/validators/rules/boolean"
 require "diaspora_federation/validators/rules/diaspora_id"
 require "diaspora_federation/validators/rules/guid"
-require "diaspora_federation/validators/rules/nilable_uri"
 require "diaspora_federation/validators/rules/not_nil"
 require "diaspora_federation/validators/rules/public_key"
 require "diaspora_federation/validators/rules/tag_count"

data/lib/diaspora_federation/validators/h_card_validator.rb

@@ -18,9 +18,9 @@ module DiasporaFederation
       rule :last_name, regular_expression: {regex: /\A[^;]{,32}\z/}
 
       # this urls can be relative
-      rule :photo_large_url, [:not_nil, nilableURI: [:path]]
-      rule :photo_medium_url, [:not_nil, nilableURI: [:path]]
-      rule :photo_small_url, [:not_nil, nilableURI: [:path]]
+      rule :photo_large_url, [:not_nil, URI: [:path]]
+      rule :photo_medium_url, [:not_nil, URI: [:path]]
+      rule :photo_small_url, [:not_nil, URI: [:path]]
 
       # rule :exported_key, :public_key
 

data/lib/diaspora_federation/validators/person_validator.rb

@@ -8,7 +8,7 @@ module DiasporaFederation
 
       rule :diaspora_id, %i(not_empty diaspora_id)
 
-      rule :url, %i(not_nil nilableURI)
+      rule :url, %i(not_nil URI)
 
       rule :profile, :not_nil
 

data/lib/diaspora_federation/validators/profile_validator.rb

@@ -12,16 +12,15 @@ module DiasporaFederation
       rule :last_name, regular_expression: {regex: /\A[^;]{,32}\z/}
 
       # this urls can be relative
-      rule :image_url, nilableURI: [:path]
-      rule :image_url_medium, nilableURI: [:path]
-      rule :image_url_small, nilableURI: [:path]
+      rule :image_url, URI: [:path]
+      rule :image_url_medium, URI: [:path]
+      rule :image_url_small, URI: [:path]
 
       rule :birthday, :birthday
 
-      # TODO: replace regex with "length: {maximum: xxx}" but this rule doesn't allow nil now.
-      rule :gender, regular_expression: {regex: /\A.{,255}\z/}
-      rule :bio, regular_expression: {regex: /\A.{,65535}\z/}
-      rule :location, regular_expression: {regex: /\A.{,255}\z/}
+      rule :gender, length: {maximum: 255}
+      rule :bio, length: {maximum: 65_535}
+      rule :location, length: {maximum: 255}
 
       rule :searchable, :boolean
 

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, nilableURI: %i(host path)]
-      rule :hcard_url, [:not_nil, nilableURI: %i(host path)]
-      rule :seed_url, %i(not_nil nilableURI)
-      rule :profile_url, [:not_nil, nilableURI: %i(host path)]
-      rule :atom_url, [:not_nil, nilableURI: %i(host path)]
-      rule :salmon_url, [:not_nil, nilableURI: %i(host path)]
+      rule :alias_url, [:not_nil, 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)]
     end
   end
 end

data/lib/diaspora_federation/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diaspora_federation
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Benjamin Neff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-09 00:00:00.000000000 Z
+date: 2015-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 1.0.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*
@@ -121,7 +121,6 @@ files:
 - lib/diaspora_federation/validators/rules/boolean.rb
 - lib/diaspora_federation/validators/rules/diaspora_id.rb
 - lib/diaspora_federation/validators/rules/guid.rb
-- lib/diaspora_federation/validators/rules/nilable_uri.rb
 - lib/diaspora_federation/validators/rules/not_nil.rb
 - lib/diaspora_federation/validators/rules/public_key.rb
 - lib/diaspora_federation/validators/rules/tag_count.rb

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

@@ -1,19 +0,0 @@
-module Validation
-  module Rule
-    # URI validation rule
-
-    # It allows +nil+, so maybe add an additional {Rule::NotNil} rule.
-    class NilableURI < Validation::Rule::URI
-      # The error key for this rule
-      # @return [Symbol] error key
-      def error_key
-        :nilableURI
-      end
-
-      # Determines if value is a valid URI
-      def valid_value?(uri_string)
-        uri_string.nil? || super
-      end
-    end
-  end
-end