validation_sync 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34b87bb8b0da916b105a076745c5cf79844411a6
-  data.tar.gz: 7f45885c57849b6c521c48faf5fafe985f703843
+  metadata.gz: 74fc180dc9264157b728b7fa8d5047a814a6ffb7
+  data.tar.gz: ebd5d1cacf26e5a52a775d17a05b240773aab194
 SHA512:
-  metadata.gz: 92704e5182f91810a6501209bf33d84603f4383a3e71702cc69867f98d62736658c775fe9c51ee55bc613e5534882ea29d4760a3de703a29fcd07b3233cd2859
-  data.tar.gz: 6df8471aa1a5c7edd030003eefc0731f840fc054aacdabaf6a8138cf73c01a31eb5043d8b4947e8085eacd439b58b92513177d7ba373beb2af401306d8605699
+  metadata.gz: 00818ccdfc64c8e780001edbdefc9026c84c0ac3a13ae90346d87ff15eac26b8b61cbb5206a4d2b4070c006233d0e85040152025f99d7ec7d346aafd0565f601
+  data.tar.gz: 77f71cbf6d4710739b8d9a8f615437dc6e40edfa3782dd15d4c57cfd1d29588d436a78d5bc2906a954c50fb868bbe9acd916d68cbe9a10ed1ca811d793a77634

data/app/assets/javascripts/generate_validations.js.erb

@@ -0,0 +1,138 @@
+<%
+	# Our Builder object
+	@builder = ValidationBuilder.new
+
+	# Helpers for ActiveRecord/Model Validators
+	presence_validator 			= ActiveRecord::Validations::PresenceValidator
+	number_validator 				= ActiveModel::Validations::NumericalityValidator
+	confirmation_validator	= ActiveModel::Validations::ConfirmationValidator
+%>
+
+
+var ValidationSync;
+
+ValidationSync = {
+
+	init: function() {
+		<% @builder.find_all_models.each do |model| %>
+
+			// validate only if a relevant form is present
+			if ( $(".new_<%= model[:name] %>[data-sync-validations='true'], .edit_<%= model[:name] %>[data-sync-validations='true']").length ){
+				ValidationSync.validate<%= model[:name].camelize %>();
+			}
+
+		<% end %>
+	},
+
+
+	// build a validateModel() method for each ActiveRecord model
+	<% @builder.find_all_models.each do |model| %>
+
+		validate<%= model[:name].camelize %>: function() {
+			$forms = $(".new_<%= model[:name] %>[data-sync-validations='true'], .edit_<%= model[:name] %>[data-sync-validations='true']");
+			$forms.validate({
+
+
+				rules: {
+					<% model[:attributes].each do |attr| 
+
+							# Set default arguments
+							@builder.object_name = model[:name]
+							@builder.method = attr.to_sym
+
+					%>
+
+						"<%= model[:name] %>[<%= attr %>]": {
+
+
+							// REQUIRED: if we use the presence_validator	
+							// ----------------------------------------------------------------
+							<% if @builder.check_model_validation(presence_validator) %>
+								required: true,
+
+							// REQUIRED: if we use the number_validator, :allow_nil => false
+							// ----------------------------------------------------------------
+							<% elsif @builder.check_model_validation(number_validator) %>
+								// with allow_nil = false
+								<% if @builder.get_validation_attr(number_validator, :allow_nil).nil? %>
+									required: true,
+								<% end %>
+							<% end # required %>
+
+
+							// NUMBER: if we use the number_validator	
+							// ----------------------------------------------------------------
+							<% if @builder.check_model_validation(number_validator) %>
+								number: true,
+							<% end %>
+
+
+							// EQUALTO: if we use the confirmation_validator	
+							// ----------------------------------------------------------------
+							<% if @builder.check_model_validation(confirmation_validator) %>
+								equalTo: "#<%= model[:name] %>_<%= attr %>_confirmation",
+							<% end %>
+
+
+						},
+					<% end # model[:attributes].each %>
+				},
+
+
+				messages: {
+					<% model[:attributes].each do |attr| 
+
+							# Set default arguments
+							@builder.object_name = model[:name]
+							@builder.method = attr.to_sym
+							
+					%>
+
+						"<%= model[:name] %>[<%= attr %>]": {
+
+
+							// REQUIRED: if we use the presence_validator	
+							// ----------------------------------------------------------------
+							<% if @builder.check_model_validation(presence_validator) %>
+								required: "<%= @builder.get_validation_message(presence_validator) %>",
+
+							// REQUIRED: if we use the number_validator, :allow_nil => false
+							// ----------------------------------------------------------------
+							<% elsif @builder.check_model_validation(number_validator) %>
+								// with allow_nil = false
+								<% if @builder.get_validation_attr(number_validator, :allow_nil).nil? %>
+									required: "<%= @builder.get_validation_message(number_validator) %>",
+								<% end %>
+							<% end # required %>
+
+
+							// NUMBER: if we use the number_validator	
+							// ----------------------------------------------------------------
+							<% if @builder.check_model_validation(number_validator) %>
+								number: 	"<%= @builder.get_validation_message(number_validator) %>",
+							<% end %>
+
+
+							// EQUALTO: if we use the confirmation_validator	
+							// ----------------------------------------------------------------
+							<% if @builder.check_model_validation(confirmation_validator) %>
+								equalTo: 	"<%= @builder.get_validation_message(confirmation_validator) %>",
+							<% end %>
+
+
+						},
+					<% end # model[:attributes].each %>
+				},
+
+
+			}); // $forms.validate()
+		}, // validateModel
+
+	<% end # @builder.find_all_models.each %>
+}
+
+
+
+
+// Fire init() on ready (or page:load for turbolinks)
+$(document).on('ready page:load', ValidationSync.init);

