New logic for setting :port in development mode

Now developers running on ports other than 3000 must inform their URL options in config/url_options.yml

New logic for setting :port in development mode
Now developers running on ports other than 3000 must inform their URL options in config/url_options.yml
Antonio Terceiro
1 parent 4c5a5681
Showing 2 changed files with 10 additions and 10 deletions Show diff stats
app/helpers/tags_helper.rb
lib/noosfero.rb
@@ -51,7 +51,7 @@ module TagsHelper
       style = ""+
         "font-size: #{ (v * delta).round + min_size }px;"+
         "top: #{ -(delta/2) - (v * (delta/2)).round }px;"
-      destination = url.kind_of?(Hash) ? url_for(url.merge(tagname_option => tag)) : (url.to_s + tag)
+      destination = url.merge(tagname_option => tag)
       if options[:show_count]
         display_count = options[:show_count] ? "<small><sup>(#{count})</sup></small>" : ""
@@ -60,16 +60,16 @@ module Noosfero
     end
   end
-  # FIXME couldn't think of a way to test this.
-  #
-  # Works (tested by hand) on Rails 2.0.2, with mongrel. Should work with
-  # webrick too.
   def self.development_url_options
-    if Object.const_defined?('OPTIONS')
-      { :port => OPTIONS[:port ]}
-    else
-      {}
-    end
+    @development_url_options ||=
+      begin
+        options = { :port => 3000 }
+        config = File.join(Rails.root, 'config', 'url_options.yml')
+        if File.exists?(config)
+          options.merge!(YAML.load_file(config).symbolize_keys)
+        end
+        options
+      end
   end
	@@ -51,7 +51,7 @@ module TagsHelper		@@ -51,7 +51,7 @@ module TagsHelper
51	style = ""+	51	style = ""+
52	"font-size: #{ (v * delta).round + min_size }px;"+	52	"font-size: #{ (v * delta).round + min_size }px;"+
53	"top: #{ -(delta/2) - (v * (delta/2)).round }px;"	53	"top: #{ -(delta/2) - (v * (delta/2)).round }px;"
54	- destination = url.kind_of?(Hash) ? url_for(url.merge(tagname_option => tag)) : (url.to_s + tag)	54	+ destination = url.merge(tagname_option => tag)
55		55
56	if options[:show_count]	56	if options[:show_count]
57	display_count = options[:show_count] ? "<small><sup>(#{count})</sup></small>" : ""	57	display_count = options[:show_count] ? "<small><sup>(#{count})</sup></small>" : ""