flexible_feeds 0.2.1 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTc4OTkwOWJiOTc3N2RlMTMwNGMyOWY0Y2YwN2U2N2Q5ZWQ2MGI1Yw==
+    Yzc0YmRkYzEwZTVjMjk2ZTMyN2EwMjcyNTBkZGZiYzM3M2UzNzZlOQ==
   data.tar.gz: !binary |-
-    ZDI5NTYxYWM3NGY4MGVjMzljOWNmZDJjNzdlOGExY2M5MzUyOWRjMg==
+    OWZiZDM2ZjdiMmE1NTFmZGRhYmExMjIzOGVjMTIzMmY4ODBiZmQ2MA==
 SHA512:
   metadata.gz: !binary |-
-    OGUzNmQzZDQ5Mjk1NTNjNDgzMzlkM2JiMjI0Y2M5NzZhMGRlYWNkOGE3MWIx
-    MGU4YTZlOTBhNzA4NGUxODQ2MDcwM2ZkMWE2NjUxNWFkNjFhNDk1ZmFmZjNl
-    OGNjNmQ2MjJhYjQ1MTkyN2ZhNmRlM2I0ZjdiYTc0NWMyMGQ4ZTg=
+    YjZjYTQwN2Y2ZGM5MjNmMTY0M2E3MDFkNzA0NTRhM2VmNWVlYTMyNWRlZjFm
+    ZTc1MzVhOTk4YTA4OGE2OTVmNDk2NGM0M2QzMGU0YzdkYWVlMjU1YzliZDEy
+    MGU5ZGZiNzM0NmUyZWJmY2M0NTNmODNjZmE2NzNiMmZkZjRiZmQ=
   data.tar.gz: !binary |-
-    MWYxMjU1NGRmMWY1MDgzYmEzYjgyMWFkMjMxN2IyZGVmODJkYmY1ZDVmNWMy
-    ZjRmMzI4NWE4MTM5OGEwZjc1M2Q0NzczOGExODBhYTYxNmZlNDAxNmY4OTYz
-    NWYwNDFiYjMxOGNmZDE3MWRhYmZjNzI3Y2U4ZmFlYTNkYjBjOGI=
+    NTBmYmQ4OThiMWViNTA1MWM4NzdiOGM0ZjI5YzFlNTA5ZTQ1MGNiMzVlOTJi
+    OTAzOWI3MjQ0NjRjMjljMGViZTAyODZlMDA0ODAxMGI5YTkyNDgwZjEwODcz
+    Y2JlY2FiOTljYzdlNDU3NTdlZjZjNzhjZjQ5NTM0YjNmMWEwODg=

data/app/models/flexible_feeds/event.rb

@@ -1,10 +1,12 @@
 module FlexibleFeeds
   class Event < ActiveRecord::Base
-    belongs_to :ancestor, polymorphic: true
-    belongs_to :eventable, polymorphic: true
-    belongs_to :parent, polymorphic: true
+    belongs_to :ancestor, class_name: "FlexibleFeeds::Event"
     belongs_to :creator, polymorphic: true
+    belongs_to :eventable, polymorphic: true
+    belongs_to :parent, class_name: "FlexibleFeeds::Event"
 
+    has_many :children, class_name: "FlexibleFeeds::Event",
+      foreign_key: :parent_id
     has_many :event_joins, dependent: :destroy
     has_many :feeds, through: :event_joins
     has_many :votes
@@ -41,6 +43,18 @@ module FlexibleFeeds
       save
     end
 
+    def increment_parent_counter
+      ancestors.each do |this_ancestor|
+        this_ancestor.increment(:children_count)
+      end
+    end
+
+    def decrement_parent_counter
+      ancestors.each do |this_ancestor|
+        this_ancestor.decrement(:children_count, children_count + 1)
+      end
+    end
+
     private
     def calculate_controversy(pos, neg)
       return 0 if pos == 0 || neg == 0
@@ -52,5 +66,15 @@ module FlexibleFeeds
     def calculate_popularity(pos, n)
       PopularityCalculator.new(pos, n).get_popularity
     end
+
+    def ancestors
+      ancestors = []
+      next_parent = parent
+      until next_parent.nil? do
+        ancestors.push next_parent
+        next_parent = next_parent.parent
+      end
+      ancestors
+    end
   end
 end

data/db/migrate/20140227194816_create_flexible_feeds_events.rb

@@ -7,9 +7,7 @@ class CreateFlexibleFeedsEvents < ActiveRecord::Migration
       t.string :creator_type
 
       t.integer :parent_id
-      t.string :parent_type
       t.integer :ancestor_id
-      t.string :ancestor_type
       t.integer :children_count, null: false, default: 0
       
       t.integer :votes_sum, null: false, default: 0
@@ -27,17 +25,13 @@ class CreateFlexibleFeedsEvents < ActiveRecord::Migration
     add_index :flexible_feeds_events, :controversy
     add_index :flexible_feeds_events, :popularity
     add_index :flexible_feeds_events, :children_count
+    add_index :flexible_feeds_events, :ancestor_id
+    add_index :flexible_feeds_events, :parent_id
     add_index :flexible_feeds_events,
       [:eventable_id, :eventable_type],
       name: "flexible_feeds_events_on_eventable"
     add_index :flexible_feeds_events,
       [:creator_id, :creator_type],
       name: "flexible_feeds_events_on_creator"
-    add_index :flexible_feeds_events,
-      [:parent_id, :parent_type],
-      name: "flexible_feeds_events_on_parent"
-    add_index :flexible_feeds_events,
-      [:ancestor_id, :ancestor_type],
-      name: "flexible_feeds_events_on_ancestor"
   end
 end

data/lib/flexible_feeds/acts_as_child.rb

@@ -9,6 +9,8 @@ module FlexibleFeeds
           true
         end
 
+        after_destroy :decrement_parent_counter
+
         send :include, InstanceMethods
       end
     end
@@ -27,9 +29,10 @@ module FlexibleFeeds
       end
 
       def child_of(parent)
-        if can_accept_parent?(parent)
-          ancestor = parent.try(:ancestor) || parent.event
-          event.update_attributes(parent: parent.event, ancestor: ancestor)
+        if can_accept_parent?(parent.eventable)
+          ancestor = parent.try(:ancestor) || parent
+          event.update_attributes(parent: parent, ancestor: ancestor)
+          event.increment_parent_counter
         end
       end
 
@@ -47,6 +50,10 @@ module FlexibleFeeds
       def initialize_event
         event || create_event
       end
+
+      def decrement_parent_counter
+        event.decrement_parent_counter
+      end
     end
   end
 end

data/lib/flexible_feeds/acts_as_parent.rb

@@ -32,9 +32,10 @@ module FlexibleFeeds
       end
 
       def parent_of(child)
-        if can_accept_child?(child)
+        if can_accept_child?(child.eventable)
           ancestor = self.try(:ancestor) || self.event
-          child.event.update_attributes(parent: self.event, ancestor: ancestor)
+          child.update_attributes(parent: self.event, ancestor: ancestor)
+          child.increment_parent_counter
         end
       end
 

data/lib/flexible_feeds/polymorphic_join.rb

@@ -14,7 +14,9 @@ module FlexibleFeeds
 
       def define_association(join_table, association, singular_association)
         define_method association do
-          send(join_table).collect { |join| join.send(singular_association) }
+          send(join_table).includes(singular_association).collect do |join|
+            join.send(singular_association)
+          end
         end
       end
 

data/lib/flexible_feeds/version.rb

@@ -1,3 +1,3 @@
 module FlexibleFeeds
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flexible_feeds
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - timothycommoner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2014-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails