comply 1.2.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b662d78ac11be66ad06d3cb1b4e1bd733070f5bd
-  data.tar.gz: 52d6cfcbbde33678af8a62c144cbc901098f30bc
+  metadata.gz: ee73736d6989d2b6f909ef8e39385d7cd8bf4d72
+  data.tar.gz: b22aacb5881c0bb6116e7d7b7122f392f8b821e1
 SHA512:
-  metadata.gz: 2521a60c65b306b6b00263b7537b01d4e4e3d4d50584e0d3e7b7f383ea02847ac9aaca6c24b225fea5b042d3014cf98f5c744660029a00db1b9abdf9e123036b
-  data.tar.gz: 7de391bee6898d2b714dfea02a053ed0883cf5d9e32bfc3e764f6a76cd190b2ca120eb91a03f7aa35a801b5d90dd785e6a8a6ba867cfffe0232d0ea444aa2250
+  metadata.gz: 277312618b13c1b4b648a6f10f2ae14a13a12c4c8ee73f6fb73771e9f5d1e4525bdebbd53e43f3cde0196f2bc4e51c2f2510362778af9b89e02dc462ca6dacff
+  data.tar.gz: 8bb27b8ea2a7cd92b88209980ea9222806c3f1704c1e5b90aee2d098c86836f285cd4281060feb23e3120de022fbe64e218847cdcd4d07b35f7480767019e0fe

data/app/assets/javascripts/comply/base_validatable_form.js.coffee

@@ -0,0 +1,53 @@
+class Comply.BaseValidatableForm
+  constructor: (@$form) ->
+    return if @$form.data('complied')
+    @$form.data('complied', true)
+    @inputs          = @_inputs()
+    @model           = @$form.data('validate-model')
+    @$button         = @$form.find('[type=submit]')
+    @validationRoute = @$form.data('validate-route') or "/#{Comply.enginePath}/validations"
+    @$button.click @validateInputs
+    @$button.attr('disabled', false).removeClass('disabled')
+
+  validateInputs: (event) =>
+    event.preventDefault()
+    @validate inputs: @inputs, submit: true
+
+  validate: (options) ->
+    $.get @validationRoute, @_params(), (response) =>
+      @_onValidate(response, options)
+
+      if @_allSuccess(response)
+        if @_onValidationSuccess(response, options)
+          return @$form.submit() if options.submit
+      else
+        @_onValidationFailure(response, options)
+
+      if @_onValidationComplete(response, options)
+        @_setMessages(options.inputs, response)
+
+  # private
+
+  _onValidate: (response, options) ->
+  _onValidationSuccess: (response, options) -> true
+  _onValidationFailure: (response, options) -> true
+  _onValidationComplete: (response, options) -> true
+
+  _setMessages: (inputs, response) =>
+    for input in inputs
+      status = @_isSuccess(input, response)
+      input.setMessage status, @_responseValue(input, response, status)
+
+  _allSuccess: (response) -> not (err for field, err of response.error when err.length).length
+
+  _inputs: ->
+    for input in @$form.find('[data-validate][name]')
+      new Comply.ValidatableInput $(input), this
+
+  _isSuccess: (input, response) ->
+    if !!@_responseValue(input, response) then 'error' else 'success'
+
+  _params: -> "#{$.param(model: @model)}&#{@$form.serialize()}"
+
+  _responseValue: (input, response, status = 'error') ->
+    if response[status]? then response[status][input.attrName]

data/app/assets/javascripts/comply/validatable_form.js.coffee

@@ -1,40 +1 @@
-class Comply.ValidatableForm
-  constructor: (@$form) ->
-    return if @$form.data('complied')
-    @$form.data('complied', true)
-    @inputs          = @_inputs()
-    @model           = @$form.data('validate-model')
-    @$button         = @$form.find('[type=submit]')
-    @validationRoute = @$form.data('validate-route') or "/#{Comply.enginePath}/validations"
-    @$button.click @validateInputs
-    @$button.attr('disabled', false).removeClass('disabled')
-
-  validateInputs: (event) =>
-    event.preventDefault()
-    @validate inputs: @inputs, submit: true
-
-  validate: (options) ->
-    $.get @validationRoute, @_params(), (response) =>
-      return @$form.submit() if options.submit and @_allSuccess(response)
-      @_setMessages(options.inputs, response)
-
-  # private
-
-  _setMessages: (inputs, response) =>
-    for input in inputs
-      status = @_isSuccess(input, response)
-      input.setMessage status, @_responseValue(input, response, status)
-
-  _allSuccess: (response) -> not (err for field, err of response.error when err.length).length
-
-  _inputs: ->
-    for input in @$form.find('[data-validate][name]')
-      new Comply.ValidatableInput $(input), this
-
-  _isSuccess: (input, response) ->
-    if !!@_responseValue(input, response) then 'error' else 'success'
-
-  _params: -> "#{$.param(model: @model)}&#{@$form.serialize()}"
-
-  _responseValue: (input, response, status = 'error') ->
-    if response[status]? then response[status][input.attrName]
+class Comply.ValidatableForm extends Comply.BaseValidatableForm

data/app/assets/javascripts/comply/validatable_input.js.coffee

@@ -22,7 +22,10 @@ class Comply.ValidatableInput
   #private
 
   _dependency: ->
-    new Comply.ValidatableInput($("#{@$el.data('validate-with')}[name]"), @form) if @$el.data('validate-with')?
+    if @$el.data('validate-with')?
+      new Comply.ValidatableInput(
+        $("#{@$el.data('validate-with')}[name]"), @form
+      )
 
   _forceValidate: -> @forceValidate or= @$el.data('validate-force')
 
@@ -34,7 +37,8 @@ class Comply.ValidatableInput
   _$multiparamFields: ->
     @$multiparamFields or= $(field) for field in @_multiparamFields()
 
-  _submitValidations: => @form.validate inputs: (el for el in [this, @dependency] when el)
+  _submitValidations: =>
+    @form.validate inputs: (el for el in [this, @dependency] when el)
 
   _validatable: ->
     return true if @_forceValidate() or not @_multiparam()

data/app/controllers/comply/validations_controller.rb

@@ -1,9 +1,19 @@
+require 'comply/whitelist_constantize'
+begin
+  require 'strong_parameters'
+rescue LoadError
+end
+
 module Comply
   class ValidationsController < Comply::ApplicationController
     ssl_allowed :show
 
     before_filter :require_model, :require_fields
 
+    if ActiveModel.const_defined?(:ForbiddenAttributesProtection)
+      include ActiveModel::ForbiddenAttributesProtection
+    end
+
     def show
       @instance = validation_instance
       @instance.valid?
@@ -26,8 +36,8 @@ module Comply
     end
 
     def require_model
-      @model = params[:model].classify.constantize if params[:model].present?
-    rescue NameError
+      @model = Comply::WhitelistConstantize.constantize(params[:model]) if params[:model].present?
+    rescue NameError, Comply::WhitelistConstantize::NotWhitelistedError
       @model = nil
     ensure
       render json: { error: 'Model not found' }, status: 500 unless @model

data/lib/comply/version.rb

@@ -1,3 +1,3 @@
 module Comply
-  VERSION = '1.2.0'
+  VERSION = '1.4.0'
 end

data/lib/comply/whitelist_constantize.rb

@@ -0,0 +1,62 @@
+require 'active_model/validations'
+
+module Comply
+  module WhitelistConstantize
+
+    class MatcherFactory
+      attr_reader :obj, :options
+      def initialize(obj, options = {})
+        @obj     = obj
+        @options = options
+      end
+
+      def to_matcher
+        if obj.is_a?(Module) && options[:include_inheritance]
+          procify_module
+        else
+          obj
+        end
+      end
+
+      private
+
+      def procify_module
+        -> (klass) { klass <= obj }
+      end
+    end
+
+    class NotWhitelistedError < ArgumentError
+    end
+
+    class << self
+      DEFAULT_PROC = MatcherFactory.new(ActiveModel::Validations, include_inheritance: true).to_matcher
+
+      def constantize(str)
+        whitelist!(str.classify.constantize)
+      end
+
+      def whitelist
+        @whitelist ||= [DEFAULT_PROC]
+      end
+
+      # obj can be a Class, Module or Proc.
+      # For classes and modules, optionally add `include_inheritance: true` to
+      # also match subclasses.
+      # Procs should accept one argument.
+      def allow(obj, opts = {})
+        whitelist << MatcherFactory.new(obj, opts).to_matcher
+      end
+
+      private
+
+      def whitelist!(obj)
+        obj.tap do |klass|
+          whitelist.detect(-> { raise NotWhitelistedError }) do |matcher|
+            matcher === klass || matcher == klass
+          end
+        end
+      end
+    end
+
+  end
+end

metadata

@@ -1,129 +1,115 @@
 --- !ruby/object:Gem::Specification
 name: comply
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.4.0
 platform: ruby
 authors:
-- '@jacobaweiss'
-- '@andyjbas'
-- '@azach'
-- '@linedotstar'
-- '@cfurrow'
+- "@jacobaweiss"
+- "@andyjbas"
+- "@azach"
+- "@linedotstar"
+- "@cfurrow"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-06 00:00:00.000000000 Z
+date: 2015-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bartt-ssl_requirement
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
-  name: jasmine-rails
+  name: strong_parameters
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sinon-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 0.2.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: pry-nav
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Validate your ActiveRecord models on the client, showing their error
@@ -137,6 +123,7 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- app/assets/javascripts/comply/base_validatable_form.js.coffee
 - app/assets/javascripts/comply/base_validation_message.js.coffee
 - app/assets/javascripts/comply/config.js.coffee
 - app/assets/javascripts/comply/index.js.coffee
@@ -149,6 +136,7 @@ files:
 - lib/comply.rb
 - lib/comply/engine.rb
 - lib/comply/version.rb
+- lib/comply/whitelist_constantize.rb
 homepage: http://www.github.com/lumoslabs/comply
 licenses: []
 metadata: {}
@@ -158,19 +146,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: Inline validation of your ActiveRecord models via the AJAX internets
 test_files: []
-has_rdoc: