muck-contents 3.1.0 → 3.1.1

data/README.rdoc

@@ -66,6 +66,27 @@ This method determines who can add content to any url on your website.  For exam
 http://www.example.com/a/test/page and that page does not exist, muck contents will automatically create
 a page for you at that location if the logged in user has a method can_add_root_content? that returns true.
 
+=== Attach content to a parent model
+Content can be scoped to a specific model. ie
+
+  class User < ActiveRecord::Base
+    include MuckContents::Models::MuckContentable
+  end
+
+Then the user's content can be accessed via:
+  
+  @user.contents
+  
+=== Content Permissions
+By default users are not allowed to add content. Add 'can_add_root_content?' to your user model to determine which users can add content to the root of the
+website. A default configuration might be admins only:
+  
+  class User < ActiveRecord::Base
+    def can_add_root_content?
+      admin?
+    end
+  end
+  
 === Content models
 Create the following models in your project.  This let's you add any other methods that you see fit.
 
@@ -83,14 +104,13 @@ Create the following models in your project.  This let's you add any other metho
 
 === Contents controller
 
-Create a ContentsController and inherit from Muck::ContentsController.  Unfortunately, due to routing issues this is required or 
-we'd have to hard code the routes to go to muck/contents which prevent modification of the contents_controller.
+Optionally create a ContentsController and inherit from Muck::ContentsController. This step is only needed if you intend to override the default contents controller functionality.
   class ContentsController < Muck::ContentsController
   end
 
 Add a route for the new controller:
   MyApp::Application.routes.draw do
-    map.resource :contents
+    resources :contents
   end
   
 Override the contents controller to change the the security model.  For example:

data/Rakefile

@@ -64,7 +64,7 @@ begin
     gem.add_dependency "awesome_nested_set"
     gem.add_dependency "sanitize"
     gem.add_dependency "acts-as-taggable-on"
-    gem.add_dependency "friendly_id"
+    gem.add_dependency "friendly_id", ">=3.2.0"
     gem.add_dependency "uploader"
     gem.add_dependency "tiny_mce"
     gem.files.exclude 'test/**'

data/VERSION

@@ -1 +1 @@
-3.1.0
+3.1.1

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

@@ -1,5 +1,5 @@
 <% content_for :head do  -%>
   <meta name="keywords" content="<%=@content.tags.join(',')%>" />
 <% end -%>
-<%= @content.locale_body(I18n.locale) %>
+<%= @content.locale_body(I18n.locale).html_safe %>
 <%= render :partial => 'contents/admin', :locals => { :content => @content } -%>

data/config/locales/en.yml

@@ -1,3 +1,4 @@
+---
 en:
   muck:
     contents:

data/db/migrate/20110226174321_add_cached_slugs.rb

@@ -0,0 +1,10 @@
+class AddCachedSlugs < ActiveRecord::Migration
+  def self.up
+    add_column :contents, :cached_slug, :string
+    add_index  :contents, :cached_slug
+  end
+
+  def self.down
+    remove_column :contents, :cached_slug
+  end
+end

data/lib/muck-contents.rb

@@ -7,6 +7,7 @@ require 'uploader'
 
 require 'muck-contents/config.rb'
 require 'muck-contents/rack/rack.rb'
+require 'muck-contents/models/contentable.rb'
 require 'muck-contents/models/content.rb'
 require 'muck-contents/models/content_permission.rb'
 require 'muck-contents/models/content_translation.rb'

data/lib/muck-contents/controllers/content_handler.rb

@@ -51,11 +51,11 @@ module MuckContents
           return if @content # in case @content is setup by an overriding method
           id = params[:id] || Content.id_from_uri(env["muck-contents.request_uri"])
           scope = params[:scope] || Content.scope_from_uri(env["muck-contents.request_uri"]) 
-          @content = Content.find(id, :scope => scope) rescue nil
+          @content = Content.find(id, :include => :slugs, :conditions => {:slugs => {:scope => scope}}) rescue nil
           if @content.blank?
             @contentable = get_parent
             if @contentable
-              @content = Content.find(params[:id], :scope => Content.contentable_to_scope(@contentable)) rescue nil
+              @content = @contentable.contents.find(params[:id]) rescue nil
             end
           end
         end

data/lib/muck-contents/engine.rb

@@ -22,6 +22,11 @@ module MuckContents
         I18n.load_path += Dir[ File.join(File.dirname(__FILE__), '..', '..', 'config', 'locales', '*.{rb,yml}') ]
       end
     end
+    
+    initializer 'muck-contents.add_admin_ui_links', :after => 'muck-engine.add_admin_ui_links' do
+      # Add admin link for contents
+      MuckEngine.configuration.add_muck_admin_nav_item(I18n.translate('muck.engine.admin_content'), '/admin/contents')
+    end
         
   end
 end

data/lib/muck-contents/models/contentable.rb

@@ -0,0 +1,14 @@
+# include MuckContents::Models::MuckContentable
+module MuckContents
+  module Models
+    module MuckContentable
+      extend ActiveSupport::Concern
+    
+      included do
+        has_many :contents, :as => :contentable, :dependent => :destroy
+      end
+      
+    end
+    
+  end
+end

data/muck-contents.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-contents}
-  s.version = "3.1.0"
+  s.version = "3.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball", "Joel Duffin"]
-  s.date = %q{2010-11-18}
+  s.date = %q{2011-02-26}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [
     "README.rdoc"
@@ -91,6 +91,7 @@ Gem::Specification.new do |s|
     "db/migrate/20090703055724_add_contents.rb",
     "db/migrate/20090806230610_add_layout_to_contents.rb",
     "db/migrate/20090808175401_add_contents_comment_counter_cache.rb",
+    "db/migrate/20110226174321_add_cached_slugs.rb",
     "lib/muck-contents.rb",
     "lib/muck-contents/config.rb",
     "lib/muck-contents/controllers/content_handler.rb",
@@ -98,6 +99,7 @@ Gem::Specification.new do |s|
     "lib/muck-contents/models/content.rb",
     "lib/muck-contents/models/content_permission.rb",
     "lib/muck-contents/models/content_translation.rb",
+    "lib/muck-contents/models/contentable.rb",
     "lib/muck-contents/rack/rack.rb",
     "lib/muck-contents/routes.rb",
     "lib/tasks/muck_contents.rake",
@@ -1473,11 +1475,10 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/tatemae/muck-contents}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.2}
   s.summary = %q{Add content to your muck based project}
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
@@ -1488,7 +1489,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<awesome_nested_set>, [">= 0"])
       s.add_runtime_dependency(%q<sanitize>, [">= 0"])
       s.add_runtime_dependency(%q<acts-as-taggable-on>, [">= 0"])
-      s.add_runtime_dependency(%q<friendly_id>, [">= 0"])
+      s.add_runtime_dependency(%q<friendly_id>, [">= 3.2.0"])
       s.add_runtime_dependency(%q<uploader>, [">= 0"])
       s.add_runtime_dependency(%q<tiny_mce>, [">= 0"])
     else
@@ -1499,7 +1500,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<awesome_nested_set>, [">= 0"])
       s.add_dependency(%q<sanitize>, [">= 0"])
       s.add_dependency(%q<acts-as-taggable-on>, [">= 0"])
-      s.add_dependency(%q<friendly_id>, [">= 0"])
+      s.add_dependency(%q<friendly_id>, [">= 3.2.0"])
       s.add_dependency(%q<uploader>, [">= 0"])
       s.add_dependency(%q<tiny_mce>, [">= 0"])
     end
@@ -1511,7 +1512,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<awesome_nested_set>, [">= 0"])
     s.add_dependency(%q<sanitize>, [">= 0"])
     s.add_dependency(%q<acts-as-taggable-on>, [">= 0"])
-    s.add_dependency(%q<friendly_id>, [">= 0"])
+    s.add_dependency(%q<friendly_id>, [">= 3.2.0"])
     s.add_dependency(%q<uploader>, [">= 0"])
     s.add_dependency(%q<tiny_mce>, [">= 0"])
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: muck-contents
 version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: false
+  hash: 1
+  prerelease: 
   segments: 
   - 3
   - 1
-  - 0
-  version: 3.1.0
+  - 1
+  version: 3.1.1
 platform: ruby
 authors: 
 - Justin Ball
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-18 00:00:00 -07:00
+date: 2011-02-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -125,10 +125,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15
         segments: 
+        - 3
+        - 2
         - 0
-        version: "0"
+        version: 3.2.0
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
@@ -244,6 +246,7 @@ files:
 - db/migrate/20090703055724_add_contents.rb
 - db/migrate/20090806230610_add_layout_to_contents.rb
 - db/migrate/20090808175401_add_contents_comment_counter_cache.rb
+- db/migrate/20110226174321_add_cached_slugs.rb
 - lib/muck-contents.rb
 - lib/muck-contents/config.rb
 - lib/muck-contents/controllers/content_handler.rb
@@ -251,6 +254,7 @@ files:
 - lib/muck-contents/models/content.rb
 - lib/muck-contents/models/content_permission.rb
 - lib/muck-contents/models/content_translation.rb
+- lib/muck-contents/models/contentable.rb
 - lib/muck-contents/rack/rack.rb
 - lib/muck-contents/routes.rb
 - lib/tasks/muck_contents.rake
@@ -1653,7 +1657,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Add content to your muck based project