arkaan 0.8.11 → 0.8.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 582ae77affc1c3416bb3407251121f5dc3a5caa8
-  data.tar.gz: 8a88991e5083e8027354e3f3d8d8922bf4cfd712
+  metadata.gz: 274d18d1f23d156f2665a5bd1359fe482a0736cd
+  data.tar.gz: 0db5765f3a5aec00ea6cbcd9e3f23828ee3a8eb9
 SHA512:
-  metadata.gz: f836aaf8df7aa1fafecacb9917fd61355f4929581eadbc318e7c5d1b614978469e47355060ce5932b94ff253399e46cd4ba4d10eefc9b8fd74338f4fc12804a0
-  data.tar.gz: 2ed179e505eb98b8ee3cea01dc251f47d133deb54c4d48377f4976af76c949509953289e0c266d4a55e3fd3f0963c57ae25013bccd9145c03c2a1d2d88f3ef39
+  metadata.gz: 2d8915708a7e1a471ae84c6e8d7201ae742aaa1b524b59d67a7beb9f9b0baa4d4510fc8fbb2d8f4291d9d685c12976138c55c6e1f7be68f97444fd58637018ec
+  data.tar.gz: a435fab17ee5dca22cf9a3de9c80b5c825f9aeda6e989cb060183e31c9c5c884d37844e445fb5726ab102c8dd88f14e2ed5ca72eb7b51cd4aeab2ad3a286ac6d

data/lib/arkaan/account.rb

@@ -58,20 +58,20 @@ module Arkaan
     has_many :created_invitations, class_name: 'Arkaan::Campaigns::Invitation', inverse_of: :creator
 
     validates :username,
-      presence: {message: 'account.username.blank'},
-      length: {minimum: 6, message: 'account.username.short', if: :username?},
-      uniqueness: {message: 'account.username.uniq', if: :username?}
+      presence: {message: 'required'},
+      length: {minimum: 6, message: 'minlength', if: :username?},
+      uniqueness: {message: 'uniq', if: :username?}
 
     validates :email,
-      presence: {message: 'account.email.blank'},
-      format: {with: /\A[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,}\z/, message: 'account.email.format', if: :email?},
-      uniqueness: {message: 'account.email.uniq', if: :email?}
+      presence: {message: 'required'},
+      format: {with: /\A[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,}\z/, message: 'pattern', if: :email?},
+      uniqueness: {message: 'uniq', if: :email?}
 
     validates :password,
-      presence: {message: 'account.password.blank', if: ->{ !persisted? || password_digest_changed? }},
-      confirmation: {message: 'account.password.confirmation', if: :password_digest_changed?}
+      presence: {message: 'required', if: ->{ !persisted? || password_digest_changed? }},
+      confirmation: {message: 'confirmation', if: :password_digest_changed?}
 
     validates :password_confirmation,
-      presence: {message: 'account.password_confirmation.blank', if: :password_digest_changed?}
+      presence: {message: 'required', if: :password_digest_changed?}
   end
 end

data/lib/arkaan/authentication/session.rb

@@ -17,9 +17,9 @@ module Arkaan
       belongs_to :account, class_name: 'Arkaan::Account', inverse_of: :sessions
 
       validates :token,
-        presence: {message: 'session.token.blank'},
-        uniqueness: {message: 'session.token.uniq', if: :token?},
-        length: {minimum: 10, message: 'session.token.short', if: :token?}
+        presence: {message: 'required'},
+        uniqueness: {message: 'uniq', if: :token?},
+        length: {minimum: 10, message: 'minlength', if: :token?}
     end
   end
 end

data/lib/arkaan/campaign.rb

@@ -27,15 +27,15 @@ module Arkaan
     has_many :invitations, class_name: 'Arkaan::Campaigns::Invitation', inverse_of: :campaign
 
     validates :title,
-      presence: {message: 'campaign.title.blank'},
-      length: {minimum: 4, message: 'campaign.title.short', if: :title?}
+      presence: {message: 'required'},
+      length: {minimum: 4, message: 'minlength', if: :title?}
 
     validate :title_unicity
 
     # Adds an error message if the account creating this campaign already has a campaign with the very same name.
     def title_unicity
       if creator? && title? && creator.campaigns.where(title: title, :id.ne => _id).exists?
-        errors.add(:title, 'campaign.title.uniq')
+        errors.add(:title, 'uniq')
       end
     end
   end

data/lib/arkaan/campaigns/tag.rb

@@ -14,8 +14,8 @@ module Arkaan
       field :count, type: Integer, default: 1
 
       validates :content,
-        presence: {message: 'campaign.tag.content.blank'},
-        uniqueness: {message: 'campaign.tag.content.uniq'}
+        presence: {message: 'required'},
+        uniqueness: {message: 'uniq'}
     end
   end
 end

data/lib/arkaan/concerns/diagnosticable.rb

@@ -16,9 +16,9 @@ module Arkaan
           field :diagnostic, type: String, default: '/status'
 
           validates :diagnostic,
-            presence: {message: "#{entity_type}.diagnostic.blank"},
-            length: {minimum: 4, message: "#{entity_type}.diagnostic.short"},
-            format: {with: /\A(\/[a-z]+)+\z/, message: "#{entity_type}.diagnostic.format"}
+            presence: {message: "required"},
+            length: {minimum: 4, message: "minlength"},
+            format: {with: /\A(\/[a-z]+)+\z/, message: "pattern"}
         end
       end
     end

data/lib/arkaan/concerns/sluggable.rb

