common-content 0.0.2 → 0.0.3

data/app/controllers/contents_controller.rb

@@ -17,7 +17,7 @@ class ContentsController < ApplicationController
 
   def edit
     @content = Content.find_by_ancestry(params[:ancestors].try(:split,'/'), params[:id]) 
-    @content.build_seo unless @content.seo
+    # @content.build_seo unless @content.seo
     # @content.child_contents.create(slug:"#{@content.slug}-kid-#{@content.child_contents.count}", title:"#{@content.slug} Kid") if @content.child_contents.size == 0
     respond_with @content
   end

data/app/helpers/contents_helper.rb

@@ -17,7 +17,12 @@ module ContentsHelper
   # end
 
   def link_to_add_fields(name, f, association)
-    new_object = f.object.send(association).klass.new
+    begin
+      new_object = f.object.send(association).klass.new
+    rescue Exception => e
+      p e
+    end
+    new_object ||= ::Content.const_get(association.to_s.camelize).new
     id = new_object.object_id
     fields = f.fields_for(association, new_object, child_index: id) do |builder|
       render(partial: association.to_s.singularize + "_fields", locals: { f: builder })

data/app/models/content.rb

@@ -11,10 +11,10 @@ class Content
 
   field :body, type: Textile  # optional html block of text for this content
 
-  embeds_one :seo  # optional SEO fields
+  embeds_one :seo, class_name: 'Content::Seo'  # optional SEO fields
   accepts_nested_attributes_for :seo   # mongoid BUG see http://stackoverflow.com/questions/9392315/mongoid-and-nested-form-for-embeds-one-document
 
-  embeds_many :resources   # optional 1-n resources like images, videos, REST urls, etc
+  embeds_many :resources, class_name: 'Content::Resource'   # optional 1-n resources like images, videos, REST urls, etc
   accepts_nested_attributes_for :resources # mongoid BUG see http://stackoverflow.com/questions/9392315/mongoid-and-nested-form-for-embeds-one-document
 
   recursively_embeds_many  # optionaal 1-n embedded child Content objects, the editable field controls if user can change
@@ -46,4 +46,22 @@ class Content
     parent_content ? parent_content.to_param + '/' + id : id
   end
 
+  class Resource
+    include Mongoid::Document
+    embedded_in :content
+
+    field :slug, type: String
+    field :uri, type: String  # the URI of the entity we're linking to
+    field :content_type, type: String  # mime type if there is one
+  end
+
+  class Seo
+    include Mongoid::Document
+    embedded_in :content
+
+    field :description, type: String
+    field :keywords, type: String
+    field :metatitle, type: String
+    # validates :description, :keywords, :metatitle, presence: true
+  end
 end

data/app/views/contents/edit.html.erb

@@ -17,7 +17,7 @@
   <%= render :partial => 'fields_new', :locals => {f: f} %>
   <%= render :partial => 'fields_edit', :locals => {f: f} %>
   <hr/>
-  <h4>Seo</h4>
+  <%= link_to_add_fields "+ seo", f, :seo unless @content.seo %>
   <%= f.fields_for :seo do |seo| %>
     <%= render :partial => 'seo_fields', :locals => {f: seo} %>
   <% end %>

data/lib/common-content/engine.rb

@@ -1,6 +1,5 @@
 module CommonContent
   class Engine < ::Rails::Engine
-    isolate_namespace CommonContent
     config.to_prepare do
       ApplicationController.helper(ContentsHelper)
     end

data/lib/common-content/version.rb

@@ -1,3 +1,3 @@
 module CommonContent
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: common-content
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -126,8 +126,6 @@ files:
 - app/controllers/contents_controller.rb
 - app/helpers/contents_helper.rb
 - app/models/content.rb
-- app/models/resource.rb
-- app/models/seo.rb
 - app/models/textile.rb
 - app/views/contents/_array_form.html.erb
 - app/views/contents/_child_content_fields.html.erb
@@ -144,7 +142,7 @@ files:
 - app/views/contents/new.html.erb
 - app/views/contents/show.html.erb
 - app/views/contents/show.xml.builder
-- app/views/layouts/application.html.erb
+- app/views/layouts/contents.html.erb
 - config/routes.rb
 - lib/common-content/engine.rb
 - lib/common-content/version.rb

data/app/models/resource.rb

@@ -1,10 +0,0 @@
-class Resource
-  include Mongoid::Document
-
-  embedded_in :content
-
-  field :slug, type: String
-  field :uri, type: String  # the URI of the entity we're linking to
-  field :content_type, type: String  # mime type if there is one
-  
-end

data/app/models/seo.rb

@@ -1,11 +0,0 @@
-class Seo
-  include Mongoid::Document
-
-  embedded_in :content
-
-  field :description, type: String
-  field :keywords, type: String
-  field :metatitle, type: String
-
-  # validates :description, :keywords, :metatitle, presence: true
-end