thimbl 0.1.2 → 0.2.0

data/test/fixtures/messages_1.json

@@ -0,0 +1,22 @@
+{
+    "following": [
+        {
+            "address": "mike@mikepearce.net",
+            "nick": "mike"
+        },
+        {
+            "address": "rw@telekommunisten.org",
+            "nick": "rico"
+        }
+    ],
+    "messages": [
+        {
+            "text": "messages_1 a",
+            "time": "20101105124412"
+        },
+        {
+            "text": "messages_1 b",
+            "time": "20100707125120"
+        }
+    ]
+}

data/test/fixtures/messages_2.json

@@ -0,0 +1,12 @@
+{
+    "messages": [
+        {
+            "text": "messages_2 a",
+            "time": "20101105124416"
+        },
+        {
+            "text": "messages_2 b",
+            "time": "20100707125126"
+        }
+    ]
+}

data/test/fixtures/messages_3.json

@@ -0,0 +1,12 @@
+{
+    "messages": [
+        {
+            "text": "messages_3 a",
+            "time": "20101105124406"
+        },
+        {
+            "text": "messages_3 b",
+            "time": "20100707125136"
+        }
+    ]
+}

data/test/fixtures/official_plan.json

@@ -0,0 +1,69 @@
+{
+    "bio": "Venture Communist",
+    "following": [
+        {
+            "address": "mike@mikepearce.net",
+            "nick": "mike"
+        },
+        {
+            "address": "rw@telekommunisten.org",
+            "nick": "rico"
+        },
+        {
+            "address": "ashull@telekommunisten.org",
+            "nick": "ashull"
+        }
+    ],
+    "messages": [
+        {
+            "text": "Hey @mark, this is the first update sent with Thimbl-CLI",
+            "time": "20101105124412"
+        },
+        {
+            "text": "mike needs to stop sending messages from the future!",
+            "time": "20100707125120"
+        },
+        {
+            "text": "#thimbl is rolling!",
+            "time": "20100707122140"
+        },
+        {
+            "text": "I love thimbl! #thimbl",
+            "time": "20100622170914"
+        }
+    ],
+    "name": "Dmytri Kleiner",
+    "properties": {
+        "email": "dk@telekommunisten.net",
+        "mobile": "+491632866163",
+        "website": "http://www.telekommunisten.net"
+    },
+    "replies": {
+        "ashull@telekommunisten.org": [
+            {
+                "text": "@ashull, the feed is awesome, works great!",
+                "time": "20100707122315"
+            },
+            {
+                "text": "@ashull, here is a reply",
+                "time": "20100705163145"
+            }
+        ],
+        "mike@mikepearce.net": [
+            {
+                "text": "@mike, the baboon would win. No contest",
+                "time": "20100707122100"
+            },
+            {
+                "text": "@mike, do you like this json format?",
+                "time": "20100622170025"
+            }
+        ],
+        "rw@telekommunisten.org": [
+            {
+                "text": "@rico, I'll call you later",
+                "time": "20100622162340"
+            }
+        ]
+    }
+}

data/test/fixtures/print.txt

@@ -0,0 +1,6 @@
+2010-07-07 12:51:20 user@thimbl.net > messages_1 b
+2010-07-07 12:51:26 mike@mikepearce.net > messages_2 b
+2010-07-07 12:51:36 rw@telekommunisten.org > messages_3 b
+2010-11-05 12:44:06 rw@telekommunisten.org > messages_3 a
+2010-11-05 12:44:12 user@thimbl.net > messages_1 a
+2010-11-05 12:44:16 mike@mikepearce.net > messages_2 a

data/test/test_helper.rb

@@ -2,4 +2,6 @@ require "#{File.dirname(__FILE__)}/../lib/thimbl"
 require 'test/unit'
 require 'mocha'
 require 'ruby-debug'
-require 'delorean'
+require 'delorean'
+
+FIXTURES_PATH = "#{File.dirname(__FILE__)}/fixtures"

data/test/thimbl_base_test.rb

@@ -25,161 +25,178 @@ class ThimblBaseTest < Test::Unit::TestCase
   end
   
   def test_new_without_options
-    thimbl = Thimbl::Base.new
-    
-    assert_equal( 'address', thimbl.me )
-    
-    data = thimbl.data['plans'][thimbl.me]
-    assert_equal( 'name', data['name'] )
-    assert_equal( [], data['messages'] )
-    assert_equal( 'bio', data['bio'] )
-    assert_equal( {}, data['replies'] )
-    assert_equal( [], data['following'] )
-    assert_equal( 'mobile', data['properties']['mobile'] )
-    assert_equal( 'website', data['properties']['website'] )
-    assert_equal( 'email', data['properties']['email'] )
+    thimbl = Thimbl::Base.new 'user@thimbl.net'
+    
+    assert_equal 'user@thimbl.net', thimbl.address
+    assert_equal nil  , thimbl.properties.name
+    assert_equal []   , thimbl.messages
+    assert_equal nil  , thimbl.properties.bio
+    assert_equal []   , thimbl.following
+    assert_equal nil  , thimbl.properties.mobile
+    assert_equal nil  , thimbl.properties.website
+    assert_equal nil  , thimbl.properties.email
   end
   
   def test_new_with_options
     thimbl = 
       Thimbl::Base.new(
-        'bio'      => 'my bio',
-        'website'  => 'my website', 
-        'mobile'   => 'my mobile', 
-        'email'    => 'my email', 
-        'address'  => 'my address', 
-        'name'     => 'my name'
+        'user@thimbl.net',
+        {
+          :bio      => 'my bio',
+          :website  => 'my website', 
+          :mobile   => 'my mobile', 
+          :email    => 'my email', 
+          :name     => 'my name'
+        }
       )
     
-    assert_equal( 'my address', thimbl.me )
-    
-    data = thimbl.data['plans'][thimbl.me]
-    assert_equal( 'my name', data['name'] )
-    assert_equal( 'my bio', data['bio'] )
-    assert_equal( 'my mobile', data['properties']['mobile'] )
-    assert_equal( 'my website', data['properties']['website'] )
-    assert_equal( 'my email', data['properties']['email'] )
+    assert_equal 'user@thimbl.net'  , thimbl.address
+    assert_equal 'my name'          , thimbl.properties.name
+    assert_equal 'my bio'           , thimbl.properties.bio
+    assert_equal 'my mobile'        , thimbl.properties.mobile
+    assert_equal 'my website'       , thimbl.properties.website
+    assert_equal 'my email'         , thimbl.properties.email
   end
   
   def test_post
-    thimbl = Thimbl::Base.new
+    thimbl = Thimbl::Base.new 'user@thimbl.net'
     
     Delorean.time_travel_to("2011-02-03 04:05:06") do
       thimbl.post( "wadus wadus" )
     end
 
-    message = thimbl.data['plans'][thimbl.me]['messages'].last
-    assert_equal( '20110203040506', message['time'] )
-    assert_equal( 'wadus wadus', message['text'] )
+    message = thimbl.messages.last
+    assert_equal '20110203040506', message.time.strftime('%Y%m%d%H%M%S')
+    assert_equal 'wadus wadus', message.text
+  end
+  
+  def test_post!
+    thimbl = Thimbl::Base.new 'user@thimbl.net'
+    thimbl.expects( :post ).with( 'wadus wadus' )
+    thimbl.expects( :push ).with( 'password' )
+    
+    thimbl.post! 'wadus wadus', 'password'
   end
   
   def test_follow
-    thimbl = Thimbl::Base.new
+    thimbl = Thimbl::Base.new 'user@thimbl.net'
     
     thimbl.follow( 'nick', 'address' )
     
-    following = thimbl.data['plans'][thimbl.me]['following'].last
-    assert_equal( 'nick', following['nick'] )
-    assert_equal( 'address', following['address'] )
+    followed = thimbl.following.last
+    assert_equal( 'nick', followed.nick )
+    assert_equal( 'address', followed.address )
+  end
+  
+  def test_follow!
+    thimbl = Thimbl::Base.new 'user@thimbl.net'
+    thimbl.expects( :follow ).with( 'nick', 'new@thimbl.net' )
+    thimbl.expects( :push ).with( 'password' )
+    
+    thimbl.follow! 'nick', 'new@thimbl.net', 'password'
+  end
+  
+  def test_unfollow
+    thimbl = Thimbl::Base.new 'user@thimbl.net'
+    thimbl.data = JSON.load File.read "#{FIXTURES_PATH}/following.json"
+    
+    assert_equal 2, thimbl.following.size
+  
+    thimbl.unfollow 'rw@telekommunisten.org'
+    
+    assert_equal 1, thimbl.following.size
+  end
+  
+  def test_unfollow!
+    thimbl = Thimbl::Base.new 'user@thimbl.net'
+    thimbl.expects( :unfollow ).with( 'new@thimbl.net' )
+    thimbl.expects( :push ).with( 'password' )
+    
+    thimbl.unfollow! 'new@thimbl.net', 'password'
   end
   
   def test_fetch
-    finger_fixture = File.read "#{File.dirname(__FILE__)}/fixtures/finger_dk_telekommunisten_org.txt"
-    finger_sequence = sequence('finger_sequence')
-      
-    Thimbl::Finger.
-      expects(:run).
-      with( 'wadus1@telekommunisten.org' ).
-      returns( finger_fixture ).
-      in_sequence( finger_sequence )
-      
-    Thimbl::Finger.
-      expects(:run).
-      with( 'wadus2@telekommunisten.org' ).
-      returns( finger_fixture ).
-      in_sequence( finger_sequence )
-      
-    Thimbl::Finger.
-      expects(:run).
-      with( 'me@thimbl.net' ).
-      returns( finger_fixture ).
-      in_sequence( finger_sequence )
+    finger_fixture = File.read "#{FIXTURES_PATH}/finger_dk_telekommunisten_org.txt"
+    Thimbl::Finger.expects(:run).with( 'me@thimbl.net' ).returns( finger_fixture )
       
-    thimbl = Thimbl::Base.new( 'address' => 'me@thimbl.net' )
-    thimbl.expects(:following).returns( [ 
-      {'nick' => 'wadus1', 'address' => 'wadus1@telekommunisten.org' },
-      {'nick' => 'wadus2', 'address' => 'wadus2@telekommunisten.org' },
-    ] )
-  
+    thimbl = Thimbl::Base.new 'me@thimbl.net'
     thimbl.fetch
     
-    assert_equal( 21, thimbl.data['plans']['wadus1@telekommunisten.org']['messages'].count )
-    assert_equal( 21, thimbl.data['plans']['wadus2@telekommunisten.org']['messages'].count )
+    assert_equal( 21, thimbl.messages.size )
   end
   
   def test_fetch_with_plan_with_two_break_lines
-    finger_fixture = File.read "#{File.dirname(__FILE__)}/fixtures/finger_dk_telekommunisten_org_two_break_lines.txt"
+    finger_fixture = File.read "#{FIXTURES_PATH}/finger_dk_telekommunisten_org_two_break_lines.txt"
     Thimbl::Finger.expects(:run).with( 'me@thimbl.net' ).returns( finger_fixture )
     
-    thimbl = Thimbl::Base.new( 'address' => 'me@thimbl.net' )
+    thimbl = Thimbl::Base.new 'me@thimbl.net'
     thimbl.fetch
     
-    assert_equal( 22, thimbl.data['plans']['me@thimbl.net']['messages'].count )
+    assert_equal( 22, thimbl.messages.size )
+  end
+  
+  def test_fetch_with_not_plan
+    Thimbl::Finger.expects(:run).with( 'me@thimbl.net' ).returns( 'no plan' )
+    
+    thimbl = Thimbl::Base.new 'me@thimbl.net'
+    
+    assert_raise(Thimbl::NoPlanException) do
+      thimbl.fetch
+    end
   end
   
   def test_push
-    thimbl = Thimbl::Base.new( 'address' => 'user@domain.com' )
+    thimbl = Thimbl::Base.new 'user@domain.com'
     Net::SCP.expects(:start).with( 'domain.com', 'user', :password => 'my password' )
     thimbl.push 'my password'
   end
     
   def test_messages
-    thimbl = Thimbl::Base.new
-    thimbl.data = JSON.load File.read "#{File.dirname(__FILE__)}/fixtures/cache.json"
+    thimbl = Thimbl::Base.new 'user@thimbl.net'
+    thimbl.data = JSON.load File.read "#{FIXTURES_PATH}/messages_1.json"
 
-    assert_equal( 24, thimbl.messages.size )
+    assert_equal( 2, thimbl.messages.size )
     
     first = thimbl.messages.first
     last = thimbl.messages.last
     
-    assert_equal 'dk@telekommunisten.org', first['address']
-    assert_equal '@bernd, would be cool to inegrate thimbl in http://bau-ha.us\\!', first['text']
-    assert_equal Time.utc( 2010, 11, 29, 6, 3, 35 ), first['time']
+    assert_equal 'user@thimbl.net', first.address
+    assert_equal 'messages_1 b', first.text
+    assert_equal '20100707125120', first.time.strftime('%Y%m%d%H%M%S')
     
-    assert_equal 'fguillen@telekommunisten.org', last['address']
-    assert_equal 'testing 3', last['text']
-    assert_equal Time.utc( 2011, 2, 5, 15, 22, 47 ), last['time']
+    assert_equal 'user@thimbl.net', last.address
+    assert_equal 'messages_1 a', last.text
+    assert_equal '20101105124412', last.time.strftime('%Y%m%d%H%M%S')
   end
   
-  def test_messages_with_nil_error
-    thimbl = Thimbl::Base.new
-    thimbl.data = JSON.load File.read "#{File.dirname(__FILE__)}/fixtures/cache_error_nil.json"
+  def test_messages_when_plan_has_not_messages
+    thimbl = Thimbl::Base.new 'user@thimbl.net'
+    thimbl.data = JSON.load File.read "#{FIXTURES_PATH}/no_messages.json"
+    
+    assert_equal [], thimbl.messages
+  end
+  
+  def test_following
+    thimbl = Thimbl::Base.new 'user@thimbl.net'
+    thimbl.data = JSON.load File.read "#{FIXTURES_PATH}/following.json"
 
-    assert_not_nil thimbl.messages
-  end
-  
-  def test_print
-    messages = [ 
-      { 
-        "address" => "fguillen@telekommunisten.org",
-        "text"    => "Here I am",
-        "time"    => "20110131002202"
-      },
-      { 
-        "address" => "fguillen@telekommunisten.org",
-        "text"    => "testing :)",
-        "time"    => "20110205150637"
-      }
-    ]
+    assert_equal( 2, thimbl.following.size )
     
-    thimbl = Thimbl::Base.new
-    thimbl.expects( :messages ).returns( messages )
+    first = thimbl.following.first
+    last = thimbl.following.last
     
-    print = thimbl.print
-
-    assert_equal( 2, print.lines.to_a.size )
-    assert_equal( "2011-01-31 00:22:02 fguillen@telekommunisten.org > Here I am\n", print.lines.to_a[0] )
-    assert_equal( "2011-02-05 15:06:37 fguillen@telekommunisten.org > testing :)\n", print.lines.to_a[1] )
+    assert_equal 'mike@mikepearce.net', first.address
+    assert_equal 'mike', first.nick
+    
+    assert_equal 'rw@telekommunisten.org', last.address
+    assert_equal 'rico', last.nick
+  end
+  
+  def test_following_when_plan_has_not_following
+    thimbl = Thimbl::Base.new 'user@thimbl.net'
+    thimbl.data = JSON.load File.read "#{FIXTURES_PATH}/no_following.json"
+    
+    assert_equal [], thimbl.following
   end
     
   def test_parse_time
@@ -187,7 +204,7 @@ class ThimblBaseTest < Test::Unit::TestCase
   end
   
   def test_not_adding_a_following_if_already_there
-    thimbl = Thimbl::Base.new
+    thimbl = Thimbl::Base.new 'user@thimbl.net'
     thimbl.follow 'wadus', 'wadus@thimbl.net'
     thimbl.follow 'wadus', 'wadus@thimbl.net'
     

data/test/thimbl_command_test.rb

@@ -7,6 +7,37 @@ class CommandTest < Test::Unit::TestCase
   def teardown
   end
   
+  def test_get_actual
+    temp_folder = Dir.tmpdir
+    
+    File.open( "#{temp_folder}/actual", 'w' ) { |f| f.write 'user@thimbl.net' }
+    
+    Thimbl::Command.stubs( :thimbl_folder ).returns( temp_folder )
+    Thimbl::Base.any_instance.expects( :fetch )
+    
+    thimbl = Thimbl::Command.get_actual
+    
+    assert_equal 'user@thimbl.net', thimbl.address
+  end
+  
+  def test_get_actual_with_not_existing_file
+    Thimbl::Command.stubs( :thimbl_folder ).returns( '/not_exists' )
+    
+    assert_raise( ArgumentError ) do
+      Thimbl::Command.get_actual
+    end
+  end
+  
+  def test_save_actual
+    temp_folder = "#{Dir.tmpdir}/.thimbl"
+    FileUtils.mkdir_p temp_folder
+    Thimbl::Command.stubs( :thimbl_folder ).returns( temp_folder )
+    
+    Thimbl::Command.save_actual 'user@thimbl.net'
+    
+    assert_equal 'user@thimbl.net', File.read( "#{temp_folder}/actual" )
+  end
+  
   def test_setup_should_exit_if_parameters_not_correct
     assert_raise( ArgumentError ) do
       Thimbl::Command.setup
@@ -14,30 +45,25 @@ class CommandTest < Test::Unit::TestCase
   end
   
   def test_setup
