s3_media_server_api 0.1.0.9 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67cc7e60f78b951e10130ca37c645b2dc9ed6ee6
-  data.tar.gz: be756d7d1cfe701d892d4f8f05fb516a3d6bf8d6
+  metadata.gz: 6fb4b13fe747e3af3990c2d8a08e4c3ccb60766c
+  data.tar.gz: 5ce9e75067d2e47f3a7a3e912e4fa052ef2f4265
 SHA512:
-  metadata.gz: ef7b0dd0e7d097b128c9752b51e19577a466148d2b6d68ca26b9f3f57932e3062dd322c414457f9f88ae5f551cf026172bc67b18c584f7c4e88a3ec4e92a1a9a
-  data.tar.gz: a415ed7e763d60d97d651408e05a134b3735627ab03b2238a5f9ea7c33a686079e0087b34273149b91492f376c8872dcf96c71830c5915a7d4c5b62af879cd04
+  metadata.gz: f5d800aa65a4bd113331b6c1ad922951ba5c2811e9d1e6ded9748171d0f2cb5f7ce8b75837de047cc5fb95a2f31e099db3a56438831dad8e7cedf070085a1cc6
+  data.tar.gz: 084787667184b2363179070f932a1e1983843701cf57e4935093f4e360ab4e0959304ebfd3e97450dabcb7de8908bcf1890b10552b063cb809a2daa50c99cdfb

data/README.md

@@ -163,6 +163,33 @@ video.versions[0].size
 S3MediaServerApi::Media::Video.destroy(video.uuid)
 ```
 
+#### S3MediaServerApi::Media::Collection
+Use S3MediaServerApi::Media::Collection to interact with Collection resource
+```ruby
+# to create Collection, use create method
+# provide uuid of collection owner
+owner_uuid = "4edbfdf9-9517-4902-8e92-2212215b0de5"
+collection = S3MediaServerApi::Media::Collection.create(owner_uuid)
+
+
+# to resolve document, use resolve method
+resolved_collection = S3MediaServerApi::Media::Collection.resolve(created_collection.uuid)
+
+# both methods create and resolve return collection object
+
+resolved_collection.uuid # uuid of the collection
+resolved_collection.owner_uuid  # uuid of the collection owner
+resolved_collection.videos # array of videos
+resolved_collection.documents  # array of documents
+resolved_collection.images  # array of images
+resolved_collection.audios  # array of audio files
+# NOTE: video, document, image and audio objects are described above
+
+# use destroy method, to destroy collection
+# this method is asynchronous, so it doesn't return anything
+S3MediaServerApi::Media::Colllection.destroy(created_collection.uuid)
+```
+
 #### AwsFile
 ```ruby
 # to create aws file from its path, use upload method from S3MediaServerApi::Uploader module

data/lib/s3_media_server_api/media.rb

@@ -3,6 +3,7 @@ require 's3_media_server_api/media/image'
 require 's3_media_server_api/media/video'
 require 's3_media_server_api/media/audio'
 require 's3_media_server_api/media/document'
+require 's3_media_server_api/media/collection'
 
 
 module S3MediaServerApi

data/lib/s3_media_server_api/media/audio.rb

@@ -20,17 +20,6 @@ module S3MediaServerApi
       end
 
       class << self
-        def create(uuid)
-          Audio.new(super(uuid))
-        end
-
-        def create_from_path(path)
-          Audio.new(super(path))
-        end
-
-        def resolve(uuid)
-          Audio.new(super(uuid))
-        end
         #
         # sends request to cut audio file
         # parameters: uuid - uuid of file

data/lib/s3_media_server_api/media/collection.rb

@@ -1,22 +1,22 @@
 module S3MediaServerApi
   module Media
-    class COLLECTION < CommonMediaApi
+    class Collection < CommonMediaApi
       COLLECTION = 'collection'
 
       def videos
-        @params[:videos].map { |video| Video.new(video) } if @params[:videos]
+        @params[:videos].map { |video| Video.new(data: video) } if @params[:videos]
       end
 
       def images
-        @params[:images].map { |image| Image::ImageObject.new(image) } if @params[:images]
+        @params[:images].map { |image| Image::ImageObject.new(data: image) } if @params[:images]
       end
 
       def documents
-        @params[:documents].map { |documents| Video.new(document) } if @params[:documents]
+        @params[:documents].map { |document| Video.new(data: document) } if @params[:documents]
       end
 
       def audios
-        @params[:audios].map { |audios| Audio.new(audio) } if @params[:audios]
+        @params[:audios].map { |audio| Audio.new(data: audio) } if @params[:audios]
       end
 
       def owner_uuid
@@ -25,10 +25,6 @@ module S3MediaServerApi
 
       class << self
 
-        def resolve(uuid)
-          Collection.new(super(uuid))
-        end
-
         private
 
           def media_type; COLLECTION; end

data/lib/s3_media_server_api/media/common_media_api.rb

@@ -35,10 +35,20 @@ module S3MediaServerApi
 
       class << self
         def create(uuid)
-          params = (media_type == 'video') ? { uuid: uuid } : { aws_file_uuid: uuid }
+          params = {}
+          case media_type
+          when 'video'
+            params = {uuid: uuid}
+          when 'collection'
+            params = {owner_uuid: uuid}
+          else
+            params = { aws_file_uuid: uuid }
+          end
+          return empty_object unless uuid
+
           response = AsynkRequest.sync_request(base_path, :create, params)
           raise CreationError.message_from_asynk_response(response) unless response.success?
-          response
+          self.new(response)
         end
         #
         # creates media file
@@ -65,9 +75,10 @@ module S3MediaServerApi
         # returns: response with file information
         #
         def resolve(uuid)
+          return empty_object unless uuid
           cache_key = "#{media_type}/#{uuid}"
           Config.cache_class.fetch(cache_key) do
-            AsynkRequest.sync_request(base_path, :resolve, uuid: uuid)
+            self.new(AsynkRequest.sync_request(base_path, :resolve, uuid: uuid))
           end
         end
         #
@@ -94,6 +105,9 @@ module S3MediaServerApi
         end
 
         private
+          def empty_object
+            self.new(data: nil)
+          end
           #
           # specifies media type which methods will be called
           #

data/lib/s3_media_server_api/media/document.rb

@@ -8,17 +8,6 @@ module S3MediaServerApi
       end
 
       class << self
-        def create(uuid)
-          Document.new(super(uuid))
-        end
-
-        def create_from_path(path)
-          Document.new(super(path))
-        end
-
-        def resolve(uuid)
-          Document.new(super(uuid))
-        end
 
         private
 

data/lib/s3_media_server_api/media/image.rb

@@ -35,17 +35,6 @@ module S3MediaServerApi
       end
 
       class << self
-        def create(uuid)
-          Image.new(super(uuid))
-        end
-
-        def create_from_path(path)
-          Image.new(super(path))
-        end
-
-        def resolve(uuid)
-          Image.new(super(uuid))
-        end
         #
         # copies image file
         # parameters: uuid - uuid of file

data/lib/s3_media_server_api/media/video.rb

@@ -54,17 +54,6 @@ module S3MediaServerApi
       end
 
       class << self
-        def create(uuid)
-          Video.new(super(uuid))
-        end
-
-        def create_from_path(path)
-          Video.new(super(path))
-        end
-
-        def resolve(uuid)
-          Video.new(super(uuid))
-        end
 
         private
 

data/lib/s3_media_server_api/mocked/request.rb

@@ -25,6 +25,8 @@ module S3MediaServerApi
             mocked_image_sync_request(params)
           when /s3_media_server.media.(document).(\.*)/
             mocked_document_sync_request(params)
+          when /s3_media_server.media.(collection).(\.*)/
+            mocked_collection_sync_request(params)
           end
         end
 
@@ -49,9 +51,10 @@ module S3MediaServerApi
           end
 
           def mocked_video_sync_request(params)
+            uuid = params[:aws_file_uuid] ? params[:aws_file_uuid] : params[:uuid]
             response = {:data=>{:duration=>6.037,
                                 :transcoded=>true,
-                                :uuid=>params[:uuid],
+                                :uuid=>uuid,
                                 :versions=>[{ :url=>"https://storage-nginx.stage.govermedia.com/test-bucket/test_files/18e776ab-c4ca-40cd-9ecb-a605664ce118.mp4",
                                               :format=>"mp4",
                                               :size=>326089,
@@ -139,6 +142,31 @@ module S3MediaServerApi
                                 name: "document.pdf"}}
              Request.new(response)
           end
+
+          def mocked_collection_sync_request(params)
+            response = {:data=>{:videos=>[{:duration=>104.50999999999999,
+                                           :transcoded=>true,
+                                           :uuid=>"597e7538-3455-4ec2-b234-0cc4bc6c4870",
+                                           :versions=>[{:url=>"https://storage-nginx.stage.govermedia.com/gm-s2-f/files/ccbb152c-328b-4f2d-bc09-aefc16416698.mp4", :format=>"mp4", :size=>12300035, :resolution=>"r480p"}, {:url=>"https://storage-nginx.stage.govermedia.com/gm-s2-f/files/e2de9962-99da-4d4e-8eb8-80d6d38e2526.mp4", :format=>"mp4", :size=>5796575, :resolution=>"r240p"}, {:url=>"https://storage-nginx.stage.govermedia.com/gm-s2-f/files/7773219c-feb4-43cf-927a-7b63d5638884.mp4", :format=>"mp4", :size=>9447976, :resolution=>"r360p"}, {:url=>"https://storage-nginx.stage.govermedia.com/gm-s2-f/files/cf52bc8a-976c-453d-9208-f998e014e9c4.webm", :format=>"webm", :size=>4079234, :resolution=>"r240p"}, {:url=>"https://storage-nginx.stage.govermedia.com/gm-s2-f/files/b5f5555c-9358-46b4-92fd-07a1fc06cc25.mp4", :format=>"mp4", :size=>29609393, :resolution=>"r720p"}, {:url=>"https://storage-nginx.stage.govermedia.com/gm-s2-f/files/c27ee433-c380-48ae-9507-23fccac2d115.webm", :format=>"webm", :size=>11323327, :resolution=>"r480p"}, {:url=>"https://storage-nginx.stage.govermedia.com/gm-s2-f/files/ed96c629-0ca8-4a07-ab30-81ff085b8560.webm", :format=>"webm", :size=>21693633, :resolution=>"r720p"}, {:url=>"https://storage-nginx.stage.govermedia.com/gm-s2-f/files/644ba3fb-cc25-46fb-8e80-3a58a6554648.webm", :format=>"webm", :size=>8039883, :resolution=>"r360p"}],
+                                           :preview=>{:uuid=>"1e271fe0-5645-4ce2-bcdc-db0f93cf26d7", :size=>68287, :name=>nil, :source=>{:url=>"https://storage-nginx.stage.govermedia.com/gm-s2-f/files/5f30a9f3-b9a3-4b2f-8fac-86cb2c128def.jpeg", :width=>1280, :height=>720}, :thumb=>{:url=>"https://storage-nginx.stage.govermedia.com/gm-s2-f/files/0ab76f9d-4633-4e24-9937-d0a7ebad5359.jpeg", :width=>nil, :height=>nil}},
+                                           :screenshots=>[{:uuid=>"d96fc060-ccd0-4ce1-86f8-af11f59b82fb", :size=>68448, :name=>nil, :source=>{:url=>"https://storage-nginx.stage.govermedia.com/gm-s2-f/files/d2b24e87-5aee-4180-90b0-d80276ea9843.jpeg", :width=>1280, :height=>720}, :thumb=>{:url=>"https://storage-nginx.stage.govermedia.com/gm-s2-f/files/de3bf8ec-18c2-4039-823e-0f12ae9bed55.jpeg", :width=>nil, :height=>nil}}, {:uuid=>"1e271fe0-5645-4ce2-bcdc-db0f93cf26d7", :size=>68287, :name=>nil, :source=>{:url=>"https://storage-nginx.stage.govermedia.com/gm-s2-f/files/5f30a9f3-b9a3-4b2f-8fac-86cb2c128def.jpeg", :width=>1280, :height=>720}, :thumb=>{:url=>"https://storage-nginx.stage.govermedia.com/gm-s2-f/files/0ab76f9d-4633-4e24-9937-d0a7ebad5359.jpeg", :width=>nil, :height=>nil}}, {:uuid=>"ce174591-d297-43da-9cbd-00056f22dc29", :size=>64795, :name=>nil, :source=>{:url=>"https://storage-nginx.stage.govermedia.com/gm-s2-f/files/0f364891-37ae-4acd-b89f-e93ccbf9fd9d.jpeg", :width=>1280, :height=>720}, :thumb=>{:url=>"https://storage-nginx.stage.govermedia.com/gm-s2-f/files/b7094c5c-ae8b-447d-844b-00c3acbf4333.jpeg", :width=>440, :height=>248}}], :name=>"2c6d87a9-1d81-48e5-9282-81a76f1e942d.mp4", :embed_url=>"https://stage.govermedia.com/embed_video/?uuid=597e7538-3455-4ec2-b234-0cc4bc6c4870", :provider=>"govermedia"}],
+                                :audios=>[{ url: "https://storage-nginx.stage.govermedia.com/test-bucket/test_files/#{SecureRandom.uuid}.mp3",
+                                                    sample_url: "https://storage-nginx.stage.govermedia.com/test-bucket/test_files/#{SecureRandom.uuid}.mp3",
+                                                    uuid: 'asfasfasfasfasf',
+                                                    size: 704512,
+                                                    sample_uploaded: true,
+                                                    name: "music_test.mp3",
+                                                    duration: 87.891875,
+                                                    sample_duration: 19.983673}],
+                                :documents=>[{url: "https://storage-nginx.stage.govermedia.com/test-bucket/test_files/95d5edfe-1f17-422d-85c7-69f63e00c3fe.mp4",
+                                              uuid: "c147f0aa-f0e3-42da-ab0e-28895dc21ea1",
+                                              size: 245779,
+                                              name: "document.pdf"}],
+                                :images=>[{:uuid=>"ccfac9dc-e208-4644-b932-18e1aae95f4f", :size=>312857, :name=>'image1.jpeg', :source=>{:url=>"https://storage-nginx.stage.govermedia.com/gm-s2-f/files/23b3d879-bc0c-47a1-aba5-2fcc20ee6872.png", :width=>600, :height=>437}, :thumb=>{:url=>"https://storage-nginx.stage.govermedia.com/gm-s2-f/files/589ea98b-1c90-46e4-a98f-0e42798a549c.jpeg", :width=>384, :height=>280}}, {:uuid=>"c1e43b8d-e593-466d-8aa1-0fdd56282052", :size=>83782, :name=>nil, :source=>{:url=>"https://storage-nginx.stage.govermedia.com/gm-s2-f/files/34ee64a7-bf47-4d47-8dc2-c3d8ae522087.png", :width=>836, :height=>546}, :thumb=>{:url=>"https://storage-nginx.stage.govermedia.com/gm-s2-f/files/89847cd4-4e88-4373-af53-54ad3d52fbdd.jpeg", :width=>429, :height=>280}}],
+                                :uuid=>params[:uuid],
+                                :owner_uuid=>"ee287478-d4d7-4731-a11e-d18cf8cfd1c5"}}
+              Request.new(response)
+          end
       end
     end
   end

data/lib/s3_media_server_api/version.rb

@@ -1,3 +1,3 @@
 module S3MediaServerApi
-  VERSION = "0.1.0.9"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3_media_server_api
 version: !ruby/object:Gem::Version
-  version: 0.1.0.9
+  version: 0.1.1
 platform: ruby
 authors:
 - Ayrat Badykov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-25 00:00:00.000000000 Z
+date: 2016-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler