slim_form_object 0.5.14 → 0.5.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08415906154c7a4e386d9294d708acac0cc2afe0
-  data.tar.gz: 6afcece85875f2388fcac37b1cf904a62492b4db
+  metadata.gz: 239fc8e0a836b0c614a1b7607a7775057f5f91cf
+  data.tar.gz: a1240a1e9dd26ca7bdb0d39744c7d99f07ebee6f
 SHA512:
-  metadata.gz: 048b844bd6610e2886d9300484fb8f959dfc68cd704b4d45ae4cee8b8a271bf3ca49d7ca917ecef7bceb750049ff541654df5583f9cac6302837fb4fc4d776c9
-  data.tar.gz: 06f1bcd3814b9374a2e4fe40ad5bcc983d39c3b7ca088fd2a1e0660fd7541122aab716daea8e94da3f0d846effbbc1ec15392592d13a41f3f9dea78a736bd990
+  metadata.gz: 1cb24a67ce6370d71bc00c7ae71a9720db254bca41c7992f0ac4b9f3d4023628f4860166895aa0e5d153f4515a05a095630a3c3f07da291e783b929edfaf148c
+  data.tar.gz: cae3003ff4b6f04744ab92c1ba96aa955cdf2e29ff2153e91c0c3eb0adbe7cbdfb438d5f494123af3a49f7d64224cf94986f9130af21c8d35537e23a120bbc11

data/lib/slim_form_object.rb

@@ -1,171 +1,7 @@
 require "slim_form_object/version"
 require "slim_form_object/helpers"
+require "slim_form_object/processing"
 
 module SlimFormObject
 
