commontator 0.5.13 → 0.5.14

data/README.md

@@ -112,7 +112,7 @@ That's it! Commontator is now ready for use.
 ## Browser Support
 
 No incompatibilities are currently known with any of the major browsers.
-Currently commontator requires javascript to be enabled to function properly.
+Currently commontator requires javascript enabled to function properly.
 
 ## Customization
 
@@ -132,6 +132,10 @@ $ rake commontator:copy:models
 
 You are now free to modify them and have any changes made manifest in your application.
 
+## Testing
+
+Soon
+
 ## Contributing
 
 1. Fork it

data/lib/commontator/acts_as_commontable.rb

@@ -15,20 +15,22 @@ module Commontator
           has_many :comments, :class_name => 'Commontator::Comment', :through => :thread
           has_many :subscriptions, :class_name => 'Commontator::Subscription', :through => :thread
           
-          after_initialize :create_thread, :unless => :thread, :if => :id
-          before_validation :build_thread, :unless => :thread
-          
           validates_presence_of :thread
           
           cattr_accessor :commontable_config
           self.commontable_config = Commontator::CommontableConfig.new
           self.is_commontable = true
           
-          def create_thread
-            thread = Commontator::Thread.new
-            thread.commontable = self
-            thread.save!
-            self.reload
+          alias_method :thread_raw, :thread
+          
+          def thread
+            raw = thread_raw
+            return raw unless raw.nil?
+            return Commontator::Thread.find_or_create_by_commontable_id_and_commontable_type(self.id, self.class.name) \
+              unless self.id.nil?
+            self.thread = Commontator::Thread.new
+            self.thread.commontable = self
+            self.thread
           end
         end
       end

data/lib/commontator/acts_as_commontable.rb~

@@ -0,0 +1,43 @@
+require 'commontator/commontable_config'
+
+module Commontator
+  module ActsAsCommontable
+    def self.included(base)
+      base.class_attribute :is_commontable
+      base.is_commontable = false
+      base.extend(ClassMethods)
+    end
+    
+    module ClassMethods
+      def acts_as_commontable(options = {})
+        class_eval do
+          has_one :thread, :as => :commontable, :class_name => 'Commontator::Thread'
+          has_many :comments, :class_name => 'Commontator::Comment', :through => :thread
+          has_many :subscriptions, :class_name => 'Commontator::Subscription', :through => :thread
+          
+          validates_presence_of :thread
+          
+          cattr_accessor :commontable_config
+          self.commontable_config = Commontator::CommontableConfig.new
+          self.is_commontable = true
+          
+          alias_method :thread_raw, :thread
+          
+          def thread
+            t = thread_raw
+            return t unless t.nil?
+            return Commontator::Thread.find_or_create_by_commontable_id_and_commontable_type(self.id, self.class.name) \
+              unless self.id.nil?
+            self.thread = Commontator::Thread.new
+            self.thread.commontable = self
+            self.thread
+          end
+        end
+      end
+      
+      alias_method :acts_as_commentable, :acts_as_commontable
+    end
+  end
+end
+
+ActiveRecord::Base.send :include, Commontator::ActsAsCommontable

data/lib/commontator/version.rb

@@ -1,3 +1,3 @@
 module Commontator
-  VERSION = "0.5.13"
+  VERSION = "0.5.14"
 end

data/lib/commontator/version.rb~

@@ -1,3 +1,3 @@
 module Commontator
-  VERSION = "0.5.12"
+  VERSION = "0.5.13"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: commontator
 version: !ruby/object:Gem::Version
-  version: 0.5.13
+  version: 0.5.14
   prerelease: 
 platform: ruby
 authors:
@@ -131,6 +131,7 @@ files:
 - lib/commontator/version.rb
 - lib/commontator/engine.rb
 - lib/commontator/shared_methods.rb~
+- lib/commontator/acts_as_commontable.rb~
 - lib/commontator/shared_helper.rb~
 - lib/commontator/commontable_config.rb
 - lib/commontator/version.rb~