julien51-babylon 0.1.2 → 0.1.3

data/lib/babylon/base/controller.rb

@@ -21,7 +21,9 @@ module Babylon
         begin
           self.send(@action_name)
         rescue
-          Babylon.logger.error("#{$!}:\n#{$!.backtrace.join("\n")}")
+          Babylon.logger.error {
+            "#{$!}:\n#{$!.backtrace.join("\n")}"
+          }
         end
         self.render
       end
@@ -86,9 +88,13 @@ module Babylon
       ##
       # Creates the view and "evaluates" it to build the XML for the stanza
       def render_for_file(file)
-        Babylon.logger.info("RENDERING : #{file}")
+        Babylon.logger.info {
+          "RENDERING : #{file}"
+        }
         @view = Babylon::Base::View.new(file, assigns)
-        Babylon.logger.info(" ")
+        Babylon.logger.info {
+          " "
+        }
       end
       
     end

data/lib/babylon/base/view.rb

@@ -25,7 +25,7 @@ module Babylon
         raise ViewFileNotFound unless Babylon.views[@view_template] 
         builder = Nokogiri::XML::Builder.new 
         builder.stream do |xml|
-          eval(Babylon.views[@view_template]) 
+          eval(Babylon.views[@view_template], binding, @view_template, 1)
         end
         builder.doc.root.children # we output the document built 
       end 

data/lib/babylon/client_connection.rb

@@ -27,7 +27,9 @@ module Babylon
           # If ruby version is too old and SRV is unknown, this will raise a NameError
           # which is caught below
           host_from_jid = params["jid"].split("/").first.split("@").last
-          Babylon.logger.debug("RESOLVING: _xmpp-client._tcp.#{host_from_jid} (SRV)")
+          Babylon.logger.debug {
+            "RESOLVING: _xmpp-client._tcp.#{host_from_jid} (SRV)"
+          }
           srv = dns.getresources("_xmpp-client._tcp.#{host_from_jid}", Resolv::DNS::Resource::IN::SRV)
         }
         # Sort SRV records: lowest priority first, highest weight first
@@ -45,7 +47,9 @@ module Babylon
           end
         }
       rescue NameError
-        Babylon.logger.debug "Resolv::DNS does not support SRV records. Please upgrade to ruby-1.8.3 or later! \n#{$!} : #{$!.backtrace.join("\n")}"
+        Babylon.logger.debug {
+          "Resolv::DNS does not support SRV records. Please upgrade to ruby-1.8.3 or later! \n#{$!} : #{$!.backtrace.join("\n")}"
+        }
       end
     end
 
@@ -181,7 +185,9 @@ module Babylon
             begin
               @handler.on_connected(self) if @handler and @handler.respond_to?("on_connected")
             rescue
-              Babylon.logger.error("on_connected failed : #{$!}\n#{$!.backtrace.join("\n")}")
+              Babylon.logger.error {
+                "on_connected failed : #{$!}\n#{$!.backtrace.join("\n")}"
+              }
             end
             @state = :connected
           end

data/lib/babylon/component_connection.rb

@@ -52,7 +52,9 @@ module Babylon
           begin
             @handler.on_connected(self) if @handler and @handler.respond_to?("on_connected")
           rescue
-            Babylon.logger.error("on_connected failed : #{$!}\n#{$!.backtrace.join("\n")}")
+            Babylon.logger.error {
+              "on_connected failed : #{$!}\n#{$!.backtrace.join("\n")}"
+            }
           end
           @state = :connected
         elsif stanza.name == "stream:error"

data/lib/babylon/router.rb

@@ -31,7 +31,9 @@ module Babylon
     # Executes the route for the given xml_stanza, by instantiating the controller_name, calling action_name and sending 
     # the result to the connection
     def execute_route(controller_name, action_name, xml_stanza = nil)
-      Babylon.logger.info("ROUTING TO #{controller_name}::#{action_name}") 
+      Babylon.logger.info {
+        "ROUTING TO #{controller_name}::#{action_name}"
+      }
       stanza = nil
       stanza = Kernel.const_get(action_name.capitalize).new(xml_stanza) if xml_stanza
       controller = controller_name.new(stanza) 

data/lib/babylon/runner.rb

@@ -13,7 +13,14 @@ module Babylon
       
       # Add an outputter to the logger
       log_file = Log4r::RollingFileOutputter.new("#{Babylon.environment}", :filename => "log/#{Babylon.environment}.log", :trunc => false)
