moxie_forum 0.2.4 → 0.2.5

data/app/views/moxie/posts/_form.html.erb

@@ -15,7 +15,7 @@
 
     <div class="m_post clearfix m_newpost">
       <div class="m_user">
-        <%= current_user.profile_pic %>
+        <%=raw current_user.profile_pic %>
       </div>
 
       <div class="m_contents">

data/lib/moxie_forum/acts_as_moxie_user/base.rb

@@ -18,6 +18,10 @@ module MoxieForum
           has_many :topics, :foreign_key => 'author_id', 
                             :order => "created_at", 
                             :class_name => 'Moxie::Topic'
+                            
+          def self.i_am_moxie_user
+            true
+          end
           
           include MoxieForum::ActsAsMoxieUser::Base::InstanceMethods
         end

data/lib/moxie_forum/engine.rb

@@ -20,14 +20,12 @@ module MoxieForum
     
     initializer "moxie_forum.check_config" do |app|
 
-      # convert symbol to a string and upcase first letter
-      if config.user_model.is_a? Symbol
-        config.user_model_name = config.user_model.to_s.classify # [0..0].upcase + config.user_model.to_s[1..9]
-      end
+      # load all the models in the app
+      Dir.glob(RAILS_ROOT + '/app/models/**/*.rb').each { |file| require file }
 
-      if defined?( config.user_model ) == 'constant'
-        config.user_model = eval config.user_model_name
-      end
+      # Figure out which one is the official user class
+      config.user_model = ActiveRecord::Base.send(:subclasses).select { |c| c.respond_to? :i_am_moxie_user }.first
+      config.user_model_name = config.user_model.to_s
       
       # make sure mount_at ends with trailing slash
       config.mount_at += '/'  unless config.mount_at.last == '/'

data/lib/rails/generators/moxie_forum/moxie_forum_generator.rb

@@ -43,14 +43,61 @@ class MoxieForumGenerator < Rails::Generators::Base
   def copy_initializer_file
     copy_file 'initializer.rb', 'config/initializers/moxie_forum.rb'
   end
+  
+  def initialize_user_model
+    begin
+      print "    \e[1m\e[34mquestion\e[0m  What's the name of your user model? [user.rb] > "
+      model_name = gets.chomp
+      model_name = "user.rb"  if model_name.empty?
+    end while not model_name =~ /\.rb/i
+
+    begin
+      print "    \e[1m\e[34mquestion\e[0m  Would you to auto-add a few necessary lines to the top of #{model_name} [y/n] "
+      answer = gets.chomp
+    end while not answer =~ /[yn]/i
+    
+    if answer =~ /y/i
+      begin
+        f = File.open "app/models/#{model_name}"
+        file = f.read; f.close
+
+        # Create the initializer file
+        file.gsub!(/class User < ActiveRecord::Base\n/, 
+                  "class User < ActiveRecord::Base\n\n" +
+                  "\tacts_as_moxie_user\n\n" +
+                  "\t# MoxieForum looks for the following optional methods within this class.\n" +
+                  "\t#\n" +
+                  "\t# def moderator?\n" +
+                  "\t# def admin?\n" +
+                  "\t# def display_name\n" +
+                  "\t# def profile_pic" )
+
+        tmp = File.open "tmp/~model.rb", "w"
+        tmp.write file; tmp.close
+
+        remove_file "app/models/#{model_name}"
+        copy_file '../../../tmp/~model.rb', "app/models/#{model_name}"
+        remove_file 'tmp/~model.rb'
+      rescue
+        puts "       \e[1m\e[31merror\e[0m  Unable to open #{model_name}, visit ##### for instructions to manually connect your user model"
+      end
+    else
+      puts "    \e[1m\e[33mskipping\e[0m  Visit ##### for instructions to connect your user model"
+    end    
+    
+  end
 
   def update_application_template
     f = File.open "app/views/layouts/application.html.erb"
     layout = f.read; f.close
     
     if layout =~ /<%=[ ]+yield[ ]+%>/
-      print "    \e[1m\e[34mquestion\e[0m  Your layouts/application.html.erb layout currently has the line <%= yield %>. MoxieForum needs to change this line to <%= content_for?(:content) ? yield(:content) : yield %> to support its nested layouts. This change should not affect any of your existing layouts or views. Is this okay? [y/n] "
+      print "    \e[1m\e[34mquestion\e[0m  Your layouts/application.html.erb layout currently has the " +
+            "line <%= yield %>. MoxieForum needs to change this line to <%= content_for?(:content) ? " +
+            "yield(:content) : yield %> to support its nested layouts. This change should not affect " +
+            "any of your existing layouts or views. "
       begin
+        print "Is this okay? [y/n] "
         answer = gets.chomp
       end while not answer =~ /[yn]/i
       
@@ -69,8 +116,15 @@ class MoxieForumGenerator < Rails::Generators::Base
     elsif layout =~ /<%=[ ]+content_for\?\(:content\) \? yield\(:content\) : yield[ ]+%>/
       puts "    \e[1m\e[33mskipping\e[0m  layouts/application.html.erb modification is already done."
     else
-      puts "    \e[1m\e[31mconflict\e[0m  MoxieForum is confused by your layouts/application.html.erb. It does not contain the default line <%= yield %>, you may need to make manual changes to get MoxieForum's nested layouts working. Visit ###### for details."
+      puts  "    \e[1m\e[31mconflict\e[0m  MoxieForum is confused by your " +
+            "layouts/application.html.erb. It does not contain the default line <%= yield %>, you " +
+            "may need to make manual changes to get MoxieForum's nested layouts working. Visit " +
+            "###### for details."
     end
   end
   
+  def done
+    puts "\n        \e[1m\e[32mdone\e[0m  Installation complete! Run rake db:migrate and start up your web server. You can try the forum at http://localhost:3000/forum but full functionality requires you to have a current_user application method. In addition, open your user model rb file for a few comments near the top.\n\n"
+  end
+  
 end

data/lib/rails/generators/moxie_forum/templates/initializer.rb

@@ -2,7 +2,6 @@ module MoxieForum
   class Engine < Rails::Engine
 
     config.mount_at = '/forum'
-    config.user_model = :user
     config.forum_entity_name = 'forum'
     config.topic_entity_name = 'discussion'
     config.prompt_for_new_topic_creation = "What's your question?"

data/test/generators/moxie_forum_generator_test.rb

@@ -1,10 +1,10 @@
-require 'test_helper'
-require 'generators/moxie_forum/moxie_forum_generator'
-
-class MoxieForumGeneratorTest < Test::Unit::TestCase
-
-  def test_install
-    assert true
-  end
-  
-end
+# require 'test_helper'
+# require 'generators/moxie_forum/moxie_forum_generator'
+# 
+# class MoxieForumGeneratorTest < Test::Unit::TestCase
+# 
+#   def test_install
+#     assert true
+#   end
+#   
+# end

data/test/unit/forum_test.rb

@@ -33,7 +33,6 @@ class ForumTest < Test::Unit::TestCase
 
     p = Moxie::Post.create(   :topic_id   => moxie_topics(:welcome).id,
                               :author_id  => 0,
-                              :title      => "I forgot",
                               :body       => "Don't forget to introduce yourself." )
   
     assert  moxie_topics(:welcome).posts.include? p
@@ -52,12 +51,10 @@ class ForumTest < Test::Unit::TestCase
                               :title      => "Dummy topic 2" )
     p1 = Moxie::Post.create(  :topic_id   => t1.id,
                               :author_id  => 0,
-                              :title      => "Dummy post 1.1",
-                              :body       => "body" )
+                              :body      => "Dummy post 1.1" )
     p2 = Moxie::Post.create(  :topic_id   => t1.id,
                               :author_id  => 0,
-                              :title      => "Dummy post 1.2",
-                              :body       => "body" )
+                              :body      => "Dummy post 1.2" )
 
     assert f.topics.include? t1
     assert t1.posts.include? p1    

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: moxie_forum
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - Keith Schacht
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-30 00:00:00 -07:00
+date: 2010-10-03 00:00:00 -07:00
 default_executable: 
 dependencies: []