muck-comments 3.0.0 → 3.0.1

data/Rakefile

@@ -47,7 +47,7 @@ begin
     gemspec.authors = ["Justin Ball", "Joel Duffin"]
     gemspec.rubyforge_project = 'muck-comments'
     gemspec.add_dependency "sanitize"
-    gemspec.add_dependency "awesome_nested_set"
+    gemspec.add_dependency "nested_set"
     gemspec.add_dependency "muck-engine"
     gemspec.add_dependency "muck-users"
   end

data/VERSION

@@ -1 +1 @@
-3.0.0
+3.0.1

data/app/views/comments/{_form.html.erb → _form.erb}

@@ -1,5 +1,5 @@
 <div id="<%= parent.dom_id %>_new_comment" class="comment-form-wrapper">
-  <% form_for(:comment, :url => new_comment_path_with_parent(parent), :html => { :id => "#{parent.dom_id}_comment_form", :class => "comment-form"} ) do |f| -%>
+  <%= form_for(:comment, :url => new_comment_path_with_parent(parent), :html => { :id => "#{parent.dom_id}_comment_form", :class => "comment-form"} ) do |f| -%>
     <%= f.text_area :body, :class => 'min' %>
     <%= hidden_field_tag :parent_comment_id, comment.id unless comment.blank? -%>
     <%= hidden_field_tag :render_new, render_new -%>

data/app/views/comments/{_tiny_mce_form.html.erb → _tiny_mce_form.erb}

@@ -10,7 +10,7 @@ muck_comment_message_id = "#{@project.dom_id}_message"
   </div>
 </div>
 <div id="<%= parent.dom_id %>_new_comment" class="comment-form-wrapper">
-  <% form_for(:comment, :url => new_comment_path_with_parent(parent), :html => { :id => muck_comment_form_id, :class => "comment-form"} ) do |f| -%>
+  <%= form_for(:comment, :url => new_comment_path_with_parent(parent), :html => { :id => muck_comment_form_id, :class => "comment-form"} ) do |f| -%>
     <%= f.text_area :body, :class => 'mceEditor min', :id => muck_comment_mce_id %>
     <%= hidden_field_tag :parent_comment_id, comment.id unless comment.blank? -%>
     <%= hidden_field_tag :render_new, render_new -%>

data/lib/muck_comments/models/comment.rb

@@ -1,3 +1,4 @@
+require 'nested_set'
 # include MuckComments::Models::MuckComment
 module MuckComments
   module Models

data/muck-comments.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-comments}
-  s.version = "3.0.0"
+  s.version = "3.0.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-10-07}
+  s.date = %q{2010-10-08}
   s.description = %q{The comment engine for the muck system.}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [
@@ -28,10 +28,10 @@ Gem::Specification.new do |s|
      "app/views/comment_mailer/new_comment.html.erb",
      "app/views/comment_mailer/new_comment.text.erb",
      "app/views/comments/_comment.erb",
-     "app/views/comments/_comment_title.html.erb",
-     "app/views/comments/_form.html.erb",
-     "app/views/comments/_simple_comment.html.erb",
-     "app/views/comments/_tiny_mce_form.html.erb",
+     "app/views/comments/_comment_title.erb",
+     "app/views/comments/_form.erb",
+     "app/views/comments/_simple_comment.erb",
+     "app/views/comments/_tiny_mce_form.erb",
      "app/views/comments/index.html.erb",
      "app/views/comments/new.html.erb",
      "app/views/comments/permission_denied.js.erb",
@@ -817,18 +817,18 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<sanitize>, [">= 0"])
-      s.add_runtime_dependency(%q<awesome_nested_set>, [">= 0"])
+      s.add_runtime_dependency(%q<nested_set>, [">= 0"])
       s.add_runtime_dependency(%q<muck-engine>, [">= 0"])
       s.add_runtime_dependency(%q<muck-users>, [">= 0"])
     else
       s.add_dependency(%q<sanitize>, [">= 0"])
-      s.add_dependency(%q<awesome_nested_set>, [">= 0"])
+      s.add_dependency(%q<nested_set>, [">= 0"])
       s.add_dependency(%q<muck-engine>, [">= 0"])
       s.add_dependency(%q<muck-users>, [">= 0"])
     end
   else
     s.add_dependency(%q<sanitize>, [">= 0"])
-    s.add_dependency(%q<awesome_nested_set>, [">= 0"])
+    s.add_dependency(%q<nested_set>, [">= 0"])
     s.add_dependency(%q<muck-engine>, [">= 0"])
     s.add_dependency(%q<muck-users>, [">= 0"])
   end

data/test/rails_test/app/controllers/application_controller.rb

@@ -9,13 +9,5 @@ class ApplicationController < ActionController::Base
     def admin_access?
       admin?
     end
-    
-    # only require ssl if we are in production
-    def ssl_required?
-      return ENV['SSL'] == 'on' ? true : false if defined? ENV['SSL']
-      return false if local_request?
-      return false if RAILS_ENV == 'test'
-      ((self.class.read_inheritable_attribute(:ssl_required_actions) || []).include?(action_name.to_sym)) && (RAILS_ENV == 'production' || RAILS_ENV == 'staging')
-    end
-    
+
 end

data/test/rails_test/spec/controllers/comments_controller_spec.rb

@@ -2,6 +2,8 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Muck::CommentsController do
 
+  render_views
+  
   before do
     @user = Factory(:user)
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: muck-comments
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 3
   - 0
-  - 0
-  version: 3.0.0
+  - 1
+  version: 3.0.1
 platform: ruby
 authors: 
 - Justin Ball
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-07 00:00:00 -06:00
+date: 2010-10-08 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,7 +34,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: awesome_nested_set
+  name: nested_set
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -96,10 +96,10 @@ files:
 - app/views/comment_mailer/new_comment.html.erb
 - app/views/comment_mailer/new_comment.text.erb
 - app/views/comments/_comment.erb
-- app/views/comments/_comment_title.html.erb
-- app/views/comments/_form.html.erb
-- app/views/comments/_simple_comment.html.erb
-- app/views/comments/_tiny_mce_form.html.erb
+- app/views/comments/_comment_title.erb
+- app/views/comments/_form.erb
+- app/views/comments/_simple_comment.erb
+- app/views/comments/_tiny_mce_form.erb
 - app/views/comments/index.html.erb
 - app/views/comments/new.html.erb
 - app/views/comments/permission_denied.js.erb