contentable 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/contentable.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{contentable}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["metasoarous"]
-  s.date = %q{2011-01-17}
+  s.date = %q{2011-01-20}
   s.description = %q{Contentable allows rails developers to place chunks of content in "content_items" whcih store content text, titles and descriptions in order to make content more easily updateable manageable.}
   s.email = %q{metasoarous@gmail.com}
   s.extra_rdoc_files = [

data/lib/contentable.rb

@@ -24,7 +24,7 @@ module Contentable
 	# Model module in the model class
 	module Helpers
 		def display_textile(text)
-			RedCloth.new(text).to_html
+			RedCloth.new(text).to_html.html_safe
 		end
 		def display_content(content_item, edit = false)
 			html = display_textile(content_item.text)
@@ -85,6 +85,7 @@ module Contentable
 			else
 				@content_item = ContentItem.safe_find_by_name("content_missing")
 			end
+			return @content_item
 		end
 	end
 	

data/spec/rails3/app_root/app/controllers/content_items_controller.rb

@@ -13,7 +13,16 @@ class ContentItemsController < ApplicationController
   # GET /content_items/1
   # GET /content_items/1.xml
   def show
-    @content_item = ContentItem.find(params[:id])
+    find_content_item
+
+    respond_to do |format|
+      format.html # show.html.erb
+      format.xml  { render :xml => @content_item }
+    end
+  end
+
+  def show_with_direct_attribute_assign
+    @content_item = find_content_item
 
     respond_to do |format|
       format.html # show.html.erb
@@ -34,7 +43,7 @@ class ContentItemsController < ApplicationController
 
   # GET /content_items/1/edit
   def edit
-    @content_item = ContentItem.find(params[:id])
+    find_content_item
   end
 
   # POST /content_items

data/spec/rails3/app_root/config/routes.rb

@@ -1,60 +1,61 @@
 AppRoot::Application.routes.draw do
-  resources :content_items
-
-  # The priority is based upon order of creation:
-  # first created -> highest priority.
-
-  # Sample of regular route:
-  #   match 'products/:id' => 'catalog#view'
-  # Keep in mind you can assign values other than :controller and :action
-
-  # Sample of named route:
-  #   match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
-  # This route can be invoked with purchase_url(:id => product.id)
-
-  # Sample resource route (maps HTTP verbs to controller actions automatically):
-  #   resources :products
-
-  # Sample resource route with options:
-  #   resources :products do
-  #     member do
-  #       get 'short'
-  #       post 'toggle'
-  #     end
-  #
-  #     collection do
-  #       get 'sold'
-  #     end
-  #   end
-
-  # Sample resource route with sub-resources:
-  #   resources :products do
-  #     resources :comments, :sales
-  #     resource :seller
-  #   end
-
-  # Sample resource route with more complex sub-resources
-  #   resources :products do
-  #     resources :comments
-  #     resources :sales do
-  #       get 'recent', :on => :collection
-  #     end
-  #   end
-
-  # Sample resource route within a namespace:
-  #   namespace :admin do
-  #     # Directs /admin/products/* to Admin::ProductsController
-  #     # (app/controllers/admin/products_controller.rb)
-  #     resources :products
-  #   end
-
-  # You can have the root of your site routed with "root"
-  # just remember to delete public/index.html.
-  # root :to => "welcome#index"
-
-  # See how all your routes lay out with "rake routes"
-
-  # This is a legacy wild controller route that's not recommended for RESTful applications.
-  # Note: This route will make all actions in every controller accessible via GET requests.
-  # match ':controller(/:action(/:id(.:format)))'
+	resources :content_items
+	
+	match "content/:name" => "content_items#view"
+	# The priority is based upon order of creation:
+	# first created -> highest priority.
+
+	# Sample of regular route:
+	#		match 'products/:id' => 'catalog#view'
+	# Keep in mind you can assign values other than :controller and :action
+
+	# Sample of named route:
+	#		match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
+	# This route can be invoked with purchase_url(:id => product.id)
+
+	# Sample resource route (maps HTTP verbs to controller actions automatically):
+	#		resources :products
+
+	# Sample resource route with options:
+	#		resources :products do
+	#			member do
+	#				get 'short'
+	#				post 'toggle'
+	#			end
+	#
+	#			collection do
+	#				get 'sold'
+	#			end
+	#		end
+
+	# Sample resource route with sub-resources:
+	#		resources :products do
+	#			resources :comments, :sales
+	#			resource :seller
+	#		end
+
+	# Sample resource route with more complex sub-resources
+	#		resources :products do
+	#			resources :comments
+	#			resources :sales do
+	#				get 'recent', :on => :collection
+	#			end
+	#		end
+
+	# Sample resource route within a namespace:
+	#		namespace :admin do
+	#			# Directs /admin/products/* to Admin::ProductsController
+	#			# (app/controllers/admin/products_controller.rb)
+	#			resources :products
+	#		end
+
+	# You can have the root of your site routed with "root"
+	# just remember to delete public/index.html.
+	# root :to => "welcome#index"
+
+	# See how all your routes lay out with "rake routes"
+
+	# This is a legacy wild controller route that's not recommended for RESTful applications.
+	# Note: This route will make all actions in every controller accessible via GET requests.
+	# match ':controller(/:action(/:id(.:format)))'
 end

data/spec/rails3/contentable_spec.rb

@@ -28,4 +28,33 @@ A paragraph
 			result.should include "<p>"
 		end
 	end
-end
+end
+
+describe ContentItemsController do
+	before :all do
+		@content = Factory :content_item, :name => "some_content"
+	end
+	
+	describe "find_content_item method" do
+		it "should assign a content item to @content_item implicitly" do
+			get "content/some_content"
+			assigns[:content_item].should.be_a_kind_of ContentItem
+		end
+		it "should assign the correct content item to @content_item" do
+			get "content/some_content"
+			assigns[:content_item].should == @content
+		end
+		it "should assign a content item to @content_item explicitly" do
+			
+		end
+	end
+end
+
+
+# Things to spec:
+# 
+# Make sure that the find_content_item method doesn't return a string
+# This is sure to be confusing to people
+#
+# Spec out the way it is written to respond here though (that is, by
+# assigning directly to the attribute within the method)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: contentable
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - metasoarous
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-17 00:00:00 -08:00
+date: 2011-01-20 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency