muck-contents 0.1.1 → 0.1.2

data/README.rdoc

@@ -8,7 +8,7 @@ Note that all gems below should be installed automatically as a muck-contents ha
 Many of the gems are found on github so before installing do:
   gem sources -a http://gems.github.com
 
-  sudo gem install jbasdf-acts_as_git                 # Versioning. Requires a git installation.
+  sudo gem install muck-acts_as_git                   # Versioning. Requires a git installation.
   sudo gem install collectiveidea-awesome_nested_set  # Nested pages.  Used to setup navigation hierarchy (http://github.com/collectiveidea/awesome_nested_set/tree/master)
   sudo gem install rgrove-sanitize                    # Remove harmful html. (http://github.com/rgrove/sanitize/tree/master.)
   sudo gem install mbleigh-acts-as-taggable-on        # Tagging.  (http://github.com/mbleigh/acts-as-taggable-on/tree/master)
@@ -64,7 +64,16 @@ Create the following models in your project.  This let's you add any other metho
     acts_as_muck_content_permission
   end
 
+=== Application controller
+Add acts_as_muck_content_handler if you want muck_contents to intercept pages that are not found and provide authorized users
+and opportunity to add them.
+
+  class ApplicationController < ActionController::Base
+    acts_as_muck_content_handler
+  end
+
 === 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.
   class ContentsController < Muck::ContentsController
@@ -74,27 +83,15 @@ Add a route for the new controller:
   ActionController::Routing::Routes.draw do |map|
     map.resource :contents
   end
-
   
-=== Application controller
-Add acts_as_muck_content_handler if you want muck_contents to intercept pages that are not found and provide authorized users
-and opportunity to add them.
-
-  class ApplicationController < ActionController::Base
-    acts_as_muck_content_handler
-  end
-
-=== Content controller
 Override the contents controller to change the the security model.  For example:
 
   class ContentsController < Muck::ContentsController
     
-    before_filter :login_required   # require the user to be logged in to add content
-    
     # Modify this method to change how permissions are checked to see if a user can content.
     # Each model that implements 'has_muck_content' can (and should) override can_add_content? to 
     # change how content permissions are handled.
-    def has_permission_to_add_content(user, parent)
+    def has_permission_to_add_content(user, parent, content)
       parent.can_add_content?(user)
     end
     
@@ -103,6 +100,8 @@ Override the contents controller to change the the security model.  For example:
     # layout will need to exist in your 'views/layouts' directory
     def setup_layouts
       @content_layouts = 
+      @content_layouts << OpenStruct.new(:name => 'A Great Layout', :value => 'great_layout')
+      @content_layouts << OpenStruct.new(:name => 'Default', :value => 'default')
     end
     
   end

data/Rakefile

@@ -68,34 +68,9 @@ begin
     gemspec.add_dependency "mbleigh-acts-as-taggable-on"
     gemspec.add_dependency "friendly_id"
   end
-
+  Jeweler::RubyforgeTasks.new do |rubyforge|
+    rubyforge.doc_task = "rdoc"
+  end
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
-
-# rubyforge tasks
-begin
-  require 'rake/contrib/sshpublisher'
-  namespace :rubyforge do
-
-    desc "Release gem and RDoc documentation to RubyForge"
-    task :release => ["rubyforge:release:gem", "rubyforge:release:docs"]
-
-    namespace :release do
-      desc "Publish RDoc to RubyForge."
-      task :docs => [:rdoc] do
-        config = YAML.load(
-            File.read(File.expand_path('~/.rubyforge/user-config.yml'))
-        )
-
-        host = "#{config['username']}@rubyforge.org"
-        remote_dir = "/var/www/gforge-projects/muck-contents/"
-        local_dir = 'rdoc'
-
-        Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
-      end
-    end
-  end
-rescue LoadError
-  puts "Rake SshDirPublisher is unavailable or your rubyforge environment is not configured."
-end

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/app/controllers/muck/contents_controller.rb

@@ -148,7 +148,7 @@ class Muck::ContentsController < ApplicationController
           end
         end
       end
-      layouts
+      layouts.flatten
     end
 
     # This method checks to see if the specified user has the right o

data/lib/action_controller/acts/muck_content_handler.rb

@@ -20,6 +20,11 @@ module ActionController
 
           # Renders content, shows 404 or redirects to new content as appropriate
           def handle_content_request
+            if !request.format.html?
+              # If the the request is html we can bail.
+              render :nothing => true, :status => 404
+              return
+            end
             get_content
             if @content.blank?
               redirect_to new_content_path(:path => request.path)

data/lib/active_record/acts/muck_content.rb

@@ -66,7 +66,7 @@ module ActiveRecord
           end
 
           if options[:enable_solr]
-            acts_as_solr :fields => [ :search_content ]
+            acts_as_solr({ :fields => [ :search_content => 'string' ] }, { :multi_core => true, :default_core => 'en' })
           end
 
           class_eval <<-EOV
@@ -189,10 +189,10 @@ module ActiveRecord
           self.body
         end
 
-        # Provided for solr index
-        # TODO figure out how to make this work with multiple languages
+        # Provided for solr index.  Override this method if you wish to add
+        # other fields/data to the solr index.
         def search_content
-          "#{title} #{body} #{tags.collect{|t| t.name}.join(' ')}"
+          "#{body}"
         end
 
         # Called after 'save' if auto translate is enabled

data/muck-contents.gemspec

@@ -1,12 +1,15 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{muck-contents}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball"]
-  s.date = %q{2009-08-08}
+  s.date = %q{2009-08-12}
   s.email = %q{justinball@gmail.com}
   s.extra_rdoc_files = [
     "README.rdoc"
@@ -580,7 +583,6 @@ Gem::Specification.new do |s|
      "test/rails_root/db/migrate/20090806230610_add_layout_to_contents.rb",
      "test/rails_root/db/migrate/20090808005918_add_scope_index_to_slugs.rb",
      "test/rails_root/db/migrate/20090808175401_add_contents_comment_counter_cache.rb",
-     "test/rails_root/db/schema.rb",
      "test/rails_root/features/step_definitions/common_steps.rb",
      "test/rails_root/features/step_definitions/content_steps.rb",
      "test/rails_root/features/step_definitions/webrat_steps.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-contents
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Justin Ball
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-08 00:00:00 -06:00
+date: 2009-08-12 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -677,7 +677,6 @@ test_files:
 - test/rails_root/db/migrate/20090806230610_add_layout_to_contents.rb
 - test/rails_root/db/migrate/20090808005918_add_scope_index_to_slugs.rb
 - test/rails_root/db/migrate/20090808175401_add_contents_comment_counter_cache.rb
-- test/rails_root/db/schema.rb
 - test/rails_root/features/step_definitions/common_steps.rb
 - test/rails_root/features/step_definitions/content_steps.rb
 - test/rails_root/features/step_definitions/webrat_steps.rb

data/test/rails_root/db/schema.rb

@@ -1,186 +0,0 @@
-# This file is auto-generated from the current state of the database. Instead of editing this file, 
-# please use the migrations feature of Active Record to incrementally modify your database, and
-# then regenerate this schema definition.
-#
-# Note that this schema.rb definition is the authoritative source for your database schema. If you need
-# to create the application database on another system, you should be using db:schema:load, not running
-# all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
-#
-# It's strongly recommended to check this file into your version control system.
-
-ActiveRecord::Schema.define(:version => 20090808175401) do
-
-  create_table "activities", :force => true do |t|
-    t.integer  "item_id"
-    t.string   "item_type"
-    t.string   "template"
-    t.integer  "source_id"
-    t.string   "source_type"
-    t.text     "content"
-    t.string   "title"
-    t.boolean  "is_status_update", :default => false
-    t.boolean  "is_public",        :default => true
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "activities", ["item_id", "item_type"], :name => "index_activities_on_item_id_and_item_type"
-
-  create_table "activity_feeds", :force => true do |t|
-    t.integer "activity_id"
-    t.integer "ownable_id"
-    t.string  "ownable_type"
-  end
-
-  add_index "activity_feeds", ["activity_id"], :name => "index_activity_feeds_on_activity_id"
-  add_index "activity_feeds", ["ownable_id", "ownable_type"], :name => "index_activity_feeds_on_ownable_id_and_ownable_type"
-
-  create_table "comments", :force => true do |t|
-    t.integer  "commentable_id",                 :default => 0
-    t.string   "commentable_type", :limit => 15, :default => ""
-    t.text     "body"
-    t.integer  "user_id"
-    t.integer  "parent_id"
-    t.integer  "lft"
-    t.integer  "rgt"
-    t.integer  "is_denied",                      :default => 0,     :null => false
-    t.boolean  "is_reviewed",                    :default => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "comments", ["commentable_id", "commentable_type"], :name => "index_comments_on_commentable_id_and_commentable_type"
-  add_index "comments", ["user_id"], :name => "index_comments_on_user_id"
-
-  create_table "content_permissions", :force => true do |t|
-    t.integer  "content_id"
-    t.integer  "user_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "content_permissions", ["content_id", "user_id"], :name => "index_content_permissions_on_content_id_and_user_id"
-
-  create_table "content_translations", :force => true do |t|
-    t.integer  "content_id"
-    t.string   "title"
-    t.text     "body"
-    t.string   "locale"
-    t.boolean  "user_edited"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "content_translations", ["content_id"], :name => "index_content_translations_on_content_id"
-  add_index "content_translations", ["locale"], :name => "index_content_translations_on_locale"
-
-  create_table "contents", :force => true do |t|
-    t.integer  "creator_id"
-    t.string   "title"
-    t.text     "body"
-    t.string   "locale"
-    t.text     "body_raw"
-    t.integer  "contentable_id"
-    t.string   "contentable_type"
-    t.integer  "parent_id"
-    t.integer  "lft"
-    t.integer  "rgt"
-    t.boolean  "is_public"
-    t.string   "state"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "layout"
-    t.integer  "comment_count",    :default => 0
-  end
-
-  add_index "contents", ["creator_id"], :name => "index_contents_on_creator_id"
-  add_index "contents", ["parent_id"], :name => "index_contents_on_parent_id"
-
-  create_table "friends", :force => true do |t|
-    t.integer  "inviter_id"
-    t.integer  "invited_id"
-    t.integer  "status",     :default => 0
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "friends", ["invited_id", "inviter_id"], :name => "index_friends_on_invited_id_and_inviter_id"
-  add_index "friends", ["inviter_id", "invited_id"], :name => "index_friends_on_inviter_id_and_invited_id"
-
-  create_table "permissions", :force => true do |t|
-    t.integer  "role_id",    :null => false
-    t.integer  "user_id",    :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "roles", :force => true do |t|
-    t.string   "rolename"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "slugs", :force => true do |t|
-    t.string   "name"
-    t.integer  "sluggable_id"
-    t.integer  "sequence",                     :default => 1, :null => false
-    t.string   "sluggable_type", :limit => 40
-    t.string   "scope",          :limit => 40
-    t.datetime "created_at"
-  end
-
-  add_index "slugs", ["name", "sluggable_type", "scope", "sequence"], :name => "index_slugs_on_name_and_sluggable_type_and_scope_and_sequence", :unique => true
-  add_index "slugs", ["scope"], :name => "index_slugs_on_scope"
-  add_index "slugs", ["sluggable_id"], :name => "index_slugs_on_sluggable_id"
-
-  create_table "taggings", :force => true do |t|
-    t.integer  "tag_id"
-    t.integer  "taggable_id"
-    t.integer  "tagger_id"
-    t.string   "tagger_type"
-    t.string   "taggable_type"
-    t.string   "context"
-    t.datetime "created_at"
-  end
-
-  add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id"
-  add_index "taggings", ["taggable_id", "taggable_type", "context"], :name => "index_taggings_on_taggable_id_and_taggable_type_and_context"
-
-  create_table "tags", :force => true do |t|
-    t.string "name"
-  end
-
-  create_table "users", :force => true do |t|
-    t.string   "login"
-    t.string   "email"
-    t.string   "first_name"
-    t.string   "last_name"
-    t.string   "crypted_password"
-    t.string   "password_salt"
-    t.string   "persistence_token"
-    t.string   "single_access_token"
-    t.string   "perishable_token"
-    t.integer  "login_count",         :default => 0,     :null => false
-    t.integer  "failed_login_count",  :default => 0,     :null => false
-    t.datetime "last_request_at"
-    t.datetime "last_login_at"
-    t.datetime "current_login_at"
-    t.string   "current_login_ip"
-    t.string   "last_login_ip"
-    t.boolean  "terms_of_service",    :default => false, :null => false
-    t.string   "time_zone",           :default => "UTC"
-    t.datetime "disabled_at"
-    t.datetime "activated_at"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "users", ["email"], :name => "index_users_on_email"
-  add_index "users", ["last_request_at"], :name => "index_users_on_last_request_at"
-  add_index "users", ["login"], :name => "index_users_on_login"
-  add_index "users", ["perishable_token"], :name => "index_users_on_perishable_token"
-  add_index "users", ["persistence_token"], :name => "index_users_on_persistence_token"
-  add_index "users", ["single_access_token"], :name => "index_users_on_single_access_token"
-
-end