has_content 0.0.2 → 0.0.3

data/CHANGELOG

@@ -1,2 +1,7 @@
+= 0.0.3
+  * Set attr_accessible to :content only on the record, set name and owner via relationships
+
+= 0.0.2
+
 = 0.0.1
   * Initial Release

data/lib/has_content/content_owner.rb

@@ -41,22 +41,25 @@ module HasContent
         
         has_one "#{name}_content".to_sym, options.reverse_merge(:as => 'owner', :class_name => 'HasContent::Record', :dependent => :destroy, :conditions => {name: name}, :autosave => true)
         
+        # content getter (delegates to the content association)
         define_method name do
-          send("find_or_build_#{name}_content").content
+          send("get_#{name}_content").content
         end
         
+        # content setter (delegates to the content association, updating timestamps on owner record if required)
         define_method "#{name}=" do |value|
-          (send("find_or_build_#{name}_content").content = value).tap do |*|
-            if respond_to?(:updated_at?) && send("find_or_build_#{name}_content").changed?
+          (send("get_#{name}_content").content = value).tap do |*|
+            if respond_to?(:updated_at?) && send("get_#{name}_content").changed?
               updated_at_will_change!
             end
           end
         end
         
-        define_method "find_or_build_#{name}_content" do
-          send("#{name}_content") || send("build_#{name}_content", name: name)
+        # find or build (and save if possible) the content association
+        define_method "get_#{name}_content" do
+          send("#{name}_content") or send("build_#{name}_content").tap {|r| r.name = name; r.save unless new_record? }
         end
-        private "find_or_build_#{name}_content".to_sym
+        private "get_#{name}_content".to_sym
       end
     end
   end

data/lib/has_content/record.rb

@@ -1,5 +1,7 @@
 module HasContent
   class Record < ActiveRecord::Base
+    attr_accessible :content # :name, and :owner are set by content owners
+    
     self.table_name = 'has_content_records'
     
     belongs_to :owner, polymorphic: true
@@ -8,17 +10,9 @@ module HasContent
                       inclusion: {in: lambda(&:allowed_names), if: :owner},
                       uniqueness: {scope: %w(owner_id owner_type), if: :owner_persisted?}
 
-    before_create :verify_valid_owner! # this badboy is here because owner is sometimes not present at validation
+    before_create :verify_valid_owner! # this badboy is here because owner is sometimes not present at validation
                                        # because content is a has_one on owner, with autosave true
-
-    # Contents are only ever instantiated by has_content assoc, and it's convenient for them to
-    # always refer (for links to content etc).
-    # If there is a validation problem, the save will fail silently (which is fine)
-    def initialize(*)
-      super
-      save if new_record? && owner_persisted?
-    end
-
+    
     def to_s
       content
     end

data/lib/has_content/version.rb

@@ -1,3 +1,3 @@
 module HasContent
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/has_content/record_spec.rb

@@ -3,21 +3,16 @@ require 'spec_helper'
 describe HasContent::Record do
   subject { record }
 
-  let(:record) { described_class.new attrs }
-  let(:attrs)  { {} }
-  
-  it "does not save itself - as it's invalid" do
-    should be_new_record
-  end
+  let(:record) { described_class.new }
   
   describe 'with valid attributes' do
-    let(:attrs) { {:name => 'body', :owner => owner} }
-    let(:owner) { ContentOwner.create! }
-    
-    it "saves itself (to enable always referring relationships)" do
-      should_not be_new_record
+    before do
+      record.name = 'body'
+      record.owner = owner
     end
     
+    let(:owner) { ContentOwner.create! }
+    
     it { should be_valid }
     
     describe '[validation]' do
@@ -28,7 +23,7 @@ describe HasContent::Record do
     
       it 'requires :name + :owner be unique' do
         record.save!
-        record = described_class.new :name => 'body', :owner => owner
+        record = described_class.new {|r| r.name = 'body'; r.owner = owner }
         record.should_not be_valid
         record.name = 'excerpt'
         record.should be_valid

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_content
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70244228437940 !ruby/object:Gem::Requirement
+  requirement: &70179807906620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70244228437940
+  version_requirements: *70179807906620
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70244228459060 !ruby/object:Gem::Requirement
+  requirement: &70179807716000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70244228459060
+  version_requirements: *70179807716000
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70244228456400 !ruby/object:Gem::Requirement
+  requirement: &70179807713540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *70244228456400
+  version_requirements: *70179807713540
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70244228453880 !ruby/object:Gem::Requirement
+  requirement: &70179807710640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70244228453880
+  version_requirements: *70179807710640
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70244228452440 !ruby/object:Gem::Requirement
+  requirement: &70179807709560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,9 +65,9 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70244228452440
+  version_requirements: *70179807709560
 description: Simple wrapper for adding content via a polymorphic join for any active
-  record.  Version 0.0.2.
+  record.  Version 0.0.3.
 email:
 - ian.w.white@gmail.com
 executables: []
@@ -105,7 +105,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2447319576099344314
+      hash: 778003700105874322
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2447319576099344314
+      hash: 778003700105874322
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15