troo 0.0.4 → 0.0.5

data/lib/troo/display/comment_presenter.rb

@@ -1,8 +1,8 @@
 module Troo
   class CommentPresenter
     class << self
-      def render_show(card, options = {})
-        new(card, options).render_show
+      def show(card, options = {})
+        new(card, options).show
       end
     end
 
@@ -13,18 +13,14 @@ module Troo
       @options = options
     end
 
-    def render_show
+    def show
       spacing do
-        print CardDecorator.new(card).short
+        print card.decorator.short
 
-        if card.comments.any?
-          card.comments.each do |comment|
-            indent do
-              print CommentDecorator.new(comment).as_view
-            end
-          end
-        else
-          print_error "No comments were found."
+        print_error "No comments were found." unless card.comments.any?
+
+        card.comments.each do |comment|
+          indent { print comment.decorator.as_view }
         end
       end
     end

data/lib/troo/display/decorator_helpers.rb

@@ -7,8 +7,16 @@ module Troo
       base.extend(ClassMethods)
     end
 
+    def title
+      highlight([default, brackets(id), name].join(" "), options)
+    end
+
     private
 
+    def title_for(resource)
+      indent { print resource.title + "\n" }
+    end
+
     def word_wrap(text, line_width = 70)
       return text if line_width <= 0
       text.gsub(/\n/, ' ').gsub(/(.{1,#{line_width}})(\s+|$)/, "\\1\n").strip

data/lib/troo/display/list_decorator.rb

@@ -35,6 +35,10 @@ module Troo
       list.id.to_s
     end
 
+    def cards(alt_options = {})
+      list.cards.map { |card| card.decorator(alt_options) }
+    end
+
     private
     attr_reader :list
 

data/lib/troo/display/list_presenter.rb

@@ -1,36 +1,30 @@
 module Troo
   class ListPresenter
     class << self
-      def render_show(list, options = {})
-        new(list, options).render_show
+      def show(list, options = {})
+        new(list, options).show
       end
     end
 
     include DecoratorHelpers
 
     def initialize(list, options = {})
-      @list   = list
+      @list    = list
       @options = options
     end
 
-    def render_show
-      spacing do
-        print BoardDecorator.new(board).short
-
-        indent do
-          print ListDecorator.new(list).short
-
-          if list.cards.any?
-            list.cards.each do |card|
-              indent do
-                print CardDecorator.new(card).short
-              end
-            end
-          else
-            print_error "No cards were found."
-          end
-        end
+    def show
+      puts board.decorator.title
+
+      title_for(list.decorator)
+
+      print_error "No cards were found." if cards.empty?
+
+      cards.each do |card|
+        title_for(card)
       end
+
+      puts
     end
 
     private
@@ -39,5 +33,9 @@ module Troo
     def board
       list.board
     end
+
+    def cards
+      list.decorator.cards
+    end
   end
 end

data/lib/troo/display/member_decorator.rb

@@ -2,8 +2,9 @@ module Troo
   class MemberDecorator
     include DecoratorHelpers
 
-    def initialize(member)
-      @member = member
+    def initialize(member, options = {})
+      @member  = member
+      @options = options
     end
 
     def username

data/lib/troo/display/member_presenter.rb

@@ -1,8 +1,8 @@
 module Troo
   class MemberPresenter
     class << self
-      def render_show(card, options = {})
-        new(card, options).render_show
+      def show(card, options = {})
+        new(card, options).show
       end
     end
 
@@ -13,7 +13,7 @@ module Troo
       @options = options
     end
 
-    def render_show
+    def show
       decorated_members
     end
 
@@ -33,7 +33,7 @@ module Troo
     end
 
     def members
-      @members ||= card.members.map { |member| MemberDecorator.new(member).username }
+      @members ||= card.members.map { |member| member.decorator.username }
     end
 
     def one_member?

data/lib/troo/external/board.rb

@@ -4,13 +4,13 @@ module Troo
       class << self
         def fetch(external_id, options = {})
           new(external_id, options).fetch_by_external_id.map do |resource|
-            Troo::BoardPersistence.for(resource) unless closed?(resource)
+            BoardPersistence.for(resource) unless closed?(resource)
           end
         end
 
         def fetch_all
           new.fetch_all.map do |resource|
-            Troo::BoardPersistence.for(resource) unless closed?(resource)
+            BoardPersistence.for(resource) unless closed?(resource)
           end
         end
       end

data/lib/troo/external/card.rb

@@ -6,7 +6,7 @@ module Troo
           new(external_id, options).fetch_by_external_id.map do |resource|
             unless closed?(resource)
               Troo::External::Comment.fetch(resource.id, { mode: :card }) if options.fetch(:comments, true)
-              Troo::CardPersistence.for(resource)
+              CardPersistence.for(resource)
             end
           end
         end

data/lib/troo/external/comment.rb

@@ -4,7 +4,7 @@ module Troo
       class << self
         def fetch(external_id, options = {})
           new(external_id, options).fetch_by_external_id.map do |resource|
-            Troo::CommentPersistence.for(resource)
+            CommentPersistence.for(resource)
           end
         end
       end

data/lib/troo/external/list.rb

@@ -4,7 +4,7 @@ module Troo
       class << self
         def fetch(external_id, options = {})
           new(external_id, options).fetch_by_external_id.map do |resource|
-            Troo::ListPersistence.for(resource) unless closed?(resource)
+            ListPersistence.for(resource) unless closed?(resource)
           end
         end
       end

data/lib/troo/external/member.rb

@@ -4,7 +4,7 @@ module Troo
       class << self
         def fetch(external_id, options = {})
           new(external_id, options).fetch_by_external_id.map do |resource|
-            Troo::MemberPersistence.for(resource)
+            MemberPersistence.for(resource)
           end
         end
       end

data/lib/troo/models/board.rb

@@ -21,6 +21,18 @@ module Troo
     def cards
       Troo::Card.find(external_board_id: self.external_board_id)
     end
+
+    def decorator(options = {})
+      BoardDecorator.new(self, options)
+    end
+
+    def presenter
+      BoardPresenter.new(self)
+    end
+
+    def set_default!
+      SetDefault.for(self)
+    end
   end
 end
 

data/lib/troo/models/card.rb

@@ -25,11 +25,11 @@ module Troo
     alias_method :default?, :default
 
     def board
-      Troo::BoardRetrieval.retrieve(self.external_board_id)
+      BoardRetrieval.retrieve(self.external_board_id)
     end
 
     def list
-      Troo::ListRetrieval.retrieve(self.external_list_id)
+      ListRetrieval.retrieve(self.external_list_id)
     end
 
     def comments
@@ -49,6 +49,18 @@ module Troo
         []
       end
     end
+
+    def decorator(options = {})
+      CardDecorator.new(self, options)
+    end
+
+    def presenter
+      CardPresenter.new(self)
+    end
+
+    def set_default!
+      SetDefault.for(self)
+    end
   end
 end
 

data/lib/troo/models/comment.rb

@@ -17,15 +17,19 @@ module Troo
     index :external_member_id
 
     def board
-      Troo::BoardRetrieval.retrieve(self.external_board_id)
+      BoardRetrieval.retrieve(self.external_board_id)
     end
 
     def card
-      Troo::CardRetrieval.retrieve(self.external_card_id)
+      CardRetrieval.retrieve(self.external_card_id)
     end
 
     def member
-      Troo::MemberRetrieval.retrieve(self.external_member_id)
+      MemberRetrieval.retrieve(self.external_member_id)
+    end
+
+    def decorator(options = {})
+      CommentDecorator.new(self, options)
     end
   end
 end

data/lib/troo/models/list.rb

@@ -17,11 +17,23 @@ module Troo
     alias_method :default?, :default
 
     def board
-      Troo::BoardRetrieval.retrieve(self.external_board_id)
+      BoardRetrieval.retrieve(self.external_board_id)
     end
 
     def cards
       Troo::Card.find(external_list_id: self.external_list_id)
     end
+
+    def decorator(options = {})
+      ListDecorator.new(self, options)
+    end
+
+    def presenter
+      ListPresenter.new(self)
+    end
+
+    def set_default!
+      SetDefault.for(self)
+    end
   end
 end

data/lib/troo/models/member.rb

@@ -13,6 +13,14 @@ module Troo
     attribute :external_member_id
 
     index :external_member_id
+
+    def decorator(options = {})
+      MemberDecorator.new(self, options)
+    end
+
+    def presenter
+      MemberPresenter.new(self)
+    end
   end
 end
 

data/lib/troo/troo.rb

@@ -65,7 +65,7 @@ require_relative "models/member_retrieval"
 require_relative "models/member_persistence"
 require_relative "models/refresh"
 
-require_relative "cli/thor_fixes"
+require_relative "cli/cli_helpers"
 require_relative "cli/add_cli"
 require_relative "cli/default_cli"
 require_relative "cli/show_cli"

data/lib/troo/version.rb

@@ -1,4 +1,4 @@
 module Troo
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end
 

data/test/lib/troo/actions/create_board_test.rb

@@ -8,7 +8,7 @@ module Troo
 
     before do
       @board = Fabricate(:board, name: board_name, description: description)
-      Troo::BoardPersistence.stubs(:for).returns(@board)
+      BoardPersistence.stubs(:for).returns(@board)
     end
 
     after { database_cleanup }

data/test/lib/troo/actions/create_card_test.rb

@@ -11,7 +11,7 @@ module Troo
       @list = Fabricate(:list)
       @card = Fabricate(:card, name: card_name, desc: description)
 
-      Troo::CardPersistence.stubs(:for).returns(@card)
+      CardPersistence.stubs(:for).returns(@card)
     end
 
     after { database_cleanup }

data/test/lib/troo/actions/create_comment_test.rb

@@ -10,7 +10,7 @@ module Troo
       @card = Fabricate(:card)
       @comment = Fabricate(:comment, text: comment)
 
-      Troo::CommentPersistence.stubs(:for).returns(@comment)
+      CommentPersistence.stubs(:for).returns(@comment)
     end
 
     after { database_cleanup }

data/test/lib/troo/actions/create_list_test.rb

@@ -10,7 +10,7 @@ module Troo
       @board = Fabricate(:board)
       @list = Fabricate(:list, name: list_name)
 
-      Troo::ListPersistence.stubs(:for).returns(@list)
+      ListPersistence.stubs(:for).returns(@list)
     end
 
     after { database_cleanup }

data/test/lib/troo/cli/add_cli_test.rb

@@ -12,10 +12,10 @@ module Troo
         @comment = Fabricate.build(:comment)
         @list    = Fabricate.build(:list, name: "My New Test List")
 
-        Troo::CreateBoard.stubs(:with).returns(@board)
-        Troo::CreateCard.stubs(:for).returns(@card)
-        Troo::CreateComment.stubs(:for).returns(@comment)
-        Troo::CreateList.stubs(:for).returns(@list)
+        CreateBoard.stubs(:with).returns(@board)
+        CreateCard.stubs(:for).returns(@card)
+        CreateComment.stubs(:for).returns(@comment)
+        CreateList.stubs(:for).returns(@list)
       end
 
       after { database_cleanup }
@@ -42,7 +42,7 @@ module Troo
         end
 
         context "when the board was not created" do
-          before { Troo::CreateBoard.stubs(:with).returns(false) }
+          before { CreateBoard.stubs(:with).returns(false) }
 
           it "returns a polite message" do
             subject.must_match /Board could not be created/
@@ -50,7 +50,7 @@ module Troo
         end
 
         context "when the Trello access token credentials are invalid" do
-          before { Troo::CreateBoard.stubs(:with).raises(Troo::InvalidAccessToken) }
+          before { CreateBoard.stubs(:with).raises(Troo::InvalidAccessToken) }
 
           it "returns a polite message" do
             subject.must_match /access credentials have expired, please renew/
@@ -63,7 +63,7 @@ module Troo
         let(:card_name)   { "My New Test Card" }
         let(:description) { "A very brief description..." }
 
-        before { Troo::ListRetrieval.stubs(:retrieve).returns(@list) }
+        before { ListRetrieval.stubs(:retrieve).returns(@list) }
 
         subject { capture_io { described_class.new.card(list_id, card_name, description) }.join }
 
@@ -85,7 +85,7 @@ module Troo
           end
 
           context "when the card was not created" do
-            before { Troo::CreateCard.stubs(:for).returns(false) }
+            before { CreateCard.stubs(:for).returns(false) }
 
             it "returns a polite message" do
               subject.must_match /Card could not be created/
@@ -93,7 +93,7 @@ module Troo
           end
 
           context "when the Trello access token credentials are invalid" do
-            before { Troo::CreateCard.stubs(:for).raises(Troo::InvalidAccessToken) }
+            before { CreateCard.stubs(:for).raises(Troo::InvalidAccessToken) }
 
             it "returns a polite message" do
               subject.must_match /access credentials have expired, please renew/
@@ -102,7 +102,7 @@ module Troo
         end
 
         context "when the list was not found" do
-          before { Troo::ListRetrieval.stubs(:retrieve).returns(nil) }
+          before { ListRetrieval.stubs(:retrieve) }
 
           it "returns a polite message" do
             subject.must_match /list was not found/
@@ -114,7 +114,7 @@ module Troo
         let(:card_id) { "526d8f19ddb279532e005259" }
         let(:comment) { "A very brief description..." }
 
-        before { Troo::CardRetrieval.stubs(:retrieve).returns(@card) }
+        before { CardRetrieval.stubs(:retrieve).returns(@card) }
 
         subject { capture_io { described_class.new.comment(card_id, comment) }.join }
 
@@ -136,7 +136,7 @@ module Troo
           end
 
           context "when the comment was not created" do
-            before { Troo::CreateComment.stubs(:for).returns(false) }
+            before { CreateComment.stubs(:for).returns(false) }
 
             it "returns a polite message" do
               subject.must_match /Comment could not be created/
@@ -144,7 +144,7 @@ module Troo
           end
 
           context "when the Trello access token credentials are invalid" do
-            before { Troo::CreateComment.stubs(:for).raises(Troo::InvalidAccessToken) }
+            before { CreateComment.stubs(:for).raises(Troo::InvalidAccessToken) }
 
             it "returns a polite message" do
               subject.must_match /access credentials have expired, please renew/
@@ -153,7 +153,7 @@ module Troo
         end
 
         context "when the card was not found" do
-          before { Troo::CardRetrieval.stubs(:retrieve).returns(nil) }
+          before { CardRetrieval.stubs(:retrieve) }
 
           it "returns a polite message" do
             subject.must_match /card was not found/
@@ -165,7 +165,7 @@ module Troo
         let(:board_id)  { "526d8e130a14a9d846001d96" }
         let(:list_name) { "My New List" }
 
-        before { Troo::BoardRetrieval.stubs(:retrieve).returns(@board) }
+        before { BoardRetrieval.stubs(:retrieve).returns(@board) }
 
         subject { capture_io { described_class.new.list(board_id, list_name) }.join }
 
@@ -187,7 +187,7 @@ module Troo
           end
 
           context "when the list was not created" do
-            before { Troo::CreateList.stubs(:for).returns(false) }
+            before { CreateList.stubs(:for).returns(false) }
 
             it "returns a polite message" do
               subject.must_match /List could not be created/
@@ -195,7 +195,7 @@ module Troo
           end
 
           context "when the Trello access token credentials are invalid" do
-            before { Troo::CreateList.stubs(:for).raises(Troo::InvalidAccessToken) }
+            before { CreateList.stubs(:for).raises(Troo::InvalidAccessToken) }
 
             it "returns a polite message" do
               subject.must_match /access credentials have expired, please renew/
@@ -204,7 +204,7 @@ module Troo
         end
 
         context "when the board was not found" do
-          before { Troo::BoardRetrieval.stubs(:retrieve).returns(nil) }
+          before { BoardRetrieval.stubs(:retrieve) }
 
           it "returns a polite message" do
             subject.must_match /board was not found/

data/test/lib/troo/cli/{thor_fixes_test.rb → cli_helpers_test.rb}

@@ -3,6 +3,9 @@ require "thor"
 
 module Troo
   module CLI
+    module Helpers
+    end
+
     describe ThorFixes do
       let(:described_class) { ThorFixes }
 

data/test/lib/troo/cli/default_cli_test.rb

@@ -12,7 +12,7 @@ module Troo
         subject { capture_io { described_class.new.board(id) }.join }
 
         context "when the id cannot be found" do
-          before { Troo::BoardRetrieval.stubs(:retrieve).returns(nil) }
+          before { BoardRetrieval.stubs(:retrieve) }
 
           it "returns a polite message" do
             subject.must_match /Board cannot be found/
@@ -22,7 +22,7 @@ module Troo
         context "when the id was found" do
           before do
             @board = Fabricate.build(:board)
-            Troo::BoardRetrieval.stubs(:retrieve).returns(@board)
+            BoardRetrieval.stubs(:retrieve).returns(@board)
           end
 
           it "returns a polite message" do
@@ -36,13 +36,13 @@ module Troo
 
         before do
           @card  = Fabricate.build(:card)
-          Troo::CardRetrieval.stubs(:retrieve).returns(@card)
+          CardRetrieval.stubs(:retrieve).returns(@card)
         end
 
         subject { capture_io { described_class.new.card(id) }.join }
 
         context "when the id cannot be found" do
-          before { Troo::CardRetrieval.stubs(:retrieve).returns(nil) }
+          before { CardRetrieval.stubs(:retrieve) }
 
           it "returns a polite message" do
             subject.must_match /Card cannot be found/
@@ -62,7 +62,7 @@ module Troo
         subject { capture_io { described_class.new.list(id) }.join }
 
         context "when the id cannot be found" do
-          before { Troo::ListRetrieval.stubs(:retrieve).returns(nil) }
+          before { ListRetrieval.stubs(:retrieve) }
 
           it "returns a polite message" do
             subject.must_match /List cannot be found/
@@ -72,7 +72,7 @@ module Troo
         context "when the id was found" do
           before do
             @list = Fabricate.build(:list)
-            Troo::ListRetrieval.stubs(:retrieve).returns(@list)
+            ListRetrieval.stubs(:retrieve).returns(@list)
           end
 
           it "returns a polite message" do