data/app/assets/javascripts/validation_sync.js

@@ -10,4 +10,5 @@
 // Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
 // about supported directives.
 //
-//= require_tree .
+//= require jquery.validate.min
+//= require generate_validations

data/app/helpers/validation_sync_form_helper.rb

@@ -1,87 +1,28 @@
 module ValidationSyncFormHelper
 
+
+  #
+  # Override the default form_for method to include a 
+  # data-sync-validations attribute, set to true / false
+  # returns html
+  #
   def form_for(record, options = {}, &block)
   	# If the html_options / data hashes are not
-  	# set, then let's set them as an empty hash
+  	# set, then let's add them as empty hashes
   	options[:html] ||= {}
   	options[:html][:data] ||= {}
 
+    # Default to validate = false
+    options[:validate] ||= false
+
   	# Add our data-sync-validations attribute
 	  options[:html][:data][:sync_validations] = options[:validate].to_s
 
+    # Let the Rails defaults take it from here
     super
   end
 
 
-  def find_all_models
-  	models = []
-
-    # iterate over all files in folder
-    folder = File.join(ValidationSync::Engine::APP_ROOT, "app", "models")
-
-    Dir[File.join(folder, "*")].each do |filename|
-    	klass = File.basename(filename, '.rb').camelize.constantize
-  		next unless klass.ancestors.include?(ActiveRecord::Base)
-
-  		model = {
-  			name: klass.name.downcase,
-  			attributes: klass.new.attributes.keys
-  		}
-
-  		models << model
-    end
-
-    return models
-  end
-
-
-  # 
-  # Check to see if a given model attribute uses a given validation
-  # returns true/false
-  # 
-  def check_model_validation(object_name, method, validation)
-    object_class = object_name.camelize.constantize
-    if object_class.validators_on(method).map(&:class).include? validation
-      true
-    else
-      false
-    end
-  end
-
-
-  # 
-  # Check to see if a given model attribute uses a given validation
-  # returns the specified validation option
-  # 
-  def get_validation_attr(object_name, method, validation, option)
-    if check_model_validation(object_name, method, validation)
-      object_class = object_name.camelize.constantize
-      attr = object_class.validators_on(method).find { |v| v.class == validation }
-      return (attr.options[option]) ? attr.options[option] : nil
-    end
-  end
-
-
-  def get_validation_message(object_name, method, validation)
-    object_class = object_name.camelize.constantize
-
-    # we validate this attribute
-    if val = object_class.validators_on(method).find { |v| v.class == validation }
-    
-      if val.options[:message]
-        # custom message is defined
-        return val.options[:message]
-      else
-        # fall back to the default message
-        return "TODO: add default error messages"
-      end
-
-    else
-      # we don't validate this attribute
-      nil
-    end
-  end
-
 
-end
+end # ValidationSyncFormHelper
 

data/lib/validation_sync/engine.rb

@@ -9,8 +9,10 @@ module ValidationSync
       g.helper false
     end
 
+    # Find the root of the rails app that is using validation_sync
     initializer "validation_sync.load_app_instance_data" do |app|
 			APP_ROOT = app.root
 		end
+
   end
 end

data/lib/validation_sync/validation_builder.rb

@@ -0,0 +1,139 @@
+class ValidationBuilder
+
+  # allows us to set default arguments for the builder
+  attr_accessor :object_name, :method
+
+
+	# 
+	# Create a list of all of the current app's Active Record Models
+	# returns an array of hashes
+	#
+	def find_all_models
+  	models = []
+
+    # iterate over all files in folder
+    folder = File.join(ValidationSync::Engine::APP_ROOT, "app", "models")
+
+    Dir[File.join(folder, "*")].each do |filename|
+    	klass = File.basename(filename, '.rb').camelize.constantize
+  		next unless klass.ancestors.include?(ActiveRecord::Base)
+
+  		model = {
+  			name: klass.name.downcase,
+  			attributes: klass.new.attributes.keys
+  		}
+
+  		models << model
+    end
+
+    return models
+  end
+
+
+
+  #
+  # Check to see if a given model attribute uses a given validation
+  # returns either a validation object or nil
+  # 
+  def get_model_validation(object_name=self.object_name, method=self.method, validation)
+    object_class = object_name.camelize.constantize
+    if val = object_class.validators_on(method).find { |v| v.class == validation }
+      val
+    else
+      nil
+    end
+  end
+
+
+
+  #
+  # Check to see if a given model attribute uses a given validation
+  # returns true / false
+  # 
+  def check_model_validation(object_name=self.object_name, method=self.method, validation)
+    unless get_model_validation(object_name, method, validation).nil?
+      return true
+    else
+      return false
+    end
+  end
+
+
+
+  # 
+  # Fetch a given option for a model's attribute's validation
+  # returns the specified validation option
+  # 
+  def get_validation_attr(object_name=self.object_name, method=self.method, validation, option)
+
+  	# Make sure that we use this validation for this attribute
+    if get_model_validation(object_name, method, validation)
+
+    	# look up the option
+      object_class = object_name.camelize.constantize
+      validation = object_class.validators_on(method).find { |v| v.class == validation }
+      return (validation.options[option]) ? validation.options[option] : nil
+
+    else
+    	nil
+    end
+  end
+
+
+
+  # 
+  # Fetch the validation message for a given model's attribute's validation
+  # returns a string
+  # 
+  def get_validation_message(object_name=self.object_name, method=self.method, validation)
+
+    unless (val = get_model_validation(object_name, method, validation)).nil?
+
+    	if val.options[:message]
+    		# Simple lookup:
+	    	return val.options[:message]
+
+	    else
+	    	# Takes some digging:
+	    	# get the index of this validation in the validators_on array...
+	    	validators_array = []
+
+	    	object_class = object_name.camelize.constantize
+	    	object_class.validators_on(method).each do |v|
+	    		validators_array << v.class
+	    	end
+
+	    	validators_hash = Hash[validators_array.map.with_index.to_a]
+	    	index = validators_hash[validation]
+
+        # create a new object
+	    	object = object_class.new
+
+        # Do we need ro define a confirmation_of attribute?
+        # If so, then we should read the errors from this
+        # attribute, rather than the original
+        if object_class.method_defined?("#{method}_confirmation")
+          object.send("#{method}_confirmation=", "#{object.send(method)}_not_confirmed")
+          method_to_read_errors_from = "#{method}_confirmation".to_sym
+        else
+          method_to_read_errors_from = method
+        end
+
+        # gather the errors
+	    	object.valid?
+
+        # and match the index to the errors array
+        if object.errors.messages[method_to_read_errors_from]
+  	    	return object.errors.messages[method_to_read_errors_from][index]
+        end
+	    end
+
+    else
+    	nil
+    end
+
+  end
+
+
+
+end # ValidationBuilder

data/lib/validation_sync/version.rb

@@ -1,3 +1,3 @@
 module ValidationSync
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/validation_sync.rb

@@ -1,3 +1,4 @@
+require "validation_sync/validation_builder"
 require "validation_sync/engine"
 
 module ValidationSync

data/spec/dummy/app/controllers/posts_controller.rb

@@ -53,6 +53,6 @@ class PostsController < ApplicationController
 
     # Only allow a trusted parameter "white list" through.
     def post_params
-      params.require(:post).permit(:title, :content, :view_count, :author_email)
+      params.require(:post).permit(:title, :content, :view_count, :order, :author_email, :user_id)
     end
 end

data/spec/dummy/app/controllers/users_controller.rb

@@ -0,0 +1,58 @@
+class UsersController < ApplicationController
+  before_action :set_user, only: [:show, :edit, :update, :destroy]
+
+  # GET /users
+  def index
+    @users = User.all
+  end
+
+  # GET /users/1
+  def show
+  end
+
+  # GET /users/new
+  def new
+    @user = User.new
+  end
+
+  # GET /users/1/edit
+  def edit
+  end
+
+  # POST /users
+  def create
+    @user = User.new(user_params)
+
+    if @user.save
+      redirect_to @user, notice: 'User was successfully created.'
+    else
+      render action: 'new'
+    end
+  end
+
+  # PATCH/PUT /users/1
+  def update
+    if @user.update(user_params)
+      redirect_to @user, notice: 'User was successfully updated.'
+    else
+      render action: 'edit'
+    end
+  end
+
+  # DELETE /users/1
+  def destroy
+    @user.destroy
+    redirect_to users_url, notice: 'User was successfully destroyed.'
+  end
+
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def set_user
+      @user = User.find(params[:id])
+    end
+
+    # Only allow a trusted parameter "white list" through.
+    def user_params
+      params.require(:user).permit(:email, :password, :password_confirmation)
+    end
+end

data/spec/dummy/app/models/post.rb

@@ -1,10 +1,21 @@
 class Post < ActiveRecord::Base
 
-	validates_presence_of :title, :message => "you need a title, bor"
-
-	validates_length_of :title, :minimum => 5, :maximum => 15, :allow_blank => true
+	# Title
+	validates_presence_of :title, :message => "You need a title, bro."
+	validates_length_of :title, :minimum => 5
 
+	# View Count
 	validates_presence_of :view_count
-	validates_numericality_of :view_count, :message => "NUMBERZ ONLY!"
+	validates_numericality_of :view_count
+
+	# Order
+	validates_numericality_of :order, :message => "Make that shit a number!", :allow_nil => true
+
+	# User ID
+	validates_numericality_of :user_id, :message => "User ID Must be a number."
+
+	# Content
+	validates_presence_of :content
+	validates_length_of :content, :maximum => 140
 
 end

data/spec/dummy/app/models/user.rb

@@ -0,0 +1,11 @@
+class User < ActiveRecord::Base
+
+	attr_accessor :password_confirmation
+
+	# email
+	validates_confirmation_of :email
+
+	# Password
+	validates_confirmation_of :password, message: "Confirm your password, bitch!"
+
+end

