fire-model 0.0.12 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4809220eb2a1cc5481b34b214b9d6ec19da5c9fb
-  data.tar.gz: efb51d7f87f3203404f0f030c588451e6089f4e9
+  metadata.gz: 65203fc48f1b59dc053e3a1fd9c644eeeb64fa3c
+  data.tar.gz: 8ac11f7090972f18e29af3f053adb534521edad8
 SHA512:
-  metadata.gz: a8381e70908de5fc46da08be6fca3f412cd4b738b36fc354820c1f821abf9354f0e8203ef5f0932527c855d16c97a2d4504b6c4cc1f1e6757f5c21e5c508a59a
-  data.tar.gz: 6a58ce0cda46cb96135db5393710cc5ba84151f04ac46d99141727d1003e40e36472acc2e49ad998ee433047125e0740f5de21c36885e6ff994699e4d26ce472
+  metadata.gz: 2459a91fd0f9c59d2cf266f1c9f8c6956f57440e21bc834164d054ecbc2ee30db9f0ab820564a275c5435fc5144dcb4f55fefd56afcc60c0b5b8015801d40ea9
+  data.tar.gz: f6263a5a8f4ebcf06e79a870924a16bafc9e05db557abb3abf13ed1837ffaf67558aae3f3b48a111f421921c937b4e7f53619ee6b6587fc56d867e1e84b73752

data/VERSION

@@ -1 +1 @@
-0.0.12
+0.0.14

data/fire-model.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: fire-model 0.0.12 ruby lib
+# stub: fire-model 0.0.14 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "fire-model"
-  s.version = "0.0.12"
+  s.version = "0.0.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

data/lib/model/base.rb

@@ -62,10 +62,14 @@ module Fire
     end
 
     def update(attrs)
-      @table.merge!(attrs)
+      set(attrs)
       save
     end
 
+    def set(attrs)
+      @table.merge!(attrs)
+    end
+
     # Data Methods
 
     def path_values
@@ -110,10 +114,6 @@ module Fire
       self.to_h
     end
 
-    def saving_data
-      data
-    end
-
     def cache(key, &value)
       @cache ||= {}
       @cache[key] ||= value.call
@@ -215,10 +215,12 @@ module Fire
     require_relative './querying/querying'
     include Querying
 
+    require_relative './nested/parent'
+    include NestedParent
+
     require_relative './nested/base'
     require_relative './nested/single'
-    require_relative './nested/parent'
 
-    include NestedModel::Parent
   end
+
 end

data/lib/model/nested/base.rb

@@ -3,14 +3,28 @@ module Fire
   class NestedModel < Model
     non_shared_cattr_accessor :parent, :nested_options
 
+    def initialize(hash={}, parent_original={})
+      @parent_original = parent_original
+      super(hash)
+    end
+
+    def sync_parent
+      @parent_original.merge!(saving_data)
+    end
+
     def saving_data
       return super() if nested_options.parent_values
 
-      self.class.parent.all_path_keys.each_with_object( data.clone) do |k, res|
+      self.class.parent.all_path_keys.each_with_object(data.clone) do |k, res|
         res.delete(k)
       end
     end
 
+    def save
+      sync_parent
+      super
+    end
+
     def nested_options
       self.class.nested_options
     end
@@ -48,10 +62,11 @@ module Fire
 
       def folder_content(parent)
         levels_count = (path_keys || []).count
-        objects = self.down_levels(parent.send(folder), levels_count)
-        objects.map{|x|
-          full_data = x.merge(parent.path_data)
-          new(full_data)
+        nested_folder = parent.send(folder) || {}
+        objects = self.down_levels(nested_folder, levels_count)
+        objects.map{|parent_original|
+          full_data = parent_original.clone.merge(parent.path_data)
+          new(full_data, parent_original)
         }
       end
 

data/lib/model/nested/parent.rb

@@ -1,36 +1,42 @@
 module Fire
-  class NestedModel
-    module Parent
-      extend ActiveSupport::Concern
+  module NestedParent
+    extend ActiveSupport::Concern
 
-      included do
-        non_shared_cattr_accessor :assigned_nested_models
-      end
+    included do
+      non_shared_cattr_accessor :assigned_nested_models
+    end
 
-      module ClassMethods
+    def saving_data
+      self.class.nested_models.map(&:folder).each{|folder|
+         nested_folder = send("nested_#{folder}")
+         nested_folder.is_a?(Array) ? nested_folder.each(&:sync_parent) : nested_folder.sync_parent
+      }
+      data
+    end
 
-        def has_nested(nested_model)
-          self.assigned_nested_models ||= []
-          self.assigned_nested_models << nested_model
+    module ClassMethods
 
-          folder = nested_model.folder
-          define_method "nested_#{folder}" do
-            self.cache(folder) do
-              nested_model.folder_content(self)
-            end
-          end
+      def has_nested(nested_model)
+        self.assigned_nested_models ||= []
+        self.assigned_nested_models << nested_model
 
-          define_method "add_to_#{folder}" do |object|
-            nested_model.create(object.merge(self.path_data))
+        folder = nested_model.folder
+        define_method "nested_#{folder}" do
+          self.cache(folder) do
+            nested_model.folder_content(self)
           end
         end
 
-        def nested_models
-          self.assigned_nested_models || []
+        define_method "add_to_#{folder}" do |object|
+          nested_model.create(object.merge(self.path_data))
         end
+      end
 
+      def nested_models
+        self.assigned_nested_models || []
       end
 
     end
   end
 end
+

data/lib/model/nested/single.rb

@@ -9,8 +9,9 @@ module Fire
       end
 
       def folder_content(parent)
-        object = parent.send(folder) || {}
-        new(object.merge(parent.path_data))
+        init_empty_parent_object(parent)
+        parent_original = parent.send(folder)
+        new(parent_original.clone.merge(parent.path_data), parent_original)
       end
 
       protected
@@ -23,6 +24,12 @@ module Fire
         name
       end
 
+      def init_empty_parent_object(parent)
+        unless parent.send(folder)
+          parent.send("#{folder}=", {})
+        end
+      end
+
     end
 
     class PathKeysNotSupported < FireModelError

data/spec/models/nested_models_spec.rb

@@ -114,6 +114,42 @@ describe 'Nested Models' do
                                'name'=>'Google',
                                'state'=>'CA'}}}}}
       )
+
+      employee = google.reload.nested_employees.first
+
+      employee.full_name = 'Sergey Brin'
+      employee.position = 'CEO'
+
+      google.save
+
+      expect(current_data).to eq(
+          {'Organization'=>
+               {'usa'=>
+                    {'ca'=>
+                         {'apple'=>
+                              {'country'=>'USA',
+                               'employees'=>
+                                   {'hq'=>
+                                        {tim.id=>
+                                             {'department'=>'HQ',
+                                              'full_name'=>'Tim Cook',
+                                              'id'=>tim.id,
+                                              'position'=>'CEO'}}},
+                               'name'=>'Apple',
+                               'state'=>'CA'},
+                          'google'=>
+                              {'country'=>'USA',
+                               'employees'=>
+                                   {'research'=>
+                                        {larry.id=>
+                                             {'department'=>'Research',
+                                              'full_name'=>'Sergey Brin',
+                                              'id'=>larry.id,
+                                              'position'=>'CEO'}}},
+                               'name'=>'Google',
+                               'state'=>'CA'}}}}}
+      )
+
     end
 
     context 'Nested Models Types' do
@@ -162,10 +198,18 @@ describe 'Nested Models' do
         expect(zaporozhets.nested_engine.code).to eq('MeMZ-777')
         expect(zaporozhets.reload.nested_engine.code).to eq('MeMZ-966')
 
+
         # nested association saving
         zap2 = Car.take(manufacturer: 'Zaporozhets', model: 'ZAZ-965', car_class: 'Mini', id: car.id)
         zap2.nested_engine.update(code: 'MeMZ-555')
         expect(zaporozhets.nested_engine.reload.code).to eq('MeMZ-555')
+
+        # saving nested models with a parent
+        zap3 = Car.take(manufacturer: 'Zaporozhets', model: 'ZAZ-965', car_class: 'Mini', id: car.id)
+        zap3.nested_engine.code = 'MeMZ-1111'
+
+        zap3.save
+        expect(zap3.reload.nested_engine.code).to eq('MeMZ-1111')
       end
 
       it 'should allow to declare nested models with all *parent values* duplicated' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fire-model
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.14
 platform: ruby
 authors:
 - Vitaly Tarasenko