soft_validate 0.0.1 → 0.0.2

data/lib/soft_validate.rb

@@ -1,70 +1,36 @@
 require 'active_record'
-require 'pry'
 
 module SoftValidate
-
-  def self.included(base)
-    base.send :extend, ClassMethods
-  end
+  extend ActiveSupport::Concern
 
   module ClassMethods
-    # any method placed here will apply to classes, like Hickwall
-
     def soft_validates_presence_of(attr)
       cattr_accessor :soft_attributes
       self.soft_attributes ||= Array.new
       self.soft_attributes << attr
-      send :include, InstanceMethods
     end
 
-    
-
   end
 
-  module InstanceMethods
-    # any method placed here will apply to instaces, like @hickwall
-    
-    def progress_complete_count
-      self.soft_attributes.length
-    end
-    
-    def soft_valid?
-
-      self.soft_attributes.each do |a|
-        return false if self.attributes[a.to_s].nil?
-      end
-
-      true
-    end
-
-    def soft_errors
-      errors = {}
-      self.soft_attributes.each do |a|
-        if self.attributes[a.to_s].nil?
-          errors[a] = "shouldn't be blank"
-        end
-      end
-
-      errors
-    end
-
-    def progress_count
-      count = 0
+  def progress_complete_count
+    self.soft_attributes.length
+  end
 
-      self.soft_attributes.each do |a|
-        if !self.attributes[a.to_s].nil?
-          count += 1
-        end
-      end
+  def soft_valid?
+    self.soft_attributes.all? { |a| !self.attributes[a.to_s].nil? }
+  end
 
-      count
-    end
+  def soft_errors
+    Hash[ self.soft_attributes.map { |a| [a, "shouldn't be blank"] if self.attributes[a.to_s].nil? } ]
+  end
 
-    def progress_percent
-      self.progress_count.to_f / self.progress_complete_count.to_f
-    end
+  def progress_count
+    self.soft_attributes.count { |a| !self.attributes[a.to_s].nil? }
   end
 
+  def progress_percent
+    self.progress_count.to_f / self.progress_complete_count.to_f
+  end
 end
 
 ActiveRecord::Base.send :include, SoftValidate

data/lib/soft_validate/version.rb

@@ -1,3 +1,3 @@
 module SoftValidate
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/test/debug.log

@@ -23,3 +23,19 @@
    (0.1ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
    (0.1ms)  SELECT version FROM "schema_migrations"
    (0.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('0')
+   (1.2ms)  select sqlite_version(*)
+   (0.4ms)  CREATE TABLE "dumb_users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "email" varchar(255), "first_name" varchar(255), "last_name" varchar(255)) 
+   (0.2ms)  CREATE TABLE "non_validated_users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "email" varchar(255)) 
+   (0.2ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.0ms)  PRAGMA index_list("schema_migrations")
+   (0.2ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (0.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('0')
+   (2.2ms)  select sqlite_version(*)
+   (0.4ms)  CREATE TABLE "dumb_users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "email" varchar(255), "first_name" varchar(255), "last_name" varchar(255)) 
+   (0.2ms)  CREATE TABLE "non_validated_users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "email" varchar(255)) 
+   (0.1ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.0ms)  PRAGMA index_list("schema_migrations")
+   (0.1ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (0.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('0')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: soft_validate
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70095288178760 !ruby/object:Gem::Requirement
+  requirement: &70180042847580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *70095288178760
+  version_requirements: *70180042847580
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70095288177280 !ruby/object:Gem::Requirement
+  requirement: &70180042845940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +33,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70095288177280
+  version_requirements: *70180042845940
 description: Add softs_validate_presence_of :attr to your model and it will give you
   methods to figure out percent complete, missing fields, etc without preventing the
   record from being saved.