scriba 0.0.1.alpha4 → 0.0.1.alpha5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5518ab48176f05d83deaece3e6a44c3bd77ed7b
-  data.tar.gz: efa6a5f8a22501d88c515be06d293d8d68653730
+  metadata.gz: aa1ceda1c68fb56b7556fd5881f56c40930bf309
+  data.tar.gz: 9e1e4f6c4a1d8717140e85b20ead463f753adf2b
 SHA512:
-  metadata.gz: 2df4486faea12e1e5f630f62cbc50c274aa1dc36333ea3e42dcb2e956305c983c082bd451e5cbe07c215703a929e1cc4077bfa7227c9a0e07d381581baf2ae6a
-  data.tar.gz: 9c554ddfd541931bd8fbf836265378ddee44c61460de96d1e5c8f1f8ef255d53901678465d0407886f9ba4c21c9b82de26ba1b87dad867d5ddb05a551270b263
+  metadata.gz: e98f80125086b86ae8f2b5e7462f08c9ec5edec6448f497345a03b49496dcd889b8298eb65ee0a802564e4cd24b39781fa43746973b64b7fe63e798fdcbebee9
+  data.tar.gz: 2e946bbdd2b4eb65c68b31273b527a6944861387b2097befc0dae1b21d2852ec9a8830ff6182f4d56c6a4c5775fd9187556f41030bd7a693b23624b84644f5fb

data/lib/scriba/assertions.rb

@@ -37,16 +37,20 @@ module Scriba::Assertions
     assert(att, error) { |v| format === v.to_s }
   end
 
-  def assert_length(att, value, error = :wrong_length)
-    assert(att, error, value: value) { |v| v.to_s.length == value }
+  def assert_length(att, length, error = :wrong_length)
+    assert(att, error, length: length) { |v| v.to_s.length == length }
   end
 
-  def assert_maximum_length(att, value, error = :too_long)
-    assert(att, error, value: value) { |v| v.to_s.length <= value }
+  def assert_maximum_length(att, length, error = :too_long)
+    assert(att, error, length: length) { |v| v.to_s.length <= length }
   end
 
-  def assert_minimum_length(att, value, error = :too_short)
-    assert(att, error, value: value) { |v| v.to_s.length >= value }
+  def assert_minimum_length(att, length, error = :too_short)
+    assert(att, error, length: length) { |v| v.to_s.length >= length }
+  end
+
+  def assert_member(att, set, error = :not_member)
+    assert(att, error) { |v| set.include?(v) }
   end
 
   BLANK = /\A[[:space:]]*\z/
@@ -71,7 +75,7 @@ module Scriba::Assertions
     if value
       return true
     else
-      errors[att] << generate_message(error, options)
+      errors[att] << generate_message(error, options.merge(value: value))
       return false
     end
   end

data/lib/scriba/messages.rb

@@ -2,13 +2,14 @@ module Scriba::Messages
   DEFAULTS = {
     not_email: "must be a valid email",
     not_equal: "doesn't match",
+    not_member: "is not included in the list",
     not_present: "is required",
     not_unique: "is already taken",
     not_url: "is an invalid URL",
     not_valid: "is invalid",
-    too_long: "must be maximum %{value} characters",
-    too_short: "must be minimum %{value} characters",
-    wrong_length: "must be %{value} characters"
+    too_long: "must be maximum %{length} characters",
+    too_short: "must be minimum %{length} characters",
+    wrong_length: "must be %{length} characters"
   }
 
   private

data/scriba.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name        = "scriba"
-  s.version     = "0.0.1.alpha4"
+  s.version     = "0.0.1.alpha5"
   s.summary     = "Validation frontend for models."
   s.description = s.summary + " Inspired by the scrivener gem."
   s.authors     = ["Francesco Rodríguez"]
-  s.email       = ["frodsan@me.com"]
+  s.email       = ["frodsan@protonmail.ch"]
   s.homepage    = "https://github.com/harmoni/scriba"
   s.license     = "MIT"
 

data/test/assertions.rb

@@ -160,3 +160,23 @@ test "url assertion" do
   assert filter.valid?
   assert filter.errors.empty?
 end
+
+test "member assertion" do
+  class A < Scriba
+    attribute :status
+
+    def validate
+      assert_member :status, %w(pending active)
+    end
+  end
+
+  filter = A.new(status: "undefined")
+
+  assert !filter.valid?
+  assert filter.errors.key?(:status)
+
+  filter.status = "active"
+
+  assert filter.valid?
+  assert filter.errors.empty?
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scriba
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha4
+  version: 0.0.1.alpha5
 platform: ruby
 authors:
 - Francesco Rodríguez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-12 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cutest
@@ -26,7 +26,7 @@ dependencies:
         version: '1.2'
 description: Validation frontend for models. Inspired by the scrivener gem.
 email:
-- frodsan@me.com
+- frodsan@protonmail.ch
 executables: []
 extensions: []
 extra_rdoc_files: []