rails-angulate 0.0.4 → 0.0.5.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a43c0dd10b6ea2a418346f98eb497f0bb2836bb
-  data.tar.gz: 53be53d6a4b7512f206c2632fbf7e8fe1aab7f25
+  metadata.gz: 028e9269a483d6f3148f726cf86b2c5f49d50dc3
+  data.tar.gz: 24f89a7798749b0c76ea78c50abb300019e77068
 SHA512:
-  metadata.gz: 5d2d7cb1de7704a25bb4f560cb2d49afbf75e681a02d0cfd7a07a23ab3f28b87a67b098208d43b8abc5ff9e737676c290681357ea604bb6e3b47ffe18874101d
-  data.tar.gz: fb52d43038cd80801d8d1f6dc394dd4c4bcd8d0069730ccd28e53e76bb2a979e3f1fdb99c6f86098b74d92f16b22e8c5f61bfab7bde5f397bfa3b9792efa6766
+  metadata.gz: 089bc3386ff49bf0d79c9488016e34fea3c29a6c1ae4678bd928d957533df0831854a1c49e4c98c2a7ee28cd92d1d8f96a3c3b10a8066486d26edf142af7db70
+  data.tar.gz: 2f1038662c1f44a85cbc4d4ca9f7f422cd6ba4817a80e9715c5bc9c5cff5a3e57c63d4b7f013f6b75eefc96419df32435657df42c952d0a3e87ba485d554cf79

data/app/assets/javascripts/rails/angulate/directives/form_extensions.js.coffee

@@ -1,9 +1,9 @@
 # Add $blur flag to form controller
 blurifyDirective = ['$timeout', ($timeout) ->
   restrict: 'E',
-  require: '^form'
+  require: '?^form'
   link: (scope, element, attrs, form) ->
-    return unless attrs.name
+    return if !attrs.name || !form
     form.$blur = false
 
     element.on 'blur', handler = ->
@@ -17,7 +17,7 @@ blurifyDirective = ['$timeout', ($timeout) ->
 ]
 
 formExtensions = ['$timeout', ($timeout) ->
-  restrict: 'E'
+  restrict: 'EAC'
   priority: 10
   require: 'form'
   compile: ->
@@ -48,7 +48,7 @@ angular.module 'angulate.directives'
   .directive('select', blurifyDirective)
   .directive('blurify', blurifyDirective)
 
-  .directive('form', formExtensions)
+  .directive('angForm', formExtensions)
   .config ['$provide', ($provide) ->
     $provide.decorator 'ngSubmitDirective', ['$delegate', ($delegate) ->
       # Remove default ngSubmit

data/lib/rails/angulate/configuration.rb

@@ -9,13 +9,12 @@ module Rails
       # blur: only once the field has been visited
       # dirty: only if the field is dirty
       # submit_attempt: only once the user has submitted the form
-      attr_accessor :validate_on
-
-      attr_accessor :validate_show_condition
+      attr_accessor :validate_on, :default_error_classes, :validate_show_condition
 
       def initialize
         self.validate_on = { submit_attempt: :or, blur: nil }
         self.validate_show_condition = "%{field}.$invalid && (%{validate_on})"
+        self.default_error_classes = []
       end
 
       def validator_mappings

data/lib/rails/angulate/helpers/form_builder.rb

@@ -14,6 +14,7 @@ module Rails
         }.each do |_adv_method|
           define_method _adv_method do |*args, &block|
             options = args.extract_options!
+            options = apply_builder_options(options)
             options = objectify_options(options)
             @template.send(_adv_method, @object_name, *args, options, &block)
           end
@@ -30,6 +31,14 @@ module Rails
             @template.send(_simple_method, object, *args, &block)
           end
         end
+
+        protected
+
+        def apply_builder_options(options)
+          options.dup.tap do |opts|
+            opts[:validate_on] ||= self.options[:validate_on]
+          end
+        end
       end
     end
   end

data/lib/rails/angulate/helpers/form_helper.rb

@@ -8,6 +8,7 @@ module Rails
 
         def ng_form_for(record, options = {}, &block)
           options[:html] ||= {}
+          options[:html]['ang-form'] = ""
           options[:html][:name] ||= options[:as] || ng_form_name(record)
           form_for(record, options, &block)
         end

data/lib/rails/angulate/helpers/tags/ng_validation_errors.rb

@@ -6,17 +6,9 @@ module Rails
           include TagCommon
 
           def render
-            attrs = {}
-            [:id, :class].each do |key|
-              if options.include?(key)
-                value = options[key]
-                attrs[key] = value unless value.blank?
-              end
-            end
-
             # We can't use content_tag with a block (no self.output_buffer)
             # so we pass in content
-            container attrs, angular_error_list_html
+            container(angular_error_list_html)
           end
 
           private
@@ -25,8 +17,8 @@ module Rails
             @_options ||= @options.symbolize_keys
           end
 
-          def container(attrs, content)
-            content_tag :ul, content, attrs.merge(container_attrs)
+          def container(content)
+            content_tag :ul, content, container_attrs
           end
 
           def angular_error_list_html
@@ -46,16 +38,35 @@ module Rails
               validate_on: validate_on || 'true'
             }
 
-            {
+            attrs = {
               'ng-show' => ng_show
             }
+
+            attrs[:class] = configuration.default_error_classes
+              .dup.concat([options[:class]]).compact.uniq.join(' ')
+
+            attrs
+          end
+
+          def validate_on_options
+            validate_on = (options[:validate_on] || configuration.validate_on)
+            case validate_on
+            when Array
+              validate_on = validate_on.each_with_index.map { |cond, i| [cond, i == validate_on.length - 1 ? nil : :and] }
+            when Symbol
+              options[:validate_on] = Array.wrap(validate_on)
+              validate_on = validate_on_options
+            end
+            validate_on
           end
 
           def validate_on
             field = angular_form_field_object_name
             form = angular_form_object_name
 
-            configuration.validate_on.inject('') do |str, (kind, op)|
+            return validate_on_options if validate_on_options.is_a?(String)
+
+            validate_on_options.inject('') do |str, (kind, op)|
               op = case op
               when :and
                 ' && '

data/lib/rails/angulate/helpers/tags/tag_common.rb

@@ -53,8 +53,10 @@ module Rails
             id.camelize(:lower)
           end
 
-          def self.field_type
-            @field_type ||= super.sub(/^ng/, '')
+          module ClassMethods
+            def field_type
+              @field_type ||= super.sub(/^ng/, '')
+            end
           end
         end
       end

data/lib/rails/angulate/version.rb

@@ -1,5 +1,5 @@
 module Rails
   module Angulate
-    VERSION = "0.0.4"
+    VERSION = "0.0.5.rc1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-angulate
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5.rc1
 platform: ruby
 authors:
 - Stan Bondi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-28 00:00:00.000000000 Z
+date: 2014-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -104,7 +104,6 @@ files:
 - lib/rails/angulate/mappers/length_validator_mapper.rb
 - lib/rails/angulate/mappers/numericality_validator_mapper.rb
 - lib/rails/angulate/mappers/validator_mapper.rb
-- lib/rails/angulate/railtie.rb
 - lib/rails/angulate/version.rb
 homepage: https://github.com/fixate/rails-angulate
 licenses:
@@ -121,9 +120,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2

data/lib/rails/angulate/railtie.rb

@@ -1,15 +0,0 @@
-require 'rails'
-require 'angulate/helpers'
-
-module Rails
-  module Angulate
-    class Railtie < ::Rails::Railtie
-      initializer :include_helpers do |app|
-        ActiveSupport.on_load(:action_view) do
-          include Rails::Angulate::Helpers
-          cattr_accessor(:default_form_builder) { Rails::Angulate::Helpers::FormBuilder }
-        end
-      end
-    end
-  end
-end