fire-model 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de9855aaa62f8486c88fd342c4e2fda217d042f0
-  data.tar.gz: b1d04688dc786d1ffefb03d22a5e7ecd63a0082e
+  metadata.gz: 2f20e6ee2e52181a1490b86b89ac6fd856ef625d
+  data.tar.gz: 47ed6a3f6a15e509dcd8a0be087b45fd2b0d10a0
 SHA512:
-  metadata.gz: dd9605004b7ee87c441f509f69ae328c6b2fd36ef9d9ddd50ef8096dfa2f7ef920da12a92fc227762f86a7f23bea977dbd4e987cf68d1e7dc52b6baa76e4157d
-  data.tar.gz: cef9a05347474fd52edcd5844b92d7560a963698aa7d918e76b56dd54d38cf77aab5b6d4e8c94aa96bf100f5e6b148141f802689e8abdfcbb59a550c10dbf660
+  metadata.gz: b39771a4764b4ac5c23bf893092a1504c4db6813b119bb6868af7e4a25aa02abe276a89fec772157b787778a601e61391db08c61b425f1db9728c1d05cfb2507
+  data.tar.gz: dee861d2c31ed08b12b4ce2bc0a31bd37678c8e644e1be37c90c7b322cfd1a2564c88aecf7292852dc4bcbd752311cb01cecc5687ac0a6514889c94cc9b6de1f

data/README.md

@@ -15,11 +15,16 @@ end
 
 Use query syntax
 ```ruby
-LibraryBook.create(library: 'Shevchenko', floor: 1, row_number: 1, shelf: 10, name: 'Kobzar', author: 'T.G. Shevchenko')
-LibraryBook.create(library: 'Shevchenko', floor: 1, row_number: 1, shelf: 15, name: 'Eneida', author: 'I. Kotlyrevskiy')
-LibraryBook.create(library: 'Shevchenko', floor: 2, row_number: 15, shelf: 115, name: 'Lord Of The Rings', author: ' J.R.R. Tolkien')
-LibraryBook.create(library: 'Skovoroda', floor: 1, row_number: 25, shelf: 34, name: 'Harry Potter', author: 'J.K. Rowling')
-LibraryBook.create(library: 'Skovoroda', floor: 2, row_number: 12, shelf: 15, name: 'Hobbit', author: ' J.R.R. Tolkien')
+LibraryBook.create(library: 'Shevchenko', floor: 1, row_number: 1, shelf: 10, 
+  name: 'Kobzar', author: 'T.G. Shevchenko')
+LibraryBook.create(library: 'Shevchenko', floor: 1, row_number: 1, shelf: 15, 
+  name: 'Eneida', author: 'I. Kotlyrevskiy')
+LibraryBook.create(library: 'Shevchenko', floor: 2, row_number: 15, shelf: 115, 
+  name: 'Lord Of The Rings', author: ' J.R.R. Tolkien')
+LibraryBook.create(library: 'Skovoroda', floor: 1, row_number: 25, shelf: 34, 
+  name: 'Harry Potter', author: 'J.K. Rowling')
+LibraryBook.create(library: 'Skovoroda', floor: 2, row_number: 12, shelf: 15, 
+  name: 'Hobbit', author: ' J.R.R. Tolkien')
 
 LibraryBook.all.map(&:name)
 => [ 'Kobzar', 'Eneida', 'Lord Of The Rings', 'Harry Potter', 'Hobbit' ]
@@ -118,6 +123,8 @@ larry == employee
 employee.department = 'Research'
 employee.save
 => true
+
+google.reload
   
 tim = apple.add_to_employees(
   full_name: 'Tim Cook',
@@ -125,34 +132,130 @@ tim = apple.add_to_employees(
   department: 'HQ'
 )
 
-Fire.connection.get(?/).body
+Fire.tree
 => {'Organization'=>
-             {'usa'=>
-                  {'ca'=>
-                       {'apple'=>
-                            {'country'=>'USA',
-                             'employees'=>
-                                 {'hq'=>
-                                      {'h543ka'=>
-                                           {'department'=>'HQ',
-                                            'full_name'=>'Tim Cook',
-                                            'id'=>'h543ka',
-                                            'position'=>'CEO'}}},
-                             'name'=>'Apple',
-                             'state'=>'CA'},
-                        'google'=>
-                            {'country'=>'USA',
-                             'employees'=>
-                                 {'research'=>
-                                      {'d23h1a'=>
-                                           {'department'=>'Research',
-                                            'full_name'=>'Larry Page',
-                                            'id'=>'d23h1a',
-                                            'position'=>'CEO'}}},
-                             'name'=>'Google',
-                             'state'=>'CA'}}}}}
+     {'usa'=>
+          {'ca'=>
+               {'apple'=>
+                    {'country'=>'USA',
+                     'employees'=>
+                         {'hq'=>
+                              {'h543ka'=>
+                                   {'department'=>'HQ',
+                                    'full_name'=>'Tim Cook',
+                                    'id'=>'h543ka',
+                                    'position'=>'CEO'}}},
+                     'name'=>'Apple',
+                     'state'=>'CA'},
+                'google'=>
+                    {'country'=>'USA',
+                     'employees'=>
+                         {'research'=>
+                              {'d23h1a'=>
+                                   {'department'=>'Research',
+                                    'full_name'=>'Larry Page',
+                                    'id'=>'d23h1a',
+                                    'position'=>'CEO'}}},
+                     'name'=>'Google',
+                     'state'=>'CA'}}}}}
+```
+Single Nested Models
+```ruby
+class Car < Fire::Model
+  has_path_keys :manufacturer, :model, :car_class
+end
 
+class Engine < Fire::SingleNestedModel
+  nested_in Car
+end
+
+scirocco = Car.create(manufacturer: 'Volkswagen', model: 'Scirocco', car_class: 'Sport compact')
+scirocco.add_to_engine(code: 'I4 turbo', power: '122 PS')
+
+car = Car.create(manufacturer: 'Zaporozhets', model: 'ZAZ-965', car_class: 'Mini', 
+  engine: { code: 'MeMZ-966' })
+
+zaporozhets = Car.take(manufacturer: 'Zaporozhets', model: 'ZAZ-965', car_class: 'Mini', id: car.id)
+expect(zaporozhets.nested_engine.code).to eq('MeMZ-966')
+
+Fire.tree
+=> {
+  'Car'=>
+    {'volkswagen'=>
+         {'scirocco'=>
+              {'sport-compact'=>
+                   {'adqa21'=>
+                        {'car_class'=>'Sport compact',
+                         'engine'=>{'code'=>'I4 turbo', 'power'=>'122 PS'},
+                         'id'=>'adqa21',
+                         'manufacturer'=>'Volkswagen',
+                         'model'=>'Scirocco'}}}},
+     'zaporozhets'=>
+         {'zaz-965'=>
+              {'mini'=>
+                   {'23rtfw'=>
+                        {'car_class'=>'Mini',
+                         'engine'=>{'code'=>'MeMZ-966'},
+                         'id'=>'23rtfw',
+                         'manufacturer'=>'Zaporozhets',
+                         'model'=>'ZAZ-965'}}}}}})
+
+zap2 = Car.take(manufacturer: 'Zaporozhets', model: 'ZAZ-965', car_class: 'Mini', id: car.id)
+zap2.nested_engine.update(code: 'MeMZ-555')
+zaporozhets.nested_engine.reload.code
+=> 'MeMZ-555'
+```
 
+Nested Models with Parent`s values
+```ruby
+class House < Fire::Model
+  has_path_keys :country, :city, :street
+  set_id_key(:house_number)
+end
+
+class Room < Fire::NestedModel
+  nested_in House, parent_values: true
+  set_id_key(:number)
+  has_path_keys :floor
+end
+
+house = House.create(country: 'Ukraine', city: 'Kyiv', 
+  street: 'Shevchenko Ave.', house_number: '53101')
+  
+house.add_to_rooms(floor: 200, number: '1A')
+house.add_to_rooms(floor: 150, number: '2A')
+
+
+rooms = house.reload.nested_rooms
+expect(rooms.map(&:number).sort).to eq(%w{ 1A 2A }.sort)
+
+Fire.tree
+=>  {'House'=>
+      {'ukraine'=>
+           {'kyiv'=>
+                {'shevchenko-ave'=>
+                     {'53101'=>
+                          {'city'=>'Kyiv',
+                           'country'=>'Ukraine',
+                           'house_number'=>'53101',
+                           'rooms'=>
+                               {'150_'=>
+                                    {'2a'=>
+                                         {'city'=>'Kyiv',
+                                          'country'=>'Ukraine',
+                                          'floor'=>150,
+                                          'number'=>'2A',
+                                          'house_number'=>'53101',
+                                          'street'=>'Shevchenko Ave.'}},
+                                '200_'=>
+                                    {'1a'=>
+                                         {'city'=>'Kyiv',
+                                          'country'=>'Ukraine',
+                                          'floor'=>200,
+                                          'number'=>'1A',
+                                          'house_number'=>'53101',
+                                          'street'=>'Shevchenko Ave.'}}},
+                           'street'=>'Shevchenko Ave.'}}}}}})
 ```
 
 

data/VERSION

@@ -1 +1 @@
-0.0.10
+0.0.11

data/fire-model.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: fire-model 0.0.10 ruby lib
+# stub: fire-model 0.0.11 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "fire-model"
-  s.version = "0.0.10"
+  s.version = "0.0.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Vitaly Tarasenko"]
-  s.date = "2015-06-20"
+  s.date = "2015-06-21"
   s.description = "You can define your Firebase models, set collection names, CRUD your data.  "
   s.email = "vetal.tarasenko@gmail.com"
   s.extra_rdoc_files = [

data/lib/fire-model.rb

@@ -20,6 +20,10 @@ module Fire
     connection.delete(?/)
   end
 
+  def self.tree
+    connection.get(?/).body
+  end
+
   def self.connection
     Fire::Connection::Request.new
   end

data/lib/model/base.rb

@@ -54,6 +54,18 @@ module Fire
       ([ collection_name ] + path_values) * LEVEL_SEPARATOR
     end
 
+    def reload
+      loaded_data = self.class.take(path_data).data
+      @table = loaded_data
+      @cache = {}
+      self
+    end
+
+    def update(attrs)
+      @table.merge!(attrs)
+      save
+    end
+
     # Data Methods
 
     def path_values
@@ -102,6 +114,11 @@ module Fire
       data
     end
 
+    def cache(key, &value)
+      @cache ||= {}
+      @cache[key] ||= value.call
+    end
+
     class << self
 
       # Klass Setters
@@ -196,10 +213,12 @@ module Fire
     end
 
     require_relative './querying/querying'
+    include Querying
+
     require_relative './nested/base'
     require_relative './nested/single'
     require_relative './nested/parent'
-    include Querying
+
     include NestedModel::Parent
   end
 end

data/lib/model/nested/base.rb

@@ -55,6 +55,14 @@ module Fire
         }
       end
 
+      def query(params={}, &filter_condition)
+        raise QueryingNotSupportedError.new
+      end
+
+      def all
+        query
+      end
+
       protected
 
       def default_folder_name
@@ -89,6 +97,12 @@ module Fire
       end
     end
 
+    class QueryingNotSupportedError < FireModelError
+      def initialize
+        super("Nested Models do not support querying")
+      end
+    end
+
   end
 
 end

data/lib/model/nested/parent.rb

@@ -15,7 +15,9 @@ module Fire
 
           folder = nested_model.folder
           define_method "nested_#{folder}" do
-            nested_model.folder_content(self)
+            self.cache(folder) do
+              nested_model.folder_content(self)
+            end
           end
 
           define_method "add_to_#{folder}" do |object|

data/lib/model/nested/single.rb

@@ -9,7 +9,8 @@ module Fire
       end
 
       def folder_content(parent)
-        new(parent.send(folder).merge(parent.path_data))
+        object = parent.send(folder) || {}
+        new(object.merge(parent.path_data))
       end
 
       protected

data/lib/model/querying/querying.rb

@@ -12,7 +12,8 @@ module Fire
           response = connection.get(full_path).body
           return [] if response.nil?
 
-          rows = down_levels(response, (own_path_keys - direct_keys).count)
+          needed_levels = (all_path_keys - direct_keys - default_path_keys).count
+          rows = down_levels(response, needed_levels)
 
           filter_result(rows, filter_opts(params, direct_keys), filter_condition)
         end

data/spec/models/main_spec.rb

@@ -146,7 +146,7 @@ describe 'Fire Models' do
           has_path_keys(:library, :floor, :row_number, :shelf)
         end
 
-        LibraryBook.create(library: 'Shevchenko', floor: 1, row_number: 1, shelf: 10, name: 'Kobzar', author: 'T.G. Shevchenko')
+        book = LibraryBook.create(library: 'Shevchenko', floor: 1, row_number: 1, shelf: 10, name: 'Kobzar', author: 'T.G. Shevchenko')
         LibraryBook.create(library: 'Shevchenko', floor: 1, row_number: 1, shelf: 15, name: 'Eneida', author: 'I. Kotlyrevskiy')
         LibraryBook.create(library: 'Shevchenko', floor: 2, row_number: 15, shelf: 115, name: 'Lord Of The Rings', author: ' J.R.R. Tolkien')
         LibraryBook.create(library: 'Skovoroda', floor: 1, row_number: 25, shelf: 34, name: 'Harry Potter', author: 'J.K. Rowling')
@@ -172,6 +172,12 @@ describe 'Fire Models' do
 
         # Query by math condition
         expect(LibraryBook.query{|m| m.row_number % 5 == 0  }.map(&:name)).to eq([ 'Lord Of The Rings', 'Harry Potter' ])
+
+        # Query by full path
+        expect(LibraryBook.query(library: 'Shevchenko', floor: 1, row_number: 1, shelf: 10).map(&:name)).to eq([ 'Kobzar' ])
+
+        # Take by full path + ID
+        expect(LibraryBook.take(library: 'Shevchenko', floor: 1, row_number: 1, shelf: 10, id: book.id).name).to eq('Kobzar')
       end
 
     end
@@ -184,6 +190,7 @@ describe 'Fire Models' do
           has_path_keys(:x, :y)
         end
 
+        # Creating
         p1 = Point.create(x: 1, y: 1, value: 1)
         p2 = Point.create(x: 1, y: 2, value: 2)
         p3 = Point.create(x: 2, y: 1, value: 3)
@@ -191,23 +198,31 @@ describe 'Fire Models' do
 
         expect(Point.all.map(&:value).sort).to eq([ 1, 2, 3, 4 ].sort)
 
+        # ID generation
         expect(p1.id).to be
 
+        # Updating
         p1.value = 5
         expect(p1.path_changed?).to be_falsey
         p1.save
 
+
         expect(Point.all.map(&:value).sort).to eq([ 5, 2, 3, 4 ].sort)
 
         reloaded_point = Point.take(x: p2.x, y: p2.y, id: p2.id)
-        reloaded_point.value = 6
+        reloaded_point.update(value: 6)
 
         expect(reloaded_point.path_changed?).to be_falsey
 
         reloaded_point.save
-
         expect(Point.all.map(&:value).sort).to eq([ 5, 6, 3, 4 ].sort)
 
+        # Reloading
+        expect(p2.value).to eq(2)
+        p2.reload
+        expect(p2.value).to eq(6)
+
+        # Deletion
         p1.delete
 
         expect(Point.all.map(&:value).sort).to eq([ 6, 3, 4].sort)

data/spec/models/nested_models_spec.rb

@@ -2,210 +2,223 @@ require 'spec_helper'
 
 describe 'Nested Models' do
 
-  before :each do
-    Fire.drop!
-  end
-
-  after :each do
-    Fire.drop!
-  end
+  context 'With Firebase Connection' do
 
-  it 'should declare nested models' do
-
-    class Organization < Fire::Model
-      has_path_keys :country, :state
-      set_id_key(:name)
+    before :each do
+      Fire.drop!
     end
 
-    expect(Organization.nested_models).to be_empty
+    after :each do
+      Fire.drop!
+    end
 
-    class Employee < Fire::NestedModel
-      nested_in Organization
-      has_path_keys :department
+    def current_data
+      Fire.tree
     end
 
-    expect(Organization.nested_models).to eq([ Employee ])
-
-    google = Organization.create(name: 'Google', country: 'USA', state: 'CA')
-    apple = Organization.create(name: 'Apple', country: 'USA', state: 'CA')
-
-    expect(current_data).to eq(
-        {'Organization'=>
-                {'usa'=>
-                     {'ca'=>
-                          {'apple'=>{'country'=>'USA', 'name'=>'Apple', 'state'=>'CA'},
-                           'google'=>{'country'=>'USA', 'name'=>'Google', 'state'=>'CA'}}}}})
-
-    larry = Employee.create(name: 'Google', country: 'USA', state: 'CA',
-                    department: 'HQ', full_name: 'Larry Page', position: 'CEO')
-
-    expect(current_data).to eq(
-        {'Organization'=>
-             {'usa'=>
-                  {'ca'=>
-                       {'apple'=>{'country'=>'USA', 'name'=>'Apple', 'state'=>'CA'},
-                        'google'=>{
-                            'country'=>'USA', 'name'=>'Google', 'state'=>'CA', 'employees' => {
-                                'hq' => {
-                                    larry.id => {
-                                        'id' => larry.id,
-                                        'full_name' => 'Larry Page',
-                                        'position' => 'CEO',
-                                        'department' => 'HQ',
-                                    }}}}}}}})
-
-    google = Organization.query(name: 'Google').first
-    google.nested_employees
-
-    employee = google.nested_employees.first
-    expect(larry).to eq(employee)
-
-    employee.department = 'Research'
-    employee.save
-
-    expect(current_data).to eq(
-        {'Organization'=>
-             {'usa'=>
-                  {'ca'=>
-                       {'apple'=>{'country'=>'USA', 'name'=>'Apple', 'state'=>'CA'},
-                        'google'=>{
-                            'country'=>'USA', 'name'=>'Google', 'state'=>'CA', 'employees' => {
-                                'research' => {
-                                    larry.id => {
-                                        'id' => larry.id,
-                                        'full_name' => 'Larry Page',
-                                        'position' => 'CEO',
-                                        'department' => 'Research',
-                                    }}}}}}}})
-
-    apple = Organization.query(name: 'Apple').first
-    tim = apple.add_to_employees(
-      full_name: 'Tim Cook',
-      position: 'CEO',
-      department: 'HQ'
-    )
-
-    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'=>'Larry Page',
-                                            'id'=>larry.id,
-                                            'position'=>'CEO'}}},
-                             'name'=>'Google',
-                             'state'=>'CA'}}}}}
-    )
-  end
+    it 'should declare nested models' do
 
-  context 'Nested Models Types' do
+      class Organization < Fire::Model
+        has_path_keys :country, :state
+        set_id_key(:name)
+      end
 
-    it 'should declare single nested models' do
+      expect(Organization.nested_models).to be_empty
 
-      class Car < Fire::Model
-        has_path_keys :manufacturer, :model, :car_class
+      class Employee < Fire::NestedModel
+        nested_in Organization
+        has_path_keys :department
       end
 
-      class Engine < Fire::SingleNestedModel
-        nested_in Car
-      end
+      expect(Organization.nested_models).to eq([ Employee ])
+
+      google = Organization.create(name: 'Google', country: 'USA', state: 'CA')
+      apple = Organization.create(name: 'Apple', country: 'USA', state: 'CA')
 
-      scirocco = Car.create(manufacturer: 'Volkswagen', model: 'Scirocco', car_class: 'Sport compact')
-      scirocco.add_to_engine(code: 'I4 turbo', power: '122 PS')
-
-      car = Car.create(manufacturer: 'Zaporozhets', model: 'ZAZ-965', car_class: 'Mini', engine: { code: 'MeMZ-966' })
-
-      zaporozhets = Car.take(manufacturer: 'Zaporozhets', model: 'ZAZ-965', car_class: 'Mini', id: car.id)
-      expect(zaporozhets.nested_engine.code).to eq('MeMZ-966')
-
-      expect(current_data).to eq({
-        'Car'=>
-          {'volkswagen'=>
-               {'scirocco'=>
-                    {'sport-compact'=>
-                         {scirocco.id=>
-                              {'''car_class'=>'Sport compact',
-                               'engine'=>{'code'=>'I4 turbo', 'power'=>'122 PS'},
-                               'id'=>scirocco.id,
-                               'manufacturer'=>'Volkswagen',
-                               'model'=>'Scirocco'}}}},
-           'zaporozhets'=>
-               {'zaz-965'=>
-                    {'mini'=>
-                         {zaporozhets.id=>
-                              {'car_class'=>'Mini',
-                               'engine'=>{'code'=>'MeMZ-966'},
-                               'id'=>zaporozhets.id,
-                               'manufacturer'=>'Zaporozhets',
-                               'model'=>'ZAZ-965'}}}}}})
+      expect(current_data).to eq(
+          {'Organization'=>
+                  {'usa'=>
+                       {'ca'=>
+                            {'apple'=>{'country'=>'USA', 'name'=>'Apple', 'state'=>'CA'},
+                             'google'=>{'country'=>'USA', 'name'=>'Google', 'state'=>'CA'}}}}})
+
+      larry = Employee.create(name: 'Google', country: 'USA', state: 'CA',
+                      department: 'HQ', full_name: 'Larry Page', position: 'CEO')
+
+      expect(current_data).to eq(
+          {'Organization'=>
+               {'usa'=>
+                    {'ca'=>
+                         {'apple'=>{'country'=>'USA', 'name'=>'Apple', 'state'=>'CA'},
+                          'google'=>{
+                              'country'=>'USA', 'name'=>'Google', 'state'=>'CA', 'employees' => {
+                                  'hq' => {
+                                      larry.id => {
+                                          'id' => larry.id,
+                                          'full_name' => 'Larry Page',
+                                          'position' => 'CEO',
+                                          'department' => 'HQ',
+                                      }}}}}}}})
+
+
+      employee = google.reload.nested_employees.first
+      expect(larry).to eq(employee)
+
+      employee.update(department: 'Research')
+
+      expect(current_data).to eq(
+          {'Organization'=>
+               {'usa'=>
+                    {'ca'=>
+                         {'apple'=>{'country'=>'USA', 'name'=>'Apple', 'state'=>'CA'},
+                          'google'=>{
+                              'country'=>'USA', 'name'=>'Google', 'state'=>'CA', 'employees' => {
+                                  'research' => {
+                                      larry.id => {
+                                          'id' => larry.id,
+                                          'full_name' => 'Larry Page',
+                                          'position' => 'CEO',
+                                          'department' => 'Research',
+                                      }}}}}}}})
+
+      tim = apple.add_to_employees(
+        full_name: 'Tim Cook',
+        position: 'CEO',
+        department: 'HQ'
+      )
+
+      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'=>'Larry Page',
+                                              'id'=>larry.id,
+                                              'position'=>'CEO'}}},
+                               'name'=>'Google',
+                               'state'=>'CA'}}}}}
+      )
     end
 
-    it 'should allow to declare nested models with all *parent values* duplicated' do
-      class House < Fire::Model
-        has_path_keys :country, :city, :street
-        set_id_key(:house_number)
-      end
+    context 'Nested Models Types' do
+
+      it 'should declare single nested models' do
 
-      class Room < Fire::NestedModel
-        nested_in House, parent_values: true
-        set_id_key(:number)
-        has_path_keys :floor
+        class Car < Fire::Model
+          has_path_keys :manufacturer, :model, :car_class
+        end
+
+        class Engine < Fire::SingleNestedModel
+          nested_in Car
+        end
+
+        scirocco = Car.create(manufacturer: 'Volkswagen', model: 'Scirocco', car_class: 'Sport compact')
+        scirocco.add_to_engine(code: 'I4 turbo', power: '122 PS')
+
+        car = Car.create(manufacturer: 'Zaporozhets', model: 'ZAZ-965', car_class: 'Mini', engine: { code: 'MeMZ-966' })
+
+        zaporozhets = Car.take(manufacturer: 'Zaporozhets', model: 'ZAZ-965', car_class: 'Mini', id: car.id)
+        expect(zaporozhets.nested_engine.code).to eq('MeMZ-966')
+
+        expect(current_data).to eq({
+          'Car'=>
+            {'volkswagen'=>
+                 {'scirocco'=>
+                      {'sport-compact'=>
+                           {scirocco.id=>
+                                {'car_class'=>'Sport compact',
+                                 'engine'=>{'code'=>'I4 turbo', 'power'=>'122 PS'},
+                                 'id'=>scirocco.id,
+                                 'manufacturer'=>'Volkswagen',
+                                 'model'=>'Scirocco'}}}},
+             'zaporozhets'=>
+                 {'zaz-965'=>
+                      {'mini'=>
+                           {zaporozhets.id=>
+                                {'car_class'=>'Mini',
+                                 'engine'=>{'code'=>'MeMZ-966'},
+                                 'id'=>zaporozhets.id,
+                                 'manufacturer'=>'Zaporozhets',
+                                 'model'=>'ZAZ-965'}}}}}})
+
+        # nested association caching
+        zaporozhets.nested_engine.code = 'MeMZ-777'
+        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')
       end
 
-      house = House.create(country: 'Ukraine', city: 'Kyiv', street: 'Shevchenko Ave.', house_number: '53101')
-      house.add_to_rooms(floor: 200, number: '1A')
-      house.add_to_rooms(floor: 150, number: '2A')
+      it 'should allow to declare nested models with all *parent values* duplicated' do
+        class House < Fire::Model
+          has_path_keys :country, :city, :street
+          set_id_key(:house_number)
+        end
+
+        class Room < Fire::NestedModel
+          nested_in House, parent_values: true
+          set_id_key(:number)
+          has_path_keys :floor
+        end
 
-      house = House.query(house_number: '53101').first
-      rooms = house.nested_rooms
-      expect(rooms.map(&:number).sort).to eq(%w{ 1A 2A }.sort)
+        house = House.create(country: 'Ukraine', city: 'Kyiv', street: 'Shevchenko Ave.', house_number: '53101')
+        house.add_to_rooms(floor: 200, number: '1A')
+        house.add_to_rooms(floor: 150, number: '2A')
+
+
+        rooms = house.reload.nested_rooms
+        expect(rooms.map(&:number).sort).to eq(%w{ 1A 2A }.sort)
+
+        expect(current_data).to eq(
+          {'House'=>
+              {'ukraine'=>
+                   {'kyiv'=>
+                        {'shevchenko-ave'=>
+                             {'53101'=>
+                                  {'city'=>'Kyiv',
+                                   'country'=>'Ukraine',
+                                   'house_number'=>'53101',
+                                   'rooms'=>
+                                       {'150_'=>
+                                            {'2a'=>
+                                                 {'city'=>'Kyiv',
+                                                  'country'=>'Ukraine',
+                                                  'floor'=>150,
+                                                  'number'=>'2A',
+                                                  'house_number'=>'53101',
+                                                  'street'=>'Shevchenko Ave.'}},
+                                        '200_'=>
+                                            {'1a'=>
+                                                 {'city'=>'Kyiv',
+                                                  'country'=>'Ukraine',
+                                                  'floor'=>200,
+                                                  'number'=>'1A',
+                                                  'house_number'=>'53101',
+                                                  'street'=>'Shevchenko Ave.'}}},
+                                   'street'=>'Shevchenko Ave.'}}}}}})
 
-      expect(current_data).to eq(
-        {'House'=>
-            {'ukraine'=>
-                 {'kyiv'=>
-                      {'shevchenko-ave'=>
-                           {'53101'=>
-                                {'city'=>'Kyiv',
-                                 'country'=>'Ukraine',
-                                 'house_number'=>'53101',
-                                 'rooms'=>
-                                     {'150_'=>
-                                          {'2a'=>
-                                               {'city'=>'Kyiv',
-                                                'country'=>'Ukraine',
-                                                'floor'=>150,
-                                                'number'=>'2A',
-                                                'house_number'=>'53101',
-                                                'street'=>'Shevchenko Ave.'}},
-                                      '200_'=>
-                                          {'1a'=>
-                                               {'city'=>'Kyiv',
-                                                'country'=>'Ukraine',
-                                                'floor'=>200,
-                                                'number'=>'1A',
-                                                'house_number'=>'53101',
-                                                'street'=>'Shevchenko Ave.'}}},
-                                 'street'=>'Shevchenko Ave.'}}}}}})
+      end
 
     end
-
   end
 
   context 'Restrictions' do
@@ -262,10 +275,22 @@ describe 'Nested Models' do
         end
       }).to raise_error(Fire::SingleNestedModel::PathKeysNotSupported)
     end
-  end
 
-  def current_data
-    Fire.connection.get(?/).body
+    it 'should now allow to query by Nested Models' do
+      class Earth < Fire::Model
+
+      end
+
+      class Moon < Fire::SingleNestedModel
+        nested_in Earth
+      end
+
+      expect(->{
+        Moon.query
+      }).to raise_error(Fire::NestedModel::QueryingNotSupportedError)
+    end
+
+
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fire-model
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Vitaly Tarasenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-20 00:00:00.000000000 Z
+date: 2015-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tarvit-helpers