stratosphere 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 905b59e0f027db766423f0a7ba6debedb8052106
-  data.tar.gz: 965b81ddfed6656d877256ba47f7fa4da78a2f7c
+  metadata.gz: 132dc7d64cf9c7b22c4c7219c5e8c45872f7f526
+  data.tar.gz: 2cfb6ee61a0c920716a8492c48c3aa8bcb27fb31
 SHA512:
-  metadata.gz: 9268320ede2866543b7321ea05ee1517698589538c13325d0746dc020035e269b658c5225f0065bb80aaed5d237b6eeea0477425a44f7db9456092eab952c1ac
-  data.tar.gz: e412e68dbb9f1a548f0fd9976866b10a6af972d8869eb071659b6e8b0eb7159f5ac46cb132b8bed84d74b40a664380b4ea87a0cdbd1a84edbdd27ad8841e7a23
+  metadata.gz: 823104776ae55b0bf60cbb81dc617b85803caf1cdb0a7daf45922d0ea6d313afcea8b4a73d73da1781ba86dc46fd20bf235621b77f7b41da46db62267ffd66bf
+  data.tar.gz: 2028921a8023d78c0710b74f2ac68b37b5ef5da26f38ec76d72278db17792591a05ee2f3357fd5f4de70fc869d8de309a578a0c975b2c4aff232441bfe339a8c

data/README.md

@@ -40,7 +40,7 @@ brew install imagemagick
 If your using **Ubuntu** or other **Debian** based Linux distros you can install ImageMagick with:
 
 ```bash
-sudo apt-get install -y ImageMagick libmagickwand-dev
+sudo apt-get install -y imagemagick libmagickwand-dev
 ```
 
 If your using **Amazon Linux**, **CentOS**, **Red Hat**, or other **RPM** based Linux distros you can install ImageMagick with:
@@ -136,7 +136,21 @@ Stratosphere.configure do |config|
 end
 ```
 
-To add a directory prefix to provide Stratosphere better, global insight to where your attachments will be stored in your S3 bucket you can add `config.dir_prefix = 'path/to/attachments'` to the `Stratosphere.configure` block above. Also if you are using Cloudfront to serve assets in you S3 bucket you can change the `config.domain` option to your CloudFront domain name or CNAME.
+You can also add specification configuration per each Stratosphere model like so:
+
+```ruby
+class Post < ActiveRecord::Base
+  # configuration options here will be merged with the global config
+  # from the Stratosphere initalizer.
+  has_attachment :image, type: :image, config: {
+    aws: {
+      s3_bucket: 'a-different-bucket-name'
+    }
+  }
+end
+```
+
+To add a directory prefix to provide Stratosphere a better, global insight to where your attachments will be stored in your S3 bucket you can add `config.dir_prefix = 'path/to/attachments'` to the `Stratosphere.configure` block above. Also if you are using Cloudfront to serve assets in you S3 bucket you can change the `config.domain` option to your CloudFront domain name or CNAME.
 
 ##### Attachment URLs
 
@@ -197,7 +211,7 @@ end
 ##### Image Cropping
 
 To crop your image attachment first make sure that you have at least one style set in your Model's `has_attachment` method. Cropping can be done simply making a PATCH request with the following parameters to the relative controller's `update` method:
- 
+
 ```javascript
 {
   crop_params: [x, y, width, height]
@@ -245,10 +259,12 @@ end
 
 ## Example
 
-Coming Soon!
+<a href="http://stratosphere.zacharygolba.com" target="_blank">Check out a live production RoR App with different attachment demonstrations.</a>
+
+The source code for the example app is <a href="https://github.com/zacharygolba/stratosphere-demo" target="_blank">available here</a>.
 
 ## To Do
-  
+
 - [ ] Better tests
 - [ ] Multiple attachment support per each ActiveRecord Model
 - [ ] Add additional cloud service providers (Google Cloud Storage, Azure Storage Box, Zencoder Video Encoding)
@@ -259,4 +275,4 @@ Coming Soon!
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
+5. Create a new Pull Request

data/app/assets/javascripts/stratosphere/stratosphere.bundled.min.js

@@ -28,4 +28,4 @@ window&&!window.InflectionJS&&(window.InflectionJS=null),InflectionJS={uncountab
  * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-window.Stratosphere=function(){"use strict";function e(e,t,n){var a=document.querySelectorAll("meta[name=csrf-token]")[0];this.file=null,this.csrfToken=a?a.getAttribute("content"):"",this.modelId=t,this.modelName=e,this.attachmentName=n}return e.activate=function(){var t=jQuery('*[data-stratosphere-enabled="true"]');if(t.length>0){var n=new e(t.data("modelName"),t.data("modelId"),t.data("attachmentName")),a=t.find("input[type='file']"),o=function(e){if(e){var o=t.find(".upload-controls"),r=t.find(".upload-progress"),i=r.find(".progress-bar");o.css("display","none"),r.css("display","block"),n.upload(e,i[0]).then(function(e){var n=!!e&&e.hasOwnProperty("url")&&e.hasOwnProperty("name")&&e.hasOwnProperty("type");n&&(t.find(".current-attachment a").html(e.name),t.find(".current-attachment a").attr("href",e.url),/^image\/.+/g.test(e.type)&&t.find(".current-attachment img").attr("src",e.url)),o.css("display",""),r.css("display","none"),t.find(".current-attachment").css("display","inline-block"),t.find('*[data-stratosphere-action="delete"]').css("display",""),a.val(""),setTimeout(function(){i[0].setAttribute("aria-valuenow","0"),i[0].style.width=0},500)},function(e){console.log(e)})}else n.file=null};t.find("button").on("click",function(e){var o=jQuery(e.target);e.preventDefault(),"upload"===o.data("stratosphereAction")&&a.trigger("click"),"delete"===o.data("stratosphereAction")&&window.confirm("Are you sure you want to delete this attachment?")&&n.deleteAttachment().then(function(){t.find(".current-attachment").css("display","none"),t.find('*[data-stratosphere-action="delete"]').css("display","none")})}),a.on("change",function(){o(a[0].files[0])})}},e.deactivate=function(){var e=jQuery('*[data-stratosphere-enabled="true"]');e.length>0&&(e.find("input[type='file']").off("change"),e.find("button").off("click"))},e.prototype.getUploadUrl=function(){var e=this;return new RSVP.Promise(function(t,n){e.file?jQuery.ajax({type:"GET",url:"/"+e.modelName.pluralize()+"/"+e.modelId+"/edit",data:{file_name:e.file.name,content_type:e.file.type,content_length:e.file.size,stratosphere_submitted:!0},headers:{"X-CSRF-Token":e.csrfToken}}).done(function(e,a,o){o.status>=200&&o.status<400?e.hasOwnProperty("url")?t(e.url):n(null):n(o)}):n(null)})},e.prototype.upload=function(e,t){var n=this;return null===t&&(t=null),this.file=e,new RSVP.Promise(function(a,o){n.getUploadUrl().then(function(r){var i=new XMLHttpRequest;if(i.open("PUT",r,!0),i.setRequestHeader("Accept","*/*"),i.setRequestHeader("Content-Type",e.type),i.onload=function(){i.status>=200&&i.status<400?n.updateModel().then(function(e){e?a({url:r.split("?")[0],name:n.file.name,type:n.file.type}):o(null)},function(){o(null)}):o(null)},t&&i.upload){var l=jQuery(i.upload);l.on("progress",function(e){if(e.originalEvent.lengthComputable){var n=e.originalEvent.loaded/e.originalEvent.total*100;t.setAttribute("aria-valuenow",""+n),t.style.width=n+"%"}}),l.on("load",function(){l.off("progress"),l.off("load")})}i.send(e)},function(){o(null)})})},e.prototype.updateModel=function(){var e=this;return new RSVP.Promise(function(t,n){if(e.file){var a={stratosphere_submitted:!0};a[e.attachmentName+"_file"]=e.file.name,a[e.attachmentName+"_content_type"]=e.file.type,a[e.attachmentName+"_content_length"]=e.file.size,jQuery.ajax({type:"PATCH",url:"/"+e.modelName.pluralize()+"/"+e.modelId,data:a,headers:{"X-CSRF-Token":e.csrfToken,"Content-Type":"application/x-www-form-urlencoded; charset=UTF-8"}}).done(function(e,a,o){o.status>=200&&o.status<400?t(!0):n(o)})}else n(!1)})},e.prototype.deleteAttachment=function(){var e=this;return new RSVP.Promise(function(t,n){var a={stratosphere_submitted:!0};a[e.attachmentName+"_file"]=null,a[e.attachmentName+"_content_type"]=null,a[e.attachmentName+"_content_length"]=null,jQuery.ajax({type:"PATCH",url:"/"+e.modelName.pluralize()+"/"+e.modelId,data:a,headers:{"X-CSRF-Token":e.csrfToken,"Content-Type":"application/x-www-form-urlencoded; charset=UTF-8"}}).done(function(e,a,o){200===o.status?t(!0):n(o)})})},e}(),window.jQuery?window.Turbolinks?(jQuery(document).on("page:change",function(){Stratosphere.activate()}),jQuery(document).on("page:before-unload",function(){Stratosphere.deactivate()})):jQuery(document).ready(function(){Stratosphere.activate()}):console.error("jQuery not detected. Make sure you include stratosphere/main after jquery.");
+window.Stratosphere=function(){"use strict";function e(e,t,n){var a=document.querySelectorAll("meta[name=csrf-token]")[0];this.file=null,this.csrfToken=a?a.getAttribute("content"):"",this.modelId=t,this.modelName=e,this.attachmentName=n}return e.activate=function(){var t=jQuery('*[data-stratosphere-enabled="true"]');if(t.length>0){var n=new e(t.data("modelName"),t.data("modelId"),t.data("attachmentName")),a=t.find("input[type='file']"),o=function(e){if(e){var o=t.find(".upload-controls"),r=t.find(".upload-progress"),i=r.find(".progress-bar");o.css("display","none"),r.css("display","block"),n.upload(e,i[0]).then(function(e){var n=!!e&&e.hasOwnProperty("url")&&e.hasOwnProperty("name")&&e.hasOwnProperty("type");n&&(t.find(".current-attachment a").html(e.name),t.find(".current-attachment a").attr("href",e.url),/^image\/.+/g.test(e.type)&&t.find(".current-attachment img").attr("src",e.url)),o.css("display",""),r.css("display","none"),t.find(".current-attachment").css("display","inline-block"),t.find('*[data-stratosphere-action="delete"]').css("display",""),a.val(""),setTimeout(function(){i[0].setAttribute("aria-valuenow","0"),i[0].style.width=0},500)},function(e){console.log(e)})}else n.file=null};t.find("button").on("click",function(e){var o=jQuery(e.target);e.preventDefault(),"upload"===o.data("stratosphereAction")&&a.trigger("click"),"delete"===o.data("stratosphereAction")&&window.confirm("Are you sure you want to delete this attachment?")&&n.deleteAttachment().then(function(){t.find(".current-attachment").css("display","none"),t.find('*[data-stratosphere-action="delete"]').css("display","none")})}),a.on("change",function(){o(a[0].files[0])})}},e.deactivate=function(){var e=jQuery('*[data-stratosphere-enabled="true"]');e.length>0&&(e.find("input[type='file']").off("change"),e.find("button").off("click"))},e.prototype.getUploadUrl=function(){var e=this;return new RSVP.Promise(function(t,n){e.file?jQuery.ajax({type:"GET",url:"/"+e.modelName.pluralize()+"/"+e.modelId+"/edit",data:{file_name:e.file.name,content_type:e.file.type,content_length:e.file.size,stratosphere_submitted:!0},headers:{"X-CSRF-Token":e.csrfToken}}).done(function(e,a,o){o.status>=200&&o.status<400?e.hasOwnProperty("url")?t(e.url):n(null):n(o)}):n(null)})},e.prototype.upload=function(e,t){var n=this;return null===t&&(t=null),this.file=e,new RSVP.Promise(function(a,o){n.getUploadUrl().then(function(r){var i=new XMLHttpRequest;if(i.open("PUT",r,!0),i.setRequestHeader("Accept","*/*"),i.setRequestHeader("Content-Type",e.type),i.setRequestHeader("x-amz-acl", "public-read"),i.onload=function(){i.status>=200&&i.status<400?n.updateModel().then(function(e){e?a({url:r.split("?")[0],name:n.file.name,type:n.file.type}):o(null)},function(){o(null)}):o(null)},t&&i.upload){var l=jQuery(i.upload);l.on("progress",function(e){if(e.originalEvent.lengthComputable){var n=e.originalEvent.loaded/e.originalEvent.total*100;t.setAttribute("aria-valuenow",""+n),t.style.width=n+"%"}}),l.on("load",function(){l.off("progress"),l.off("load")})}i.send(e)},function(){o(null)})})},e.prototype.updateModel=function(){var e=this;return new RSVP.Promise(function(t,n){if(e.file){var a={stratosphere_submitted:!0};a[e.attachmentName+"_file"]=e.file.name,a[e.attachmentName+"_content_type"]=e.file.type,a[e.attachmentName+"_content_length"]=e.file.size,jQuery.ajax({type:"PATCH",url:"/"+e.modelName.pluralize()+"/"+e.modelId,data:a,headers:{"X-CSRF-Token":e.csrfToken,"Content-Type":"application/x-www-form-urlencoded; charset=UTF-8"}}).done(function(e,a,o){o.status>=200&&o.status<400?t(!0):n(o)})}else n(!1)})},e.prototype.deleteAttachment=function(){var e=this;return new RSVP.Promise(function(t,n){var a={stratosphere_submitted:!0};a[e.attachmentName+"_file"]=null,a[e.attachmentName+"_content_type"]=null,a[e.attachmentName+"_content_length"]=null,jQuery.ajax({type:"PATCH",url:"/"+e.modelName.pluralize()+"/"+e.modelId,data:a,headers:{"X-CSRF-Token":e.csrfToken,"Content-Type":"application/x-www-form-urlencoded; charset=UTF-8"}}).done(function(e,a,o){200===o.status?t(!0):n(o)})})},e}(),window.jQuery?window.Turbolinks?(jQuery(document).on("page:change",function(){Stratosphere.activate()}),jQuery(document).on("page:before-unload",function(){Stratosphere.deactivate()})):jQuery(document).ready(function(){Stratosphere.activate()}):console.error("jQuery not detected. Make sure you include stratosphere/main after jquery.");

data/app/assets/javascripts/stratosphere/stratosphere.js

@@ -169,6 +169,7 @@ window.Stratosphere = function() {
 
         xhr.setRequestHeader('Accept', '*/*');
         xhr.setRequestHeader('Content-Type', file.type);
+        xhr.setRequestHeader('x-amz-acl', 'public-read');
 
         xhr.onload = function() {
           if ( xhr.status >= 200 && xhr.status < 400 ) {

data/lib/stratosphere/attachment.rb

@@ -2,22 +2,34 @@ module Stratosphere
   class Attachment
     attr_accessor :base_path, :config, :file_name, :name, :size, :mime_type, :type, :owner, :file_store
 
+    def self.create_config(options={})
+      config = Stratosphere.config.to_hash
+
+      unless options.nil?
+        unless options[:aws].nil?
+          options[:aws] = config[:aws].merge(options[:aws])
+        end
+        config.merge!(options)
+      end
+      Stratosphere::Config.new(config)
+    end
+
     def initialize(owner, name, options={})
-      @config      = Stratosphere.config
-      @name        = name
-      @owner       = owner
-      @file_name   = @owner["#{@name}_file"]
-      @file_size   = @owner["#{@name}_content_length"]
-      @mime_type   = @owner["#{@name}_content_type"]
-      @type        = :attachment
-      @file_store  = Stratosphere::AWS::S3.new
+      @config     = self.class.create_config(options[:config])
+      @name       = name
+      @owner      = owner
+      @file_name  = @owner["#{@name}_file"]
+      @file_size  = @owner["#{@name}_content_length"]
+      @mime_type  = @owner["#{@name}_content_type"]
+      @type       = :attachment
+      @file_store = Stratosphere::AWS::S3.new(@config)
       set_base_path
     end
-    
+
     def set_base_path
       plural_attr  = name.to_s.pluralize
       plural_model = owner.class.to_s.downcase.pluralize
-      
+
       if config.dir_prefix
         prefix     = config.dir_prefix[-1, 1] == '/' ? config.dir_prefix.slice(0, -1) : config.dir_prefix
         @base_path = "#{prefix}/#{plural_model}/#{plural_attr}/#{owner.id}"
@@ -25,7 +37,7 @@ module Stratosphere
         @base_path = "#{plural_model}/#{plural_attr}/#{owner.id}"
       end
     end
-    
+
     def exists?
       !file_name.nil?
     end
@@ -48,4 +60,4 @@ module Stratosphere
       file_store.delete_objects base_path
     end
   end
-end
+end

data/lib/stratosphere/aws.rb

@@ -2,19 +2,19 @@ module Stratosphere
   module AWS
     class S3
       attr_accessor :credentials, :resource, :region, :bucket_name, :presigner
-      
-      def initialize
-        key                      = Stratosphere.config.aws[:access_key]
-        secret                   = Stratosphere.config.aws[:secret]
-        @region                  = Stratosphere.config.aws[:region]
-        @bucket_name             = Stratosphere.config.aws[:s3_bucket]
+
+      def initialize(config={})
+        key                      = config.aws[:access_key]
+        secret                   = config.aws[:secret]
+        @region                  = config.aws[:region]
+        @bucket_name             = config.aws[:s3_bucket]
         @credentials             = Aws::Credentials.new(key, secret)
         @resource                = Aws::S3::Resource.new(credentials: @credentials, region: @region)
         @presigner               = Aws::S3::Presigner.new(region: @region)
         Aws.config[:region]      = @region
         Aws.config[:credentials] = @credentials
       end
-      
+
       def bucket
         resource.bucket bucket_name
       end
@@ -30,7 +30,10 @@ module Stratosphere
       end
 
       def presigned_upload(options={})
-        params = options.keep_if { |k,v| [:key, :content_type, :content_length].include? k }.merge!(bucket: bucket_name)
+        unless options.has_key?(:acl)
+          options = options.merge({:acl => "public-read"})
+        end
+        params = options.keep_if { |k,v| [:key, :content_type, :content_length, :acl, :cache_control].include? k }.merge!(bucket: bucket_name)
         presigner.presigned_url(:put_object, params)
       end
     end
@@ -47,4 +50,4 @@ module Stratosphere
       end
     end
   end
-end
+end

data/lib/stratosphere/config.rb

@@ -1,5 +1,20 @@
 module Stratosphere
   class Config
     attr_accessor :aws, :cloud, :domain, :dir_prefix
+
+    def initialize(options={})
+      @aws        = options[:aws]
+      @cloud      = options[:cloud]
+      @domain     = options[:domain]
+      @dir_prefix = options[:dir_prefix]
+    end
+
+    def to_hash
+      hash = {}
+      self.instance_variables.each do |attr|
+        hash[attr.to_s.delete('@').to_sym] = self.instance_variable_get(attr)
+      end
+      hash
+    end
   end
-end
+end

data/lib/stratosphere/version.rb

@@ -1,3 +1,3 @@
 module Stratosphere
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stratosphere
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Zachary
@@ -9,15 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-11 00:00:00.000000000 Z
+date: 2015-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
@@ -25,9 +22,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
@@ -35,9 +29,6 @@ dependencies:
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.22
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -45,9 +36,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.22
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -55,22 +43,16 @@ dependencies:
   name: rmagick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.13.4
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.13.4
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '2.0'
 description: In today's day and age we have Dropbox, Google Drive, iCloud, etc. Shouldn't
   file uploading and attachment handling be easier and alot faster in Ruby on Rails
   Applications? Stratosphere makes it easy to upload directly to cloud storage providers
@@ -145,7 +127,6 @@ files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/config/secrets.yml
-- test/dummy/log/test.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
@@ -153,7 +134,7 @@ files:
 - test/integration/navigation_test.rb
 - test/stratosphere_test.rb
 - test/test_helper.rb
-homepage: https://github.com/zacharygolba/stratosphere
+homepage: http://stratosphere.zacharygolba.com
 licenses:
 - MIT
 metadata: {}
@@ -165,7 +146,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -173,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Lightning fast, easy-to-use, magic attachment handling for Ruby on Rails
@@ -206,7 +187,6 @@ test_files:
 - test/dummy/config/routes.rb
 - test/dummy/config/secrets.yml
 - test/dummy/config.ru
-- test/dummy/log/test.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html