entangled 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8569cc565377ee14c6dac3dcbfb6e29280063196
-  data.tar.gz: 84f9ce03e7cb9c983daecfcb62669c7f35294444
+  metadata.gz: 5c90e25e9bc6ff181667253af48ad1b36235425c
+  data.tar.gz: 21dfcd7b48ed82e22056e8528d196962f6c93ae8
 SHA512:
-  metadata.gz: 7faf6c2db02a6892c1202f36295a717682103bfaa88308fa2fd1b6ecff2bede7199d10e18db2c92d602424b8e303ae8dfd8b9eb79eef60ba5041a1246db73cc4
-  data.tar.gz: 571a4107712c5d61aa1f63345dfcf79362e37a5a8b09cc432246d9e4960a441c63e14da66ca1c7a462788dacc7c9358decd8f46b72dec6440f7774a3aa69a78a
+  metadata.gz: 54f037193337876ec1bc462903f3a05fd9960ef9cc94391772ba33bf754b53405786000a84928f0673d34a56c910ec855a632aceb13d6cd903fadcc81ed072a5
+  data.tar.gz: 68e195848fd01c5349fa81d540dbf23b28adac42fc6210e71c1282f67a6bc2e29dfebbc33408d162edd73bf5c0908f6015a09249d5654f13058f727d20f8dbc8

data/README.md

@@ -270,7 +270,6 @@ The gem relies heavily on convention over configuration and currently only works
 ## Development Priorities
 The following features are to be implemented next:
 
-- Do not build channels for nil parents
 - Make prefix of create path `create_message` instead of `create_messages`
 - Support `belongsTo` in front end
 - Support `has_one` association in back end and front end

data/lib/entangled/model.rb

@@ -82,6 +82,11 @@ module Entangled
       # recursively
       def channels(tail = '')
         channels = []
+
+        # If the record is not persisted, it should not have
+        # any channels
+        return channels unless persisted?
+
         plural_name = self.class.name.underscore.pluralize
 
         # Add collection channel for child only. If the tails
@@ -131,11 +136,13 @@ module Entangled
         }.to_json
       end
 
-      # Find parent classes from belongs_to associations
+      # Find parent classes from belongs_to associations that
+      # are not nil
       def parents
         self.class.
           reflect_on_all_associations(:belongs_to).
-          map{ |a| send(a.name) }
+          map{ |a| send(a.name) }.
+          reject(&:nil?)
       end
     end
     

data/lib/entangled/version.rb

@@ -1,3 +1,3 @@
 module Entangled
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

data/spec/models/channels_spec.rb

@@ -14,6 +14,16 @@ RSpec.describe 'Channels', type: :model do
 
   let!(:child) { Child.create(parent_id: parent.id) }
 
+  # Child without parents
+  let!(:orphan) do
+    child = Child.new
+    child.save(validate: false)
+    child
+  end
+
+  # Child that's not persisted
+  let!(:fetus) { Child.new }
+
   describe "grandmother's channels" do
     it 'has two channels' do
       expect(grandmother.channels.size).to eq 2
@@ -24,7 +34,8 @@ RSpec.describe 'Channels', type: :model do
     end
 
     it 'has a member channel' do
-      expect(grandmother.channels).to include "/grandmothers/#{grandmother.to_param}"
+      channel = "/grandmothers/#{grandmother.to_param}"
+      expect(grandmother.channels).to include channel
     end
   end
 
@@ -38,7 +49,8 @@ RSpec.describe 'Channels', type: :model do
     end
 
     it 'has a member channel' do
-      expect(grandfather.channels).to include "/grandfathers/#{grandfather.to_param}"
+      channel = "/grandfathers/#{grandfather.to_param}"
+      expect(grandfather.channels).to include channel
     end
   end
 
@@ -56,19 +68,25 @@ RSpec.describe 'Channels', type: :model do
     end
 
     it 'has a collection channel nested under its grandmother' do
-      expect(parent.channels).to include "/grandmothers/#{grandmother.to_param}/parents"
+      channel = "/grandmothers/#{grandmother.to_param}/parents"
+      expect(parent.channels).to include channel
     end
 
     it 'has a member channel nested under its grandmother' do
-      expect(parent.channels).to include "/grandmothers/#{grandmother.to_param}/parents/#{parent.to_param}"
+      channel = "/grandmothers/#{grandmother.to_param}"\
+                "/parents/#{parent.to_param}"
+      expect(parent.channels).to include channel
     end
 
     it 'has a collection channel nested under its grandfather' do
-      expect(parent.channels).to include "/grandfathers/#{grandfather.to_param}/parents"
+      channel = "/grandfathers/#{grandfather.to_param}/parents"
+      expect(parent.channels).to include channel
     end
 
     it 'has a member channel nested under its grandfather' do
-      expect(parent.channels).to include "/grandfathers/#{grandfather.to_param}/parents/#{parent.to_param}"
+      channel = "/grandfathers/#{grandfather.to_param}"\
+                "/parents/#{parent.to_param}"
+      expect(parent.channels).to include channel
     end
   end
 
@@ -90,23 +108,44 @@ RSpec.describe 'Channels', type: :model do
     end
 
     it 'has a member channel nested under its parent' do
-      expect(child.channels).to include "/parents/#{parent.to_param}/children/#{child.to_param}"
+      channel = "/parents/#{parent.to_param}/children/#{child.to_param}"
+      expect(child.channels).to include channel
     end
 
     it 'has a collection channel nested under its parent and grandmother' do
-      expect(child.channels).to include "/grandmothers/#{grandmother.to_param}/parents/#{parent.to_param}/children"
+      channel = "/grandmothers/#{grandmother.to_param}"\
+                "/parents/#{parent.to_param}/children"
+      expect(child.channels).to include channel
     end
 
     it 'has a member channel nested under its parent and grandmother' do
-      expect(child.channels).to include "/grandmothers/#{grandmother.to_param}/parents/#{parent.to_param}/children/#{child.to_param}"
+      channel = "/grandmothers/#{grandmother.to_param}"\
+                "/parents/#{parent.to_param}/children/#{child.to_param}"
+      expect(child.channels).to include channel
     end
 
     it 'has a collection channel nested under its parent and grandfather' do
-      expect(child.channels).to include "/grandfathers/#{grandfather.to_param}/parents/#{parent.to_param}/children"
+      channel = "/grandfathers/#{grandfather.to_param}"\
+                "/parents/#{parent.to_param}/children"
+      expect(child.channels).to include channel
     end
 
     it 'has a member channel nested under its parent and grandfather' do
-      expect(child.channels).to include "/grandfathers/#{grandfather.to_param}/parents/#{parent.to_param}/children/#{child.to_param}"
+      channel = "/grandfathers/#{grandfather.to_param}"\
+                "/parents/#{parent.to_param}/children/#{child.to_param}"
+      expect(child.channels).to include channel
+    end
+  end
+
+  describe "orphan's channels" do
+    it 'does not have any parent channels since it has no parent' do
+      expect(orphan.channels.size).to eq 2
+    end
+  end
+
+  describe "fetus's channel" do
+    it 'does not have any channels since it is not persisted' do
+      expect(fetus.channels).to be_empty
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: entangled
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Dennis Charles Hackethal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-07 00:00:00.000000000 Z
+date: 2015-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -285,7 +285,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Makes Rails real time through websockets.