lib/vimeo_ruby/video.rb in vimeo_ruby-0.4.3 vs lib/vimeo_ruby/video.rb in vimeo_ruby-0.5.0

@@ -1,23 +1,25 @@
 module VimeoRuby
   class Video < Base
-    attr_reader :vimeo_id, :description, :duration, :embed_html, :link, :name, :player_embed_url, :type, :user, :additional_info
+    attr_reader :description, :duration, :embed_html, :link, :name, :player_embed_url, :type, :user
 
     def initialize(attrs: {}, user_class: VimeoRuby::User)
-      @vimeo_id = extract_vimeo_id_from_uri(attrs.delete("uri"))
       @description = attrs.delete("description")
       @duration = attrs.delete("duration")
       @embed_html = attrs.delete("embed").delete("html")
       @link = attrs.delete("link")
       @name = attrs.delete("name")
       @player_embed_url = attrs.delete("player_embed_url")
       @type = attrs.delete("type")
       @user = user_class.new(attrs: attrs.delete("user"))
-      @additional_info = OpenStruct.new(attrs)
+      vimeo_uri_with_id = attrs.delete("uri")
+      super(vimeo_id: vimeo_uri_with_id, remaining_attrs: attrs)
     end
 
-    def self.get_video(video_id)
-      video_info = get("#{base_uri}/videos/#{video_id}")
-      new(attrs: video_info)
+    class << self
+      def get_video(video_id)
+        video_info = get("#{base_uri}/videos/#{video_id}")
+        new(attrs: video_info)
+      end
     end
   end
 end