trollo 0.2.0 → 0.2.1

data/lib/trollo/board.rb

@@ -6,18 +6,17 @@ module Trollo
     attr_accessible :name
 
     def tasks
-      task_ids = lists.map(&:cards).flatten.compact.map(&:tasklists).flatten.compact.map(&:tasks).flatten.compact.map(&:id)
-      Task.where(id: task_ids)
+      card_ids = Trollo::Card.where(list_id: list_ids).pluck(:id)
+      tasklist_ids = Trollo::Tasklist.where(card_id: card_ids).pluck(:id)
+      Trollo::Task.where(tasklist_id: tasklist_ids)
     end
 
     def incomplete_tasks
-      task_ids = lists.map(&:cards).flatten.compact.map(&:tasklists).flatten.compact.map(&:tasks).flatten.compact.select{|t| t.incomplete?}.map(&:id)
-      Task.where(id: task_ids)
+      tasks.with_incomplete_state
     end
 
     def overdue_tasks
-      task_ids = lists.map(&:cards).flatten.compact.map(&:tasklists).flatten.compact.map(&:tasks).flatten.compact.select{|t| t.overdue?}.map(&:id)
-      Task.where(id: task_ids)
+      incomplete_tasks.overdue
     end
   end
 

data/lib/trollo/card.rb

@@ -11,7 +11,6 @@ module Trollo
     before_save :set_ordinal
     attr_accessible :name, :description, :workflow_state, :due_at, :trollable
 
-    scope :due_today, lambda { where(due_at: Time.now.beginning_of_day..Time.now.end_of_day) }
     scope :overdue, lambda { where('due_at < ?', Time.now) }
 
     workflow do

data/lib/trollo/task.rb

@@ -11,6 +11,7 @@ module Trollo
     attr_accessible :name, :group, :workflow_state, :due_at, :trollable
 
     scope :search, lambda {|term| unless term.blank?;where("name LIKE :q", q: "%#{term}%");end;}
+    scope :overdue, lambda { with_incomplete_state.where('due_at IS NOT NULL AND due_at < ?', Time.now) }
 
     workflow do
       state :incomplete do

data/lib/trollo/tasklist.rb

@@ -25,7 +25,7 @@ module Trollo
     end
 
     def next_task
-      tasks.select(&:incomplete?).first
+      tasks.with_incomplete_state.first
     end
 
     def check
@@ -35,14 +35,14 @@ module Trollo
 
     def check_complete
       if complete?
-        undo! if tasks.any?(&:incomplete?)
+        undo! if tasks.with_incomplete_state.any?
       elsif incomplete?
-        finish! if tasks.all?(&:complete?)
+        finish! if tasks.with_incomplete_state.none?
       end
     end
 
     def check_due_at
-      self.due_at = tasks.where(workflow_state: 'incomplete').minimum(:due_at)
+      self.due_at = tasks.with_incomplete_state.minimum(:due_at)
       self.save!
     end
 

data/lib/trollo/version.rb

@@ -1,3 +1,3 @@
 module Trollo
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trollo
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-11 00:00:00.000000000 Z
+date: 2014-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport