lib/with_popup/rack.rb in with_popup-0.0.7 vs lib/with_popup/rack.rb in with_popup-0.1.0

@@ -1,60 +1,63 @@
-class WithPopup::Rack
-  def initialize(app)
-    @app = app
-  end
+module WithPopup
+  class Rack
 
-  def call(env)
-    @env = env
-    @status, @headers, @response = @app.call(env)
-    return [@status, @headers, @response] unless need_injection?
-    body = inject_js_to_the_response
-    clear_param!
-    [@status, @headers, [body]]
-  end
+    def initialize(app)
+      @app = app
+    end
 
-  private
+    def call(env)
+      @env = env
+      @status, @headers, @response = @app.call(env)
+      return [@status, @headers, @response] unless need_injection?
+      body = inject_js_to_the_response
+      clear_param!
+      [@status, @headers, [body]]
+    end
 
-  def need_injection?
-    @status == 200 && html? && popup_param
-  end
+    private
 
-  def html?
-    @headers["Content-Type"].try(:include?, "text/html")
-  end
+    def need_injection?
+      @status == 200 && html? && popup_param
+    end
 
-  def popup_param
-    session[:_with_popup]
-  end
+    def html?
+      @headers["Content-Type"].try(:include?, "text/html")
+    end
 
-  def session
-    @env['rack.session']
-  end
+    def popup_param
+      session[:_with_popup]
+    end
 
-  def clear_param!
-    session.delete :_with_popup
-  end
+    def session
+      @env['rack.session']
+    end
 
-  def inject_js_to_the_response
-    body = @response.try(:body) || @response.first
-    js = popup_param == :close ? close_popup_js : reload_popup_js
-    body.sub('</body>', js + '</body>')
-  end
+    def clear_param!
+      session.delete :_with_popup
+    end
 
-  def close_popup_js
-    <<-JS
-      <script type="text/javascript">
-        var popup = open('', 'withPopup');
-        popup && popup.close();
-      </script>
-    JS
-  end
+    def inject_js_to_the_response
+      body = @response.try(:body) || @response.first
+      js = popup_param == :close ? close_popup_js : reload_popup_js
+      body.sub('</body>', js + '</body>')
+    end
 
-  def reload_popup_js
-    <<-JS
-      <script type="text/javascript">
-        var popup = open('', 'withPopup');
-        popup && (popup.location.href = '#{popup_param}');
-      </script>
-    JS
+    def close_popup_js
+      <<-JS
+        <script type="text/javascript">
+          var popup = open('', 'withPopup');
+          popup && popup.close();
+        </script>
+      JS
+    end
+
+    def reload_popup_js
+      <<-JS
+        <script type="text/javascript">
+          var popup = open('', 'withPopup');
+          popup && (popup.location.href = '#{popup_param}');
+        </script>
+      JS
+    end
   end
 end