with_popup 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc6b4929c87d9fbf8e19da6de439b351694c44d1
-  data.tar.gz: 4d14b07853d5f74b8d715450b0a6ef51495a992b
+  metadata.gz: 5464e30a0fa3ecb96e2e074958ec7d3630374f20
+  data.tar.gz: 0600195c384ea0d64af8e47448447923a486a74f
 SHA512:
-  metadata.gz: 48ba97bf97b179835237567c3edfa41aeb98ceaef98bdd9f7c26dd1a2f8ea17377b04cf0510390db7a4261df7f9f9ca372c1e74e53647e86d4d4407c7478cba8
-  data.tar.gz: 94b7085a4ad81954ae98c9f2f44769398bec368325d0e3f2550393ee6ac5549ca25f130871a996a340b1c51376244f43a50f5dc483f24b0baf4909ef77efdb13
+  metadata.gz: 3257778adf653385f0cbcc98cd24262a277091c34256044fc9e2573fedbc3f673ef268387385231d9ff8e65c5b527f1d6cd1125961fe0531bd947a1def3680b6
+  data.tar.gz: 21adf6a89f75ae80815650932f8c6c716e5d2e351835c2f345a93e3bf766155567ebf64892f8820cc6ee89a80d9f28449f8badbb30ee7061a67bd4845c142aa5

data/lib/with_popup.rb

@@ -1,5 +1,5 @@
 require "with_popup/engine"
-require 'with_popup/controller'
+require 'with_popup/controllers'
 require 'with_popup/helpers'
 
 module WithPopup

data/lib/with_popup/controllers.rb

@@ -0,0 +1,6 @@
+module WithPopup
+  module Controllers
+    extend ActiveSupport::Autoload
+    autoload :ActionController
+  end
+end

data/lib/with_popup/controllers/action_controller.rb

@@ -0,0 +1,13 @@
+module WithPopup
+  module Controllers
+    module ActionController
+      def close_popup
+        session[:_with_popup] = :close
+      end
+
+      def reload_popup(path)
+        session[:_with_popup] = path
+      end
+    end
+  end
+end

data/lib/with_popup/engine.rb

@@ -5,7 +5,7 @@ module WithPopup
 
     initializer 'with_popup.include_modules' do
       ActiveSupport.on_load :action_controller do
-        include WithPopup::Controller
+        include WithPopup::Controllers::ActionController
       end
       ActiveSupport.on_load :action_view do
         include WithPopup::Helpers::FormTagHelper

data/lib/with_popup/helpers/form_helper.rb

@@ -1,13 +1,17 @@
-module WithPopup::Helpers::FormHelper
-  include WithPopup::Helpers::Util
+module WithPopup
+  module Helpers
+    module FormHelper
+      include WithPopup::Helpers::Util
 
-  def submit_with_popup(value = nil, options = {})
-    add_with_popup_option_to!(options)
-    submit(value, options)
-  end
+      def submit_with_popup(value = nil, options = {})
+        add_with_popup_option_to!(options)
+        submit(value, options)
+      end
 
-  def button_with_popup(value = nil, options = {}, &block)
-    add_with_popup_option_to!(options)
-    button(value, options, &block)
+      def button_with_popup(value = nil, options = {}, &block)
+        add_with_popup_option_to!(options)
+        button(value, options, &block)
+      end
+    end
   end
 end

data/lib/with_popup/helpers/form_tag_helper.rb

@@ -1,43 +1,47 @@
-module WithPopup::Helpers::FormTagHelper
-  include WithPopup::Helpers::Util
-
-  def submit_with_popup_tag(value = 'Save changes', options = {})
-    add_with_popup_option_to!(options)
-    submit_tag(value, options)
-  end
-
-  def image_submit_with_popup_tag(source, options = {})
-    add_with_popup_option_to!(options)
-    image_submit_tag(source, options)
-  end
-
-  def button_with_popup_tag(content_or_options = nil, options = {}, &block)
-    add_with_popup_option_to!(options)
-    button_tag(content_or_options, options, &block)
-  end
-
-  def button_with_popup_to(name = nil, options = nil, html_options = {}, &block)
-    add_with_popup_option_to!(html_options)
-    button_to(name, options, html_options, &block)
-  end
-
-  def link_with_popup_to(name = nil, options = nil, html_options = {}, &block)
-    add_with_popup_option_to!(html_options)
-    link_to(name, options, html_options, &block)
-  end
-
-  def link_with_popup_to_if(condition, name, options = {}, html_options = {}, &block)
-    add_with_popup_option_to!(html_options)
-    link_to_if(condition, name, options, html_options, &block)
-  end
-
-  def link_with_popup_to_unless(condition, name, options = {}, html_options = {}, &block)
-    add_with_popup_option_to!(html_options)
-    link_to_unless(condition, name, options, html_options, &block)
-  end
-
-  def link_with_popup_to_unless_current(name, options = {}, html_options = {}, &block)
-    add_with_popup_option_to!(html_options)
-    link_to_unless_current(name, options, html_options, &block)
+module WithPopup
+  module Helpers
+    module FormTagHelper
+      include WithPopup::Helpers::Util
+
+      def submit_with_popup_tag(value = 'Save changes', options = {})
+        add_with_popup_option_to!(options)
+        submit_tag(value, options)
+      end
+
+      def image_submit_with_popup_tag(source, options = {})
+        add_with_popup_option_to!(options)
+        image_submit_tag(source, options)
+      end
+
+      def button_with_popup_tag(content_or_options = nil, options = {}, &block)
+        add_with_popup_option_to!(options)
+        button_tag(content_or_options, options, &block)
+      end
+
+      def button_with_popup_to(name = nil, options = nil, html_options = {}, &block)
+        add_with_popup_option_to!(html_options)
+        button_to(name, options, html_options, &block)
+      end
+
+      def link_with_popup_to(name = nil, options = nil, html_options = {}, &block)
+        add_with_popup_option_to!(html_options)
+        link_to(name, options, html_options, &block)
+      end
+
+      def link_with_popup_to_if(condition, name, options = {}, html_options = {}, &block)
+        add_with_popup_option_to!(html_options)
+        link_to_if(condition, name, options, html_options, &block)
+      end
+
+      def link_with_popup_to_unless(condition, name, options = {}, html_options = {}, &block)
+        add_with_popup_option_to!(html_options)
+        link_to_unless(condition, name, options, html_options, &block)
+      end
+
+      def link_with_popup_to_unless_current(name, options = {}, html_options = {}, &block)
+        add_with_popup_option_to!(html_options)
+        link_to_unless_current(name, options, html_options, &block)
+      end
+    end
   end
 end

data/lib/with_popup/rack.rb

@@ -1,60 +1,63 @@
-class WithPopup::Rack
-  def initialize(app)
-    @app = app
-  end
-
-  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
-
-  private
-
-  def need_injection?
-    @status == 200 && html? && popup_param
-  end
-
-  def html?
-    @headers["Content-Type"].try(:include?, "text/html")
-  end
-
-  def popup_param
-    session[:_with_popup]
-  end
-
-  def session
-    @env['rack.session']
-  end
-
-  def clear_param!
-    session.delete :_with_popup
-  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 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
+module WithPopup
+  class Rack
+
+    def initialize(app)
+      @app = app
+    end
+
+    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
+
+    private
+
+    def need_injection?
+      @status == 200 && html? && popup_param
+    end
+
+    def html?
+      @headers["Content-Type"].try(:include?, "text/html")
+    end
+
+    def popup_param
+      session[:_with_popup]
+    end
+
+    def session
+      @env['rack.session']
+    end
+
+    def clear_param!
+      session.delete :_with_popup
+    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 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

data/lib/with_popup/test_helpers.rb

@@ -0,0 +1,6 @@
+module WithPopup
+  module TestHelpers
+    extend ActiveSupport::Autoload
+    autoload :Controller
+  end
+end

data/lib/with_popup/test_helpers/controller.rb

@@ -0,0 +1,13 @@
+module WithPopup
+  module TestHelpers
+    module Controller
+      def with_popup_reloading_path
+        session[:_with_popup] == :close ? nil : session[:_with_popup]
+      end
+
+      def with_popup_is_closing?
+        session[:_with_popup] == :close
+      end
+    end
+  end
+end

data/lib/with_popup/version.rb

@@ -1,3 +1,3 @@
 module WithPopup
-  VERSION = "0.0.7"
+  VERSION = "0.1.0"
 end

data/spec/controllers/test_helper_spec.rb

@@ -0,0 +1,35 @@
+require 'rails_helper'
+
+describe 'TestHelper', type: :controller do
+  describe '#with_popup_reloading_path' do
+    context 'when popup is going to be reloaded' do
+      it 'returns reloading url' do
+        session[:_with_popup] = '/path/to'
+        expect(with_popup_reloading_path).to eql '/path/to'
+      end
+    end
+
+    context 'when popup is closing' do
+      it 'returns nil' do
+        session[:_with_popup] = :close
+        expect(with_popup_reloading_path).to be_nil
+      end
+    end
+  end
+
+  describe '#with_popup_is_closing?' do
+    context 'when popup is going to be reloaded' do
+      it 'returns false' do
+        session[:_with_popup] = '/path/to'
+        expect(with_popup_is_closing?).to be_falsy
+      end
+    end
+
+    context 'when popup is closing' do
+      it 'returns nil' do
+        session[:_with_popup] = :close
+        expect(with_popup_is_closing?).to be_truthy
+      end
+    end
+  end
+end

data/spec/dummy/log/development.log

@@ -19236,3 +19236,127 @@ Processing by PostsController#create as HTML
   Parameters: {"utf8"=>"✓", "authenticity_token"=>"nn3SRsO7PND08Q8Awypqokzw2l/6FTaCIRLQCnOCe/TxljjeHs22s0PUudn9sMOxXFpFPst7HDcAOKwssf6/ng==", "post"=>{"body"=>""}, "commit"=>"submit (with popup_features)", "view"=>"form_helper"}
   Rendered posts/form_helper.html.erb within layouts/application (0.7ms)
 Completed 200 OK in 26ms (Views: 16.2ms | ActiveRecord: 0.0ms)
+
+
+Started GET "/" for ::1 at 2016-03-24 14:03:50 +0700
+  ActiveRecord::SchemaMigration Load (0.4ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Processing by TopController#index as HTML
+  Rendered top/index.html.erb within layouts/application (3.4ms)
+Completed 200 OK in 245ms (Views: 245.1ms | ActiveRecord: 0.0ms)
+
+
+Started GET "/posts/new?view=form_tag_helper" for ::1 at 2016-03-24 14:03:53 +0700
+Processing by PostsController#new as HTML
+  Parameters: {"view"=>"form_tag_helper"}
+  Rendered posts/form_tag_helper.html.erb within layouts/application (20.8ms)
+Completed 200 OK in 53ms (Views: 39.9ms | ActiveRecord: 0.5ms)
+
+
+Started POST "/posts" for ::1 at 2016-03-24 14:03:55 +0700
+Processing by PostsController#create as HTML
+  Parameters: {"utf8"=>"✓", "authenticity_token"=>"hXe7wmoh5HZrFZhMqC2VWhfeUTzNS5VgP8UiHsuDjo3qnFFat1duFdwwLpWWtzxJB3TOXfwlv9Ue7144Cf9K5w==", "post"=>{"body"=>""}, "commit"=>"submit_tag (with popup options)", "view"=>"form_tag_helper"}
+  Rendered posts/form_tag_helper.html.erb within layouts/application (3.9ms)
+Completed 200 OK in 45ms (Views: 23.2ms | ActiveRecord: 0.0ms)
+
+
+Started GET "/posts/src" for ::1 at 2016-03-24 14:03:55 +0700
+Processing by PostsController#src as HTML
+  Rendered posts/src.html.erb within layouts/application (0.8ms)
+Completed 200 OK in 34ms (Views: 34.1ms | ActiveRecord: 0.0ms)
+
+
+Started POST "/posts" for ::1 at 2016-03-24 14:03:58 +0700
+Processing by PostsController#create as HTML
+  Parameters: {"utf8"=>"✓", "authenticity_token"=>"pYSzMNt36e5Gc5+1NwDdyHEo7bGIOdCm6F9aAcReC67Kb1moBgFjjfFWKWwJmnTbYYJy0LlX+hPJdSYnBiLPxA==", "post"=>{"body"=>"e"}, "commit"=>"submit_tag (with popup options)", "view"=>"form_tag_helper"}
+Redirected to http://localhost:3000/posts/done
+Completed 302 Found in 10ms (ActiveRecord: 0.0ms)
+
+
+Started GET "/posts/src" for ::1 at 2016-03-24 14:03:58 +0700
+Processing by PostsController#src as HTML
+  Rendered posts/src.html.erb within layouts/application (0.1ms)
+Completed 200 OK in 24ms (Views: 24.2ms | ActiveRecord: 0.0ms)
+
+
+Started GET "/posts/done" for ::1 at 2016-03-24 14:03:58 +0700
+Processing by PostsController#done as HTML
+  Rendered posts/done.html.erb within layouts/application (1.1ms)
+Completed 200 OK in 38ms (Views: 37.7ms | ActiveRecord: 0.0ms)
+
+
+Started GET "/posts/reload" for ::1 at 2016-03-24 14:03:58 +0700
+Processing by PostsController#reload as HTML
+  Rendered posts/reload.html.erb within layouts/application (0.5ms)
+Completed 200 OK in 22ms (Views: 21.8ms | ActiveRecord: 0.0ms)
+
+
+Started GET "/monthly_sales" for 127.0.0.1 at 2016-03-24 14:05:20 +0700
+
+ActionController::RoutingError (No route matches [GET] "/monthly_sales"):
+  actionpack (4.2.6) lib/action_dispatch/middleware/debug_exceptions.rb:21:in `call'
+  actionpack (4.2.6) lib/action_dispatch/middleware/show_exceptions.rb:30:in `call'
+  railties (4.2.6) lib/rails/rack/logger.rb:38:in `call_app'
+  railties (4.2.6) lib/rails/rack/logger.rb:20:in `block in call'
+  activesupport (4.2.6) lib/active_support/tagged_logging.rb:68:in `block in tagged'
+  activesupport (4.2.6) lib/active_support/tagged_logging.rb:26:in `tagged'
+  activesupport (4.2.6) lib/active_support/tagged_logging.rb:68:in `tagged'
+  railties (4.2.6) lib/rails/rack/logger.rb:20:in `call'
+  quiet_assets (1.1.0) lib/quiet_assets.rb:27:in `call_with_quiet_assets'
+  actionpack (4.2.6) lib/action_dispatch/middleware/request_id.rb:21:in `call'
+  rack (1.6.4) lib/rack/methodoverride.rb:22:in `call'
+  rack (1.6.4) lib/rack/runtime.rb:18:in `call'
+  activesupport (4.2.6) lib/active_support/cache/strategy/local_cache_middleware.rb:28:in `call'
+  rack (1.6.4) lib/rack/lock.rb:17:in `call'
+  actionpack (4.2.6) lib/action_dispatch/middleware/static.rb:120:in `call'
+  rack (1.6.4) lib/rack/sendfile.rb:113:in `call'
+  railties (4.2.6) lib/rails/engine.rb:518:in `call'
+  railties (4.2.6) lib/rails/application.rb:165:in `call'
+  rack (1.6.4) lib/rack/lock.rb:17:in `call'
+  rack (1.6.4) lib/rack/content_length.rb:15:in `call'
+  rack (1.6.4) lib/rack/handler/webrick.rb:88:in `service'
+  /Users/madmax/.rbenv/versions/2.3.0/lib/ruby/2.3.0/webrick/httpserver.rb:140:in `service'
+  /Users/madmax/.rbenv/versions/2.3.0/lib/ruby/2.3.0/webrick/httpserver.rb:96:in `run'
+  /Users/madmax/.rbenv/versions/2.3.0/lib/ruby/2.3.0/webrick/server.rb:296:in `block in start_thread'
+
+
+  Rendered /Users/madmax/Programs/itmammoth/with_popup/vendor/bundle/ruby/2.3.0/gems/actionpack-4.2.6/lib/action_dispatch/middleware/templates/rescues/_trace.html.erb (1.6ms)
+  Rendered /Users/madmax/Programs/itmammoth/with_popup/vendor/bundle/ruby/2.3.0/gems/actionpack-4.2.6/lib/action_dispatch/middleware/templates/routes/_route.html.erb (1.0ms)
+  Rendered /Users/madmax/Programs/itmammoth/with_popup/vendor/bundle/ruby/2.3.0/gems/actionpack-4.2.6/lib/action_dispatch/middleware/templates/routes/_table.html.erb (3.8ms)
+  Rendered /Users/madmax/Programs/itmammoth/with_popup/vendor/bundle/ruby/2.3.0/gems/actionpack-4.2.6/lib/action_dispatch/middleware/templates/rescues/_request_and_response.html.erb (1.4ms)
+  Rendered /Users/madmax/Programs/itmammoth/with_popup/vendor/bundle/ruby/2.3.0/gems/actionpack-4.2.6/lib/action_dispatch/middleware/templates/rescues/routing_error.html.erb within rescues/layout (109.9ms)
+
+
+Started GET "/monthly_sales" for 127.0.0.1 at 2016-03-24 14:05:24 +0700
+
+ActionController::RoutingError (No route matches [GET] "/monthly_sales"):
+  actionpack (4.2.6) lib/action_dispatch/middleware/debug_exceptions.rb:21:in `call'
+  actionpack (4.2.6) lib/action_dispatch/middleware/show_exceptions.rb:30:in `call'
+  railties (4.2.6) lib/rails/rack/logger.rb:38:in `call_app'
+  railties (4.2.6) lib/rails/rack/logger.rb:20:in `block in call'
+  activesupport (4.2.6) lib/active_support/tagged_logging.rb:68:in `block in tagged'
+  activesupport (4.2.6) lib/active_support/tagged_logging.rb:26:in `tagged'
+  activesupport (4.2.6) lib/active_support/tagged_logging.rb:68:in `tagged'
+  railties (4.2.6) lib/rails/rack/logger.rb:20:in `call'
+  quiet_assets (1.1.0) lib/quiet_assets.rb:27:in `call_with_quiet_assets'
+  actionpack (4.2.6) lib/action_dispatch/middleware/request_id.rb:21:in `call'
+  rack (1.6.4) lib/rack/methodoverride.rb:22:in `call'
+  rack (1.6.4) lib/rack/runtime.rb:18:in `call'
+  activesupport (4.2.6) lib/active_support/cache/strategy/local_cache_middleware.rb:28:in `call'
+  rack (1.6.4) lib/rack/lock.rb:17:in `call'
+  actionpack (4.2.6) lib/action_dispatch/middleware/static.rb:120:in `call'
+  rack (1.6.4) lib/rack/sendfile.rb:113:in `call'
+  railties (4.2.6) lib/rails/engine.rb:518:in `call'
+  railties (4.2.6) lib/rails/application.rb:165:in `call'
+  rack (1.6.4) lib/rack/lock.rb:17:in `call'
+  rack (1.6.4) lib/rack/content_length.rb:15:in `call'
+  rack (1.6.4) lib/rack/handler/webrick.rb:88:in `service'
+  /Users/madmax/.rbenv/versions/2.3.0/lib/ruby/2.3.0/webrick/httpserver.rb:140:in `service'
+  /Users/madmax/.rbenv/versions/2.3.0/lib/ruby/2.3.0/webrick/httpserver.rb:96:in `run'
+  /Users/madmax/.rbenv/versions/2.3.0/lib/ruby/2.3.0/webrick/server.rb:296:in `block in start_thread'
+
+
+  Rendered /Users/madmax/Programs/itmammoth/with_popup/vendor/bundle/ruby/2.3.0/gems/actionpack-4.2.6/lib/action_dispatch/middleware/templates/rescues/_trace.html.erb (2.4ms)
+  Rendered /Users/madmax/Programs/itmammoth/with_popup/vendor/bundle/ruby/2.3.0/gems/actionpack-4.2.6/lib/action_dispatch/middleware/templates/routes/_route.html.erb (1.1ms)
+  Rendered /Users/madmax/Programs/itmammoth/with_popup/vendor/bundle/ruby/2.3.0/gems/actionpack-4.2.6/lib/action_dispatch/middleware/templates/routes/_table.html.erb (1.4ms)
+  Rendered /Users/madmax/Programs/itmammoth/with_popup/vendor/bundle/ruby/2.3.0/gems/actionpack-4.2.6/lib/action_dispatch/middleware/templates/rescues/_request_and_response.html.erb (1.4ms)
+  Rendered /Users/madmax/Programs/itmammoth/with_popup/vendor/bundle/ruby/2.3.0/gems/actionpack-4.2.6/lib/action_dispatch/middleware/templates/rescues/routing_error.html.erb within rescues/layout (73.1ms)