@@ -16,10 +16,10 @@ module Arkaan
           field :slug, type: String
 
           validates :slug,
-            length: {minimum: 4, message: "#{entity_type}.slug.short"},
-            format: {with: /\A[a-z]+(_[a-z]+)*\z/, message: "#{entity_type}.slug.format"},
-            uniqueness: {message: "#{entity_type}.slug.uniq"},
-            presence: {message: "#{entity_type}.slug.blank"}
+            length: {minimum: 4, message: 'minlength', if: :slug?},
+            format: {with: /\A[a-z]+(_[a-z]+)*\z/, message: 'pattern', if: :slug?},
+            uniqueness: {message: 'uniq', if: :slug?},
+            presence: {message: 'required'}
         end
       end
     end

data/lib/arkaan/monitoring/gateway.rb

@@ -23,16 +23,12 @@ module Arkaan
       make_diagnosticable 'gateway'
 
       validates :url,
-        presence: {message: 'gateway.url.blank'},
-        format: {
-          with: /\A(https?:\/\/)((localhost:[0-9]+)|(([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*))\/?\z/,
-          message: 'gateway.url.format',
-          if: :url?
-        }
+        presence: {message: 'required'},
+        format: {with: /\A(https?:\/\/)((localhost:[0-9]+)|(([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*))\/?\z/, message: 'pattern', if: :url?}
 
       validates :token,
-        presence: {message: 'gateway.token.blank'},
-        uniqueness: {message: 'gateway.token.uniq'}
+        presence: {message: 'required'},
+        uniqueness: {message: 'uniq'}
     end
   end
 end

data/lib/arkaan/monitoring/instance.rb

@@ -21,8 +21,8 @@ module Arkaan
       embedded_in :service, class_name: 'Arkaan::Monitoring::Service', inverse_of: :instances
 
       validates :url,
-        presence: {message: 'instance.url.blank'},
-        format: {with: /\A(https?:\/\/)([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?\z/, message: 'instance.url.format', if: :url?}
+        presence: {message: 'required'},
+        format: {with: /\A(https?:\/\/)([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?\z/, message: 'pattern', if: :url?}
     end
   end
 end

data/lib/arkaan/monitoring/route.rb

@@ -27,10 +27,10 @@ module Arkaan
       has_and_belongs_to_many :groups, class_name: 'Arkaan::Permissions::Group', inverse_of: :groups
 
       validates :path,
-        format: {with: /\A(\/|((\/:?[a-zA-Z0-9]+)+))\z/, message: 'route.path.format', if: :path?}
+        format: {with: /\A(\/|((\/:?[a-zA-Z0-9]+)+))\z/, message: 'pattern', if: :path?}
 
       validates :verb,
-        inclusion: {message: 'route.verb.unknown', in: ['get', 'post', 'put', 'delete', 'patch', 'option']}
+        inclusion: {message: 'unknown', in: ['get', 'post', 'put', 'delete', 'patch', 'option']}
     end
   end
 end

data/lib/arkaan/monitoring/service.rb

@@ -28,9 +28,9 @@ module Arkaan
       #   @return [Array<Arkaan::Monitoring::Route>] the routes associated to this service, accessible from the gateway.
       has_many :routes, class_name: 'Arkaan::Monitoring::Route', inverse_of: :service
 
-      validates :key, uniqueness: {message: 'service.key.uniq'}
+      validates :key, uniqueness: {message: 'uniq'}
 
-      validates :path, format: {with: /\A(\/:?[a-z]+)+\z/, message: 'service.path.format'}
+      validates :path, format: {with: /\A(\/:?[a-z]+)+\z/, message: 'pattern'}
     end
   end
 end

data/lib/arkaan/oauth/access_token.rb

@@ -17,7 +17,9 @@ module Arkaan
       #   @return [Arkaan::OAuth::Authorization] the authorization code that issued this token to the application for this user.
       belongs_to :authorization, class_name: 'Arkaan::OAuth::Authorization', inverse_of: :access_token
 
-      validates :value, presence: true, uniqueness: true
+      validates :value, 
+        presence: {message: 'required'},
+        uniqueness: {message: 'uniq'}
     end
   end
 end

data/lib/arkaan/oauth/application.rb

@@ -23,9 +23,14 @@ module Arkaan
       #   @return [Array<Arkaan::OAuth::Authorization>] the authorizations linked to the accounts this application can get the data from.
       has_many :authorizations, class_name: 'Arkaan::OAuth::Authorization', inverse_of: :application
 
-      validates :name, presence: true, length: {minimum: 6}, uniqueness: true
+      validates :name,
+        presence: {message: 'required'},
+        length: {minimum: 6, message: 'minlength'},
+        uniqueness: {message: 'uniq'}
 
-      validates :key, presence: true, uniqueness: true
+      validates :key,
+        presence: {message: 'required'},
+        uniqueness: {message: 'uniq'}
     end
   end
 end

data/lib/arkaan/oauth/authorization.rb

@@ -20,7 +20,9 @@ module Arkaan
       #   @return [Arkaan::OAuth::AccessToken] the access token used further in the application process to access private data of the account.
       has_one :token, class_name: 'Arkaan::OAuth::AccessToken', inverse_of: :authorization
 
-      validates :code, presence: true, uniqueness: true
+      validates :code,
+        presence: {message: 'required'},
+        uniqueness: {message: 'uniq'}
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arkaan
 version: !ruby/object:Gem::Version
-  version: 0.8.11
+  version: 0.8.12
 platform: ruby
 authors:
 - Vincent Courtois