entangled 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd3064c1f6e0a2646581f73b82460adadd183021
-  data.tar.gz: a7de74b2b66c782d00af12c4c6ca6788e068b37c
+  metadata.gz: 47e523fb330c5b6afaf2a591a5b182cb0f7bb6cd
+  data.tar.gz: c2f08b77e3c57ba6f7ac7141b52f7bb4c2cfd286
 SHA512:
-  metadata.gz: 1b5c9a3d4f5b9a6b3706653162c143cad14f308d5293041faf42058a0e960d87d32b04ae6e04f31dc6101bffe15449e9ef217f3c50749fd647bb6edf82f0e9cf
-  data.tar.gz: cc0882bc886ac6aca547bb34eb398731ce8fa912acffa270f80b0d97d774b66efb473d18053b2503731c53339d72f885d9654967a5aa9abc471d247416fbb6db
+  metadata.gz: c31e87f3e09508d7c56361af3e828f84da4c0156b7ad9763fe3d888dfc2038c5ef3d1df2dbdbf473f6173707f44625d8da37dbaba59ea6e7d69d3fc2992ae85b
+  data.tar.gz: 102f1d094bd646896aade1752327b3edbe0eaea578b1e904572e6ad206d7e701acd369b74950630fc38308a7fc0ab828c4351b4e3f66e1fcc160849d780982e2

data/README.md

@@ -165,9 +165,6 @@ Otherwise the channels won't work.
 
 If you store your Redis instance in `$redis` or `REDIS` (e.g. in an initializer), Entangled will use that assigned instance so that you can configure Redis just like you're used to. Otherwise, Entangled will instantiate Redis itself and use its default settings.
 
-### Database
-Depending on your app's settings, you might have to increase the pool size in your database.yml configuration file, since every new socket will open a new connection to your database.
-
 ## The Client
 You will need to configure your client to create Websockets and understand incoming requests on those sockets. In order to use the helper methods for the front end provided by the Entangled Angular library, you must use Angular in your front end. The use of Angular as counterpart of this gem is highly recommended, since its inherent two way data binding complements the real time functionality of this gem nicely.
 
@@ -321,11 +318,11 @@ The following features are to be implemented next:
 
 - Offline capabilities - when client is disconnected, put websocket interactions in a queue and dequeue all once connected again
 - Support for authentication
+- Support for associations
 - Remove angular dependencies from bower package (they're currently all being downloaded as well when doing bower install)
 - On Heroku (maybe in production in general), objects are always in different order depending on their attributes
 - Add $onChange listener to objects
 - Add diagram on how it works to Readme
-- Reuse open DB connections to reduce pool-size - currently, a new db connection is established for every request, which quickly gets out of hand. Only one DB connection should be opened and maintained per client
 - Check if Rails 4.0.0 supported too
 
 ## Contributing

data/lib/entangled/controller.rb

@@ -27,28 +27,40 @@ module Entangled
         resources_name.singularize
       end
 
-      # Channel name for collection of resources, used in index
-      # action
-      def collection_channel
-        model.channel
-      end
-
       # The model for this controller. E.g. Taco for a TacosController
       def model
         controller_name.classify.constantize
       end
 
+      # Grabs @tacos
+      def collection
+        instance_variable_get(:"@#{resources_name}")
+      end
+
+      # Grabs @taco
+      def member
+        instance_variable_get(:"@#{resource_name}")
+      end
+
       # Channel name for single resource, used in show action
       def member_channel
         member.channel
       end
 
-      def collection
-        instance_variable_get(:"@#{resources_name}")
+      # Channel name for collection of resources, used in index
+      # action
+      def collection_channel
+        model.channel
       end
 
-      def member
-        instance_variable_get(:"@#{resource_name}")
+      # Close the connection to the DB so as to
+      # not exceed the pool size. Otherwise, too many
+      # connections will be leaked and the pool
+      # will be exceeded
+      def close_db_connection
+        if ActiveRecord::Base.connection
+          ActiveRecord::Base.connection.close
+        end
       end
 
       # Broadcast events to every connected client
@@ -92,6 +104,8 @@ module Entangled
                   tubesock.send_data({
                     resources: collection
                   }.to_json)
+
+                  close_db_connection
                 end
               end
 
@@ -131,6 +145,8 @@ module Entangled
                   tubesock.send_data({
                     resource: member
                   }.to_json)
+
+                  close_db_connection
                 end
               end
 
@@ -158,6 +174,8 @@ module Entangled
                   resource: member
                 }.to_json)
               end
+
+              close_db_connection
             end
 
           # If the controller's action name is 'update', a record should be
@@ -177,6 +195,8 @@ module Entangled
                   resource: member
                 }.to_json)
               end
+
+              close_db_connection
             end
 
           # For every other controller action, simply wrap whatever is
@@ -186,6 +206,8 @@ module Entangled
           else
             tubesock.onmessage do |m|
               yield
+
+              close_db_connection
             end
           end
         end

data/lib/entangled/model.rb

@@ -94,11 +94,13 @@ module Entangled
       # to the model's channel or the record's channel
       # gets the message
       def publish(action)
+        # Publish to model's channel
         redis.publish(
           self.class.channel,
           json(action)
         )
 
+        # Publish to record#s channel
         redis.publish(
           channel,
           json(action)

data/lib/entangled/version.rb

@@ -1,3 +1,3 @@
 module Entangled
-  VERSION = "0.0.19"
+  VERSION = "0.0.20"
 end

data/spec/dummy/config/database.yml

@@ -6,7 +6,7 @@
 #
 default: &default
   adapter: sqlite3
-  pool: 5000
+  pool: 5
   timeout: 5000
 
 development:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: entangled
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors:
 - Dennis Charles Hackethal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-13 00:00:00.000000000 Z
+date: 2015-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler