s3_media_server_api 0.1.0.5 → 0.1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a292172cf6349c6cae06a1f6b12f301c985c5154
-  data.tar.gz: 1b6280133ccf42bbcf3e4b71edbba261cdb9d0c2
+  metadata.gz: 9dd5d2438d4686aef0f18d3bf611f72e4916dd34
+  data.tar.gz: bc6826997c05d221a2af7a902da1d954ce511dea
 SHA512:
-  metadata.gz: c287cf5899834b6427ba9676b24b1ee7186ba9288ee172025f684a6395fe448d2d163b04ca5da4a75bf725b9e39fae922852c3d342f3ba08f69ca3e732b15255
-  data.tar.gz: 3410f7b5cafb132fb4bf4807f28e7e00e71b1cbfd5249971dd96931d58ea55a637a61c5d3416180479f4c0f49e9224c10720fcaec6b6661ca247b1c52fc0bf2a
+  metadata.gz: d665f7356ee6ceda17205ef6ab8b3bdb47c067aeb0c03fc53acfe33e50719f47fc0d0d315fa9dd35d7e62dc93f871588d4723b4648067078a1578f7c21455788
+  data.tar.gz: 6abd0d44ea37b137b63dfb8d3a1368fbcc081233eea23322ea76e0c4b33eae8315c371ff6460bbcf33b6c0f48c2ad99f860d57c01fb7308f774c5b1f7d8af7fb

data/Gemfile.lock

@@ -0,0 +1,81 @@
+PATH
+  remote: .
+  specs:
+    s3_media_server_api (0.1.0.3)
+      asynk (>= 0.0.1)
+      faraday
+      mimemagic
+      parallel
+      simple_file_uploader
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (5.0.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    amq-protocol (2.0.1)
+    asynk (0.0.2)
+      activesupport (>= 4.2)
+      bunny (~> 2.3)
+      celluloid (~> 0.17)
+      celluloid-io (~> 0.17)
+      connection_pool (~> 2.2)
+      json (~> 1.0)
+    bunny (2.5.0)
+      amq-protocol (>= 2.0.1)
+    celluloid (0.17.3)
+      celluloid-essentials
+      celluloid-extras
+      celluloid-fsm
+      celluloid-pool
+      celluloid-supervision
+      timers (>= 4.1.1)
+    celluloid-essentials (0.20.5)
+      timers (>= 4.1.1)
+    celluloid-extras (0.20.5)
+      timers (>= 4.1.1)
+    celluloid-fsm (0.20.5)
+      timers (>= 4.1.1)
+    celluloid-io (0.17.3)
+      celluloid (>= 0.17.2)
+      nio4r (>= 1.1)
+      timers (>= 4.1.1)
+    celluloid-pool (0.20.5)
+      timers (>= 4.1.1)
+    celluloid-supervision (0.20.6)
+      timers (>= 4.1.1)
+    concurrent-ruby (1.0.2)
+    connection_pool (2.2.0)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    hitimes (1.2.4)
+    i18n (0.7.0)
+    json (1.8.3)
+    mimemagic (0.3.1)
+    minitest (5.9.0)
+    multipart-post (2.0.0)
+    nio4r (1.2.1)
+    parallel (1.9.0)
+    rake (10.5.0)
+    simple_file_uploader (0.0.1)
+      bunny
+    thread_safe (0.3.5)
+    timers (4.1.1)
+      hitimes
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.11)
+  minitest (~> 5.0)
+  rake (~> 10.0)
+  s3_media_server_api!
+
+BUNDLED WITH
+   1.11.2

data/lib/s3_media_server_api.rb

@@ -5,8 +5,11 @@ require "s3_media_server_api/config"
 require "s3_media_server_api/uploader"
 require "s3_media_server_api/file_part"
 require "s3_media_server_api/aws_file"
+require "s3_media_server_api/mocked"
 require "s3_media_server_api/media"
 require "s3_media_server_api/asynk_request"
-
+require "s3_media_server_api/services"
+require "s3_media_server_api/simple_uploaders_repository"
+require 's3_media_server_api/consumers'
 module S3MediaServerApi
 end

data/lib/s3_media_server_api/asynk_request.rb

@@ -8,7 +8,8 @@ module S3MediaServerApi
       #             params - parametes that will be passed to consumer
       #
       def async_request(path, action, params)
-        Asynk::Publisher.publish("#{server}.#{path}.#{action}", params)
+        consumer = "#{server}.#{path}.#{action}"
+        S3MediaServerApi::Config.mocked ? Mocked::Request.publish(consumer, params) : Asynk::Publisher.publish(consumer, params)
       end
       #
       # sends synchronous request using Asynk gem - https://github.com/konalegi/asynk
@@ -17,7 +18,8 @@ module S3MediaServerApi
       #             params - parametes that will be passed to consumer
       #
       def sync_request(path, action, params)
-        Asynk::Publisher.sync_publish("#{server}.#{path}.#{action}", params)
+        consumer = "#{server}.#{path}.#{action}"
+        S3MediaServerApi::Config.mocked ? Mocked::Request.sync_publish(consumer, params) : Asynk::Publisher.sync_publish(consumer, params)
       end
 
       private

data/lib/s3_media_server_api/aws_file.rb

@@ -91,6 +91,10 @@ module S3MediaServerApi
         AwsFile.new(response)
       end
 
+      def file_exists(uuid)
+        AsynkRequest.async_request(base_path, :file_exists, uuid: uuid)
+      end
+
       private
 
         def file_mime_type(file_source_path)

data/lib/s3_media_server_api/config.rb

@@ -33,7 +33,8 @@ module S3MediaServerApi
 
     add_config :cache_class, S3MediaServerApi::Cache
     add_config :upload_thread_count, 4
+    add_config :mocked, false
 
-    required :cache_class, :upload_thread_count
+    required :cache_class, :upload_thread_count, :mocked
   end
 end

data/lib/s3_media_server_api/consumers.rb

@@ -0,0 +1,6 @@
+require 's3_media_server_api/consumers/consumer_helper'
+require 's3_media_server_api/consumers/s3_media_server_consumer'
+module S3MediaServerApi
+  module Consumers
+  end
+end

data/lib/s3_media_server_api/consumers/consumer_helper.rb

@@ -0,0 +1,14 @@
+module S3MediaServerApi
+  module Consumers
+    module ConsumerHelper
+      def handle_exception(ex)
+        bc = ActiveSupport::BacktraceCleaner.new
+        bc.add_filter   { |line| line.gsub(Rails.root.to_s, '') } # strip the Rails.root prefix
+        bc.add_silencer { |line| line =~ /mongrel|gems|minitest/ } # skip any lines from mongrel or rubygems
+        array_of_trace  = bc.clean(ex.backtrace).map{|line| ["      ", line].join }
+        array_of_trace.unshift("#{ex.class}: #{ex.message}")
+        logger.error array_of_trace.join("\n")
+      end
+    end
+  end
+end

data/lib/s3_media_server_api/consumers/s3_media_server_consumer.rb

@@ -0,0 +1,23 @@
+module S3MediaServerApi
+  module Consumers
+    class S3MediaServerConsumer
+      include Asynk::Consumer
+      include ConsumerHelper
+
+      set_consume 'broadcast.server.s3_media_server.aws_file.garbage_collect'
+
+      set_queue_options ack: true
+      set_subscribe_arguments manual_ack: true
+      set_concurrency 1
+      set_route_ending_as_action true
+      rescue_from Exception, with: :handle_exception
+
+
+      def garbage_collect(params)
+        S3MediaServerApi::Services::UploaderExistenceService.check(params[:uuid])
+      ensure
+        ack!
+      end
+    end
+  end
+end

data/lib/s3_media_server_api/media/audio.rb

@@ -11,10 +11,6 @@ module S3MediaServerApi
         @params[:url]
       end
 
-      def sample_url
-        @params[:sample_url]
-      end
-
       def duration
         @params[:duration]
       end
@@ -38,7 +34,7 @@ module S3MediaServerApi
         #             duration  - duration of audio file
         #             start_position - position where cut wil be made
         #
-        def cut(uuid, audio_url: audio_url, duration: duration, start_position: start_position)
+        def cut(uuid, audio_url:, duration:, start_position:)
           params = {
                      uuid: uuid,
                      audio_url: audio_url,

data/lib/s3_media_server_api/media/common_media_api.rb

@@ -41,7 +41,7 @@ module S3MediaServerApi
         # returns: response with created AwsFile information
         #
         def create(path)
-          aws_file = Uploader.upload(path)
+          aws_file = S3MediaServerApi::Config.mocked ? Mocked::Uploader.upload(path) : Uploader.upload(path)
           uuid = aws_file.uuid
           params = (media_type == 'video') ? { uuid: uuid } : { aws_file_uuid: uuid }
           response = AsynkRequest.sync_request(base_path, :create, params)

data/lib/s3_media_server_api/mocked.rb

@@ -0,0 +1,8 @@
+require 's3_media_server_api/mocked/uploader'
+require 's3_media_server_api/mocked/request'
+
+
+module S3MediaServerApi
+  module Mocked
+  end
+end

data/lib/s3_media_server_api/mocked/request.rb

@@ -0,0 +1,145 @@
+module S3MediaServerApi
+  module Mocked
+    class Request
+
+      def initialize(hash)
+        @body = hash
+      end
+
+      def success?
+        true
+      end
+
+      def [](key)
+        @body[key]
+      end
+
+      class << self
+        def sync_publish(path, params)
+          case path
+          when /s3_media_server.media.(audio).(\.*)/
+            mocked_audio_sync_request(params)
+          when /s3_media_server.media.(video).(\.*)/
+            mocked_video_sync_request(params)
+          when /s3_media_server.media.(image).(\.*)/
+            mocked_image_sync_request(params)
+          when /s3_media_server.media.(document).(\.*)/
+            mocked_document_sync_request(params)
+          end
+        end
+
+        def publish(path, params)
+          true
+        end
+
+        private
+
+
+          def mocked_audio_sync_request(params)
+            uuid = params[:aws_file_uuid] ? params[:aws_file_uuid] : params[:uuid]
+            response = {data: { 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: uuid,
+                                size: 704512,
+                                sample_uploaded: true,
+                                name: "music_test.mp3",
+                                duration: 87.891875,
+                                sample_duration: 19.983673}}
+            Request.new(response)
+          end
+
+          def mocked_video_sync_request(params)
+            response = {:data=>{:duration=>6.037,
+                                :transcoded=>true,
+                                :uuid=>params[:uuid],
+                                :versions=>[{ :url=>"https://storage-nginx.stage.govermedia.com/test-bucket/test_files/18e776ab-c4ca-40cd-9ecb-a605664ce118.mp4",
+                                              :format=>"mp4",
+                                              :size=>326089,
+                                              :resolution=>"r240p"},
+                                            { :url=>"https://storage-nginx.stage.govermedia.com/test-bucket/test_files/c5c9bf51-76c7-42e3-b2ce-4d55d41df815.mp4",
+                                              :format=>"mp4",
+                                              :size=>602906,
+                                              :resolution=>"r360p"},
+                                            { :url=>"https://storage-nginx.stage.govermedia.com/test-bucket/test_files/475a37b9-50de-472f-a7f4-949774fb46b4.mp4",
+                                              :format=>"mp4",
+                                              :size=>3188011,
+                                              :resolution=>"source"},
+                                            { :url=>"https://storage-nginx.stage.govermedia.com/test-bucket/test_files/5db270ce-966a-4caa-a4ca-c2dd57ad3b8b.webm",
+                                              :format=>"webm",
+                                              :size=>382660,
+                                              :resolution=>"r240p"},
+                                            { :url=>"https://storage-nginx.stage.govermedia.com/test-bucket/test_files/1597fcb9-5a54-449d-9b99-fc87564e1113.webm",
+                                              :format=>"webm",
+                                              :size=>704246,
+                                              :resolution=>"r360p"},
+                                            { :url=>"https://storage-nginx.stage.govermedia.com/test-bucket/test_files/a5519a7d-1e03-4b99-8446-eb04273ada83.webm",
+                                              :format=>"webm",
+                                              :size=>4292789,
+                                              :resolution=>"source"}],
+                                    :preview=>{:uuid=>"c13ed468-55ee-4281-bf4b-9a2115203c86",
+                                               :size=>33884,
+                                               :name=>nil,
+                                               :source=>{:url=>"https://storage-nginx.stage.govermedia.com/test-bucket/test_files/a203e4e2-1ca3-4d62-a361-4ca5033fe45c.jpeg",
+                                                         :width=>720,
+                                                         :height=>1280},
+                                               :thumb=>{:url=>"https://storage-nginx.stage.govermedia.com/test-bucket/test_files/91133554-1e86-4034-92ac-3b42d28f1aae.jpeg",
+                                                        :width=>158,
+                                                        :height=>280}},
+                                               :screenshots=>[{ :uuid=>"c6509e64-7191-4f3d-a1fe-c8abc8d9b669",
+                                                                :size=>33914,
+                                                                :name=>nil,
+                                                                :source=> {:url=>"https://storage-nginx.stage.govermedia.com/test-bucket/test_files/9ba7a208-5ab1-47ce-8f86-220fb89ed237.jpeg",
+                                                                           :width=>720,
+                                                                           :height=>1280},
+                                                                :thumb=> {:url=>"https://storage-nginx.stage.govermedia.com/test-bucket/test_files/c398defd-b770-4acd-b1ae-9cabb0b3ad75.jpeg",
+                                                                           :width=>158,
+                                                                           :height=>280}},
+                                                              { :uuid=>"c13ed468-55ee-4281-bf4b-9a2115203c86",
+                                                                :size=>33884,
+                                                                :name=>nil,
+                                                                :source=>{:url=>"https://storage-nginx.stage.govermedia.com/test-bucket/test_files/a203e4e2-1ca3-4d62-a361-4ca5033fe45c.jpeg",
+                                                                          :width=>720,
+                                                                          :height=>1280},
+                                                                :thumb=>{:url=>"https://storage-nginx.stage.govermedia.com/test-bucket/test_files/91133554-1e86-4034-92ac-3b42d28f1aae.jpeg",
+                                                                         :width=>158,
+                                                                         :height=>280}},
+                                                              { :uuid=>"32c1f326-33fe-477e-aeba-8c5bf2a85ded",
+                                                                :size=>29856,
+                                                                :name=>nil,
+                                                                :source=>{:url=>"https://storage-nginx.stage.govermedia.com/test-bucket/test_files/b513908d-b4ea-484d-823c-8ed49cf2415c.jpeg",
+                                                                          :width=>720,
+                                                                          :height=>1280},
+                                                                :thumb=>{:url=>"https://storage-nginx.stage.govermedia.com/test-bucket/test_files/e6839727-9e61-41e8-a1a5-c190f5343cb0.jpeg",
+                                                                         :width=>158,
+                                                                         :height=>280}}],
+                                                  :name=>nil,
+                                                  :embed_url=>"https://govermedia.com/embed_video/?uuid=0e4d7d8c-a8f5-49da-94cd-d9811ec01d78", :provider=>"govermedia"}}
+            Request.new(response)
+          end
+
+          def mocked_image_sync_request(params)
+            uuid = params[:aws_file_uuid] ? params[:aws_file_uuid] : params[:uuid]
+            response = {data:  {uuid: uuid,
+                                size: 12254,
+                                name: "test_image.jpg",
+                                source: { url: "https://storage-nginx.stage.govermedia.com/test-bucket/test_files/7f7e7aa3-5ed7-4120-b843-45d19f65bee6.jpeg",
+                                           width: 313,
+                                           height: 315},
+                                thumb:  { url: "https://storage-nginx.stage.govermedia.com/test-bucket/test_files/2523c7ca-cdaa-4599-8a46-e949335738a3.jpeg",
+                                          width: 278,
+                                          height: 280}}}
+             Request.new(response)
+          end
+
+          def mocked_document_sync_request(params)
+            uuid = params[:aws_file_uuid] ? params[:aws_file_uuid] : params[:uuid]
+            response = {data:  {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"}}
+             Request.new(response)
+          end
+      end
+    end
+  end
+end

data/lib/s3_media_server_api/mocked/uploader.rb

@@ -0,0 +1,38 @@
+module S3MediaServerApi
+  module Mocked
+    module Uploader
+      class << self
+        def upload(file_path)
+          uuid = SecureRandom.uuid
+          part_size = 5*1024*1024
+          response = {data:   {uuid: uuid,
+                               size: File.size(file_path),
+                               mime_type: file_mime_type(file_path),
+                               uploads_count: parts_count(file_path, part_size),
+                               default_part_size: part_size,
+                               state: "uploaded",
+                               public_url: "https://storage-nginx.stage.govermedia.com/test-bucket/test_files/#{uuid}.mp3",
+                               name: File.basename(file_path)}}
+          AwsFile.new(response)
+        end
+
+        private
+
+          def file_mime_type(file_source_path)
+            mime_magic = MimeMagic.by_magic(File.open(file_source_path))
+            mime_magic ? mime_magic.type : 'application/octet-stream'
+          end
+
+          def parts_count(source, default_part_size)
+            size = File.size(source)
+            offset, part_number = 0, 1
+            while offset < size
+              part_number += 1
+              offset += default_part_size
+            end
+            part_number
+          end
+      end
+    end
+  end
+end

data/lib/s3_media_server_api/services.rb

@@ -0,0 +1,5 @@
+require 's3_media_server_api/services/uploader_existence_service'
+module S3MediaServerApi
+  module Services
+  end
+end

data/lib/s3_media_server_api/services/uploader_existence_service.rb

@@ -0,0 +1,18 @@
+module S3MediaServerApi
+  module Services
+    class UploaderExistenceService
+      class << self
+
+        def check(aws_file_uuid)
+          return unless aws_file_uuid
+
+          S3MediaServerApi::SimpleUploadersRepository.uploader_classes.each do |uploader_class|
+            uploader = uploader_class.find_uploader_by_uuid(aws_file_uuid)
+            S3MediaServerApi::AwsFile.file_exists(aws_file_uuid) and return if uploader.present?
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/s3_media_server_api/simple_uploaders_repository.rb

@@ -0,0 +1,10 @@
+module S3MediaServerApi
+  class SimpleUploadersRepository
+    class << self
+      def uploader_classes
+        @uploader_classes ||= SimpleFileUploader::BaseUploader.descendants
+      end
+    end
+  end
+
+end

data/lib/s3_media_server_api/version.rb

@@ -1,3 +1,3 @@
 module S3MediaServerApi
-  VERSION = "0.1.0.5"
+  VERSION = "0.1.0.7"
 end

data/s3_media_server_api.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'parallel'
   spec.add_dependency 'mimemagic'
   spec.add_dependency 'faraday'
+  spec.add_dependency 'simple_file_uploader'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3_media_server_api
 version: !ruby/object:Gem::Version
-  version: 0.1.0.5
+  version: 0.1.0.7
 platform: ruby
 authors:
 - Ayrat Badykov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-15 00:00:00.000000000 Z
+date: 2016-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simple_file_uploader
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - ayratin555@gmail.com
@@ -116,6 +130,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -124,6 +139,9 @@ files:
 - lib/s3_media_server_api/aws_file.rb
 - lib/s3_media_server_api/cache.rb
 - lib/s3_media_server_api/config.rb
+- lib/s3_media_server_api/consumers.rb
+- lib/s3_media_server_api/consumers/consumer_helper.rb
+- lib/s3_media_server_api/consumers/s3_media_server_consumer.rb
 - lib/s3_media_server_api/error.rb
 - lib/s3_media_server_api/file_part.rb
 - lib/s3_media_server_api/media.rb
@@ -132,6 +150,12 @@ files:
 - lib/s3_media_server_api/media/document.rb
 - lib/s3_media_server_api/media/image.rb
 - lib/s3_media_server_api/media/video.rb
+- lib/s3_media_server_api/mocked.rb
+- lib/s3_media_server_api/mocked/request.rb
+- lib/s3_media_server_api/mocked/uploader.rb
+- lib/s3_media_server_api/services.rb
+- lib/s3_media_server_api/services/uploader_existence_service.rb
+- lib/s3_media_server_api/simple_uploaders_repository.rb
 - lib/s3_media_server_api/uploader.rb
 - lib/s3_media_server_api/version.rb
 - s3_media_server_api-0.1.0.gem