form_angular 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df338d7e4cd77e4e218a855bd39eac24349834dd
-  data.tar.gz: a533b71363ac59792bce35ec008d073bfaa5db57
+  metadata.gz: 10b085e08a657283eb0d7ed56cf681518c107f46
+  data.tar.gz: abf225ebac05be230089f0e62d0f1c16c574de7d
 SHA512:
-  metadata.gz: 20cc36741a1e26b7df18c0d1f2bc0ad075808e9b13eebc131cc70a9b42b890d256a78ebd72ae287214e1d4a823a266eb7e2d626fb583ead04c18f4186cb49668
-  data.tar.gz: e35f8772c5f0e3e7c9f6de0bf466a1be1eee7229c9e0daae28ffc2dd532a3ff55e90bca6e87b3fd2fb6e4cd3254c84477d0d179084d9418601723df8e341d083
+  metadata.gz: 98d8ff8da7a044967fa3d8e44b2dd799194706949f07e61acfe53647973e4a36ed82c9fcea69950af655f283ca0f43d5d39755ef47b62d33d2a527c4292ac37c
+  data.tar.gz: df6a7d672c467b9c0beb8246c89b5023e6401821d417466d92cf3f40c0b80f5adf047f72622cd309160d25c881030b202e947e3f193b79f3bd10befda9ff1a59

data/lib/form_angular/fields/ng_model.rb

@@ -1,31 +1,29 @@
 module FormAngular
   module Fields
     module NgModelInput
-      include NgOptionUtils
       extend ActiveSupport::Concern
+      include NgOptionUtils
 
       included do
-        alias_method_chain :input, :ng_model
+        alias_method_chain :initialize, :ng_model
       end
 
-      def input_with_ng_model(attribute_name, options = {}, &block)
-        options[:input_html] ||= {}
-        if @options[:ngform]
-          options[:input_html].merge! build_angular_options(attribute_name, @options)
-        else
-          parent_builder = @options[:parent_builder]
-          until !parent_builder || parent_builder.options[:ngform]
-            parent_builder = parent_builder.options[:parent_builder]
-          end
-          if parent_builder && parent_builder.options[:ngform]
-            options[:input_html].merge! build_angular_options(attribute_name, @options[:parent_builder].options)
-          end
-        end
+      def initialize_with_ng_model(builder, attribute_name, column, input_type, options = {})
+        initialize_without_ng_model(builder, attribute_name, column, input_type, options)
+        input_html_options.merge! build_angular_options(attribute_name, @builder) if is_ng_form?
+      end
 
-        input_without_angular(attribute_name, options, &block)
+      def is_ng_form?
+        return @builder.options[:ngform] if @builder.options[:ngform].present?
+        parent_builder = @builder.options[:parent_builder]
+        #Find a parent builder with ngform
+        until !parent_builder || parent_builder.options[:ngform].present?
+          parent_builder = parent_builder.options[:parent_builder]
+        end
+        return parent_builder && parent_builder.options[:ngform]
       end
     end
   end
 end
 
-SimpleForm::FormBuilder.send :include, FormAngular::Fields::NgModelInput
+SimpleForm::Inputs::Base.send :include, FormAngular::Fields::NgModelInput

data/lib/form_angular/helpers/ng_option_utils.rb

@@ -11,19 +11,19 @@ module FormAngular
         }
       end
 
-      def form_context(record)
-        record.class.name.camelize(:lower)
-      end
 
-      def fields_context(record, options)
-        "#{options[:fields_context]}.#{context_name(record)}"
+      def build_angular_options(attribute_name, builder)
+        begin
+          angular_options = {
+            'ng-model' => "#{builder.object_name.sub("[", ".").sub("]", "").sub("_attributes", "")}.#{attribute_name}",
+            'server-error' => "true"
+          }
+        rescue => e
+        end
       end
 
-      def build_angular_options(attribute_name, form_options)
-        angular_options = {
-          'ng-model' => "#{form_options[:fields_context]}.#{attribute_name}",
-          'server-error' => "true"
-        }
+      def form_context(record)
+        record.class.name.camelize(:lower)
       end
 
       def context_name(record)
@@ -36,19 +36,19 @@ module FormAngular
 
       #Find a better way to make the form name trickledown globally in the wrapper api
       def form_name
-        name = name_from_options(@builder.options)
+        name = from_html_options(:name, @builder.options)
         return name unless name.blank?
         builder = @builder
         until !builder || !name.blank?
-          name = name_from_options(builder.options)
+          name = from_html_options(:name, builder.options)
           builder = builder.options[:parent_builder]
         end
         name
       end
 
-      def name_from_options(from_options)
-        if from_options[:html]
-          from_options[:html][:name]
+      def from_html_options(key, html_options)
+        if html_options[:html]
+          html_options[:html][key]
         end
       end
 

data/lib/form_angular/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: form_angular
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Guillaume Balaine
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-03 00:00:00.000000000 Z
+date: 2014-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -55,7 +55,6 @@ files:
 - lib/form_angular.rb
 - lib/form_angular/errors/ng_error.rb
 - lib/form_angular/errors/ng_input_error.rb
-- lib/form_angular/fields/ng_fieldset.rb
 - lib/form_angular/fields/ng_model.rb
 - lib/form_angular/forms/ng_form.rb
 - lib/form_angular/helpers/ng_option_utils.rb

data/lib/form_angular/fields/ng_fieldset.rb

@@ -1,32 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', 'helpers', 'ng_option_utils')
-
-module FormAngular
-  module FieldSet
-    module NgFields
-      include NgOptionUtils
-      extend ActiveSupport::Concern
-
-      included do
-        alias_method_chain :simple_fields_for, :ng_model
-      end
-
-      def simple_fields_for_with_ng_model(record, options = {}, &block)
-        if @options[:ngform]
-          @options[:fields_context] = fields_context(record, @options)
-        else
-          parent_builder = @options[:parent_builder]
-          until !parent_builder || parent_builder.options[:ngform]
-            parent_builder = parent_builder.options[:parent_builder]
-          end
-          if parent_builder && parent_builder.options[:ngform]
-            @options[:fields_context] = fields_context(record, @options[:parent_builder].options)
-          end
-        end
-
-        simple_fields_for_without_ng_model(record, options, &block)
-      end
-    end
-  end
-end
-
-SimpleForm::FormBuilder.send :include, FormAngular::FieldSet::NgFields