-      log_file.formatter = Log4r::PatternFormatter.new(:pattern => "%d (#{Process.pid}) [%l] :: %m", :date_pattern => "%d/%m %H:%M")
+      case Babylon.environment
+      when "production"
+        log_file.formatter = Log4r::PatternFormatter.new(:pattern => "%d (#{Process.pid}) [%l] :: %m", :date_pattern => "%d/%m %H:%M")      
+      when "development"
+        log_file.formatter = Log4r::PatternFormatter.new(:pattern => "%d (#{Process.pid}) [%l] :: %m", :date_pattern => "%d/%m %H:%M")      
+      else
+        log_file.formatter = Log4r::PatternFormatter.new(:pattern => "%d (#{Process.pid}) [%l] :: %m", :date_pattern => "%d/%m %H:%M")      
+      end
       Babylon.logger.add(log_file)
       
       # Requiring all models, stanza, controllers
@@ -76,10 +83,14 @@ module Babylon
     def self.add_connection_observer(observer)
       @@observers ||= Array.new 
       if observer.ancestors.include? Babylon::Base::Controller
-        Babylon.logger.debug("Added #{observer} to the list of Connection Observers")
+        Babylon.logger.debug {
+          "Added #{observer} to the list of Connection Observers"
+        }
         @@observers.push(observer) unless @@observers.include? observer
       else
-        Babylon.logger.error("Observer can only be Babylon::Base::Controller")
+        Babylon.logger.error {
+          "Observer can only be Babylon::Base::Controller"
+        }
         false
       end
     end
@@ -111,10 +122,14 @@ module Babylon
       begin
         Babylon.router.route(stanza)
       rescue Babylon::NotConnected
-        Babylon.logger.fatal("#{$!.class} => #{$!.inspect}\n#{$!.backtrace.join("\n")}")
+        Babylon.logger.fatal {
+          "#{$!.class} => #{$!.inspect}\n#{$!.backtrace.join("\n")}"
+        }
         EventMachine::stop_event_loop
       rescue
-        Babylon.logger.error("#{$!.class} => #{$!.inspect}\n#{$!.backtrace.join("\n")}")
+        Babylon.logger.error {
+          "#{$!.class} => #{$!.inspect}\n#{$!.backtrace.join("\n")}"
+        }
       end
     end
     

data/lib/babylon/xmpp_connection.rb

@@ -45,11 +45,15 @@ module Babylon
     # It passes itself (as handler) and the configuration
     # This can very well be overwritten by subclasses.
     def self.connect(params, handler)
-      Babylon.logger.debug("CONNECTING TO #{params["host"]}:#{params["port"]} with #{handler.inspect} as connection handler") # Very low level Logging
+      Babylon.logger.debug {
+        "CONNECTING TO #{params["host"]}:#{params["port"]} with #{handler.inspect} as connection handler" # Very low level Logging
+      }
       begin
         EventMachine.connect(params["host"], params["port"], self, params.merge({"handler" => handler}))
       rescue RuntimeError
-        Babylon.logger.error("CONNECTION ERROR : #{$!.class} => #{$!}") # Very low level Logging
+        Babylon.logger.error {
+          "CONNECTION ERROR : #{$!.class} => #{$!}" # Very low level Logging
+        }
         raise NotConnected
       end
     end
@@ -58,18 +62,24 @@ module Babylon
     # Called when the connection is completed.
     def connection_completed
       @connected = true
-      Babylon.logger.debug("CONNECTED") # Very low level Logging
+      Babylon.logger.debug {
+        "CONNECTED"
+      } # Very low level Logging
     end
 
     ##
     # Called when the connection is terminated and stops the event loop
     def unbind()
       @connected = false
-      Babylon.logger.debug("DISCONNECTED") # Very low level Logging
+      Babylon.logger.debug {
+        "DISCONNECTED"
+      } # Very low level Logging
       begin
         @handler.on_disconnected() if @handler and @handler.respond_to?("on_disconnected")
       rescue
-        Babylon.logger.error("on_disconnected failed : #{$!}\n#{$!.backtrace.join("\n")}")
+        Babylon.logger.error {
+          "on_disconnected failed : #{$!}\n#{$!.backtrace.join("\n")}"
+        }
       end
     end
 
@@ -94,12 +104,16 @@ module Babylon
     ##
     # Called when a full stanza has been received and returns it to the central router to be sent to the corresponding controller.
     def receive_stanza(stanza)
-      Babylon.logger.debug("PARSED : #{stanza.to_xml}")
+      Babylon.logger.debug {
+        "PARSED : #{stanza.to_xml}"
+      }
       # If not handled by subclass (for authentication)
       case stanza.name
       when "stream:error"
         if !stanza.children.empty? and stanza.children.first.name == "xml-not-well-formed"
-          Babylon.logger.error("DISCONNECTED DUE TO MALFORMED STANZA")
+          Babylon.logger.error {
+            "DISCONNECTED DUE TO MALFORMED STANZA"
+          }
           raise XmlNotWellFormed
         end
         # In any case, we need to close the connection.
@@ -108,7 +122,9 @@ module Babylon
         begin
           @handler.on_stanza(stanza) if @handler and @handler.respond_to?("on_stanza")
         rescue
-          Babylon.logger.error("on_stanza failed : #{$!}\n#{$!.backtrace.join("\n")}")
+          Babylon.logger.error {
+            "on_stanza failed : #{$!}\n#{$!.backtrace.join("\n")}"
+          }
         end
       end 
     end 
@@ -130,8 +146,10 @@ module Babylon
     def send_chunk(string)
       raise NotConnected unless @connected
       return if string.blank?
-      raise StanzaTooBig if string.length > XmppConnection.max_stanza_size
-      Babylon.logger.debug("SENDING : " + string)
+      raise StanzaTooBig, "Stanza Too Big (#{string.length} vs. #{XmppConnection.max_stanza_size})\n #{string}" if string.length > XmppConnection.max_stanza_size
+      Babylon.logger.debug {
+        "SENDING : " + string
+      }
       send_data string
     end
 
@@ -139,10 +157,14 @@ module Babylon
     # receive_data is called when data is received. It is then passed to the parser. 
     def receive_data(data)
       begin
-        Babylon.logger.debug("RECEIVED : #{data}")
+        # Babylon.logger.debug {
+        #   "RECEIVED : #{data}"
+        # }
         @parser.push(data) 
       rescue
-        Babylon.logger.error("#{$!}\n#{$!.backtrace.join("\n")}")
+        Babylon.logger.error {
+          "#{$!}\n#{$!.backtrace.join("\n")}"
+        }
       end
     end
   end

data/spec/lib/babylon/base/view_spec.rb

@@ -49,7 +49,7 @@ describe Babylon::Base::View do
     
     it "should call eval on the view file" do
       Babylon.views.stub!(:[]).with(@view_template).and_return(@xml_string)
-      @view.should_receive(:eval).with(@xml_string)
+      @view.should_receive(:eval).with(@xml_string, an_instance_of(Binding), @view_template, 1)
       @view.evaluate
     end
     

data/spec/lib/babylon/xmpp_connection_spec.rb

@@ -62,14 +62,9 @@ describe Babylon::XmppConnection do
       @connection.post_init
       @connection.instance_variable_get("@parser").should == parser
     end
-    
   end
   
   describe "connection_completed" do
-    it "should write a log message" do
-      Babylon.logger.should_receive(:debug).with("CONNECTED")
-      @connection.connection_completed
-    end
     it "should set @connected to true" do
       @connection.connection_completed
       @connection.instance_variable_get("@connected").should be_true
@@ -77,11 +72,6 @@ describe Babylon::XmppConnection do
   end
   
   describe "unbind" do
-    it "should write a log message, and call on_disconnected" do
-      Babylon.logger.should_receive(:debug).with("DISCONNECTED")
-      handler_mock.should_receive(:on_disconnected)
-      @connection.unbind
-    end
     it "should set @connected to false" do
       @connection.connection_completed
       @connection.unbind
@@ -95,11 +85,6 @@ describe Babylon::XmppConnection do
       @doc = Nokogiri::XML::Document.new
     end
     
-    it "should write a log message for debug" do
-      Babylon.logger.should_receive(:debug).with(/PARSED/)
-      @connection.receive_stanza(Nokogiri::XML::Node.new("node", @doc))
-    end
-    
     describe "with an stanza that starts with stream:error" do
       
       before(:each) do
@@ -118,10 +103,6 @@ describe Babylon::XmppConnection do
            @error_stanza.add_child(@xml_not_well_formed_stanza)
          end
       
-        it "should write an error to the log and raise an error" do
-          Babylon.logger.should_receive(:error).with(/DISCONNECTED DUE TO MALFORMED STANZA/)
-          lambda {@connection.receive_stanza(@error_stanza)}.should raise_error(Babylon::XmlNotWellFormed)
-        end
       end
     end
     
@@ -206,12 +187,6 @@ describe Babylon::XmppConnection do
       @connection.instance_variable_get("@parser").stub!(:push).and_return(true)
     end
     
-    it "should show a message on the log" do
-      data = "<hello>hello world!</hello>"
-      Babylon.logger.should_receive(:debug).with("RECEIVED : #{data}")
-      @connection.__send__(:receive_data, data)
-    end
-    
     it "should push the received data to the parser" do
       data = "<hello>hello world!</hello>"
       @connection.instance_variable_get("@parser").should_receive(:push).with(data).and_return(true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: julien51-babylon
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - julien Genestoux