rails-angulate 0.0.5.rc4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 775f90b033d45baa2c8de1c4cb7eb1946555964a
-  data.tar.gz: 374a6fac127a7e5304c6b6d9c49acef925dbe3cf
+  metadata.gz: 576545c753d58329200048bb33bec86c55d9ce24
+  data.tar.gz: 88c7ef8625b479fee67aaaff6e73491fdef2c397
 SHA512:
-  metadata.gz: c02bf48f7ddb80b2c329895ae936ad5dcf609b157c633e72b05f8c1ed1e8294d5112d761a62b490934b8b67b9625d7e01f8046d824e58efd913b4e15e9fdce59
-  data.tar.gz: 4ed585232d4abaf11eb77760fc914cee95e2966a064f7ad8584d30d3d637b0eaf2f95df800fd8c41be48ec76d3934aeefae0878a6ab9967a7f629b2c02f321c8
+  metadata.gz: 8cf18883909ca7da685db56e03d65bc7dc98d5d9d841170fab3a4914526e2fc18442822d10fb7e50cbba369830671a115f607c36396a8ba1034de174d50543b7
+  data.tar.gz: df92fabf45cb2f9a84ebcb05750ece38004082d5986cfd10e4bcf1ea2d1257b3715a34df224ce4896a0db06de4273db3d2b55f49463318354c7f01da4434a43f

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

@@ -20,16 +20,28 @@ module Rails
           end
         end
 
-        %i{
-          ng_form_name
-          ng_valid
-          ng_valid_for
-          ng_invalid_for
-          ng_invalid
-        }.each do |_simple_method|
-          define_method _simple_method do |*args, &block|
-            @template.send(_simple_method, object, *args, &block)
-          end
+        def ng_form_name
+          @template.ng_form_name(@object_name)
+        end
+
+        def ng_valid(options = {}, html_options = {}, &block)
+          options = objectify_options(options)
+          @template.ng_valid(@object_name, options, html_options, &block)
+        end
+
+        def ng_invalid(options = {}, html_options = {}, &block)
+          options = objectify_options(options)
+          @template.ng_invalid(@object_name, options, html_options, &block)
+        end
+
+        def ng_valid_for(method, options = {}, html_options = {}, &block)
+          options = objectify_options(options)
+          @template.ng_valid_for(@object_name, method, options, html_options, &block)
+        end
+
+        def ng_invalid_for(method, options = {}, html_options = {}, &block)
+          options = objectify_options(options)
+          @template.ng_invalid_for(@object_name, method, options, html_options, &block)
         end
 
         def ng_select(method, choices = {}, options = {}, html_options = {})

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

@@ -33,24 +33,20 @@ module Rails
           Tags::NgValidationErrors.new(object_name, method, self, options).render
         end
 
-        def ng_valid(record, &block)
-          valid_wrapper(record, '$valid', &block)
+        def ng_valid(object_name, options, html_options, &block)
+          Tags::NgValid.new(object_name, nil, self, options, html_options, '$valid').render(&block)
         end
 
-        def ng_invalid(record, &block)
-          valid_wrapper(record, '$invalid', &block)
+        def ng_invalid(object_name, options, html_options, &block)
+          Tags::NgValid.new(object_name, nil, self, options, html_options, '$invalid').render(&block)
         end
 
-        def ng_valid_for(record, attribute, &block)
-          valid_wrapper(record, '$valid', attribute, &block)
+        def ng_valid_for(object_name, method, options, html_options, &block)
+          Tags::NgValid.new(object_name, method, self, options, html_options, '$valid').render(&block)
         end
 
-        def ng_invalid_for(record, attribute, &block)
-          valid_wrapper(record, '$invalid', attribute, &block)
-        end
-
-        def ng_form_field_name(record, attribute)
-          "#{ng_form_name(record)}['#{object_name_for(record)}[#{attribute}]']"
+        def ng_invalid_for(object_name, method, options, html_options, &block)
+          Tags::NgValid.new(object_name, method, self, options, html_options, '$invalid').render(&block)
         end
 
         def ng_form_name(record)
@@ -70,12 +66,6 @@ module Rails
           end
         end
 
-        def valid_wrapper(record, type, attribute = nil, &block)
-          ng_if = attribute.nil? ? ng_form_name(record) : ng_form_field_name(record, attribute)
-          content = capture(&block)
-          content_tag :span, content.html_safe, 'ng-if' => "#{ng_if}.#{type}"
-        end
-
       end
     end
   end

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

@@ -0,0 +1,28 @@
+module Rails
+  module Angulate
+    module Helpers
+      module Tags
+        class NgValid < ActionView::Helpers::Tags::Base
+          include TagCommon
+          attr_accessor :output_buffer
+
+          def initialize(object_name, method, template_object, options, html_options, qualifier)
+            @html_options = html_options
+            @qualifier = qualifier
+            @output_buffer = ActionView::OutputBuffer.new
+
+            super(object_name, method, template_object, options)
+          end
+
+          def render(&block)
+            object_name = @method_name.nil? ?  form_object_name : form_field_object_name
+
+            content = ''
+            content = @template_object.capture(&block) if block_given?
+            content_tag :span, content, 'ng-show' => "#{object_name}.#{@qualifier}"
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -8,7 +8,7 @@ module Rails
           def render
             # We can't use content_tag with a block (no self.output_buffer)
             # so we pass in content
-            container(angular_error_list_html) unless validators.empty?
+            container(error_list_html) unless validators.empty?
           end
 
           private
@@ -21,11 +21,11 @@ module Rails
             content_tag :ul, content, container_attrs
           end
 
-          def angular_error_list_html
+          def error_list_html
             validators.map do |validator|
               mapper = validator_mapper_for(validator)
               mapper.error_messages.map do |error_type, msg|
-                content_tag :li, msg, 'ng-show' => "#{angular_form_field_object_name}.$error.#{error_type}"
+                content_tag :li, msg, 'ng-show' => "#{form_field_object_name}.$error.#{error_type}"
               end.join
             end.join.html_safe
           end
@@ -33,8 +33,8 @@ module Rails
           def container_attrs
             ng_show = configuration.validate_show_condition % {
               model: @object_name,
-              form: angular_form_object_name,
-              field: angular_form_field_object_name,
+              form: form_object_name,
+              field: form_field_object_name,
               validate_on: validate_on || 'true'
             }
 
@@ -61,8 +61,7 @@ module Rails
           end
 
           def validate_on
-            field = angular_form_field_object_name
-            form = angular_form_object_name
+            form = form_object_name
 
             return validate_on_options if validate_on_options.is_a?(String)
 
@@ -76,7 +75,7 @@ module Rails
                 ''
               end
 
-              str << (kind == :submit_attempt ? "#{form}.$#{kind}" : "#{field}.$#{kind}") << op
+              str << (kind == :submit_attempt ? "#{form}.$#{kind}" : "#{field_name}.$#{kind}") << op
             end
           end
         end

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

@@ -10,17 +10,18 @@ module Rails
 
           delegate :configuration, to: Rails::Angulate
 
-          def angular_form_object_name
-            @template_object.ng_form_name(object)
-          end
-
-          def angular_form_field_object_name
-            @template_object.ng_form_field_name(object, @method_name)
-          end
-
           def validators
-            @validators ||=
-              object.class.validators.select { |v| v.attributes.include?(@method_name.to_sym) }
+            if object.nil?
+              raise RuntimeError.new(<<-TEXT.strip)
+                Form helper object is nil. If this is an association
+                make sure that you accept_nested_attributes_for :assocation
+                so that validations for nested attributes can be determined.
+              TEXT
+            end
+
+            @validators ||= object.class.validators.select do |v|
+              v.attributes.include?(@method_name.to_sym)
+            end
           end
 
           def add_ng_validation_attrs(attrs)
@@ -54,6 +55,22 @@ module Rails
             name.camelize(:lower)
           end
 
+          def form_object_name
+            "#{@object_name.gsub(/\[.+\]/, '')}_form"
+          end
+
+          def form_field_object_name
+            "#{form_object_name}['#{field_name}']"
+          end
+
+          def field_name
+            @field_name ||= begin
+              names = {}
+              add_default_name_and_id(names)
+              names['name']
+            end
+          end
+
           module ClassMethods
             def field_type
               @field_type ||= super.sub(/^ng/, '')

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

@@ -11,6 +11,7 @@ module Rails
           autoload :NgTextArea
           autoload :NgEmailField
           autoload :NgValidationErrors
+          autoload :NgValid
         end
       end
     end

data/lib/rails/angulate/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-angulate
 version: !ruby/object:Gem::Version
-  version: 0.0.5.rc4
+  version: 0.0.5
 platform: ruby
 authors:
 - Stan Bondi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-22 00:00:00.000000000 Z
+date: 2014-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -97,6 +97,7 @@ files:
 - lib/rails/angulate/helpers/tags/ng_select.rb
 - lib/rails/angulate/helpers/tags/ng_text_area.rb
 - lib/rails/angulate/helpers/tags/ng_text_field.rb
+- lib/rails/angulate/helpers/tags/ng_valid.rb
 - lib/rails/angulate/helpers/tags/ng_validation_errors.rb
 - lib/rails/angulate/helpers/tags/tag_common.rb
 - lib/rails/angulate/mappers.rb
@@ -121,9 +122,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2