directwave 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9895a5e52aa5d43976fa70963070d9668892a984
-  data.tar.gz: 40d6073208f79498a33f9ef7329d4bff07bb7973
+  metadata.gz: a4221f30da940883f8288a642650c86d77a99ea4
+  data.tar.gz: 18e034a411ec465b1f1a6224c6bad81527de5501
 SHA512:
-  metadata.gz: 632ccdafe01372d6bb26050a6d7d860e64177f67b45d4e8944973d014b6c6ce5b972390dee0b1b680b4f769a6fc2255141231c33439aff3d059c971d09548ca8
-  data.tar.gz: e38220247f008dfe52c2328614cbfb7d614330e8f2afdc618554d9ff6b90ae88948b450a052d3461ee16463e7ccef211f8f14c00d17b87e2105f25d2e93fd6c2
+  metadata.gz: 2c1a66ff5b293765698b6ee1f96d4828fff8a98bd4c05abdc08b3efd02ef94743732f6ed0daa4783b1c6572f70c4dfd6e5bb34b8fd74d455d4dee2e043f18e17
+  data.tar.gz: cac8f81c2bd7ec567a81ee36675c4ea7a81f8b01650449469d9893e757e099d8601c946f17b4ca1c68213aa5087614095cff89e61f0aadb6d2eecfc5d4c654ec

data/lib/directwave.rb

@@ -4,7 +4,7 @@ require "active_support/core_ext"
 require "active_support/concern"
 require "uuid"
 require "aws-sdk"
-require "base64" 
+require "base64"
 
 module DirectWave
   class << self
@@ -12,7 +12,7 @@ module DirectWave
       DirectWave::Uploader::Base.configure(&block)
     end
   end
-    
+
   autoload :Mounter, "directwave/mounter"
   autoload :VERSION, "directwave/version"
 
@@ -26,4 +26,4 @@ module DirectWave
   end
 end
 
-require "directwave/railtie" if defined?(Rails) 
+require "directwave/railtie" if defined?(Rails)

data/lib/directwave/uploader/configuration.rb

@@ -1,9 +1,9 @@
 module DirectWave
-  
+
   module Uploader
     module Configuration
       extend ActiveSupport::Concern
-      
+
       included do
         add_config :s3_access_policy
         add_config :s3_bucket
@@ -11,17 +11,19 @@ module DirectWave
         add_config :s3_secret_access_key
         add_config :s3_region
         add_config :s3_authentication_timeout
-        
+
         add_config :max_file_size
         add_config :expiration_period
-        
+
         add_config :store_dir
         add_config :upload_dir
         add_config :cache_dir
 
+        add_config :asset_host
+
         reset_config
       end
-      
+
       module ClassMethods
         def add_config(name)
           class_eval <<-RUBY, __FILE__, __LINE__ + 1
@@ -33,18 +35,18 @@ module DirectWave
                 return nil if name.nil? && !instance_variable_defined?("@#{name}")
                 @#{name} = name && !name.is_a?(Module) && !name.is_a?(Symbol) && !name.is_a?(Numeric) && !name.is_a?(TrueClass) && !name.is_a?(FalseClass) ? name.dup : name
               end
-              
+
               def #{name}=(value)
                 @#{name} = value
               end
-            end 
-            
+            end
+
             def #{name}
               self.class.#{name}
             end
           RUBY
         end
-        
+
         def configure
           yield self
         end
@@ -54,7 +56,7 @@ module DirectWave
             config.s3_access_policy = :public_read
             config.s3_region        = "us-east-1"
             config.s3_authentication_timeout = 60.minutes
-            
+
             config.max_file_size   = 300.megabytes
             config.expiration_period = 6.hours
 
@@ -66,5 +68,5 @@ module DirectWave
       end # ClassMethods
     end #Configuration
   end # Uploader
-  
+
 end # DirectWave

data/lib/directwave/uploader/paths.rb

@@ -1,22 +1,22 @@
 module DirectWave
-  
+
   module Uploader
     module Paths
       extend ActiveSupport::Concern
-      
+
       def url(version=:original)
         versions[version.to_sym].url || default_url
       end
-      
+
       def key(version=:original)
         versions[version.to_sym].key
       end
-      
+
       def default_url; end
-      
+
       def filename(part=nil)
         return original_filename unless has_store_key?
-        
+
         key_path = store_key.split("/")
         filename_parts = []
         filename = filename_parts.unshift(key_path.pop)
@@ -24,23 +24,23 @@ module DirectWave
         filename_parts.unshift(unique_key) if unique_key
         filename_parts.join("/")
       end
-              
+
       def original_filename
         model[mounted_as.to_s] if model.respond_to?(mounted_as)
       end
-            
+
       def store_key=(string)
         @store_key = string
       end
-        
+
       def store_key
         @store_key ||= "#{upload_dir}/#{guid}/${filename}"
       end
-      
+
       def has_store_key?
         @store_key.present? && !(@store_key =~ /#{Regexp.escape("${filename}")}\z/)
-      end       
+      end
     end # Paths
   end # Uploader
-  
+
 end

data/lib/directwave/uploader/versions.rb

@@ -14,10 +14,16 @@ module DirectWave
 
         def url
           @url ||= begin
-            if @uploader.s3_access_policy != :public_read
-              file.url_for(:get, { expires: @uploader.s3_authentication_timeout }).to_s
+            uri = if @uploader.s3_access_policy != :public_read
+              file.url_for :get, { expires: @uploader.s3_authentication_timeout }
             else
-              file.public_url.to_s
+              file.public_url
+            end
+
+            if @uploader.class.asset_host.present?
+              "#{@uploader.class.asset_host}#{uri.path}?#{uri.query}"
+            else
+              uri.to_s
             end
           end
         end

data/lib/directwave/version.rb

@@ -1,3 +1,3 @@
 module Directwave
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: directwave
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Dima Kochnev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-28 00:00:00.000000000 Z
+date: 2014-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -182,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: directwave
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Ruby direct uploader to Amazon S3