todo-void 0.0.1 → 0.0.2

data/bin/t

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+require 'require_relative'
 require_relative '../lib/todo_void'
 
-puts TodoVoid.execute(ARGV)
+app = TodoVoid.new(ARGV)
+puts app.execute

data/interactors/status_changes_interactor.rb

@@ -1,23 +1,30 @@
 class StatusChangesInteractor
-  def initialize(store = TodoStore.new)
-    @store = store
-    @list = @store.read
+  class ConflictingIdsError < StandardError
+    attr_reader :conflicting_todos
+
+    def initialize(conflicting_todos)
+      @conflicting_todos = conflicting_todos
+    end
   end
 
-  def finish_todo(hash)
-    change_todo_status(hash, :finished)
+  def initialize(store = TodoStore.new)
+    @store = store
+    @list = @store.todos
   end
 
-  def start_todo(hash)
-    change_todo_status(hash, :started)
+  def change_status(hash, status)
+    change_todo_status(hash, status)
   end
 
   private
   def change_todo_status(hash, status)
-    todo = @list.find(hash)
-    @list.remove(todo)
-    todo.status = status
-    @list.add(todo)
-    @store.save(@list)
+    todos = @list.find(hash).to_array
+    
+    if todos.length > 1
+      raise ConflictingIdsError.new(todos)
+    elsif todos.length == 1
+      todos[0].status = status
+      @store.update(todos[0])
+    end
   end
-end
+end

data/interactors/todo_interactor.rb

@@ -3,27 +3,13 @@ require_relative '../lib/todo_store'
 class TodoInteractor
   def initialize(store = TodoStore.new)
     @store = store
-    @list = @store.read
   end
   
   def add_todo(description)
-    @list.add(Todo.new(description))
-    save_list
-  end
-
-  def delete_todo(hash)
-    @list.remove(hash)
-    save_list
+    @store.save(Todo.new(description))
   end
 
   def list_all
-    todos = []
-    @list.todo.each do |id, todo| todos << todo end
-    todos
-  end
-
-  private
-  def save_list
-    @store.save(@list)
+    @store.todos.to_array
   end
 end

data/lib/todo_list.rb

@@ -10,13 +10,29 @@ class TodoList
   end
 
   def find(search)
+    list = TodoList.new
     @todo.each do |id, todo|
-      return todo if /^#{search}/.match id
+      list.add todo if /^#{search}/.match id
     end
-    nil
+    list
   end
 
-  def remove(hash)
-    @todo.delete(hash)
+  def length
+    @todo.length
+  end
+
+  def empty?
+    @todo.length == 0
+  end
+
+  def update(todo)
+    @todo.delete(todo.id)
+    @todo[todo.id] = todo
+  end
+
+  def to_array
+    todos = []
+    @todo.each do |id, todo| todos << todo end
+    todos
   end
 end

data/lib/todo_list_view.rb

@@ -1,6 +1,10 @@
 require_relative "../lib/todo_view"
 
 class TodoListView
+  def self.render(todos)
+    self.new(todos).render
+  end
+
   def initialize(todos)
     @todos = todos
   end

data/lib/todo_store.rb

@@ -3,7 +3,26 @@ require_relative './todo'
 require 'fileutils'
 
 class TodoStore
-  def read 
+  def initialize
+    read
+  end
+
+  def todos
+    @list
+  end
+
+  def update(todo)
+    @list.update(todo)
+    write
+  end
+
+  def save(todo)
+    @list.add(todo)
+    write
+  end
+
+  private
+  def read
     todo_list = TodoList.new
 
     FileUtils.touch(todo_file)
@@ -17,20 +36,20 @@ class TodoStore
       todo_list.add todo
     end
 
-    todo_list
+    @list = todo_list
   end
 
-  def save(list)
-    seriaized_todos = ""
-    todos = list.todo
+  def write
+    serialized_todos = ""
+    
+    todos = @list.todo
     todos.each do |id, todo|
-      seriaized_todos += "#{todo.status}||#{todo.description}\n"
+      serialized_todos += "#{todo.status}||#{todo.description}\n"
     end
 
-    File.write(todo_file, seriaized_todos)
+    File.open(todo_file, "w") {|f| f.write serialized_todos }
   end
 
-  private
   def todo_file
     Dir.home + '/.todos'
   end

data/lib/todo_void.rb

@@ -1,26 +1,47 @@
+require 'require_relative'
 require_relative '../interactors/todo_interactor.rb'
 require_relative '../interactors/status_changes_interactor.rb'
+require_relative './todo_list_view'
 
 class TodoVoid
-  def self.execute(args)
-    output = ""
+  def initialize(args=[])
+    @args = args
+    @output = ""
+  end
 
-    if args[0] == "-d"
-      TodoInteractor.new.delete_todo(args[1])
-    elsif args[0] == "-f"
-      StatusChangesInteractor.new.finish_todo(args[1])
-    elsif args[0] == "-s"
-      StatusChangesInteractor.new.start_todo(args[1])
-    elsif args[0] == "--help"
-      output = "Help:\nt 'Mowing the lawn' in order to create a todo\n-f ID to finish a todo\n-d ID to delete a todo"
-    elsif args[0]
-      TodoInteractor.new.add_todo(args[0])
+  def execute
+    if flag?('-d')
+      change_status(:deleted)
+    elsif flag?('-f')
+      change_status(:finished)
+    elsif flag?('-s')
+      change_status(:started)
+    elsif flag?('--help')
+      @output = "Help:\nt 'Mowing the lawn' in order to create a todo\n-f ID to finish a todo\n-d ID to delete a todo"
+    elsif @args[0]
+      TodoInteractor.new.add_todo(@args[0])
     else
-      require_relative './todo_list_view.rb'
       todos = TodoInteractor.new.list_all
-      view = TodoListView.new(todos)
-      output = view.render
+      @output = TodoListView.render(todos)
+    end
+    @output
+  end
+  
+  private
+  def flag?(flag)
+    @args[0] == flag
+  end
+
+  def hash
+    @args[1]
+  end
+
+  def change_status(status)
+    begin
+      StatusChangesInteractor.new.change_status(hash, status)
+    rescue StatusChangesInteractor::ConflictingIdsError => e
+      @output += "Conflicting part of an id provided please be more specific:\n"
+      @output += TodoListView.render(e.conflicting_todos)
     end
-    output
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: todo-void
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -27,6 +27,54 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A simple app to manage todos
 email: robert@rocu.de
 executables:
@@ -44,7 +92,8 @@ files:
 - interactors/status_changes_interactor.rb
 - interactors/todo_interactor.rb
 homepage: http://rubygems.org/gems/todo-void
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths: