@@ -2,5 +2,5 @@ template_location = File.join(File.dirname(__FILE__), 'views') Utype::Hooks::Views.register(:new_post_form_options_panel, template_location + '/formatter_select') Utype::App.after_components_init do - Post.is :formattable, :source_property => :body, :result_property => :body_html -end + require File.dirname(__FILE__)+'/lib/post_extensions' +end \ No newline at end of file app/components/formatters/init.rb @@ -1,5 +1,7 @@ class Post < Content - has_liquid_properties :body_html, :full_permalink, :author + property :body_excerpt, Text + + has_liquid_properties :full_permalink, :full_body, :excerpt_html, :author before :save do self.permalink = self.title.gsub(' ', '-').downcase if self.permalink.blank? @@ -13,6 +15,15 @@ class Post < Content self.permalink end + def full_body + attribute_get(:body_excerpt).blank? ? + attribute_get(:body) : "#{attribute_get(:body_excerpt)}#{attribute_get(:body)}" + end + + def excerpt_html + body_excerpt_html.blank? ? body_html : body_excerpt_html + end + def author self.user end app/components/publisher/models/post.rb @@ -7,6 +7,11 @@ </p> <p class="watermark"> + <label for="post_body_excerpt">The excerpt of your post goes here. (<a href="#" id="excerpt_cancel">cancel</a>)</label> + <%= text_area :body_excerpt, :rows => 5, :cols => 80 %> + </p> + + <p class="watermark"> <label for="post_body">The content of your post goes here.</label> <%= text_area :body, :rows => 10, :cols => 80 %> </p> app/components/publisher/views/admin/posts/_form.html.erb @@ -3,7 +3,7 @@ <% @posts.each do |post| -%> <dl class="post"> <dt><%= post.title %></dt> - <dd class="body"><%= post.body_html %></dd> + <dd class="body"><%= post.body_excerpt_html.blank? ? post.body_html : post.body_excerpt_html %></dd> <dd class="post-actions"> <h5 class="hidden">Actions</h5> <ul> app/components/publisher/views/admin/posts/index.html.erb @@ -5,77 +5,55 @@ module DataMapper FORMATTERS = [ :textile, :markdown ] ## - # fired when your plugin gets included into Resource - # - def self.included(base) - - end - - ## # Methods that should be included in DataMapper::Model. # Normally this should just be your generator, so that the namespace # does not get cluttered. ClassMethods and InstanceMethods gets added # in the specific resources when you fire is :formattable ## - def is_formattable(options={}) extend DataMapper::Is::Formattable::ClassMethods include DataMapper::Is::Formattable::InstanceMethods - options = { - :by => :textile, - :format_property => :format_with, - :source_property => :content_original, - :result_property => :content_formatted + @formattable_options = options = { + :by => :textile, + :on => { :content_original => :content_formatted }, + :format_property => :format_with }.merge!(options) - self.formattable_options = options + options[:on].each do |source, result| + property source, DataMapper::Types::Text + property result, DataMapper::Types::Text + end - property options[:source_property], DataMapper::Types::Text - property options[:result_property], DataMapper::Types::Text - property options[:format_property], DataMapper::Types::Enum[:textile, :markdown, :wikitext], + property options[:format_property], DataMapper::Types::Enum[:textile, :markdown], :nullable => false, :default => options[:by] before :save, :format_source! end module ClassMethods - attr_accessor :formattable_options - - def format_property - self.send(formattable_options[:format_property]) - end - - def source_property - self.send(formattable_options[:source_property]) - end - - def result_property - self.send(formattable_options[:result_property]) - end + attr_reader :formattable_options end # ClassMethods module InstanceMethods - def format_source! - unless new_record? || dirty_attributes.keys.include?(self.class.source_property) - return - end - format = attribute_get(self.class.formattable_options[:format_property]) - result = case format - when :textile: - RedCloth.new(attribute_get(self.class.formattable_options[:source_property])).to_html - when :markdown: - BlueCloth.new(attribute_get(self.class.formattable_options[:source_property])).to_html - else - raise Exception.new("Unknown format type: #{format}! Supported formatters are: #{FORMATTERS.join(', ')}") - end + self.class.formattable_options[:on].each do |source, result| + next unless self.dirty_attributes.map{|a, v| a.name}.include?(source) + + markup = case format + when :textile: + RedCloth.new(attribute_get(source)).to_html + when :markdown: + BlueCloth.new(attribute_get(source)).to_html + else + raise Exception.new("Unknown format type: #{format}! Supported formatters are: #{FORMATTERS.join(', ')}") + end - attribute_set(self.class.formattable_options[:result_property], result) + attribute_set(result, markup) + end end - end # InstanceMethods end # Formattable gems/gems/dm-is-formattable-0.1/lib/dm-is-formattable/is/formattable.rb @@ -5,7 +5,6 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES describe 'DataMapper::Is::Formattable' do before :all do - class Page include DataMapper::Resource property :id, Serial @@ -14,6 +13,24 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES auto_migrate! end + class Page2 + include DataMapper::Resource + property :id, Serial + is :formattable, :on => { :body_part => :body_part_html, :body => :body_html }, :format_property => :formatter + auto_migrate! + end + end + + it 'should set custom names for properties' do + page = Page2.new + + page.respond_to?(:formatter).should be(true) + page.respond_to?(:body).should be(true) + page.respond_to?(:body_html).should be(true) + + page.respond_to?(:formatter).should be(true) + page.respond_to?(:body_part).should be(true) + page.respond_to?(:body_part_html).should be(true) end it 'should format with textile by default' do @@ -30,19 +47,17 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES page.content_formatted.should eql('<p><strong>strong text only</strong></p>') end - it 'should set custom names for properties' do - class Page2 - include DataMapper::Resource - property :id, Serial - is :formattable, :format_property => :formatter, :source_property => :body, :result_property => :body_html + describe 'with more then one source field' do + it 'should format all the source fields' do + page = Page2.new( + :body_part => '*strong text*', + :body => '*strong text* and _emphasized text_' + ) + page.save + + page.body_part_html.should eql('<p><strong>strong text</strong></p>') + page.body_html.should eql('<p><strong>strong text</strong> and <em>emphasized text</em></p>') end - - page = Page2.new - - page.respond_to?(:formatter).should be(true) - page.respond_to?(:body).should be(true) - page.respond_to?(:body_html).should be(true) end - end end gems/gems/dm-is-formattable-0.1/spec/integration/formattable_spec.rb @@ -6,7 +6,7 @@ Gem::Specification.new do |s| s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Piotr Solnica"] - s.date = %q{2008-11-02} + s.date = %q{2008-11-08} s.description = %q{Formatting engines support for DataMapper} s.email = ["piotr [a] zenbe [d] com"] s.extra_rdoc_files = ["README.txt", "LICENSE", "TODO"] gems/specifications/dm-is-formattable-0.1.gemspec @@ -23,7 +23,9 @@ module Utype if self.base_model == self @liquid_properties = *args.flatten else - @liquid_properties = [*args].concat(self.base_model.liquid_properties).flatten.uniq + @liquid_properties ||= [] + @liquid_properties = [*args].concat( + self.base_model.liquid_properties).concat(self.liquid_properties).flatten.uniq end end end lib/utype.rb 248ac2fa8be9b626d8a20480c37a375559527ea8 solnic piotr@zenbe.com http://github.com/mariusz/utype/commit/d1d5ff9b6d46b57b03495b0d4b73f1a3a2208f26 d1d5ff9b6d46b57b03495b0d4b73f1a3a2208f26 2008-11-08T05:29:35-08:00 2008-11-08T05:29:35-08:00 updated dm-is-formattable 009697c4957bf1b1cb89876f1abe4cffc1cc49df solnic piotr@zenbe.com