RubyGems - flickrie - Versions diffs - 0.5.2 → 0.6.0 - Mend

flickrie 0.5.2 → 0.6.0

Files changed (71) hide show

data/.gitignore +0 -1
data/CHANGELOG.md +10 -0
data/Gemfile +3 -2
data/Rakefile +7 -2
data/flickrie.gemspec +3 -0
data/lib/flickrie/api_methods.rb +5 -0
data/lib/flickrie/client.rb +17 -4
data/lib/flickrie/location.rb +23 -50
data/lib/flickrie/media/exif.rb +4 -0
data/lib/flickrie/media/tag.rb +4 -0
data/lib/flickrie/media/ticket.rb +4 -0
data/lib/flickrie/media/visibility.rb +10 -6
data/lib/flickrie/media.rb +7 -70
data/lib/flickrie/media_count.rb +4 -0
data/lib/flickrie/oauth.rb +5 -3
data/lib/flickrie/set.rb +5 -21
data/lib/flickrie/upload_client.rb +4 -2
data/lib/flickrie/user.rb +4 -1
data/lib/flickrie/version.rb +1 -1
data/lib/flickrie/video.rb +0 -13
data/test/error_test.rb +20 -0
data/test/instance_test.rb +13 -14
data/test/license_test.rb +7 -13
data/test/location_test.rb +11 -2
data/test/media_count_test.rb +20 -12
data/test/media_test.rb +319 -311
data/test/oauth_test.rb +17 -18
data/test/photo_test.rb +78 -60
data/test/set_test.rb +72 -63
data/test/{test.rb → test_helper.rb} +7 -0
data/test/user_test.rb +43 -34
data/test/vcr_cassettes/error/code.yml +1165 -0
data/test/vcr_cassettes/instance/calling_api_methods.yml +182 -0
data/test/vcr_cassettes/license/get_licenses.yml +73 -0
data/test/vcr_cassettes/location/square_brackets.yml +85 -0
data/test/vcr_cassettes/media/delete.yml +1380 -0
data/test/vcr_cassettes/media/from_contacts.yml +155 -0
data/test/vcr_cassettes/media/from_set.yml +276 -0
data/test/vcr_cassettes/media/from_user.yml +275 -0
data/test/vcr_cassettes/media/get_context.yml +73 -0
data/test/vcr_cassettes/media/get_info.yml +167 -0
data/test/vcr_cassettes/media/remove_tag.yml +264 -0
data/test/vcr_cassettes/media/replace.yml +2252 -0
data/test/vcr_cassettes/media/search.yml +275 -0
data/test/vcr_cassettes/media/tags.yml +346 -0
data/test/vcr_cassettes/media_count/get.yml +135 -0
data/test/vcr_cassettes/media_count/square_brackets.yml +69 -0
data/test/vcr_cassettes/oauth/tokens.yml +400 -0
data/test/vcr_cassettes/photo/asynchronous_upload.yml +1693 -0
data/test/vcr_cassettes/photo/from_set.yml +273 -0
data/test/vcr_cassettes/photo/from_user.yml +275 -0
data/test/vcr_cassettes/photo/get_exif.yml +239 -0
data/test/vcr_cassettes/photo/get_sizes.yml +147 -0
data/test/vcr_cassettes/photo/other_api_calls.yml +506 -0
data/test/vcr_cassettes/photo/search.yml +271 -0
data/test/vcr_cassettes/photo/square_brackets.yml +85 -0
data/test/vcr_cassettes/photo/upload.yml +1229 -0
data/test/vcr_cassettes/set/from_user.yml +477 -0
data/test/vcr_cassettes/set/get_info.yml +951 -0
data/test/vcr_cassettes/set/square_brackets.yml +73 -0
data/test/vcr_cassettes/user/find_by_email_or_username.yml +135 -0
data/test/vcr_cassettes/user/get_info.yml +151 -0
data/test/vcr_cassettes/user/square_brackets.yml +77 -0
data/test/vcr_cassettes/video/get_exif.yml +135 -0
data/test/vcr_cassettes/video/get_info.yml +86 -0
data/test/vcr_cassettes/video/get_sizes.yml +151 -0
data/test/vcr_cassettes/video/other_api_calls.yml +643 -0
data/test/vcr_cassettes/video/square_brackets.yml +86 -0
data/test/vcr_cassettes/video/upload.yml +308 -0
data/test/video_test.rb +66 -53
metadata +123 -12

data/test/vcr_cassettes/video/square_brackets.yml ADDED Viewed

@@ -0,0 +1,86 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://api.flickr.com/services/rest?api_key=1e7490875accc5b9c1ca91a2f27b5604&format=json&method=flickr.photos.getInfo&nojsoncallback=1&photo_id=7093038981
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Authorization:
+      - OAuth oauth_consumer_key="1e7490875accc5b9c1ca91a2f27b5604", oauth_nonce="5b327e5f1f235a2ec2ded09fdee312fa",
+        oauth_signature="Q0apy5kyL6iID4ASVeGeq7E2sRQ%3D", oauth_signature_method="HMAC-SHA1",
+        oauth_timestamp="1336383011", oauth_token="72157629879773565-6da848f99ba7038a",
+        oauth_version="1.0"
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - ! '*/*'
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: !binary |-
+        T0s=
+    headers:
+      !binary "RGF0ZQ==":
+      - !binary |-
+        TW9uLCAwNyBNYXkgMjAxMiAwOTozMDoxMiBHTVQ=
+      !binary "UDNw":
+      - !binary |-
+        cG9saWN5cmVmPSJodHRwOi8vaW5mby55YWhvby5jb20vdzNjL3AzcC54bWwi
+        LCBDUD0iQ0FPIERTUCBDT1IgQ1VSIEFETSBERVYgVEFJIFBTQSBQU0QgSVZB
+        aSBJVkRpIENPTmkgVEVMbyBPVFBpIE9VUiBERUxpIFNBTWkgT1RSaSBVTlJp
+        IFBVQmkgSU5EIFBIWSBPTkwgVU5JIFBVUiBGSU4gQ09NIE5BViBJTlQgREVN
+        IENOVCBTVEEgUE9MIEhFQSBQUkUgTE9DIEdPViI=
+      !binary "QWNjZXNzLUNvbnRyb2wtQWxsb3ctT3JpZ2lu":
+      - !binary |-
+        Kg==
+      !binary "Q2FjaGUtQ29udHJvbA==":
+      - !binary |-
+        cHJpdmF0ZQ==
+      !binary "WC1TZXJ2ZWQtQnk=":
+      - !binary |-
+        d3d3MTgxLmZsaWNrci5tdWQueWFob28uY29t
+      !binary "VmFyeQ==":
+      - !binary |-
+        QWNjZXB0LUVuY29kaW5n
+      !binary "Q29udGVudC1FbmNvZGluZw==":
+      - !binary |-
+        Z3ppcA==
+      !binary "Q29udGVudC1MZW5ndGg=":
+      - !binary |-
+        ODU3
+      !binary "Q29ubmVjdGlvbg==":
+      - !binary |-
+        Y2xvc2U=
+      !binary "Q29udGVudC1UeXBl":
+      - !binary |-
+        YXBwbGljYXRpb24vanNvbg==
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        H4sIAAAAAAAAA5VVbW/bNhD+KwY/NzapV0ufiqXYlg4b0CHJgNRDcJZoibVE
+        CiQVzwjy33ckZVvpsqL9ZN3x+Nxzx+fOz2RolVWkfCaiJiXJaRHTeF2sGXm3
+        IIZXmlt0F5CxbFvsMh7c+olrdKdJmjvHDnRPygy/arB8HDoFNXdwLI6TdRxF
+        RerChNnBk9LCclJStDtRcWnQINTDwo7b42PHn3h38mllwQolwwV1kC7vM5HG
+        s81yFrM4jd7/QRMXPSIzCb1D/Ahyrxa/g1atFJuRMuqZag7dtyM6VU0ZyQM0
+        mm/fLa61Qhf4EiolZ+Vnyck5teAFTStsxx3LR/RbLl0D00XPLdeLLVT7XScG
+        4gJrbiothpDtVfiH2YmLfBJGbEUn7NG/lBnGLTaPlCx0VQsu69Ai1+NedBhH
+        X6b3MO7OoIx940ks7LkrNaIsuqLJFSsWNC6TpEwvx40GOXagffbwLB0YOw4O
+        PCBmcRIzlnuuA9e9MAaph8RoVqrvfWHxdA51jf0AUkahOn4wJ2heCwuXWiuQ
+        59uuWrTPl5lP51vxA7d8X0YDDZ8ia5SVU+w5dNup5mwMWsxQTAuaTxhTBvPV
+        2zHfBammxrsPUn7+O7RGDUEaLZiT4bEsND4afzF4GsYMp7GIWHx1mcqrtFh7
+        mcJoW6XfmAENB/TeIg4aM1o2eHqoWiH5o09EXzyti+Sf8WVRvmONvJJ0uaZF
+        Guc+QjaTm6XLIqdxkjgSVTVqqJwsmF8YPt0/9iwTBD49yYxKmCsXMHRQ8Udf
+        LKVfkptj93Cfm+ovsXenB8X90TplLFqT0PNRfh9eTLP6V91+us9V9qVfPtx9
+        mkOylEZRlAbFat78dwR/0VAv3kT+aNiHu+Vwe6eHn65vfmvvD3PkiNKcspxe
+        6Oqv+c72yQz251H+eX2T3t5tM8iMuj2+ho2TKFkncRixH21bg1rDsTNvbQ/H
+        Cyp7Xh//v0xG3XkE/PUitcfBzb//BxncPL1WXGvtUG5Wm9XhcFji0qv2eokz
+        s1n5C2azmkt3s7qIfLMiQZg9jjVOLC6ImiviN4X7QAq4x+tjqGAHouMT4QGp
+        C9kEo0ZtTpucZb4xoratk0YaObPlomkd0WiNXXL5DP7ZoK325OVfJ6yoDRkH
+        AAA=
+    http_version:
+  recorded_at: Mon, 07 May 2012 09:30:12 GMT
+recorded_with: VCR 2.1.1

data/test/vcr_cassettes/video/upload.yml ADDED Viewed

@@ -0,0 +1,308 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: http://api.flickr.com/services/upload
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        LS0tLS0tLS0tLS0tLVJ1YnlNdWx0aXBhcnRQb3N0DQpDb250ZW50LURpc3Bv
+        c2l0aW9uOiBmb3JtLWRhdGE7IG5hbWU9InBob3RvIjsgZmlsZW5hbWU9InZp
+        ZGVvLm1vdiINCkNvbnRlbnQtTGVuZ3RoOiA1MzAzDQpDb250ZW50LVR5cGU6
+        IHZpZGVvL3F1aWNrdGltZQ0KQ29udGVudC1UcmFuc2Zlci1FbmNvZGluZzog
+        YmluYXJ5DQoNCgAAABRmdHlwcXQgIAAAAABxdCAgAAAI6W1vb3YAAABsbXZo
+        ZAAAAADLyhkzy8oZMwAAAlgAAAAUAAEAAAEAAAAAAAAAAAAAAAABAAAAAAAA
+        AAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAMAAAKAdHJhawAAAFx0a2hkAAAAD8vKGTPLyhkzAAAAAQAA
+        AAAAAAAUAAAAAAAAAAAAAAAAAQAAAAABAAAAAAAAAAAAAAAAAAAAAQAAAAAA
+        AAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAJGVkdHMAAAAcZWxzdAAAAAAAAAAB
+        AAAAFAAAAAAAAQAAAAAB+G1kaWEAAAAgbWRoZAAAAADLyhkzy8oZMwAArEQA
+        ABAAVcQAAAAAADFoZGxyAAAAAG1obHJzb3VuYXBwbAAAAAAAAAAAEENvcmUg
+        TWVkaWEgQXVkaW8AAAGfbWluZgAAABBzbWhkAAAAAAAAAAAAAAA4aGRscgAA
+        AABkaGxyYWxpc2FwcGwAAAAAAAAAABdDb3JlIE1lZGlhIERhdGEgSGFuZGxl
+        cgAAACRkaW5mAAAAHGRyZWYAAAAAAAAAAQAAAAxhbGlzAAAAAQAAAStzdGJs
+        AAAAt3N0c2QAAAAAAAAAAQAAAKdtcDRhAAAAAAAAAAEAAQAAAAAAAAACABD/
+        /gAArEQAAAAABAAAAAABAAAAAgAAAAIAAAAYY2hhbgAAAAAAZQACAAAAAAAA
+        AAAAAABbd2F2ZQAAAAxmcm1hbXA0YQAAAAxtcDRhAAAAAAAAADNlc2RzAAAA
+        AAOAgIAiAAAABICAgBRAFQAYAAAB9AAAAfQABYCAgAISEAaAgIABAgAAAAgA
+        AAAAAAAAGHN0dHMAAAAAAAAAAQAAAAQAAAQAAAAAHHN0c2MAAAAAAAAAAQAA
+        AAEAAAAEAAAAAQAAACRzdHN6AAAAAAAAAAAAAAAEAAAABgAAAAYAAAAGAAAA
+        BgAAABRzdGNvAAAAAAAAAAEAAAwAAAACyXRyYWsAAABcdGtoZAAAAA/Lyhkz
+        y8oZMwAAAAIAAAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAA
+        AAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAB4AAAAWgAAAAAAER0YXB0AAAAFGNs
+        ZWYAAAAAAeAAAAFoAAAAAAAUcHJvZgAAAAAB4AAAAWgAAAAAABRlbm9mAAAA
+        AAHgAAABaAAAAAAAJGVkdHMAAAAcZWxzdAAAAAAAAAABAAAAFAAAAAAAAQAA
+        AAAB/W1kaWEAAAAgbWRoZAAAAADLyhkzy8oZMwAAdTAAAAPoVcQAAAAAADFo
+        ZGxyAAAAAG1obHJ2aWRlYXBwbAAAAAAAAAAAEENvcmUgTWVkaWEgVmlkZW8A
+        AAGkbWluZgAAABR2bWhkAAAAAQBAgACAAIAAAAAAOGhkbHIAAAAAZGhscmFs
+        aXNhcHBsAAAAAAAAAAAXQ29yZSBNZWRpYSBEYXRhIEhhbmRsZXIAAAAkZGlu
+        ZgAAABxkcmVmAAAAAAAAAAEAAAAMYWxpcwAAAAEAAAEsc3RibAAAALtzdHNk
+        AAAAAAAAAAEAAACrYXZjMQAAAAAAAAABAAAAAAAAAAAAAAIAAAACAAHgAWgA
+        SAAAAEgAAAAAAAAAAQVILjI2NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        ABj//wAAAC9hdmNDAU1AHv/hABgnTUAeqRg8F/y4C1BgEGtt6ACKwOF73wEB
+        AAQo3gnIAAAAEmNvbHJuY2xjAAYAAQAGAAAAEHBhc3AAAAABAAAAAQAAAAAA
+        AAAYc3R0cwAAAAAAAAABAAAAAQAAA+gAAAANc2R0cAAAAAAgAAAAHHN0c2MA
+        AAAAAAAAAQAAAAEAAAABAAAAAQAAABRzdHN6AAAAAAAABrcAAAABAAAAFHN0
+        Y28AAAAAAAAAAQAADgAAAAMsdWR0YQAAAuttZXRhAAAAAAAAACFoZGxyAAAA
+        AAAAAABtZGlyYXBwbAAAAAAAAAAAAAAAAr5pbHN0AAAAGWdzc3QAAAARZGF0
+        YQAAAAEAAAAAMAAAAB1nc3RkAAAAFWRhdGEAAAABAAAAADMzOTMzAAAAOGdz
+        c2QAAAAwZGF0YQAAAAEAAAAAQkQwNzVFNTQ1SEgxMzA1MzIzNTczOTU0ODc0
+        AAAAAAAAAACYZ3NwdQAAAJBkYXRhAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJhnc3BtAAAAkGRhdGEAAAABAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABGGdz
+        aGgAAAEQZGF0YQAAAAEAAAAAdjEwLmxzY2FjaGU3LmMueW91dHViZS5jb20A
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAADmpZW5jAC0AAE1hYyBPUyBYIHYxMC43LjMgKENNQSA4OTAsIENN
+        IDcwNS42MSwgeDg2XzY0KQAAAQNmcmVlAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAId2lkZQAACq9tZGF0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAACEAA0BoHCEAA0BoHCEAA0BoHCEAA0Bo
+        HAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACwYA
+        B4P7BYAAAECAAAAAFQYFEQOH9E7NCkvcoZQ6w9SbFx8DgAAAANMluCAhfw+E
+        PwnCoAAgM0nvX//+CIe/HH3333z/r5/U/6++f1fffffP+vvvvvn9T9p+98/6
+        PhANKZ9a/WppX6mNm/TPelpaebvS0tLS09dddddPxD//D1++Xvvvtb77eoQc
+        0p/+o2uuuunp+If/4Ir+reuviH/9B6/S8Q//oPX7eviH/+Hr8/eZZUrrrrmW
+        0y3pa66YSTU/EP/8EQ1/1ra2sy34h//h6/fN2p75/VPfN2rn/UtLXXXXXS11
+        1zctUIOpbY2+++lvrrp65iblE0TXS114AAAA5yUBFuCAgT///4IooAAgt3eO
+        D777775/U/6++//h/w+Eoh/w+EPwRHCoAAgS0n////giGqqxxr/D//D1///+
+        Hq///8PX775+aaf/vn5qfl18/S33z9qeuuuuuZ7Vzd6euoQMuaVv00b6bpE3
+        rr///h6vXXT///w9Xta66eb1T11zPqnrrrpaWlrm9UwkxqcXTG111282XGpf
+        //4er08/GUv///Yerzd6WuuZZUpa6euub1N2paeb1XTCCGrYjMfelpeIf/0H
+        r9dLS110tPa109dddPS1110tddPTzfqhCaVjemNrrn9V4AAAAp0lAIq4ICBP
+        ///giigACC3d40V///wRV5U8P/8EV+Pnn5Vf//wRV/5/Xh//h6/f///BFX94
+        f/4Ir81fP+n9X3z86Xz+p/zT8iT/8/qf9HwgCtpn1r9a8PhD8ERQqAAIEtJ/
+        ///4IhqqsY1/h//h6////D1f//+CK/qlvrpbe1jkKIp//h76uSP4qxBYLpiN
+        iAEfUAG4MLaQRslDF7JwIHG2uHMhy/2yqyUygAH3DRY/l6fNXJ9sGnP5DExD
+        fbiLZIyTOK3irGIcZIDpRmzGBANFuF1bgfxITFm2DcHeDhgkygI3D65M/1Fd
+        /XQIajciPUUicC9U0kJcRmnzygpTcBjG08NOObsGkJGcEHiIH1f/3DBOM7Bx
+        iHF8U5fD7AjrONzIMAZ8DdgGvuKW/dnPQdEgiLaS//0f1F11zfq6Wbnpv+un
+        rphJjNOHymdTG1110tLMt6Wlrrnk1msTf/2Ehz4pbFnOHKoDb3olSDZv6Jnh
+        mjqiXQmwgt2UAJC3X8OnhxSCJb7QCM24Z/gGhhSkwBAtxY0A9j7t9J0PGe2q
+        wPZWUD8B0JPUxZBg2t0NhN6jNwm/sygu6VBF7hCljhLf/MQNoEX8EWPtbD/H
+        LNsTBRsB52qkVglqcQriIHYF9rtNraFrO3LcNg/8JRFRice8lAoFI/8WxgI/
+        mrBWHyb//giF3+pCaWlrm9U9PT10tLUIIZpfVG138Q//wRX71109ddddcdN+
+        v/2BQRlf/YSGB/D3kbJVA7HuXoJ5pR8FVncGgvZi0ZXK72R0RX/4Sp+28NnA
+        EZWPfjnaU9vEdrpmEmNL7///XPXN6p65lvXT0TXN6pahCpZo3lT8Q//w9f4Y
+        B/8EVfqv//9h6vLJMy0iMu1PXS0tcy06XXN3pa666XAAAADtJQDPuCAgT///
+        4IooAAgt3eNGefjjT9774+EAVtM+tfrXh8IfgiKFQABAloX8d///8PDX7775
+        /U/68tD56VP+vv///h6vf4f/4ev3333z9Onz9Inz95ltXT18Q//w9fqEKldR
+        tfEP/8PX666eulqIRqJ///gir6r4h//h6/T111111111zepnsrrvqEKldxtd
+        dZ8Sn+If/4ev31z9q7e+byrm9TLanrrm7UtLS118Q//w9fvt6hCaUjFXG083
+        qunrNR82TKpZl9S09E108y5Vzeq6WlpaWnm/Ws63vqEKlqNp6UjCWsvXN3pZ
+        v1deAAABNyUARS4ICBP///giigACC3d44+flr75+Pp/18/q++++fn0/6fvP2
+        n7x8IAraZ9a/WvD4Q/CxQqAAIEtJ9fv//4Ihr/p/+8rD77/D//D1+fp0fpF/
+        /+Hq/h//h6/T109TJJHLq6665v1LS09PT111CE0rH+aN9T318Q//wRX9W9f/
+        /8EVfVPfXT1113zd6elpa5u9dLT09LS0ghNKvUhs3qnm9X28slS298/qJk9S
+        L//+gRV7z/qWlqq6uuuub1Mvq666hDCH4YBwSHFAAECrzJw/AAgHDYt+vXbb
+        9qTBanyumn519a2tra2tqGPH5qf5TkzU63J1pEdfWsfCQd95ags1DNAbn/43
+        hx4Bw9nM8IzJPciTr1a2p8PkxIhanxdtvzqTHhOIAS7t+fyf/Nfi2P+HhBcN
+        dluADQotLS0tLS0tLS0tLS0tUnVieU11bHRpcGFydFBvc3QNCkNvbnRlbnQt
+        RGlzcG9zaXRpb246IGZvcm0tZGF0YTsgbmFtZT0idGl0bGUiDQoNCnZpZGVv
+        DQotLS0tLS0tLS0tLS0tUnVieU11bHRpcGFydFBvc3QtLQ0KDQo=
+    headers:
+      Authorization:
+      - OAuth oauth_consumer_key="1e7490875accc5b9c1ca91a2f27b5604", oauth_nonce="2d42085f0a3dfbbe98f05fea3891df5a",
+        oauth_signature="dPWTzwE7qTWolqGeH2uPWt4Mui8%3D", oauth_signature_method="HMAC-SHA1",
+        oauth_timestamp="1336343120", oauth_token="72157629879773565-6da848f99ba7038a",
+        oauth_version="1.0"
+      Content-Type:
+      - multipart/form-data;boundary=-----------RubyMultipartPost
+      Content-Length:
+      - '5618'
+      Accept:
+      - ! '*/*'
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Sun, 06 May 2012 22:25:20 GMT
+      P3p:
+      - policyref="http://info.yahoo.com/w3c/p3p.xml", CP="CAO DSP COR CUR ADM DEV
+        TAI PSA PSD IVAi IVDi CONi TELo OTPi OUR DELi SAMi OTRi UNRi PUBi IND PHY
+        ONL UNI PUR FIN COM NAV INT DEM CNT STA POL HEA PRE LOC GOV"
+      Connection:
+      - close
+      Content-Length:
+      - '93'
+      Cache-Control:
+      - private
+      X-Served-By:
+      - www185.flickr.mud.yahoo.com
+      Vary:
+      - Accept-Encoding
+      Content-Type:
+      - text/xml; charset=utf-8
+    body:
+      encoding: US-ASCII
+      string: ! '<?xml version="1.0" encoding="utf-8" ?>
+        <rsp stat="ok">
+        <photoid>7004104010</photoid>
+        </rsp>
+'
+    http_version:
+  recorded_at: Sun, 06 May 2012 22:25:21 GMT
+- request:
+    method: get
+    uri: http://api.flickr.com/services/rest?api_key=1e7490875accc5b9c1ca91a2f27b5604&format=json&method=flickr.photos.getInfo&nojsoncallback=1&photo_id=7004104010
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Authorization:
+      - OAuth oauth_consumer_key="1e7490875accc5b9c1ca91a2f27b5604", oauth_nonce="0ddeb927b3af8f47b576420a6ac594c8",
+        oauth_signature="J8oBm7qDa429NVY9K%2FN1q78uXLo%3D", oauth_signature_method="HMAC-SHA1",
+        oauth_timestamp="1336343121", oauth_token="72157629879773565-6da848f99ba7038a",
+        oauth_version="1.0"
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - ! '*/*'
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: !binary |-
+        T0s=
+    headers:
+      !binary "RGF0ZQ==":
+      - !binary |-
+        U3VuLCAwNiBNYXkgMjAxMiAyMjoyNToyMyBHTVQ=
+      !binary "UDNw":
+      - !binary |-
+        cG9saWN5cmVmPSJodHRwOi8vaW5mby55YWhvby5jb20vdzNjL3AzcC54bWwi
+        LCBDUD0iQ0FPIERTUCBDT1IgQ1VSIEFETSBERVYgVEFJIFBTQSBQU0QgSVZB
+        aSBJVkRpIENPTmkgVEVMbyBPVFBpIE9VUiBERUxpIFNBTWkgT1RSaSBVTlJp
+        IFBVQmkgSU5EIFBIWSBPTkwgVU5JIFBVUiBGSU4gQ09NIE5BViBJTlQgREVN
+        IENOVCBTVEEgUE9MIEhFQSBQUkUgTE9DIEdPViI=
+      !binary "QWNjZXNzLUNvbnRyb2wtQWxsb3ctT3JpZ2lu":
+      - !binary |-
+        Kg==
+      !binary "Q2FjaGUtQ29udHJvbA==":
+      - !binary |-
+        cHJpdmF0ZQ==
+      !binary "WC1TZXJ2ZWQtQnk=":
+      - !binary |-
+        d3d3MTA0LmZsaWNrci5tdWQueWFob28uY29t
+      !binary "VmFyeQ==":
+      - !binary |-
+        QWNjZXB0LUVuY29kaW5n
+      !binary "Q29udGVudC1FbmNvZGluZw==":
+      - !binary |-
+        Z3ppcA==
+      !binary "Q29udGVudC1MZW5ndGg=":
+      - !binary |-
+        NTY1
+      !binary "Q29ubmVjdGlvbg==":
+      - !binary |-
+        Y2xvc2U=
+      !binary "Q29udGVudC1UeXBl":
+      - !binary |-
+        YXBwbGljYXRpb24vanNvbg==
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        H4sIAAAAAAAAA5VT24rbMBD9laDn3Y18SUL8VOhbof2A1mWZWBNbRJaMJMeE
+        4H/vSL4kW8pCQ8Ca0cw5M0czd9Y1xhtW3JkUrGAHzvOE5zzh7GXDHFYWPbn5
+        8ksmt72iJffxeAz2GWzLioROAjz2nTIgMKAlWbbP8ixJI5p0Z7gaKz2ygpOt
+        ZIXaYYCPqHBGf3tXeEW1+Kzx4KXRU4IZdKC9M+1isftDkiXZLv3yg+chuqfC
+        NLQB8Rvoi9l8B2saLcue+jlEPAT1eYQy1czIfkJt8fSy+WoNuSC2UBm9dr/L
+        9/ninCTYj2R66RWGKt/J71EH/a5SoGHhVqCrrOwmig8x8foqnTxJJf0tPonr
+        +hPJFKScFbQStVjkCYq2Ut2iPc76u5DZGef/8QQeLhhaS3mSvvLdK99vkl2R
+        0v9xXVvQvQIba5h4FDjfdwH8I2Kg7NC20jnqZyImszJtG3vK5nsQokUPrEin
+        HnFwCzQK6eHRcQV6zQ4DRfaanES6KMh/ZPExTgbUOEcKGqMwoWvoSZl6NTor
+        n1BcAxZnjJnB/fVskwrazMKHAyt+/Z6kMd00Cg24xYhYHuoYTd8luLcquuhL
+        Lrq6dUHtuJ5dqJ5inmgb77ui3JbbYRjeziTJxb5RheU2Jrhy+7wc5fax1+WW
+        jZGwJRFhnc34LuFAJdCWiNu0cmeQKswRj+1oIfUslejtsifxHQcpfMMKmhxF
+        VoOybvxkjoHM0R5TqLmw8Q8IPlEwcwQAAA==
+    http_version:
+  recorded_at: Sun, 06 May 2012 22:25:23 GMT
+- request:
+    method: post
+    uri: http://api.flickr.com/services/rest?api_key=1e7490875accc5b9c1ca91a2f27b5604&format=json&method=flickr.photos.delete&nojsoncallback=1&photo_id=7004104010
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Authorization:
+      - OAuth oauth_consumer_key="1e7490875accc5b9c1ca91a2f27b5604", oauth_nonce="b461eef0620f6755d9159efadc92ef94",
+        oauth_signature="0yPXxLK7O7imIzChm5nw8Ti%2Fv14%3D", oauth_signature_method="HMAC-SHA1",
+        oauth_timestamp="1336343123", oauth_token="72157629879773565-6da848f99ba7038a",
+        oauth_version="1.0"
+      Content-Length:
+      - '0'
+      Accept:
+      - ! '*/*'
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Sun, 06 May 2012 22:25:23 GMT
+      P3p:
+      - policyref="http://info.yahoo.com/w3c/p3p.xml", CP="CAO DSP COR CUR ADM DEV
+        TAI PSA PSD IVAi IVDi CONi TELo OTPi OUR DELi SAMi OTRi UNRi PUBi IND PHY
+        ONL UNI PUR FIN COM NAV INT DEM CNT STA POL HEA PRE LOC GOV"
+      Access-Control-Allow-Origin:
+      - ! '*'
+      Cache-Control:
+      - private
+      X-Served-By:
+      - www218.flickr.mud.yahoo.com
+      Vary:
+      - Accept-Encoding
+      Content-Length:
+      - '13'
+      Connection:
+      - close
+      Content-Type:
+      - application/json
+    body:
+      encoding: US-ASCII
+      string: ! '{"stat":"ok"}'
+    http_version:
+  recorded_at: Sun, 06 May 2012 22:25:23 GMT
+recorded_with: VCR 2.1.1

data/test/video_test.rb CHANGED Viewed

@@ -1,5 +1,4 @@
 # encoding: utf-8
-require 'test'
 Flickrie::Video.instance_eval do
   def public_new(*args)
@@ -20,35 +19,45 @@ class VideoTest < Test::Unit::TestCase
       url_sq url_q url_t url_s url_n url_m url_z url_c url_l url_o]
   end
-  def test_get_video_info
-    video = Flickrie.get_video_info(@video_id)
+  def test_square_brackets
+    VCR.use_cassette 'video/square_brackets' do
+      video = Flickrie.get_video_info(@video_id)
+      assert_equal 1, video['usage']['candownload'].to_i
+    end
+  end
-    assert_equal true, video.ready?
-    assert_equal false, video.failed?
-    assert_equal false, video.pending?
+  def test_get_info
+    VCR.use_cassette 'video/get_info' do
+      video = Flickrie.get_video_info(@video_id)
-    assert_equal 16, video.duration
-    assert_equal 352, video.width
-    assert_equal 288, video.height
+      assert_equal true, video.ready?
+      assert_equal false, video.failed?
+      assert_equal false, video.pending?
-    assert_nil video.source_url
-    assert_nil video.download_url
-    assert_nil video.mobile_download_url
-  end
+      assert_equal 16, video.duration
+      assert_equal 352, video.width
+      assert_equal 288, video.height
-  def test_get_video_sizes
-    get_sizes_assertions(Flickrie.get_video_sizes(@video_id))
-    get_sizes_assertions(Flickrie::Video.public_new('id' => @video_id.to_s).get_sizes)
+      assert_nil video.source_url
+      assert_nil video.download_url
+      assert_nil video.mobile_download_url
+    end
   end
-  def get_sizes_assertions(video)
-    assert_equal true, video.can_download?
-    assert_equal true, video.can_blog?
-    assert_equal true, video.can_print?
-    refute video.source_url.empty?
-    refute video.download_url.empty?
-    refute video.mobile_download_url.empty?
+  def test_get_sizes
+    VCR.use_cassette 'video/get_sizes' do
+      [Flickrie.get_video_sizes(@video_id),
+       Flickrie::Video.public_new('id' => @video_id.to_s).get_sizes].
+        each do |video|
+          assert_equal true, video.can_download?
+          assert_equal true, video.can_blog?
+          assert_equal true, video.can_print?
+          refute video.source_url.empty?
+          refute video.download_url.empty?
+          refute video.mobile_download_url.empty?
+        end
+    end
   end
   def test_methods_returning_nil
@@ -65,41 +74,45 @@ class VideoTest < Test::Unit::TestCase
     assert_nil video.mobile_download_url
   end
-  def test_video_upload
-    video_path = File.join(File.expand_path(File.dirname(__FILE__)), 'video.mov')
-    video_id = Flickrie.upload(video_path)
-    assert_nothing_raised(Flickrie::Error) { Flickrie.get_video_info(video_id) }
-    Flickrie.delete_video(video_id)
+  def test_upload
+    VCR.use_cassette 'video/upload' do
+      video_path = File.join(File.expand_path(File.dirname(__FILE__)), 'video.mov')
+      video_id = Flickrie.upload(video_path)
+      assert_nothing_raised(Flickrie::Error) { Flickrie.get_video_info(video_id) }
+      Flickrie.delete_video(video_id)
+    end
   end
-  def test_get_video_exif
-    [
-      Flickrie.get_video_exif(@video_id),
-      Flickrie::Video.public_new('id' => @video_id).get_exif
-    ].
-      each do |video|
-        assert_nil video.camera
-        assert_nil video.exif
-      end
+  def test_get_exif
+    VCR.use_cassette 'video/get_exif' do
+      [Flickrie.get_video_exif(@video_id),
+       Flickrie::Video.public_new('id' => @video_id).get_exif].
+        each do |video|
+          assert_nil video.camera
+          assert_nil video.exif
+        end
+    end
   end
   def test_other_api_calls
-    # add_video_tags, remove_video_tag,
-    # search_videos, videos_from_contacts,
-    # public_videos_from_user, videos_from_set
-    assert_nothing_raised do
-      Flickrie.add_video_tags(@video_id, "janko")
-      video = Flickrie.get_video_info(@video_id)
-      tag = video.tags.find { |tag| tag.content == "janko" }
-      Flickrie.remove_video_tag(tag.id)
-      Flickrie.videos_from_contacts(:include_self => 1)
-      Flickrie.public_videos_from_user_contacts(@user_nsid, :include_self => 1)
-      Flickrie.public_videos_from_user(@user_nsid)
-      Flickrie.videos_from_set(@set_id)
-      Flickrie.get_video_context(@video_id)
-      Flickrie.search_videos(:user_id => @user_nsid)
+    VCR.use_cassette 'video/other_api_calls' do
+      # add_video_tags, remove_video_tag,
+      # search_videos, videos_from_contacts,
+      # public_videos_from_user, videos_from_set
+      assert_nothing_raised do
+        Flickrie.add_video_tags(@video_id, "janko")
+        video = Flickrie.get_video_info(@video_id)
+        tag = video.tags.find { |tag| tag.content == "janko" }
+        Flickrie.remove_video_tag(tag.id)
+        Flickrie.videos_from_contacts(:include_self => 1)
+        Flickrie.public_videos_from_user_contacts(@user_nsid, :include_self => 1)
+        Flickrie.public_videos_from_user(@user_nsid)
+        Flickrie.videos_from_set(@set_id)
+        Flickrie.get_video_context(@video_id)
+        Flickrie.search_videos(:user_id => @user_nsid)
+      end
     end
   end
 end