redis_assist 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bcf176574c0e2ac94dcb13dbe7eeeb0f30f3784
-  data.tar.gz: 4829e9b18420dad2a506703bff439fb4c28b7484
+  metadata.gz: aa85c951b1af2427edd4810a0f66a741d105d09e
+  data.tar.gz: 7ed0c449fc3dbfe11e3a033ad4ca78eb03857b0f
 SHA512:
-  metadata.gz: d0b80cd10a09fdc88d3e2e0e1566134e60cc5c7a0a62b1456ece2dbe6427ad6feb5d458554a963d0ed952fe6fc389ef5313613b74dcb8065bd3429396c198fd4
-  data.tar.gz: aa51bd8a86fb59e38d92439435a55cffbe42ed032a49094a3657a448bc0390756cbe74f5dc89b8763bf190b101618873395aaeaf816987dd411b077512dbcae7
+  metadata.gz: 3525dbfaefc4d333297400e9852cab71a959a499cf6e58f5d1d8ae8efab896758fb36effe1aebbb8d1e88a782386119bc732ce8961ef23dd52129504e863aa0c
+  data.tar.gz: d3839bb4921a10d891847cd76789f96e3d40a6df49938c6aa70b3747caf709897f1414db45e13f35d31e2e5ecf3cde1f13f2658fddeb4fb50916238f02839cfb

data/lib/redis_assist/base.rb

@@ -2,6 +2,7 @@ module RedisAssist
   class Base
 
     include Callbacks
+    include Validations
   
     before_create {|instance| instance.created_at = Time.now.to_f if instance.respond_to?(:created_at) }
     before_update {|instance| instance.updated_at = Time.now.to_f if instance.respond_to?(:updated_at) }
@@ -52,6 +53,8 @@ module RedisAssist
         redis.exists(key_for(id, :attributes))      
       end
 
+      # TODO: needs a refactor. Should this be an interface for skipping validations?
+      # Should we optimize and skip the find? Support an array of ids?
       def update(id, params={})
         record = find(id)
         return false unless record
@@ -210,13 +213,12 @@ module RedisAssist
     end
   
     attr_accessor :attributes
-    attr_reader :id, :errors
+    attr_reader :id
   
     def initialize(attrs={})
       @attributes = {}
       self.lists  = {}
       self.hashes = {}
-      self.errors = []
   
       if attrs[:id]
         self.id = attrs[:id]
@@ -242,7 +244,7 @@ module RedisAssist
     end
   
     def save
-      return false  unless valid? 
+      return false unless valid? 
   
       invoke_callback(:before_update) unless new_record?
       invoke_callback(:before_create) if new_record?
@@ -283,12 +285,9 @@ module RedisAssist
   
     def valid?
       invoke_callback(:before_validation)
-      validate
-      errors.empty?
+      super
     end
   
-    def validate; end
-  
     # TODO: should this be a redis-assist feature?
     def deleted?
       return false unless respond_to?(:deleted_at)
@@ -319,16 +318,13 @@ module RedisAssist
     def redis
       self.class.redis
     end
-  
-    def add_error(field, message)
-      errors << { field => message }
-    end
+ 
   
 
     protected 
   
   
-    attr_writer   :id, :errors
+    attr_writer   :id
     attr_accessor :lists, :hashes, :new_record
  
 

data/lib/redis_assist/validations.rb

@@ -0,0 +1,53 @@
+module RedisAssist
+  module Validations
+    def self.included(base)
+      base.extend ClassMethods
+    end
+    
+    def validate
+      errors.clear
+      self.class.validations.each {|validation| validation.call(self) }
+    end
+    
+    def valid?
+      validate
+      errors.empty?
+    end
+    
+    def errors
+      @errors ||= []
+    end 
+
+    def add_error(attribute, message)
+      self.errors << { attribute => message }
+    end
+    
+    module ClassMethods
+      def validations
+        @validations ||= []
+      end
+      
+      def validates_presence_of(*attributes)
+        validates_attributes(*attributes) do |instance, attribute, value, options|
+          instance.add_error(attribute, "cant't be blank") if value.nil? || value.empty?
+        end
+      end
+      
+      def validates_format_of(*attributes)
+        validates_attributes(*attributes) do |instance, attribute, value, options|
+          instance.add_error(attribute, "is invalid") unless value =~ options[:with]
+        end
+      end
+      
+      def validates_attributes(*attributes, &proc)
+        options = attributes.last.is_a?(::Hash) ? attributes.pop : {}
+        
+        validations << Proc.new do |instance|
+          attributes.each do |attribute|
+            proc.call(instance, attribute, instance.__send__(attribute), options)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/redis_assist/version.rb

@@ -1,3 +1,3 @@
 module RedisAssist
-  VERSION = '0.2.0' unless defined?(::RedisAssist::VERSION)
+  VERSION = '0.3.0' unless defined?(::RedisAssist::VERSION)
 end

data/lib/redis_assist.rb

@@ -7,6 +7,7 @@ require 'json'
 require 'redis_assist/config'
 require 'redis_assist/transform'
 require 'redis_assist/callbacks'
+require 'redis_assist/validations'
 require 'redis_assist/base'
 
 # == Setup & Configuration
@@ -26,5 +27,4 @@ module RedisAssist
 end
 
 # require all transforms
-Dir["#{File.dirname(__FILE__)}/redis_assist/transforms/*.rb"].each {|file| require file }
-
+Dir["#{File.dirname(__FILE__)}/redis_assist/transforms/*.rb"].each{|file| require file }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis_assist
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Tyler Love
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-19 00:00:00.000000000 Z
+date: 2013-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -138,6 +138,7 @@ files:
 - lib/redis_assist/transforms/integer_transform.rb
 - lib/redis_assist/transforms/json_transform.rb
 - lib/redis_assist/transforms/time_transform.rb
+- lib/redis_assist/validations.rb
 - lib/redis_assist/version.rb
 - lib/redis_assist.rb
 homepage: http://github.com/endlessinc/redis-assist