active_poro 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4e43ea9ea78bdde2baab6cdbcac5c6ed70552c3
-  data.tar.gz: 6bac908f0f51f75a7a013044009b1ba8d24d2924
+  metadata.gz: b338750e482aee089da8aadb601c00da369e062f
+  data.tar.gz: fdf0737739226fec8f4c5b4fa5f62bbac77fefcf
 SHA512:
-  metadata.gz: b4fbe7a1ad8365b16d04c38eeaa692154405d1ce04aab34693367a9967f4aef917f19a372e80c248bce764ad43af133419a347a1e1d4d213d79429582c63957f
-  data.tar.gz: dcac90e161b9c14aeac187afa3e6eec17869a97c00d3da39d2c92eee14cfe7b2981bf8a62e6923317de0428b3e5ff458f765243913b01d3a8cf185850b49fdd8
+  metadata.gz: eb82d3cf0f5fb6b78c66bfc64b664cdf39b0d0895116c58a9f138d373b640c4b5985ecf7bc8df9044bf28e7657ccc0e30ced3fa886bb6578e7dd4aa131b9b8d5
+  data.tar.gz: 6cc328b1058c513a0efab6c355611e3bc169f50301b69ac78328d1c4d94893e9f9ae7990b5adb091fd5bfb1cd7b43ad109a01b199a22edffc15c1329850367ae

data/README.md

@@ -52,8 +52,8 @@ Now, with that in place you should be able to do
 
 ```ruby
 dog = Dog.new
-flea_a = Flew.new
-flea_b = Flew.new
+flea_a = Flea.new
+flea_b = Flea.new
 
 # associate the fleas with the dog
 dog.fleas = [flea_a, flea_b]

data/lib/active_poro/relations.rb

@@ -41,7 +41,7 @@ module ActivePoro
       def has_one(target_name)
         # define getter method
         define_method target_name do
-          instance_variable_get("@#{target_name}") || []
+          instance_variable_get("@#{target_name}")
         end
 
         # define setter method
@@ -50,7 +50,7 @@ module ActivePoro
           unless member.send(reflected_association_name) == self
             member.send "#{reflected_association_name}=", self
           end
-          instance_variable_set("@#{target_name}", member || [])
+          instance_variable_set("@#{target_name}", (member || nil))
         end
       end
 

data/lib/active_poro/version.rb

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

data/spec/active_poro_spec.rb

@@ -3,82 +3,119 @@ require 'spec_helper'
 describe 'ActivePoro' do
   context 'Model' do
     context 'relations' do
-      before do
-        class Dog < BaseTestClass
-          include ActivePoro::Model
-          has_many :fleas
-        end
 
-        class Flea < BaseTestClass
-          include ActivePoro::Model
-          belongs_to :dog
+      context 'has_one + belongs_to' do
+        before do
+          class Driver < BaseTestClass
+            include ActivePoro::Model
+            has_one :car
+          end
+
+          class Car < BaseTestClass
+            include ActivePoro::Model
+            belongs_to :driver
+          end
         end
-      end
 
-      let(:big_dog){ Dog.new('Big big_dog') }
-      let(:flea_a){ Flea.new('A') }
-      let(:flea_b){ Flea.new('B') }
+        let(:driver){ Driver.new('Mike') }
+        let(:car){ Car.new('A') }
 
-      context 'when dog gets fleas' do
-        let(:dog_with_fleas) do
-          big_dog.fleas = [flea_a, flea_b]
-          big_dog
+        it 'initializes unrelated/unassociated' do
+          expect(car.driver).to be_nil
+          expect(driver.car).to be_nil
         end
 
-        it 'initializes with an empty array of fleas' do
-          expect(big_dog.fleas).to eq([])
+        it 'associates the car to the driver and viceversa' do
+          driver.car = car
+          expect(car.driver).to eq(driver)
+          expect(driver.car).to eq(car)
         end
 
-        it 'is directly associated with pre-existant fleas' do
-          expect(dog_with_fleas.fleas).to eq([flea_a, flea_b])
+        it 'associates the driver to the car and viceversa' do
+          driver.car = car
+          expect(driver.car).to eq(car)
+          expect(car.driver).to eq(driver)
         end
 
-        it 'correctly sets the right big_dog to each flea' do
-          dog_with_fleas.fleas.each do |flea|
-            expect(flea.dog).to eq(big_dog)
+      end
+
+      context 'has_many + belongs_to' do
+        before do
+          class Dog < BaseTestClass
+            include ActivePoro::Model
+            has_many :fleas
+          end
+
+          class Flea < BaseTestClass
+            include ActivePoro::Model
+            belongs_to :dog
           end
         end
-      end
 
-      context 'when fleas jump onto big_dog' do
-        it 'fleas have no dog to begin with' do
-          expect(flea_a.dog).to be_nil
+        let(:big_dog){ Dog.new('Big dog') }
+        let(:flea_a){ Flea.new('A') }
+        let(:flea_b){ Flea.new('B') }
+
+        context 'when dog gets fleas' do
+          let(:dog_with_fleas) do
+            big_dog.fleas = [flea_a, flea_b]
+            big_dog
+          end
+
+          it 'initializes with an empty array of fleas' do
+            expect(big_dog.fleas).to eq([])
+          end
+
+          it 'is directly associated with pre-existant fleas' do
+            expect(dog_with_fleas.fleas).to eq([flea_a, flea_b])
+          end
+
+          it 'correctly sets the right dog to each flea' do
+            dog_with_fleas.fleas.each do |flea|
+              expect(flea.dog).to eq(big_dog)
+            end
+          end
         end
 
-        it 'fleas may have the big_dog associated to them and viceversa' do
-          flea_a.dog = big_dog
-          expect(flea_a.dog).to eq(big_dog)
-          expect(big_dog.fleas).to eq([flea_a])
+        context 'when fleas jump onto big_dog' do
+          it 'fleas have no dog to begin with' do
+            expect(flea_a.dog).to be_nil
+          end
+
+          it 'fleas may have the big_dog associated to them and viceversa' do
+            flea_a.dog = big_dog
+            expect(flea_a.dog).to eq(big_dog)
+            expect(big_dog.fleas).to eq([flea_a])
+
+            flea_b.dog = big_dog
+            expect(flea_b.dog).to eq(big_dog)
+            expect(big_dog.fleas).to eq([flea_a, flea_b])
+          end
 
-          flea_b.dog = big_dog
-          expect(flea_b.dog).to eq(big_dog)
-          expect(big_dog.fleas).to eq([flea_a, flea_b])
         end
 
-      end
+        context 'when a flea jumps between dogs' do
 
-      context 'when a flea jumps between dogs' do
+          let(:small_dog){ Dog.new('Small dog') }
 
-        let(:small_dog){ Dog.new('Small dog') }
+          it 'cannot be in two dogs at the same time' do
+            flea_a.dog = big_dog
+            expect(flea_a.dog).to eq(big_dog)
+            expect(big_dog.fleas).to eq([flea_a])
 
-        it 'cannot be in two dogs at the same time' do
-          flea_a.dog = big_dog
-          expect(flea_a.dog).to eq(big_dog)
-          expect(big_dog.fleas).to eq([flea_a])
+            # flea jumps from big dog to small dog
+            flea_a.dog = small_dog
+            expect(flea_a.dog).to eq(small_dog)
+            expect(small_dog.fleas).to eq([flea_a])
 
-          # flea jumps from big dog to small dog
-          flea_a.dog = small_dog
-          expect(flea_a.dog).to eq(small_dog)
-          expect(small_dog.fleas).to eq([flea_a])
+            # flea A no longer in big dog
+            expect(big_dog.fleas).to_not include(flea_a)
+            expect(big_dog.fleas).to be_empty # sanity check
+          end
 
-          # flea A no longer in big dog
-          expect(big_dog.fleas).to_not include(flea_a)
-          expect(big_dog.fleas).to be_empty # sanity check
         end
-
       end
 
     end
-
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_poro
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Miguel Diaz