jeffrafter-spreadhead 0.1.1 → 0.3.0

data/CHANGELOG.textile

@@ -1,3 +1,13 @@
-h2. 0.1.0 (unreleased)
+h2. 0.3.0 
+
+* Removed to_param behavior for page resource (Jeff Rafter)
+* Allowed for "/" in urls (Jeff Rafter)
+* Added a view link (Jeff Rafter)
+
+h2. 0.2.0 (unreleased)
+
+* Support for URL editing and overriding (Jeff Rafter)
+
+h2. 0.1.0
 
 * Initial Release (Jeff Rafter)

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.3.0

data/app/controllers/spreadhead/pages_controller.rb

@@ -11,11 +11,11 @@ module Spreadhead
     end
 
     def show
-      @page = ::Page.published.find_by_url!(params[:id] || params[:url].join('-slash-'))  
+      @page = ::Page.published.find_by_url!(params[:url].to_a.join('/'))  
     end
     
     def edit
-      @page = ::Page.find_by_url!(params[:id])
+      @page = ::Page.find(params[:id])
     end
 
     def create
@@ -32,7 +32,7 @@ module Spreadhead
     end
     
     def update
-      @page = ::Page.find_by_url!(params[:id])
+      @page = ::Page.find(params[:id])
       respond_to do |format|
         if @page.update_attributes(params[:page])
           format.html { redirect_to pages_url }
@@ -45,7 +45,7 @@ module Spreadhead
     end
     
     def destroy
-      @page = ::Page.find_by_url!(params[:id])
+      @page = ::Page.find(params[:id])
       @page.destroy
       respond_to do |format|
         format.html { redirect_to pages_url }

data/app/views/spreadhead/pages/_form.html.erb

@@ -6,6 +6,10 @@
   <%= form.label :title %>
   <%= form.text_field :title %>
 </div>
+<div class="text">
+  <%= form.label :url %>
+  <%= form.text_field :url %>
+</div>
 <div class="text">
   <%= form.label :description %>
   <%= form.text_field :description %>

data/app/views/spreadhead/pages/index.html.erb

@@ -12,7 +12,7 @@
       <td class="title"><%= link_to page.title || 'No title', edit_page_url(page) %></td>
       <td class="path"><%= page.url || 'No url' %></td>
       <td class="published"><%=h page.published ? 'Y' : 'N' %></td>
-      <td class="commands"><%= link_to 'Destroy', page_url(page), :confirm => 'Are you sure?', :method => :delete %></td>
+      <td class="commands"><%= link_to "View", page.url %> | <%= link_to 'Destroy', page_url(page), :confirm => 'Are you sure?', :method => :delete %></td>
     </tr>
   <% end %>
 </table>

data/lib/spreadhead/page.rb

@@ -58,17 +58,12 @@ module Spreadhead
       # :title should act like a url.
       def self.included(model)
         model.class_eval do
-          attr_protected :url
-          acts_as_url :title, :sync_url => true
+          acts_as_url :title, :sync_url => true, :only_when_blank => true
         end
       end
     end
 
     module InstanceMethods
-      # The default parameter method for pages is the url
-      def to_param
-        url
-      end
     end  
 
     module ClassMethods

data/test/controllers/pages_controller_test.rb

@@ -24,7 +24,7 @@ class PagesControllerTest < ActionController::TestCase
   context "on GET to #show" do
     setup do
       page = Factory(:page)
-      get :show, :id => page.url 
+      get :show, :url => page.url
     end  
 
     should_respond_with :success
@@ -35,7 +35,7 @@ class PagesControllerTest < ActionController::TestCase
   context "on GET to #edit" do
     setup do
       page = Factory(:page)
-      get :edit, :id => page.url
+      get :edit, :id => page.id
     end  
 
     should_respond_with :success
@@ -56,7 +56,7 @@ class PagesControllerTest < ActionController::TestCase
   context "on PUT to #update with valid attributes" do
     setup do
       page = Factory(:page)              
-      put :update, :id => page.url, :page => page.attributes
+      put :update, :id => page.id, :page => page.attributes
     end
       
     should_respond_with :redirect
@@ -66,7 +66,7 @@ class PagesControllerTest < ActionController::TestCase
   context "on DELETE to #destroy with valid attributes" do
     setup do
       page = Factory(:page)
-      delete :destroy, :id => page.url
+      delete :destroy, :id => page.id
     end
     
     should_respond_with :redirect
@@ -75,7 +75,7 @@ class PagesControllerTest < ActionController::TestCase
     should "Destroy the page" do
       count = Page.count
       page = Factory(:page)
-      delete :destroy, :id => page.url
+      delete :destroy, :id => page.id
       assert_equal Page.count, count
     end
 

data/test/models/page_test.rb

@@ -7,8 +7,7 @@ class PageTest < ActiveSupport::TestCase
     setup { Factory(:page) }
     
     should_validate_presence_of :text, :title
-    should_validate_uniqueness_of :title, :url    
-    should_not_allow_mass_assignment_of :url
+    should_validate_uniqueness_of :title
 
     should "generate a url" do
       page = Factory.build(:page, :title => 'smack!')
@@ -16,16 +15,39 @@ class PageTest < ActiveSupport::TestCase
       assert_not_nil page.url
       assert_equal 'smack', page.url
     end
+
+    should "accept a url" do
+      page = Factory.build(:page, :title => 'smackdown!', :url => 'whammo')
+      assert page.save
+      assert_not_nil page.url
+      assert_equal 'whammo', page.url
+    end
+
+    should "not duplicate urls" do
+      page = Factory.build(:page, :title => 'smurf', :url => 'bunnies')
+      assert page.save
+      assert_not_nil page.url
+      assert_equal 'bunnies', page.url
+      page = Factory.build(:page, :title => 'bunnies', :url => nil)
+      assert page.save
+      assert_not_nil page.url
+      assert_not_equal 'bunnies', page.url
+    end
+
+    should "modify the submitted url and be valid if duplicate url is submitted" do
+      page = Factory(:page, :title => 'smurf', :url => 'bunnies')
+      dup = Factory.build(:page, :title => 'smurffette', :url => 'bunnies')
+      assert dup.valid?
+      assert_not_equal page.url, dup.url
+      assert dup.save
+      assert !dup.errors.on(:url)
+    end
+
   end
   
   context "When retrieving a page" do
     setup { Factory(:page) }
 
     should_have_named_scope :published
-
-    should "use the url as the default parameter" do
-      page = Factory(:page, :title => 'whammo')
-      assert_equal 'whammo', page.to_param
-    end    
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jeffrafter-spreadhead
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.3.0
 platform: ruby
 authors: 
 - Jeff Rafter
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-14 00:00:00 -07:00
+date: 2009-08-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency