fire-model 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94a83f0d48f12fff80f3b51db09f807a28333547
-  data.tar.gz: f27302a0d64efdfb24bc97f48ff8bb91090a3866
+  metadata.gz: de9855aaa62f8486c88fd342c4e2fda217d042f0
+  data.tar.gz: b1d04688dc786d1ffefb03d22a5e7ecd63a0082e
 SHA512:
-  metadata.gz: 311cb999666f276d673a64ccb98df22200b133181ef7badfc28ffb66eb77138c66db5d39f4f0f7a1ee53926961ba464ae39c9a6496643177b0d47018562aae12
-  data.tar.gz: 7e868d0828ccd06dea11d2ecbf167e8f9eabe40b75cc9252d007780fb06fccfea47ddbc2d321072a1876fa0e76e5792eaff13cc21e64a371dde81522c6277f3c
+  metadata.gz: dd9605004b7ee87c441f509f69ae328c6b2fd36ef9d9ddd50ef8096dfa2f7ef920da12a92fc227762f86a7f23bea977dbd4e987cf68d1e7dc52b6baa76e4157d
+  data.tar.gz: cef9a05347474fd52edcd5844b92d7560a963698aa7d918e76b56dd54d38cf77aab5b6d4e8c94aa96bf100f5e6b148141f802689e8abdfcbb59a550c10dbf660

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.0.10

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.9 ruby lib
+# stub: fire-model 0.0.10 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "fire-model"
-  s.version = "0.0.9"
+  s.version = "0.0.10"
 
   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-19"
+  s.date = "2015-06-20"
   s.description = "You can define your Firebase models, set collection names, CRUD your data.  "
   s.email = "vetal.tarasenko@gmail.com"
   s.extra_rdoc_files = [
@@ -30,8 +30,9 @@ Gem::Specification.new do |s|
     "lib/connection/response.rb",
     "lib/fire-model.rb",
     "lib/model/base.rb",
-    "lib/model/nested/nested_model.rb",
+    "lib/model/nested/base.rb",
     "lib/model/nested/parent.rb",
+    "lib/model/nested/single.rb",
     "lib/model/querying/querying.rb",
     "spec/models/main_spec.rb",
     "spec/models/nested_models_spec.rb",

data/lib/model/base.rb

@@ -196,7 +196,8 @@ module Fire
     end
 
     require_relative './querying/querying'
-    require_relative './nested/nested_model'
+    require_relative './nested/base'
+    require_relative './nested/single'
     require_relative './nested/parent'
     include Querying
     include NestedModel::Parent

data/lib/model/nested/{nested_model.rb → base.rb}

@@ -4,11 +4,15 @@ module Fire
     non_shared_cattr_accessor :parent, :nested_options
 
     def saving_data
-      res = data.clone
-      self.class.parent.all_path_keys.each do |k|
+      return super() if nested_options.parent_values
+
+      self.class.parent.all_path_keys.each_with_object( data.clone) do |k, res|
         res.delete(k)
       end
-      res
+    end
+
+    def nested_options
+      self.class.nested_options
     end
 
     class << self
@@ -39,7 +43,22 @@ module Fire
       end
 
       def folder
-        path_value_param(self.nested_options.folder ? self.nested_options.folder : to_s.pluralize)
+        path_value_param(self.nested_options.folder ? self.nested_options.folder : default_folder_name)
+      end
+
+      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)
+        }
+      end
+
+      protected
+
+      def default_folder_name
+        name.pluralize
       end
     end
 

data/lib/model/nested/parent.rb

@@ -15,11 +15,7 @@ module Fire
 
           folder = nested_model.folder
           define_method "nested_#{folder}" do
-            objects = self.class.down_levels(send(folder), (nested_model.path_keys || []).count)
-            objects.map{|x|
-              full_data = x.merge(self.path_data)
-              nested_model.new(full_data)
-            }
+            nested_model.folder_content(self)
           end
 
           define_method "add_to_#{folder}" do |object|

data/lib/model/nested/single.rb

@@ -0,0 +1,35 @@
+module Fire
+
+  class SingleNestedModel < NestedModel
+
+    class << self
+
+      def has_path_keys(*keys)
+        raise PathKeysNotSupported.new(self)
+      end
+
+      def folder_content(parent)
+        new(parent.send(folder).merge(parent.path_data))
+      end
+
+      protected
+
+      def default_path_keys
+        []
+      end
+
+      def default_folder_name
+        name
+      end
+
+    end
+
+    class PathKeysNotSupported < FireModelError
+      def initialize(single_nested_model)
+        super("Single Model #{single_nested_model} don't support own path keys.")
+      end
+    end
+
+  end
+
+end

data/spec/models/nested_models_spec.rb

@@ -114,6 +114,100 @@ describe 'Nested Models' do
     )
   end
 
+  context 'Nested Models Types' do
+
+    it 'should declare single nested models' do
+
+      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'}}}}}})
+    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
+
+      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')
+
+      house = House.query(house_number: '53101').first
+      rooms = house.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.'}}}}}})
+
+    end
+
+  end
+
   context 'Restrictions' do
     before :each do
 
@@ -126,14 +220,14 @@ describe 'Nested Models' do
 
     it 'should not allow to set path keys if parent model is not set' do
       expect(->{
-        class Room < Fire::NestedModel
+        class HotelRoom < Fire::NestedModel
           has_path_keys :number
           nested_in Hotel, folder: 'rooms'
         end
       }).to raise_error(Fire::NestedModel::ParentModelNotSetError)
 
       expect(->{
-        class Room < Fire::NestedModel
+        class HotelRoom < Fire::NestedModel
           nested_in Hotel, folder: 'rooms'
           has_path_keys :number
         end
@@ -142,19 +236,32 @@ describe 'Nested Models' do
 
     it 'should not allow to declare duplicated path keys in nested models' do
       expect(->{
-        class Room < Fire::NestedModel
+        class HotelRoom < Fire::NestedModel
           nested_in Hotel, folder: 'rooms'
           has_path_keys :number, :class
         end
       }).to raise_error(Fire::NestedModel::DuplicatedParentPathKeyError)
 
       expect(->{
-        class Room < Fire::NestedModel
+        class HotelRoom < Fire::NestedModel
           nested_in Hotel, folder: 'rooms'
           has_path_keys :number, :room_class
         end
       }).to be
     end
+
+    it 'should not allow to declare own path keys in single nested models' do
+      expect(->{
+        class Earth < Fire::Model
+
+        end
+
+        class Moon < Fire::SingleNestedModel
+          nested_in Earth
+          has_path_keys :planet
+        end
+      }).to raise_error(Fire::SingleNestedModel::PathKeysNotSupported)
+    end
   end
 
   def current_data

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fire-model
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Vitaly Tarasenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-19 00:00:00.000000000 Z
+date: 2015-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tarvit-helpers
@@ -156,8 +156,9 @@ files:
 - lib/connection/response.rb
 - lib/fire-model.rb
 - lib/model/base.rb
-- lib/model/nested/nested_model.rb
+- lib/model/nested/base.rb
 - lib/model/nested/parent.rb
+- lib/model/nested/single.rb
 - lib/model/querying/querying.rb
 - spec/models/main_spec.rb
 - spec/models/nested_models_spec.rb