scriba 0.0.1.alpha3 → 0.0.1.alpha4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66228de723806bb775ac7fbca0cddf365587d0c4
-  data.tar.gz: 9259d1cf49d3fef29edc51161318d4c8bc2e8d28
+  metadata.gz: c5518ab48176f05d83deaece3e6a44c3bd77ed7b
+  data.tar.gz: efa6a5f8a22501d88c515be06d293d8d68653730
 SHA512:
-  metadata.gz: 7135a3ab4453b1132e7f9dd3e4cd29eb6dfd8df9fc57f9698cc13cc84cc06ea7f4b5a528b7ac75cfd9dfecf82d597e0b89091196e44662537ac9959a1477778c
-  data.tar.gz: 79e7a80d8b594c2eeb090e469f53c7e4f5e5bfccd741562056bd2dfcb17e658c0e548b0c1ba820533acc7cb23049bc89c1435544e438ad2431d20f9a0c7c3f0f
+  metadata.gz: 2df4486faea12e1e5f630f62cbc50c274aa1dc36333ea3e42dcb2e956305c983c082bd451e5cbe07c215703a929e1cc4077bfa7227c9a0e07d381581baf2ae6a
+  data.tar.gz: 9c554ddfd541931bd8fbf836265378ddee44c61460de96d1e5c8f1f8ef255d53901678465d0407886f9ba4c21c9b82de26ba1b87dad867d5ddb05a551270b263

data/lib/scriba/assertions.rb

@@ -25,51 +25,54 @@ module Scriba::Assertions
           ((((([a-z0-9]{1}[a-z0-9\-]{0,62}[a-z0-9]{1})|[a-z])\.)+
           [a-z]{2,12})|(\d{1,3}\.){3}\d{1,3}(\:\d{1,5})?)\z/ix
 
-  def assert_email(att, message = :not_email)
-    assert_format(att, EMAIL, message: message)
+  def assert_email(att, error = :not_email)
+    assert_format(att, EMAIL, error)
   end
 
-  def assert_equal(att, value, message = :not_equal)
-    assert(value === send(att), att, message: message)
+  def assert_equal(att, value, error = :not_equal)
+    assert(att, error) { |v| value === v }
   end
 
-  def assert_format(att, format, message = :not_valid)
-    assert(format === send(att).to_s, att, message: message)
+  def assert_format(att, format, error = :not_valid)
+    assert(att, error) { |v| format === v.to_s }
   end
 
-  def assert_length(att, length, message = :wrong_length)
-    assert(send(att).to_s.length == length, att, message: message, length: length)
+  def assert_length(att, value, error = :wrong_length)
+    assert(att, error, value: value) { |v| v.to_s.length == value }
   end
 
-  def assert_maximum_length(att, length, message = :too_long)
-    assert(send(att).to_s.length <= length, att, message: message, length: length)
+  def assert_maximum_length(att, value, error = :too_long)
+    assert(att, error, value: value) { |v| v.to_s.length <= value }
   end
 
-  def assert_minimum_length(att, length, message = :too_short)
-    assert(send(att).to_s.length >= length, att, message: message, length: length)
+  def assert_minimum_length(att, value, error = :too_short)
+    assert(att, error, value: value) { |v| v.to_s.length >= value }
   end
 
   BLANK = /\A[[:space:]]*\z/
 
-  def assert_present(att, message = :not_present)
-    assert(!(BLANK === send(att).to_s), att, message: message)
+  def assert_present(att, error = :not_present)
+    assert(att, error) { |v| !(BLANK === v.to_s) }
   end
 
   URL = /\A(http|https):\/\/([a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,12}|(2
           5[0-5]|2[0-4]\d|[0-1]?\d?\d)(\.(25[0-5]|2[0-4]\d|[0-1]?\d?\d)){3}
           |localhost)(:[0-9]{1,5})?(\/.*)?\z/ix
 
-  def assert_url(att, message = :not_url)
-    assert_format(att, URL, message: message)
+  def assert_url(att, error = :not_url)
+    assert_format(att, URL, error)
   end
 
   private
 
-  def assert(value, att, options = {})
-    value or add_error(att, options) && false
-  end
+  def assert(att, error, options = {})
+    value = yield(send(att))
 
-  def add_error(att, options)
-    errors[att] << generate_message(options)
+    if value
+      return true
+    else
+      errors[att] << generate_message(error, options)
+      return false
+    end
   end
 end

data/lib/scriba/messages.rb

@@ -6,20 +6,22 @@ module Scriba::Messages
     not_unique: "is already taken",
     not_url: "is an invalid URL",
     not_valid: "is invalid",
-    too_long: "must be maximum %{length} characters",
-    too_short: "must be minimum %{length} characters",
-    wrong_length: "must be %{length} characters"
+    too_long: "must be maximum %{value} characters",
+    too_short: "must be minimum %{value} characters",
+    wrong_length: "must be %{value} characters"
   }
 
   private
 
-  def generate_message(options)
-    message = options.delete(:message) || :not_valid
-
+  def generate_message(message, options = {})
     if message.is_a?(Symbol)
-      return sprintf(DEFAULTS[message], options)
+      return error_message(message, options)
     else
       return message
     end
   end
+
+  def error_message(message, options)
+    return sprintf(DEFAULTS[message], options)
+  end
 end

data/lib/scriba/partial_update.rb

@@ -1,9 +1,17 @@
 module Scriba::PartialUpdate
-  def __attributes
-    @_attributes ||= super & updates.keys.map(&:to_sym)
+  def initialize(updates = {})
+    super(@updates = updates)
   end
 
-  def assert(value, att, options = {})
-    super(value, att, options) if __attributes.include?(att)
+  def assert(att, error, options = {})
+    return __partials.include?(att) ? super(att, error, options) : false
+  end
+
+  def attributes
+    return slice(*__partials)
+  end
+
+  def __partials
+    @_partials ||= self.class.attributes & @updates.keys.map(&:to_sym)
   end
 end

data/lib/scriba.rb

@@ -1,7 +1,6 @@
 class Scriba
   require_relative "scriba/assertions"
   require_relative "scriba/messages"
-  require_relative "scriba/partial_update"
 
   include Scriba::Assertions
   include Scriba::Messages
@@ -19,13 +18,7 @@ class Scriba
     @attributes ||= []
   end
 
-  attr :updates
-
   def initialize(updates = {})
-    update(@updates = updates)
-  end
-
-  def update(updates)
     updates.each do |att, value|
       accessor = "#{att}="
       send(accessor, value) if respond_to?(accessor)
@@ -33,11 +26,7 @@ class Scriba
   end
 
   def attributes
-    return slice(*__attributes)
-  end
-
-  def __attributes
-    return self.class.attributes
+    return slice(*self.class.attributes)
   end
 
   def slice(*atts)

data/scriba.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "scriba"
-  s.version     = "0.0.1.alpha3"
+  s.version     = "0.0.1.alpha4"
   s.summary     = "Validation frontend for models."
   s.description = s.summary + " Inspired by the scrivener gem."
   s.authors     = ["Francesco Rodríguez"]

data/test/partial.rb

@@ -1,4 +1,5 @@
 require_relative "helper"
+require_relative "../lib/scriba/partial_update"
 
 class Signup < Scriba
   include Scriba::PartialUpdate

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scriba
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha3
+  version: 0.0.1.alpha4
 platform: ruby
 authors:
 - Francesco Rodríguez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-25 00:00:00.000000000 Z
+date: 2015-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cutest