-  def self.included(base)
-    base.include ActiveModel::Model
-    base.include HelperMethods
-    base.extend  ClassMethods
-    base.extend  HelperMethods
-  end
-
-  module ClassMethods
-
-    def init_models(*args)
-      self.instance_eval do
-        define_method(:array_of_models) { args }
-      end
-      add_attributes(args)
-    end
-
-    def add_attributes(models)
-      #attr_accessor for models and env params
-      attr_accessor :params
-      models.each{ |model| attr_accessor snake(model.to_s).to_sym }
-
-      #delegate attributes of models
-      models.each do |model|
-        model.column_names.each do |attr|
-          delegate attr.to_sym, "#{attr}=".to_sym,
-                   to: snake(model.to_s).to_sym,
-                   prefix: snake(model.to_s).to_sym
-        end
-      end
-    end
-
-    def set_model_name(name)
-      @@set_name = name
-      class << self
-        def model_name
-          ActiveModel::Name.new(self, nil, @@set_name.to_s)
-        end
-      end
-    end
-  end
-
-  def submit
-    update_attributes
-    update_attributes_for_collection
-    self
-  end
-
-  alias_method :apply_parameters, :submit
-
-  def save
-    if valid?
-      models = Array.new(array_of_models)
-      while model1 = models.delete( models[0] )
-        array_of_models.each{ |model2| save_models(model1, model2) }
-      end
-
-      return true
-    end
-    false
-  end
-
-  private
-
-  def save_models(model1, model2)
-    self_object_of_model1 = method( snake(model1.to_s) ).call
-    self_object_of_model2 = method( snake(model2.to_s) ).call
-
-    case get_association(model1, model2)
-      when :belongs_to
-        self_object_of_model1.send( "#{snake(model2.to_s)}=", self_object_of_model2 )
-        self_object_of_model1.save!
-      when :has_one
-        self_object_of_model1.send( "#{snake(model2.to_s)}=", self_object_of_model2 )
-        self_object_of_model1.save!
-      when :has_many
-        self_object_of_model1.method("#{model2.table_name}").call << self_object_of_model2
-        self_object_of_model1.save!
-      when :has_and_belongs_to_many
-        self_object_of_model1.method("#{model2.table_name}").call << self_object_of_model2
-        self_object_of_model1.save!
-    end
-  end
-
-  def validation_models
-    array_of_models.each do |model|
-      set_errors( method(snake(model.to_s)).call.errors ) unless method( snake(model.to_s) ).call.valid?
-    end
-  end
-
-  def set_errors(model_errors)
-    model_errors.each do |attribute, message|
-      errors.add(attribute, message)
-    end
-  end
-
-  def update_attributes
-    array_of_models.each do |model|
-      model_attributes = make_attributes_of_model(model)
-      method( snake(model.to_s) ).call.assign_attributes( get_attributes_for_update(model_attributes, model) )
-    end
-  end
-
-  def update_attributes_for_collection
-    array_of_models.each do |model|
-      assign_attributes_for_collection(model)
-    end
-  end
-
-  def keys_of_collections
-    @keys ||= []
-    params.keys.each do |key|
-      array_of_models.each do |model|
-        self_object_of_model = method( snake(model.to_s) ).call
-        method_name = key.to_s[/#{snake(model.to_s)}_(.*)/, 1]
-        @keys << method_name if self_object_of_model.respond_to? method_name.to_s
-      end if key[/^.+_ids$/]
-    end if @keys.empty?
-    @keys
-  end
-
-  def exist_any_arrors_without_collections?
-    keys_of_collections.each do |method_name|
-      array_of_models.each do |model|
-        name_of_model = method_name.to_s[/^(.+)_ids$/, 1]
-        name_of_constant_model = name_of_model.split('_').map(&:capitalize).join
-        name_of_key_error = Object.const_get(name_of_constant_model).table_name
-        errors.messages.delete(name_of_key_error.to_sym)
-      end
-    end unless valid?
-    errors.messages.empty?
-  end
-
-  def assign_attributes_for_collection(model)
-    self_object_of_model = method( snake(model.to_s) ).call
-
-    keys_of_collections.each do |method_name|
-      if self_object_of_model.respond_to? method_name
-        old_attribute = self_object_of_model.method( method_name ).call
-        unless self_object_of_model.update_attributes( {method_name.to_s => params["#{snake(model.to_s)}_#{method_name}".to_sym]} )
-          set_errors(self_object_of_model.errors)
-          self_object_of_model.update_attributes( {method_name.to_s => old_attribute} )
-        end if exist_any_arrors_without_collections?
-      end
-    end
-  end
-
-  def make_attributes_of_model(model)
-    model_attributes = []
-    model.column_names.each do |name|
-      model_attributes << "#{snake(model.to_s)}_#{name}"
-    end
-    model_attributes
-  end
-
-  def get_attributes_for_update(model_attributes, model)
-    update_attributes = {}
-    hash_attributes   = params.slice(*model_attributes)
-    hash_attributes.each{ |attr, val| update_attributes[attr.gsub(/#{snake(model.to_s)}_(.*)/, '\1')] = val }
-    update_attributes
-  end
-
-  def get_association(class1, class2)
-    class1.reflections.slice(snake(class2.to_s), class2.table_name).values.first.try(:macro)
-  end
-
 end

data/lib/slim_form_object/helpers.rb

@@ -1,5 +1,11 @@
 module HelperMethods
   def snake(string)
-    string.gsub(/((\w)([A-Z]))/,'\2_\3').downcase
+    string.gsub!(/((\w)([A-Z]))/,'\2_\3')
+    class_name_if_module(string.downcase)
+  end
+
+  def class_name_if_module(string)
+    return $1 if string =~ /^.+::(.+)$/
+    string
   end
 end

data/lib/slim_form_object/processing.rb

@@ -0,0 +1,163 @@
+module SlimFormObject
+
+  def self.included(base)
+    base.include ActiveModel::Model
+    base.include HelperMethods
+    base.extend  ClassMethods
+    base.extend  HelperMethods
+  end
+
+  module ClassMethods
+
+    def init_models(*args)
+      self.instance_eval do
+        define_method(:array_of_models) { args }
+      end
+      add_attributes(args)
+    end
+
+    def add_attributes(models)
+      #attr_accessor for models and env params
+      attr_accessor :params
+      models.each{ |model| attr_accessor snake(model.to_s).to_sym }
+
+      #delegate attributes of models
+      models.each do |model|
+        model.column_names.each do |attr|
+          delegate attr.to_sym, "#{attr}=".to_sym,
+                   to: snake(model.to_s).to_sym,
+                   prefix: snake(model.to_s).to_sym
+        end
+      end
+    end
+
+    def set_model_name(name)
+      define_method(:model_name) { ActiveModel::Name.new(self, nil, name) }
+    end
+  end
+
+  def submit
+    update_attributes
+    update_attributes_for_collection
+    self
+  end
+
+  alias_method :apply_parameters, :submit
+
+  def save
+    if valid?
+      models = Array.new(array_of_models)
+      while model1 = models.delete( models[0] )
+        array_of_models.each{ |model2| save_models(model1, model2) }
+      end
+
+      return true
+    end
+    false
+  end
+
+  private
+
+  def save_models(model1, model2)
+    self_object_of_model1 = method( snake(model1.to_s) ).call
+    self_object_of_model2 = method( snake(model2.to_s) ).call
+
+    case get_association(model1, model2)
+      when :belongs_to
+        self_object_of_model1.send( "#{snake(model2.to_s)}=", self_object_of_model2 )
+        self_object_of_model1.save!
+      when :has_one
+        self_object_of_model1.send( "#{snake(model2.to_s)}=", self_object_of_model2 )
+        self_object_of_model1.save!
+      when :has_many
+        self_object_of_model1.method("#{model2.table_name}").call << self_object_of_model2
+        self_object_of_model1.save!
+      when :has_and_belongs_to_many
+        self_object_of_model1.method("#{model2.table_name}").call << self_object_of_model2
+        self_object_of_model1.save!
+    end
+  end
+
+  def validation_models
+    array_of_models.each do |model|
+      set_errors( method(snake(model.to_s)).call.errors ) unless method( snake(model.to_s) ).call.valid?
+    end
+  end
+
+  def set_errors(model_errors)
+    model_errors.each do |attribute, message|
+      errors.add(attribute, message)
+    end
+  end
+
+  def update_attributes
+    array_of_models.each do |model|
+      model_attributes = make_attributes_of_model(model)
+      method( snake(model.to_s) ).call.assign_attributes( get_attributes_for_update(model_attributes, model) )
+    end
+  end
+
+  def update_attributes_for_collection
+    array_of_models.each do |model|
+      assign_attributes_for_collection(model)
+    end
+  end
+
+  def keys_of_collections
+    @keys ||= []
+    params.keys.each do |key|
+      array_of_models.each do |model|
+        self_object_of_model = method( snake(model.to_s) ).call
+        method_name          = key.to_s[/#{snake(model.to_s)}_(.*)/, 1]
+        @keys << method_name if self_object_of_model.respond_to? method_name.to_s
+      end if key[/^.+_ids$/]
+    end if @keys.empty?
+    @keys
+  end
+
+  def exist_any_errors_without_collections?
+    keys_of_collections.each do |method_name|
+      array_of_models.each do |model|
+        name_of_model          = method_name.to_s[/^(.+)_ids$/, 1]
+        name_of_constant_model = name_of_model.split('_').map(&:capitalize).join
+        name_of_key_error      = Object.const_get(name_of_constant_model).table_name
+        errors.messages.delete(name_of_key_error.to_sym)
+      end
+    end unless valid?
+    errors.messages.empty?
+  end
+
+  def assign_attributes_for_collection(model)
+    self_object_of_model = method( snake(model.to_s) ).call
+
+    keys_of_collections.each do |method_name|
+      if self_object_of_model.respond_to? method_name
+        old_attribute = self_object_of_model.method( method_name ).call
+        unless self_object_of_model.update_attributes( {method_name.to_s => params["#{snake(model.to_s)}_#{method_name}".to_sym]} )
+          set_errors(self_object_of_model.errors)
+          self_object_of_model.update_attributes( {method_name.to_s => old_attribute} )
+        end if exist_any_errors_without_collections?
+      end
+    end
+  end
+
+  def make_attributes_of_model(model)
+    model_attributes = []
+    model.column_names.each do |name|
+      model_attributes << "#{snake(model.to_s)}_#{name}"
+    end
+    model_attributes
+  end
+
+  def get_attributes_for_update(model_attributes, model)
+    update_attributes = {}
+    hash_attributes   = params.slice(*model_attributes)
+    hash_attributes.each{ |attr, val| update_attributes[attr.gsub(/#{snake(model.to_s)}_(.*)/, '\1')] = val }
+    update_attributes
+  end
+
+  def get_association(class1, class2)
+    class1.reflections.slice(snake(class2.to_s), class2.table_name).values.first.try(:macro)
+  end
+
+end

data/lib/slim_form_object/version.rb

@@ -1,3 +1,3 @@
 module SlimFormObject
-  VERSION = "0.5.14"
+  VERSION = "0.5.19"
 end

data/spec/slim_form_object_spec.rb

@@ -239,7 +239,7 @@ describe TestModule do
     end
   end
 
-  context 'exist_any_arrors_without_collections?' do
+  context 'exist_any_errors_without_collections?' do
     before :each do
       object.instance_eval do
         def test_one_model
@@ -257,7 +257,7 @@ describe TestModule do
       object.stub(:valid?).and_return( false )
       object.stub_chain(:errors, :messages).and_return( {:test_one_models=>'error', :test_four_models=>'error'} )
 
-      expect(object.send :exist_any_arrors_without_collections?).to eq( true )
+      expect(object.send :exist_any_errors_without_collections?).to eq( true )
     end
 
     it 'must be return false' do
@@ -271,7 +271,7 @@ describe TestModule do
       object.stub(:valid?).and_return( false )
       object.stub_chain(:errors, :messages).and_return( {:test_one_models=>'error', :test_four_models=>'error', :descr=>'error'} )
 
-      expect(object.send :exist_any_arrors_without_collections?).to eq( false )
+      expect(object.send :exist_any_errors_without_collections?).to eq( false )
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slim_form_object
 version: !ruby/object:Gem::Version
-  version: 0.5.14
+  version: 0.5.19
 platform: ruby
 authors:
 - woodcrust
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-07 00:00:00.000000000 Z
+date: 2016-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -136,8 +136,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Very simple automatic generation and saving of your models nested attributes.
-  For ActiveModel.
+description: Very simple automatic generation and saving nested attributes of models
+  from html form. ActiveModel.
 email:
 - roboucrop@gmail.com
 executables:
@@ -148,6 +148,7 @@ files:
 - bin/slim_form_object
 - lib/slim_form_object.rb
 - lib/slim_form_object/helpers.rb
+- lib/slim_form_object/processing.rb
 - lib/slim_form_object/version.rb
 - spec/db/database.yml
 - spec/db/database.yml.travis