Merge remote-tracking branch 'upstream/pull/2970' into master

[rails.git] / lib / potlatch.rb

diff --git a/lib/potlatch.rb b/lib/potlatch.rb
index 0b01daf2964bad39810e284874c9d30a950660bf..605d69db33d1da9ab971fb33e1144349362848f1 100644 (file)
--- a/lib/potlatch.rb
+++ b/lib/potlatch.rb
@@ -62,7 +62,7 @@ module Potlatch
 
     # Envelope data into AMF writeable form
     def self.putdata(index, n)
 
     # Envelope data into AMF writeable form
     def self.putdata(index, n)

-      d = encodestring(index + "/onResult")
+      d = encodestring("#{index}/onResult")

       d += encodestring("null")
       d += [-1].pack("N")
       d += encodevalue(n)
       d += encodestring("null")
       d += [-1].pack("N")
       d += encodevalue(n)


@@ -120,7 +120,7 @@ module Potlatch
   # The Dispatcher class handles decoding a series of RPC calls
   # from the request, dispatching them, and encoding the response
   class Dispatcher
   # The Dispatcher class handles decoding a series of RPC calls
   # from the request, dispatching them, and encoding the response
   class Dispatcher

-    def initialize(request, &_block)
+    def initialize(request, &block)

       # Get stream for request data
       @request = StringIO.new(request + 0.chr)
 
       # Get stream for request data
       @request = StringIO.new(request + 0.chr)
 


@@ -135,7 +135,7 @@ module Potlatch
       end
 
       # Capture the dispatch routine
       end
 
       # Capture the dispatch routine

-      @dispatch = Proc.new
+      @dispatch = block

     end
 
     def each(&_block)
     end
 
     def each(&_block)


@@ -144,7 +144,7 @@ module Potlatch
 
       # Output response header
       a, b = bodies.divmod(256)
 
       # Output response header
       a, b = bodies.divmod(256)

-      yield 0.chr + 0.chr + 0.chr + 0.chr + a.chr + b.chr
+      yield 0.chr * 4 + a.chr + b.chr

 
       # Process the bodies
       bodies.times do                     # Read each body
 
       # Process the bodies
       bodies.times do                     # Read each body


@@ -178,15 +178,15 @@ module Potlatch
       presettype = ""
       presetcategory = ""
       #  StringIO.open(txt) do |file|
       presettype = ""
       presetcategory = ""
       #  StringIO.open(txt) do |file|

-      File.open(Rails.root.join("config", "potlatch", "presets.txt")) do |file|
+      File.open(Rails.root.join("config/potlatch/presets.txt")) do |file|

         file.each_line do |line|
         file.each_line do |line|

-          t = line.chomp
-          if t =~ %r{(\w+)/(\w+)}
+          case line.chomp
+          when %r{(\w+)/(\w+)}

             presettype = Regexp.last_match(1)
             presetcategory = Regexp.last_match(2)
             presetmenus[presettype].push(presetcategory)
             presetnames[presettype][presetcategory] = ["(no preset)"]
             presettype = Regexp.last_match(1)
             presetcategory = Regexp.last_match(2)
             presetmenus[presettype].push(presetcategory)
             presetnames[presettype][presetcategory] = ["(no preset)"]

-          elsif t =~ /^([\w\s]+):\s?(.+)$/
+          when /^([\w\s]+):\s?(.+)$/

             pre = Regexp.last_match(1)
             kv = Regexp.last_match(2)
             presetnames[presettype][presetcategory].push(pre)
             pre = Regexp.last_match(1)
             kv = Regexp.last_match(2)
             presetnames[presettype][presetcategory].push(pre)


@@ -202,7 +202,7 @@ module Potlatch
       colours = {}
       casing = {}
       areas = {}
       colours = {}
       casing = {}
       areas = {}

-      File.open(Rails.root.join("config", "potlatch", "colours.txt")) do |file|
+      File.open(Rails.root.join("config/potlatch/colours.txt")) do |file|

         file.each_line do |line|
           next unless line.chomp =~ /(\w+)\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)/
 
         file.each_line do |line|
           next unless line.chomp =~ /(\w+)\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)/
 


@@ -217,7 +217,7 @@ module Potlatch
       relcolours = {}
       relalphas = {}
       relwidths = {}
       relcolours = {}
       relalphas = {}
       relwidths = {}

-      File.open(Rails.root.join("config", "potlatch", "relation_colours.txt")) do |file|
+      File.open(Rails.root.join("config/potlatch/relation_colours.txt")) do |file|

         file.each_line do |line|
           next unless line.chomp =~ /(\w+)\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)/
 
         file.each_line do |line|
           next unless line.chomp =~ /(\w+)\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)/
 


@@ -231,7 +231,7 @@ module Potlatch
       # Read POI presets
       icon_list = []
       icon_tags = {}
       # Read POI presets
       icon_list = []
       icon_tags = {}

-      File.open(Rails.root.join("config", "potlatch", "icon_presets.txt")) do |file|
+      File.open(Rails.root.join("config/potlatch/icon_presets.txt")) do |file|

         file.each_line do |line|
           (icon, tags) = line.chomp.split("\t")
           icon_list.push(icon)
         file.each_line do |line|
           (icon, tags) = line.chomp.split("\t")
           icon_list.push(icon)


@@ -242,7 +242,7 @@ module Potlatch
 
       # Read auto-complete
       autotags = { "point" => {}, "way" => {}, "POI" => {} }
 
       # Read auto-complete
       autotags = { "point" => {}, "way" => {}, "POI" => {} }

-      File.open(Rails.root.join("config", "potlatch", "autocomplete.txt")) do |file|
+      File.open(Rails.root.join("config/potlatch/autocomplete.txt")) do |file|

         file.each_line do |line|
           next unless line.chomp =~ %r{^([\w:]+)/(\w+)\s+(.+)$}
 
         file.each_line do |line|
           next unless line.chomp =~ %r{^([\w:]+)/(\w+)\s+(.+)$}