data/spec/dummy/app/views/posts/_form.html.erb

@@ -23,10 +23,18 @@
     <%= f.label :view_count %><br>
     <%= f.text_field :view_count %>
   </div>
+  <div class="field">
+    <%= f.label :order %><br>
+    <%= f.text_field :order %>
+  </div>
   <div class="field">
     <%= f.label :author_email %><br>
     <%= f.text_field :author_email %>
   </div>
+  <div class="field">
+    <%= f.label :user_id %><br>
+    <%= f.text_field :user_id %>
+  </div>
   <div class="actions">
     <%= f.submit %>
   </div>

data/spec/dummy/app/views/posts/show.html.erb

@@ -15,6 +15,11 @@
   <%= @post.view_count %>
 </p>
 
+<p>
+  <strong>Order:</strong>
+  <%= @post.order %>
+</p>
+
 <p>
   <strong>Author email:</strong>
   <%= @post.author_email %>

data/spec/dummy/app/views/users/_form.html.erb

@@ -0,0 +1,33 @@
+<%= form_for(@user, :validate => true) do |f| %>
+  <% if @user.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(@user.errors.count, "error") %> prohibited this user from being saved:</h2>
+
+      <ul>
+      <% @user.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <div class="field">
+    <%= f.label :email %><br>
+    <%= f.text_field :email %>
+  </div>
+  <div class="field">
+    <%= f.label :email_confirmation %><br>
+    <%= f.text_field :email_confirmation %>
+  </div>
+  <div class="field">
+    <%= f.label :password %><br>
+    <%= f.text_field :password %>
+  </div>
+  <div class="field">
+    <%= f.label :password_confirmation %><br>
+    <%= f.text_field :password_confirmation %>
+  </div>
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+<% end %>

data/spec/dummy/app/views/users/edit.html.erb

@@ -0,0 +1,6 @@
+<h1>Editing user</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Show', @user %> |
+<%= link_to 'Back', users_path %>

data/spec/dummy/app/views/users/index.html.erb

@@ -0,0 +1,29 @@
+<h1>Listing users</h1>
+
+<table>
+  <thead>
+    <tr>
+      <th>Email</th>
+      <th>Password</th>
+      <th></th>
+      <th></th>
+      <th></th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <% @users.each do |user| %>
+      <tr>
+        <td><%= user.email %></td>
+        <td><%= user.password %></td>
+        <td><%= link_to 'Show', user %></td>
+        <td><%= link_to 'Edit', edit_user_path(user) %></td>
+        <td><%= link_to 'Destroy', user, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<br>
+
+<%= link_to 'New User', new_user_path %>

data/spec/dummy/app/views/users/new.html.erb

@@ -0,0 +1,5 @@
+<h1>New user</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Back', users_path %>

data/spec/dummy/app/views/users/show.html.erb

@@ -0,0 +1,14 @@
+<p id="notice"><%= notice %></p>
+
+<p>
+  <strong>Email:</strong>
+  <%= @user.email %>
+</p>
+
+<p>
+  <strong>Password:</strong>
+  <%= @user.password %>
+</p>
+
+<%= link_to 'Edit', edit_user_path(@user) %> |
+<%= link_to 'Back', users_path %>

data/spec/dummy/config/application.rb

@@ -8,6 +8,7 @@ require "sprockets/railtie"
 # require "rails/test_unit/railtie"
 
 Bundler.require(*Rails.groups)
+require "jquery-rails"
 require "validation_sync"
 
 module Dummy

data/spec/dummy/config/routes.rb

@@ -1,3 +1,6 @@
 Rails.application.routes.draw do
+
   resources :posts
+  resources :users
+
 end

data/spec/dummy/db/migrate/20140211200846_create_users.rb

@@ -0,0 +1,10 @@
+class CreateUsers < ActiveRecord::Migration
+  def change
+    create_table :users do |t|
+      t.string :email
+      t.string :password
+
+      t.timestamps
+    end
+  end
+end