Changeset 32893 for lang/ruby

Timestamp:

04/28/09 16:34:07 (4 years ago)

Author:

isaisstillalive

Message:

• 引き回すのをはてなidのみに変更
  

Location:

lang/ruby/hatena_binding

Files:

• lib/hatena/haiku/user.rb (modified) (1 diff)
• lib/hatena/haiku/user/following.rb (modified) (1 diff)
• test/hatena/haiku/test_user.rb (modified) (3 diffs)
• test/hatena/haiku/user/test_following.rb (modified) (2 diffs)

lang/ruby/hatena_binding/lib/hatena/haiku/user.rb

@@ -7 +7 @@
       attr_reader :id
       
-      def initialize user
-        @user = user
-        @id = @user.id
+      attr_reader :name
+      
+      def initialize id
+        if id.kind_of? Hash
+          init_properties id
+          id = id["id"]
+        end
+        @id = id.dup.freeze
       end
       
       def entries
-        Entries.new "/statuses/user_timeline/#{@user.id}.json?"
+        Entries.new "/statuses/user_timeline/#{@id}.json?"
       end
       
       def following
-        @following = Following.new self unless @following
+        @following = Following.new @id unless @following
         @following
+      end
+      
+      private
+      def init_properties user
+        @name = user["name"].dup.freeze
       end
     end

lang/ruby/hatena_binding/lib/hatena/haiku/user/following.rb

@@ -3 +3 @@
     class User
       class Following
-        def initialize user
-          @user = user
+        def initialize id
+          @id = id.dup.freeze
         end
         
         def entries
-          Entries.new "/statuses/friends_timeline/#{@user.id}.json?"
+          Entries.new "/statuses/friends_timeline/#{@id}.json?"
         end
       end

lang/ruby/hatena_binding/test/hatena/haiku/test_user.rb

@@ -4 +4 @@
 class TestHatenaUser < Test::Unit::TestCase
   def setup
-    @id = "hatena_user_id"
-    @hatena_user = Hatena::User.new @id
-    @user = Hatena::Haiku::User.new @hatena_user
+    @id = "hid"
+    @user = Hatena::Haiku::User.new @id
   end
   
+  # Followingクラスがautoloadされるか
   def test_following
+    assert Hatena::Haiku::User.autoload?(:Following)
     assert_kind_of Class, Hatena::Haiku::User::Following
   end
   
-  def test_user_should_have_hatena_user
-    assert_same @hatena_user, @user.__send__(:instance_variable_get, :@user)
+  # id文字列で初期化した場合、その文字列をフリーズして保持する
+  def test_initialize_with_id_should_keep_frozen_id
+    id = "hid"
+    user = Hatena::Haiku::User.new id
+    
+    assert_not_same id, user.id
+    assert_equal    id, user.id
+    assert              user.id.frozen?
   end
   
-  def test_id_should_return_hatena_user_id
-    assert_same @hatena_user.id, @user.id
+  # userハッシュで初期化した場合、そのハッシュのidを保持し、それ以外はinit_propertiesメソッドに任せる
+  def test_initialize_with_hash_should_frozen_id_and_call_init_properties
+    $called_args = []
+    user_class = Class.new(Hatena::Haiku::User) do
+      def init_properties hash
+        $called_args << [:init_properties, hash]
+      end
+    end
+    
+    hash = {"id" => "hid"}
+    user = user_class.new hash
+    
+    assert_not_same hash["id"], user.id
+    assert_equal    hash["id"], user.id
+    assert                      user.id.frozen?
+    
+    assert_equal 1, $called_args.size
+    assert_equal :init_properties, $called_args[0][0]
+    assert_equal hash, $called_args[0][1]
   end
   
+  # init_propertiesメソッドは、プロパティを設定する
+  def test_init_properties_should_set_properies
+    hash = {
+      "id"   => "hid",
+      "name" => "hname",
+    }
+    @user.__send__(:init_properties, hash)
+    
+    assert_not_same hash["name"], @user.name
+    assert_equal    hash["name"], @user.name
+    assert                        @user.name.frozen?
+  end
+  
+  # entriesメソッドはEntriesインスタンスを返すこと
   def test_entries_should_return_entries_class
     entries = @user.entries
@@ -26 +64 @@
   end
   
-  def test_entries_should_set_user_timeline
+  # entriesメソッドはユーザIDを含んだパスを設定すること
+  def test_entries_should_set_path_user_timeline
     entries = @user.entries
-    assert_equal "/statuses/user_timeline/hatena_user_id.json?", entries.__send__(:instance_variable_get, :@path)
+    assert_equal "/statuses/user_timeline/#{@id}.json?", entries.__send__(:instance_variable_get, :@path)
   end
   
+  # followingメソッドはFollowingインスタンスを返すこと
   def test_following_should_return_following_class
     following = @user.following
@@ -36 +76 @@
   end
   
-  def test_following_should_set_user
+  # followingメソッドはユーザIDを設定すること
+  def test_following_should_set_user_id
     following = @user.following
-    assert_same @user, following.__send__(:instance_variable_get, :@user)
+    assert_equal @user.id, following.__send__(:instance_variable_get, :@id)
   end
 end

lang/ruby/hatena_binding/test/hatena/haiku/user/test_following.rb

@@ -4 +4 @@
 class TestHatenaUserFollowing < Test::Unit::TestCase
   def setup
-    @id = "hatena_user_id"
-    @hatena_user = Hatena::User.new @id
-    @user = Hatena::Haiku::User.new @hatena_user
-    @following = Hatena::Haiku::User::Following.new(@user)
+    @id = "hid"
+    @following = Hatena::Haiku::User::Following.new @id
   end
   
-  def test_following_should_have_user
-    assert_same @user, @following.__send__(:instance_variable_get, :@user)
+  # id文字列で初期化した場合、その文字列をフリーズして保持する
+  def test_initialize_with_id_should_keep_frozen_id
+    id = @following.__send__(:instance_variable_get, :@id)
+    
+    assert_not_same @id, id
+    assert_equal    @id, id
+    assert               id.frozen?
   end
   
+  # entriesメソッドはEntriesインスタンスを返すこと
   def test_entries_should_return_entries_class
     entries = @following.entries
@@ -19 +23 @@
   end
   
-  def test_entries_should_return_entries_class
+  # entriesメソッドはユーザIDを含んだパスを設定すること
+  def test_entries_should_set_path_friends_timeline
     entries = @following.entries
-    assert_equal "/statuses/friends_timeline/hatena_user_id.json?", entries.__send__(:instance_variable_get, :@path)
+    assert_equal "/statuses/friends_timeline/#{@id}.json?", entries.__send__(:instance_variable_get, :@path)
   end
 end