websocket-rails 0.4.0 → 0.4.1

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # WebsocketRails Change Log
 
+February 28 2013
+
+## Version 0.4.1
+
+* Fix bug in ControllerFactory#reload! that prevented the handling of
+internal events when running in the Development environment. Fixes issue #50. - Thanks to @nessche
+
+* Only reload controller classes when Rails config.cache_classes is set
+to false instead of always reloading when in the Rails development
+environment. This better respects the Rails configuration options.
+Addresses issue #51. - Thanks to @ngauthier
+
 February 27 2013
 
 ## Version 0.4.0

data/lib/rails/config/routes.rb

@@ -1,3 +1,7 @@
 Rails.application.routes.draw do
-  match "/websocket", :to => WebsocketRails::ConnectionManager.new
+  if Rails.version >= '4.0.0'
+    get "/websocket", :to => WebsocketRails::ConnectionManager.new
+  else
+    match "/websocket", :to => WebsocketRails::ConnectionManager.new
+  end
 end

data/lib/websocket_rails/controller_factory.rb

@@ -59,11 +59,13 @@ module WebsocketRails
     # Reloads the controller class to pick up code changes
     # while in the development environment.
     def reload!(controller)
-      return unless defined?(Rails) and Rails.env.development?
-
-      class_name = controller.name
-      filename = class_name.underscore
-      load "#{filename}.rb"
+      return unless defined?(Rails) and !Rails.configuration.cache_classes
+      # we don't reload our own controller as we assume it provide as 'library'
+      unless controller == WebsocketRails::InternalController
+        class_name = controller.name
+        filename = class_name.underscore
+        load "#{filename}.rb"
+      end
     end
 
   end

data/lib/websocket_rails/engine.rb

@@ -6,7 +6,12 @@ module WebsocketRails
 
     paths["app"] << "lib/rails/app"
     paths["app/controllers"] << "lib/rails/app/controllers"
-    paths["config/routes"]   << "lib/rails/config/routes.rb"
+
+    if ::Rails.version >= '4.0.0'
+      paths["config/routes.rb"]   << "lib/rails/config/routes.rb"
+    else
+      paths["config/routes"]   << "lib/rails/config/routes.rb"
+    end
 
     rake_tasks do
       require 'websocket-rails'

data/lib/websocket_rails/version.rb

@@ -1,3 +1,3 @@
 module WebsocketRails
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/spec/dummy/log/test.log

@@ -14,3 +14,13 @@ Connecting to database specified by database.yml
 Connecting to database specified by database.yml
 Connecting to database specified by database.yml
 Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml

data/spec/unit/controller_factory_spec.rb

@@ -31,6 +31,19 @@ module WebsocketRails
     end
 
     describe "#new_for_event" do
+
+      context "when Rails is defined and env is set to development" do
+
+        it "creates and returns a controller instance of the InternalController" do
+          rails_env = double(:rails_env)
+          Rails.stub(:env).and_return rails_env
+          rails_env.stub(:development?).and_return true
+          controller = subject.new_for_event(event, InternalController)
+          controller.class.should == InternalController
+        end
+
+      end
+
       it "creates and returns a new controller instance" do
         controller = subject.new_for_event(event, TestController)
         controller.class.should == TestController

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: websocket-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-27 00:00:00.000000000 Z
+date: 2013-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -300,7 +300,7 @@ files:
 - CHANGELOG.md
 homepage: http://danknox.github.com/websocket-rails/
 licenses: []
-post_install_message: ! "  Welcome to WebsocketRails v0.4.0!\n\n  There have been
+post_install_message: ! "  Welcome to WebsocketRails v0.4.1!\n\n  There have been
   a few significant changes in the public\n  API, so if you are upgrading please be
   sure to read the\n  CHANGELOG located at:\n\n  http://github.com/DanKnox/websocket-rails/CHANGELOG.md\n"
 rdoc_options: []
@@ -314,7 +314,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 500969557461387914
+      hash: -416918436862506067
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -323,7 +323,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 500969557461387914
+      hash: -416918436862506067
 requirements: []
 rubyforge_project: websocket-rails
 rubygems_version: 1.8.23