s3_media_server_api 0.1.0 → 0.1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49178c41050a932cd11ba20ab661e0e3353e64d4
-  data.tar.gz: bf5572843932b79e5424b649b1fa3db92432be50
+  metadata.gz: 38ba4e51274bac69d7af53286c338b5a216f9240
+  data.tar.gz: 13dcaede9a9a023111ba792322ab8cab7d2b882c
 SHA512:
-  metadata.gz: 415b6b8a82653c15cd62d9bbca6b0f4cabd12cd44951d9c5bc954fa55ab29dd302bf1fe7845bdb084d6ce2b3b4987d7f402ba9d1782f657307436cd26603d50e
-  data.tar.gz: 0e2df36585d3c516f74a322de409580c2c07da68a2ea1386b8b02760b4543786504fee4ffc2e524806f00e8ca70ec03ad47ef50596f224383bc0fa3f111ff7d6
+  metadata.gz: f77b81060a59a2a27aae2ae8c76a1b80549e558ab830ce1742599ab587a66b9a63a4360de7ae23cd7bac31215b48f25bac65d08d14f9dd6764ab2d3bff99550b
+  data.tar.gz: fcbd78d7989a66cbf90b35ac90e20b2b3a565132135066791a1d627697d4189166b10e6ded29a22ed4c6f575eca12b16d417ae67e0c3b3f223f63b6e9a2dd606

data/lib/s3_media_server_api/cache.rb

@@ -0,0 +1,9 @@
+module S3MediaServerApi
+  class Cache
+    class << self
+      def fetch(key, params = {}, &block)
+        yield
+      end
+    end
+  end
+end

data/lib/s3_media_server_api/config.rb

@@ -2,25 +2,39 @@ require 'yaml'
 
 module S3MediaServerApi
   class ConfigError < S3MediaServerApiError; end
-  #
-  # By default 4 threads is used for file uploading. To change
-  # this value you can create config/s3_media_server_api.yml and specify
-  # upload_thread_count
-  #
-  # Example
-  #   prosuction:
-  #     upload_thread_count: 10
-  #
   class Config
-    attr_reader :upload_thread_count
+    class << self
+      def add_config(name, default_value = nil)
 
-    def initialize
-      @upload_thread_count = nil
-      environment = ENV['RUBY_ENV'] || ENV['RAILS_ENV']
-      if File.exists?('config/s3_media_server_api.yml')
-        @attributes = YAML.load_file('config/s3_media_server_api.yml')[environment][:upload_thread_count]
+        define_singleton_method "#{name}=".to_sym do |value|
+          instance_variable_set("@#{name}".to_sym,value)
+        end
+
+        define_singleton_method "#{name}".to_sym do
+          value = instance_variable_get(:"@#{name}")
+          raise ConfigError.new("Key: '#{name}' cannot be nil.")  if @required_keys.include?(name.to_sym) && value.nil?
+          value
+        end
+
+        self.send("#{name}=".to_sym, default_value)
+      end
+
+      def required(*args)
+        @required_keys = args
+      end
+
+      def configure
+        yield self
+        @required_keys.each do |key|
+          raise ConfigError.new("Key: #{key} cannot be nil.") if instance_variable_get(:"@#{key}").nil?
+        end
       end
-      @upload_thread_count ||= 4
     end
+
+    add_config :mocked
+    add_config :cache_class, S3MediaServerApi::Cache
+    add_config :upload_thread_count, 4
+
+    required :mocked, :cache_class, :upload_thread_count
   end
 end

data/lib/s3_media_server_api/media/common_media_api.rb

@@ -14,21 +14,25 @@ module S3MediaServerApi
       end
 
       def uuid
-        @params[:uuid]
+        @params[:uuid] if exist?
       end
 
       def name
-        @params[:name]
+        @params[:name] if exist?
       end
 
       def size
-        @params[:size]
+        @params[:size] if exist?
       end
 
-      def as_hash
+      def as_hash if exist?
         @params
       end
 
+      def exist?
+        !@params.nil?
+      end
+
       class << self
         #
         # creates media file
@@ -58,7 +62,10 @@ module S3MediaServerApi
         # returns: response with file information
         #
         def resolve(uuid)
-          AsynkRequest.sync_request(base_path, :resolve, uuid: uuid)
+          cache_key = "#{media_type}/#{uuid}"
+          Config.cache_class.fetch(cache_key) do
+            AsynkRequest.sync_request(base_path, :resolve, uuid: uuid)
+          end
         end
         #
         # this method should be used to send custom synchronous request to

data/lib/s3_media_server_api/media/document.rb

@@ -4,7 +4,7 @@ module S3MediaServerApi
       DOCUMENT = 'document'
 
       def url
-        @params[:url]
+        @params[:url if exist?
       end
 
       class << self

data/lib/s3_media_server_api/media/image.rb

@@ -27,11 +27,11 @@ module S3MediaServerApi
       end
 
       def source
-        ImageObject.new(@params[:source])
+        ImageObject.new(@params[:source]) if exist?
       end
 
       def thumb
-        ImageObject.new(@params[:thumb])
+        ImageObject.new(@params[:thumb]) if exist?
       end
 
       class << self

data/lib/s3_media_server_api/media/video.rb

@@ -26,31 +26,31 @@ module S3MediaServerApi
       end
 
       def preview
-        @params[:preview]
+        @params[:preview] if exist?
       end
 
       def duration
-        @params[:duration]
+        @params[:duration] if exist?
       end
 
       def transcoded
-        @params[:transcoded]
+        @params[:transcoded] if exist?
       end
 
       def embed_url
-        @params[:embed_url]
+        @params[:embed_url] if exist?
       end
 
       def provider
-        @params[:provider]
+        @params[:provider] if exist?
       end
 
       def screenshots
-        @params[:screenshots].map { |screenshot| Image::ImageObject.new(screenshot) }
+        @params[:screenshots].map { |screenshot| Image::ImageObject.new(screenshot) } if exist?
       end
 
       def versions
-        @params[:versions].map { |version| Version.new(version) }
+        @params[:versions].map { |version| Version.new(version) } if exist?
       end
 
       class << self

data/lib/s3_media_server_api/uploader.rb

@@ -29,7 +29,7 @@ module S3MediaServerApi
         aws_file_uuid = file.uuid
         uploads_count = file.uploads_count
         parts = compute_parts(file_path, default_part_size)
-        Parallel.each(parts, in_threads: S3MediaServerApi.upload_thread_count) do |part|
+        Parallel.each(parts, in_threads: S3MediaServerApi::Config.upload_thread_count) do |part|
           signed_upload_url = AwsFile.get_signed_upload_url(aws_file_uuid, part[:part_number])
 
           raise PartUploadError.new("Part #{part[:part_number]} wasn't uploaded") unless upload_part(signed_upload_url, part[:body].read)

data/lib/s3_media_server_api/version.rb

@@ -1,3 +1,3 @@
 module S3MediaServerApi
-  VERSION = "0.1.0"
+  VERSION = "0.1.0.2"
 end

data/lib/s3_media_server_api.rb

@@ -1,5 +1,6 @@
 require "s3_media_server_api/version"
 require "s3_media_server_api/error"
+require "s3_media_server_api/cache"
 require "s3_media_server_api/config"
 require "s3_media_server_api/uploader"
 require "s3_media_server_api/file_part"
@@ -8,17 +9,4 @@ require "s3_media_server_api/media"
 require "s3_media_server_api/asynk_request"
 
 module S3MediaServerApi
-
-  class << self
-
-    def upload_thread_count
-      config.upload_thread_count
-    end
-
-    private
-
-      def config
-        @@config ||= Config.new
-      end
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3_media_server_api
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.0.2
 platform: ruby
 authors:
 - Ayrat Badykov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-11 00:00:00.000000000 Z
+date: 2016-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,6 +122,7 @@ files:
 - lib/s3_media_server_api.rb
 - lib/s3_media_server_api/asynk_request.rb
 - 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/error.rb
 - lib/s3_media_server_api/file_part.rb
@@ -133,6 +134,7 @@ files:
 - lib/s3_media_server_api/media/video.rb
 - lib/s3_media_server_api/uploader.rb
 - lib/s3_media_server_api/version.rb
+- s3_media_server_api-0.1.0.gem
 - s3_media_server_api.gemspec
 homepage: 
 licenses: