RubyGems - rack-pjax - Versions diffs - 0.5.3 → 0.5.4 - Mend

rack-pjax 0.5.3 → 0.5.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

data/README.md CHANGED Viewed

@@ -3,16 +3,26 @@ Rack-pjax [![stillmaintained](http://stillmaintained.com/eval/rack-pjax.png)](ht
 Rack-pjax is middleware that lets you serve 'chrome-less' pages in respond to [pjax-requests](https://github.com/defunkt/jquery-pjax).
-While responding to a pjax-request is quite easy on a per application basis (e.g. just skip the layout), there are less optimal situations.
-For example when you have:
+It does this by simply filtering the generated page; only the title and inner-html of the pjax-container are sent to the client.
-- a rack stack, consisting of several pieces of middleware
-- an application you can't or don't want to customize server-side (e.g. Spree, Radiant)
+While this won't save you any time rendering the page, it gives you more flexibility where or how to define the pjax-container.
+Ryan Bates featured [rack-pjax on Railscasts](http://railscasts.com/episodes/294-playing-with-pjax) and explains how this gem compares to [pjax_rails](https://github.com/rails/pjax_rails).
-Usage
+Installation
 ------------
-I. Include **rack-pjax** as middleware to your application(-stack)
+Check out the [Railscast notes](http://railscasts.com/episodes/294-playing-with-pjax) how to integrate rack-pjax in your Rails 3.1 application.
+The more generic installation comes down to:
+I. Add the gem to your Gemfile
+```ruby
+    # Gemfile
+    gem "rack-pjax"
+```
+II. Include **rack-pjax** as middleware to your application(-stack)
 ```ruby
     # config.ru
@@ -20,7 +30,8 @@ I. Include **rack-pjax** as middleware to your application(-stack)
     use Rack::Pjax
     run RackApp::Application
 ```
-II. Install [jquery-pjax](https://github.com/defunkt/jquery-pjax). Make sure to add the 'data-pjax-container'-attribute to the container.
+III. Install [jquery-pjax](https://github.com/defunkt/jquery-pjax). Make sure to add the 'data-pjax-container'-attribute to the container.
 ```html
     <head>
@@ -41,19 +52,13 @@ II. Install [jquery-pjax](https://github.com/defunkt/jquery-pjax). Make sure to
     </body>
 ```
-III. Fire up your [pushState-enabled browser](http://caniuse.com/#search=pushstate) and enjoy!
-Installation
-------------
-    $ gem install rack-pjax
+IV. Fire up your [pushState-enabled browser](http://caniuse.com/#search=pushstate) and enjoy!
 Requirements
 ------------
-- Nokogiri
+- Hpricot
 Author

data/lib/rack/pjax/version.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 module Rack
   class Pjax
-    VERSION = "0.5.3"
+    VERSION = "0.5.4"
   end
 end

data/lib/rack/pjax.rb CHANGED Viewed

@@ -1,4 +1,4 @@
-require 'nokogiri'
+require 'hpricot'
 module Rack
   class Pjax
@@ -14,13 +14,16 @@ module Rack
       if pjax?(env)
         new_body = ""
-        body.each do |r|
-          container = Nokogiri::HTML(r).at_css("[@data-pjax-container]")
+        body.each do |b|
+          parsed_body = Hpricot(b)
+          container = parsed_body.at("[@data-pjax-container]")
           if container
-            title = Nokogiri::HTML(r).at_css("title")
-            new_body << title.to_s << container.inner_html.strip
+            title = parsed_body.at("title")
+            new_body << title.to_s if title
+            new_body << container.inner_html
           else
-            new_body << r
+            new_body << b
           end
         end

data/rack-pjax.gemspec CHANGED Viewed

@@ -18,6 +18,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.add_dependency('rack', '>1.0')
-  s.add_dependency('nokogiri', '~>1.5.0')
+  s.add_dependency('rack', '~>1.3')
+  s.add_dependency('hpricot', '~>0.8.4')
 end

data/spec/rack/pjax_spec.rb CHANGED Viewed

@@ -3,41 +3,75 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe Rack::Pjax do
   include Rack::Test::Methods # can be moved to config
-  def app
+  def generate_app(options={})
+    body = options[:body]
     Rack::Lint.new(
-      Rack::Builder.app do
-        use Rack::Pjax
-        run lambda { |env|
-          body = '<html><title>Hello</title><body><div data-pjax-container>World!</div></body></html>'
-          headers = {
-            "Content-Length" => Rack::Utils.bytesize(body).to_s,
-            "Content-Type" => 'text/plain'
-          }
-          [200, headers, [body]]
-        }
-      end
+      Rack::Pjax.new(
+        lambda do |env|
+          [
+            200,
+            {'Content-Type' => 'text/plain', 'Content-Length' => Rack::Utils.bytesize(body).to_s},
+            [body]
+          ]
+        end
+      )
     )
   end
-  context "when receiving a pjax-request" do
-    it "should return title-tag and inner-html of the pjax-container" do
+  context "a pjaxified app, upon receiving a pjax-request" do
+    before do
+      self.class.app = generate_app(:body => '<html><title>Hello</title><body><div data-pjax-container>World!</div></body></html>')
+    end
+    it "should return the title-tag in the body" do
       get "/", {}, {"HTTP_X_PJAX" => "true"}
       body.should == "<title>Hello</title>World!"
     end
-    it "should have the correct Content Length" do
+    it "should return the inner-html of the pjax-container in the body" do
+      self.class.app = generate_app(:body => '<html><body><div data-pjax-container>World!</div></body></html>')
+      get "/", {}, {"HTTP_X_PJAX" => "true"}
+      body.should == "World!"
+    end
+    it "should return the correct Content Length" do
       get "/", {}, {"HTTP_X_PJAX" => "true"}
       headers['Content-Length'].should == Rack::Utils.bytesize(body).to_s
     end
+    it "should return the original body when there's no pjax-container" do
+      self.class.app = generate_app(:body => '<html><body>Has no pjax-container</body></html>')
+      get "/", {}, {"HTTP_X_PJAX" => "true"}
+      body.should == "<html><body>Has no pjax-container</body></html>"
+    end
+    it "should preserve whitespaces of the original body" do
+      container = "\n <p>\nfirst paragraph</p> <p>Second paragraph</p>\n"
+      self.class.app = generate_app(:body =><<-BODY)
+<html>
+<div data-pjax-container>#{container}</div>
+</html>
+BODY
+      get "/", {}, {"HTTP_X_PJAX" => "true"}
+      body.should == container
+    end
   end
-  context "when receiving a non-pjax request" do
-    it "should not alter the body" do
+  context "a pjaxified app, upon receiving a non-pjax request" do
+    before do
+      self.class.app = generate_app(:body => '<html><title>Hello</title><body><div data-pjax-container>World!</div></body></html>')
+    end
+    it "should return the original body" do
       get "/"
       body.should == '<html><title>Hello</title><body><div data-pjax-container>World!</div></body></html>'
     end
-    it "should have the correct Content Length" do
+    it "should return the correct Content Length" do
       get "/"
       headers['Content-Length'].should == Rack::Utils.bytesize(body).to_s
     end

metadata CHANGED Viewed

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rack-pjax
 version: !ruby/object:Gem::Version
-  hash: 13
+  hash: 3
   prerelease:
   segments:
   - 0
   - 5
-  - 3
-  version: 0.5.3
+  - 4
+  version: 0.5.4
 platform: ruby
 authors:
 - Gert Goet
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-11-02 00:00:00 Z
+date: 2011-11-06 00:00:00 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -23,29 +23,29 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ">"
+    - - ~>
       - !ruby/object:Gem::Version
-        hash: 15
+        hash: 9
         segments:
         - 1
-        - 0
-        version: "1.0"
+        - 3
+        version: "1.3"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: hpricot
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        hash: 3
+        hash: 55
         segments:
-        - 1
-        - 5
         - 0
-        version: 1.5.0
+        - 8
+        - 4
+        version: 0.8.4
   type: :runtime
   version_requirements: *id002
 description: Serve pjax responses through rack middleware