-    temp_file = Tempfile.new('cache.json')
-    Thimbl::Command.stubs( :cache_path ).returns( temp_file.path )
+    temp_folder = "#{Dir.tmpdir}/.thimbl"
+    Thimbl::Command.expects( :thimbl_folder ).returns( temp_folder )
+    Thimbl::Command.expects( :save_actual ).with( 'me@thimbl.net' )
+    
     Thimbl::Command.setup( 'me@thimbl.net' )
 
-    cache_written = JSON.load temp_file.read
-    assert_equal 'me@thimbl.net', cache_written['me']
-    
-    temp_file.unlink
+    assert File.directory? temp_folder
   end
   
   def test_print
-    thimbl = Thimbl::Base.new
-    Thimbl::Command.expects( :load ).returns( thimbl )
-    thimbl.expects( :print )
+    thimbl = Thimbl::Base.new 'user@thimbl.net'
+    Thimbl::Command.expects( :get_actual ).returns( thimbl )
+    Thimbl::Base.any_instance.expects( :fetch_plan ).times( 3 ).returns(
+      File.read( "#{FIXTURES_PATH}/messages_1.json" ), # the user
+      File.read( "#{FIXTURES_PATH}/messages_2.json" ), # following 1
+      File.read( "#{FIXTURES_PATH}/messages_3.json" )  # following 2
+    )
     
-    Thimbl::Command.print
-  end
-  
-  def test_fetch
-    thimbl = Thimbl::Base.new
-    Thimbl::Command.expects( :load ).returns( thimbl )
-    thimbl.expects( :fetch )
-
-    Thimbl::Command.fetch
+    assert_equal File.read( "#{FIXTURES_PATH}/print.txt" ), Thimbl::Command.print
   end
   
   def test_post_should_raise_error_if_wrong_parameters
@@ -46,22 +72,20 @@ class CommandTest < Test::Unit::TestCase
     end
   end
   
-  def test_post
-    thimbl = Thimbl::Base.new
-    Thimbl::Command.expects( :load ).returns( thimbl )
-    thimbl.expects( :post ).with( 'wadus' )
-    
-    Thimbl::Command.post 'wadus'
+  def test_post_should_raise_error_if_not_password
+    assert_raise( ArgumentError ) do
+      Thimbl::Command.post "message"
+    end
   end
   
-  def test_push
-    thimbl = Thimbl::Base.new
-    Thimbl::Command.expects( :load ).returns( thimbl )
-    thimbl.expects( :push ).with( 'pass' )
+  def test_post
+    thimbl = Thimbl::Base.new 'user@thimbl.net'
+    Thimbl::Command.expects( :get_actual ).returns( thimbl )
+    thimbl.expects( :post! ).with( 'wadus', 'password' )
     
-    Thimbl::Command.push 'pass'
+    Thimbl::Command.post 'wadus', 'password'
   end
-  
+    
   def test_follow_should_raise_error_if_wrong_parameters
     assert_raise( ArgumentError ) do
       Thimbl::Command.follow
@@ -69,32 +93,10 @@ class CommandTest < Test::Unit::TestCase
   end
     
   def test_follow
-    thimbl = Thimbl::Base.new
-    Thimbl::Command.expects( :load ).returns( thimbl )
-    thimbl.expects( :follow ).with( 'wadus', 'wadus@domain.com' )
+    thimbl = Thimbl::Base.new 'user@thimbl.net'
+    Thimbl::Command.expects( :get_actual ).returns( thimbl )
+    thimbl.expects( :follow! ).with( 'wadus', 'wadus@domain.com', 'password' )
 
-    Thimbl::Command.follow 'wadus', 'wadus@domain.com'
-  end
-  
-  def test_load_should_raise_error_if_not_config_file
-    Thimbl::Command.stubs( :cache_path ).returns( '/tmp/not_exists_file' )
-    
-    assert_raise( ArgumentError ) do
-      Thimbl::Command.load
-    end
-  end
-  
-  def test_load
-    temp_file = Tempfile.new 'cache.json'
-    temp_file.write "{ \"a\" : 1 }"
-    temp_file.close
-    
-    Thimbl::Command.stubs( :cache_path ).returns( temp_file.path )
-
-    thimbl = Thimbl::Command.load
-    
-    assert_equal 1, thimbl.data['a']
-    
-    temp_file.unlink
+    Thimbl::Command.follow 'wadus', 'wadus@domain.com', 'password'
   end
 end