todo-void 0.0.4 → 0.1pre

data/interactors/status_changes_interactor.rb

@@ -1,3 +1,5 @@
+require_relative '../lib/todo_filter'
+
 class StatusChangesInteractor
   class StatusChangesInteractor::NoTodoWithIdError < StandardError ; end
   class ConflictingIdsError < StandardError
@@ -20,7 +22,8 @@ class StatusChangesInteractor
   private
   def change_todo_status(hash, status)
     todos = @list.find(hash).to_array
-    
+    todos = TodoFilter.new(todos).with_status([:finished, :started, :pending]).recent.execute
+
     case todos.length
     when 0
       raise StatusChangesInteractor::NoTodoWithIdError

data/interactors/todo_interactor.rb

@@ -1,4 +1,5 @@
 require_relative '../lib/todo_store'
+require_relative '../lib/todo_filter'
 
 class TodoInteractor
   def initialize(store = TodoStore.new)
@@ -10,6 +11,13 @@ class TodoInteractor
   end
 
   def list_all
-    @store.todos.to_array
+    todos = @store.todos.to_array
+    filter_todos(todos)
+  end
+
+  private
+  def filter_todos(todos)
+    filter = TodoFilter.new(todos) 
+    filter.with_status([:started, :pending, :finished]).recent.execute
   end
 end

data/lib/todo.rb

@@ -2,7 +2,7 @@ require 'openssl'
 
 class Todo
   attr_reader :description
-  attr_accessor :status
+  attr_accessor :status, :finished_at
 
   def initialize(description)
     @description = description
@@ -14,4 +14,11 @@ class Todo
     description_hash = description_hash.hexdigest
     description_hash.slice(0..5)
   end
+
+  def status=(status)
+    @status = status
+    if status == :finished && finished_at.nil?
+      @finished_at = Time.now
+    end
+  end
 end

data/lib/todo_filter.rb

@@ -0,0 +1,35 @@
+class TodoFilter
+  def initialize(todos)
+    @todos = todos.dup
+    @todos.reject! { |todo| todo.status == :deleted }
+  end
+
+  def with_status(statuses)
+    result = []
+    statuses.each do |status|
+      todos_with_status(status).each do |todo|
+        result << todo
+      end
+    end
+    @todos = result
+    self
+  end
+
+  def recent
+    @todos.reject! do |todo|
+      todo.status == :finished &&
+        todo.finished_at < (Time.now - 86400)
+    end
+    self
+  end
+
+  def execute
+    @todos
+  end
+
+  private
+
+  def todos_with_status(status)
+    @todos.reject { |todo| todo.status != status }
+  end
+end

data/lib/todo_list_view.rb

@@ -2,33 +2,12 @@ require_relative "../lib/todo_view"
 
 class TodoListView
   def self.render(todos)
-    self.new(todos).render
-  end
-
-  def initialize(todos)
-    @todos = todos
-  end
-
-  def render
-    @output = ""
-    render_todo_by_status(:started)
-    render_todo_by_status(:pending)
-    render_todo_by_status(:finished)
-    @output
-  end
-
-  private
-  def render_todo_by_status(status)
-    todos_by_status(status).each { |todo| render_todo(todo) }
-  end
-
-  def todos_by_status(status)
-    @todos.reject {|todo| todo.status != status}
-  end
-
-  def render_todo(todos)
-    @output += TodoView.new(todos).render
-    @output += "\n"
+    output = ""
+    todos.each do |todo|
+      output += TodoView.new(todo).render
+      output += "\n"
+    end
+    output
   end
 end
 

data/lib/todo_store.rb

@@ -1,6 +1,7 @@
 require_relative "./todo_list"
 require_relative './todo'
 require 'fileutils'
+require 'csv'
 
 class TodoStore
   def initialize
@@ -23,31 +24,26 @@ class TodoStore
 
   private
   def read
-    todo_list = TodoList.new
-
+    @list = TodoList.new 
+    
     FileUtils.touch(todo_file)
-    file_content = File.readlines(todo_file)
-
-    file_content.each do |line|
-      line = line.gsub("\n", "")
-      status, description = line.split "||"
-      todo = Todo.new(description)
-      todo.status = status.to_sym
-      todo_list.add todo
+    data = CSV.read(todo_file)
+    data.each do |raw_todo|
+      todo = Todo.new raw_todo[0]
+      unless raw_todo[2].nil?
+        todo.finished_at =  DateTime.parse(raw_todo[2]).to_time
+      end
+      todo.status = raw_todo[1].to_sym
+      @list.add todo
     end
-
-    @list = todo_list
   end
-
+  
   def write
-    serialized_todos = ""
-    
-    todos = @list.todo
-    todos.each do |id, todo|
-      serialized_todos += "#{todo.status}||#{todo.description}\n"
+    CSV.open(todo_file, "w") do |csv|
+      @list.to_array.each do |task|
+        csv << [task.description, task.status, task.finished_at]
+      end
     end
-
-    File.open(todo_file, "w") {|f| f.write serialized_todos }
   end
 
   def todo_file

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: todo-void
 version: !ruby/object:Gem::Version
-  version: 0.0.4
-  prerelease: 
+  version: 0.1pre
+  prerelease: 3
 platform: ruby
 authors:
 - Robert Curth
@@ -99,6 +99,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/todo.rb
+- lib/todo_filter.rb
 - lib/todo_list.rb
 - lib/todo_list_view.rb
 - lib/todo_store.rb
@@ -123,9 +124,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24