@@ -2,12 +2,12 @@ class Article < Post acts_as_defensio_article :fields => { :author => :source, :title => :header } if SITE_SETTINGS[:use_defensio] # We don't want to generate permalinks for imported posts - has_permalink :header, :unless => :from_feed? + has_permalink :header, :unless => :permalink? validates_presence_of :header, :content validates_uniqueness_of :permalink, :allow_blank => true - attr_accessible :content, :header, :permalink, :allow_comments + attr_accessible :content, :header, :permalink, :allow_comments, :source def link(root='') from_feed? ? permalink : super app/models/posts/article.rb @@ -6,4 +6,5 @@ config.action_controller.allow_forgery_protection = false config.action_mailer.delivery_method = :test # smooth -config.gem 'mocha' \ No newline at end of file +config.gem 'mocha' +config.gem 'fixjour', :version => '0.1.0' \ No newline at end of file config/environments/test.rb @@ -1,15 +1,5 @@ require 'faker' -Fixjour::MergingProxy.class_eval do - def unprotect(*attrs) - old = @klass.accessible_attributes || [] - @klass.attr_accessible *(attrs.to_a + old.to_a) - result = yield - @klass.attr_accessible *old.to_a - result - end -end - Fixjour :verify => true do define_builder(User) do |klass, overrides| klass.new \ @@ -27,9 +17,8 @@ Fixjour :verify => true do end define_builder(Article) do |klass, overrides| - klass.unprotect(:feed, :user, :source) do - klass.new :header => 'A name', :content => 'Some content', :feed => new_feed - end + klass.protected :feed, :user + klass.new :header => 'A name', :content => 'Some content', :feed => new_feed end define_builder(Feed) do |klass, overrides| test/builders.rb ec85b5fbeaf5dc25382318284de8d59871f67410 Pat Nakajima patnakajima@gmail.com http://github.com/nakajima/aintablog/commit/7ad995fae08b013e45333b68e927ba35b5bcc53c 7ad995fae08b013e45333b68e927ba35b5bcc53c 2009-02-08T17:39:12-08:00 2009-02-08T17:39:12-08:00 Updated tests to use most recent version of Fixjour d9dc26ba056240ffaec80c086709d66b41c2e442 Pat Nakajima patnakajima@gmail.com