Dex_Rack 0.1.9 → 0.2.0

data/lib/Dex_Rack.rb

@@ -12,6 +12,7 @@ class Dex_Rack
   
   set :dex, ( Dex.db("/tmp/dex.rack.sample.db") && Dex )
 
+  enable :sessions
   use Rack::Lint
   
   set :public_folder, RACK_DIR + "/public"
@@ -28,14 +29,26 @@ class Dex_Rack
   end
 
   get "/" do
-    recent
+    nav = page_nav( count, 10, :last)
+    nav[:link_to_list] = true
+    
+    results = Hash[
+      :title => "Dex List",
+      :list  => dex.filter(:status => 0),
+      :app => self
+    ]
+    layout nav.merge(results), :index
   end
 
   get "/recent/:page" do | page |
-    recent page
+    layout recent(page), :index
   end
 
   get '/:id' do | id |
+    if request.referer
+      session[:page_list] = request.referer
+    end
+
     r = find_id( id )
     pass unless r
 
@@ -66,7 +79,9 @@ class Dex_Rack
     r = dex.filter(:id=>id).first
     s = r[:status] == 0 ? 1 : 0
     dex.filter(:id=>id).update(:status=>s)
-    redirect to("/#{r[:id]}"), 302
+    
+    page = session[:page_list] || "/#{r[:id]}"
+    redirect to(page), 302
   end
 
   get "/:id/delete" do | id |
@@ -104,28 +119,19 @@ class Dex_Rack
     def find_id id
       r = dex.filter(:id=>id).first
     end
-    
-    def list_recent limit, offset
-      dex.limit(limit, offset).to_a.reverse
-    end
 
     def recent page = :last, limit = 10
       nav  = page_nav( count, limit, page)
 
       return redirect(to('/'), 302) if !nav
 
-      nav[:prev_url] = "/recent/#{nav[:prev]}" if nav[:prev]
-      nav[:next_url] = "/recent/#{nav[:next]}" if nav[:next]
-      nav[:next_url] = "/" if nav[:next] == nav[:total]
-
-      vars = nav.merge(
-        Hash[
-          :title => "Dex List",
-          :list  => list_recent(nav[:limit], nav[:offset]),
-          :app => self
-        ])
-
-        layout(vars, :index) 
+      results = Hash[
+        :title => "Dex List",
+        :list  => dex.limit(nav[:limit], nav[:offset]).to_a.reverse,
+        :app => self
+      ]
+      
+      nav.merge results
     end
 
     def layout vars, file_name
@@ -183,7 +189,7 @@ class Dex_Rack
       offset = div * (page - 1)
       offset = 0 if offset < 1
 
-      Hash[ 
+      page_nav_urls Hash[ 
 
         :total => total, 
         :next => n, 
@@ -197,6 +203,12 @@ class Dex_Rack
       ]
     end
     
+    def page_nav_urls nav
+      nav[:prev_url] = "/recent/#{nav[:prev]}" if nav[:prev]
+      nav[:next_url] = "/recent/#{nav[:next]}" if nav[:next]
+      nav[:last_url] = "/recent/#{nav[:total]}" 
+      nav
+    end
   end # === Base =======================================================
 
   include Base

data/lib/Dex_Rack/version.rb

@@ -1,5 +1,5 @@
 require "sinatra/base"
 
 class Dex_Rack < Sinatra::Base
-  VERSION = "0.1.9"
+  VERSION = "0.2.0"
 end

data/lib/Dex_Rack/views/index.rb

@@ -30,12 +30,16 @@ end
 
 div.recent_nav! {
 
-  if vars[:prev_url]
-    a(:href=>vars[:prev_url]) { "<< Back in Time" }
-  end
+  if vars[:app].request.path_info == '/'
+    a(:href=>vars[:last_url]) { "<< Full list" }
+  else
+    if vars[:prev_url]
+      a(:href=>vars[:prev_url]) { "<< Back in Time" }
+    end
 
-  if vars[:next_url]
-    a(:href=>vars[:next_url]) { "Forward In Time >>" }
+    if vars[:next_url]
+      a(:href=>vars[:next_url]) { "Forward In Time >>" }
+    end
   end
 
 }

data/spec/Dex_App.rb

@@ -42,16 +42,23 @@ describe "get /" do
 
   it "renders message when there are no exceptions" do
     get "/"
-    should_render %!No exceptions!
+    renders %r!No exceptions!
   end
 
   it "renders a recent list of 10" do
-      5.times { |i| Dex.insert except("Err: #{i}") }
-      
-      get "/"
-      5.times { |i|
-        last_response.body.should.match %r!Err: #{i}!
-      }
+    5.times { |i| Dex.insert except("Err: #{i}") }
+
+    get "/"
+    5.times { |i|
+      last_response.body.should.match %r!Err: #{i}!
+    }
+  end
+
+  it "renders a link to the last page of results" do
+    15.times { |i| Dex.insert except("Err: #{i}") }
+    get "/"
+    renders %r!/recent/2">!
+    renders %r!Full list\ *</a>!
   end
 
 end # === get /
@@ -101,16 +108,23 @@ describe "get /:id/toggle" do
   behaves_like 'Test DB'
   
   it "updates status of record" do
-      id = Dex.insert(except "rand err")
-      get "/#{id}/toggle"
-      Dex.filter(:id=>id).first[:status]
-      .should == 1
+    id = Dex.insert(except "rand err")
+    get "/#{id}/toggle"
+    Dex.filter(:id=>id).first[:status]
+    .should == 1
   end
 
   it "redirects to /:id 302" do
-      id = Dex.insert(except "rand err")
-      get "/#{id}/toggle"
-      should_redirect_to "/#{id}", 302
+    id = Dex.insert(except "rand err")
+    get "/#{id}/toggle"
+    redirects_to 302, "/#{id}"
+  end
+
+  it "redirects to PAGE_LIST 302 if set in session" do
+    id = Dex.insert( except "rand err")
+    get "/#{id}", {}, {'HTTP_REFERER'=>"/page/list"}
+    get "/#{id}/toggle"
+    redirects_to 302, "/page/list"
   end
   
 end # === put /:id/status
@@ -130,7 +144,7 @@ describe "get /:id/delete" do
       Dex.insert(except("Deleted"))
       r = Dex.recent(1)
       get "/#{r[:id]}/delete"
-      should_redirect_to "/"
+      redirects_to "/"
   end
 
 end # === delete /:id

data/spec/lib/main.rb

@@ -39,24 +39,13 @@ shared "Test DB" do
 end
 
 class Bacon::Context
+  
   include Rack::Test::Methods
 
   def app
     Dex_Rack
   end
 
-  def should_render txt
-    last_response.should.be.ok
-    r = txt.respond_to?(:~) ? txt : %r!#{txt}!
-    last_response.body.should.match r
-  end
-
-  def should_redirect_to url, status = 303
-    last_response.status.should == status
-    last_response['Location'].sub( %r!http://(www.)?example.(com|org)!, '' )
-    .should == url
-  end
-    
 end # === class Bacon::Context
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Dex_Rack
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-12 00:00:00.000000000 Z
+date: 2012-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon