anaconda 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20a626eb236bf4ff39e32bb83f8b975fa664530c
-  data.tar.gz: 6a991a2b23aa1c971f0a0deaee2f8e6c3713082e
+  metadata.gz: 6a362cf9690829d3184624cbf62dc7a0b91cc555
+  data.tar.gz: e3fed3967d2f2c8eb7adbee4a64a1f2fa35ecd2b
 SHA512:
-  metadata.gz: 9d41093e0fd99096c0a8c9bfbb306a147146b5bb81dca7168008264df11b93d3c959397efc062e9273ca44468a299bf25ff62882b796587a85e236e8892c6279
-  data.tar.gz: ac78dfde3e04e5e6c778d591b85d40030c6a6a6e2a294d2c15fbcc89f366d28c39c315549b3fcc3e3f75b29df15b418fc412db49210d104299b50508b9ed1d2e
+  metadata.gz: bc25838f832c4fe24971d5c054dd8da3923781ee02ffc0f3f71415a636ca37646b257697970f7764922d2e11722ca1ab042b5337acdd78abcae6302c87536be8
+  data.tar.gz: fe04aefa077d7d1da356b7a8fdbd70dbb304321101ed542e5b779b1939e67a738398010942bf5ea37ab1d1b51cb8863ba28e28e2f89d1d7ea42d59fbe90fd705

data/README.markdown

@@ -2,7 +2,7 @@
 
 Dead simple direct-to-s3 file uploading for your rails app.
 
-Current Version: 1.0.0
+Current Version: 1.0.2
 
 ## Installation
 
@@ -202,6 +202,9 @@ If you return false to the following events it will prevent the default behavior
 From version 1.0.0 on we have used [Semantic Versioning](http://semver.org/).
 
 ## Changelog
+* 1.0.2
+  * Refactor S3Uploader into it's own class so it can be used outside of the form helper
+  
 * 1.0.1 
   * Use OpenSSL::Digest instead of deprecated OpenSSL::Digest::Digest.
   

data/lib/anaconda.rb

@@ -3,6 +3,7 @@ require 'anaconda/anaconda'
 require 'anaconda/errors'
 require 'anaconda/anaconda_for'
 require 'anaconda/railtie'
+require 'anaconda/s3_uploader'
 require 'anaconda/engine'
 require 'anaconda/version'
 

data/lib/anaconda/form_builder_helpers.rb

@@ -23,7 +23,7 @@ module Anaconda
           options[:base_key] = instance.send(options[:base_key].to_s) if options[:base_key].kind_of? Symbol
         end
         
-        uploader = S3Uploader.new(options)
+        uploader = Anaconda::S3Uploader.new(options)
         output += self.input_field "file", name: "file", id: element_id, as: :file, data: {url: uploader.url, form_data: uploader.fields.to_json, media_types: Anaconda.js_file_types}
       end
 
@@ -64,84 +64,5 @@ module Anaconda
 
       output.html_safe
     end
-
-    class S3Uploader
-      def initialize(options)
-        @options = options.reverse_merge(
-          id: "fileupload",
-          aws_access_key_id: Anaconda.aws[:aws_access_key],
-          aws_secret_access_key: Anaconda.aws[:aws_secret_key],
-          bucket: Anaconda.aws[:aws_bucket],
-          acl: "public-read",
-          expiration: 10.hours.from_now.utc,
-          max_file_size: 500.megabytes,
-          as: "file"
-        )
-      end
-
-      def form_options
-        {
-          id: @options[:id],
-          method: "post",
-          authenticity_token: false,
-          multipart: true,
-          data: {
-            post: @options[:post],
-            as: @options[:as],
-            base_key: base_key
-          }
-        }
-      end
-
-      def fields
-        {
-          :key => key,
-          :acl => @options[:acl],
-          "Content-Type" => "application/octet-stream",
-          :policy => policy,
-          :signature => signature,
-          "AWSAccessKeyId" => @options[:aws_access_key_id],
-        }
-      end
-
-      def key
-        @key ||= "#{base_key}/${filename}"
-      end
-
-      def base_key
-        @options[:base_key]
-      end
-
-      def url
-        "https://s3.amazonaws.com/#{@options[:bucket]}/"
-      end
-
-      def policy
-        Base64.encode64(policy_data.to_json).gsub("\n", "")
-      end
-
-      def policy_data
-        {
-          expiration: @options[:expiration],
-          conditions: [
-            #["starts-with", "$utf8", ""],
-            ["starts-with", "$key", base_key],
-            ["starts-with", "$Content-Type", ""],
-            ["content-length-range", 1, @options[:max_file_size]],
-            {bucket: @options[:bucket]},
-            {acl: @options[:acl]}
-          ]
-        }
-      end
-
-      def signature
-        Base64.encode64(
-          OpenSSL::HMAC.digest(
-            OpenSSL::Digest.new('sha1'),
-            @options[:aws_secret_access_key], policy
-          )
-        ).gsub("\n", "")
-      end
-    end
   end
 end

data/lib/anaconda/s3_uploader.rb

@@ -0,0 +1,80 @@
+module Anaconda
+  class S3Uploader
+    def initialize(options)
+      @options = options.reverse_merge(
+        id: "fileupload",
+        aws_access_key_id: Anaconda.aws[:aws_access_key],
+        aws_secret_access_key: Anaconda.aws[:aws_secret_key],
+        bucket: Anaconda.aws[:aws_bucket],
+        acl: "public-read",
+        expiration: 10.hours.from_now.utc,
+        max_file_size: 500.megabytes,
+        as: "file"
+      )
+    end
+
+    def form_options
+      {
+        id: @options[:id],
+        method: "post",
+        authenticity_token: false,
+        multipart: true,
+        data: {
+          post: @options[:post],
+          as: @options[:as],
+          base_key: base_key
+        }
+      }
+    end
+
+    def fields
+      {
+        :key => key,
+        :acl => @options[:acl],
+        "Content-Type" => "application/octet-stream",
+        :policy => policy,
+        :signature => signature,
+        "AWSAccessKeyId" => @options[:aws_access_key_id],
+      }
+    end
+
+    def key
+      @key ||= "#{base_key}/${filename}"
+    end
+
+    def base_key
+      @options[:base_key]
+    end
+
+    def url
+      "https://s3.amazonaws.com/#{@options[:bucket]}/"
+    end
+
+    def policy
+      Base64.encode64(policy_data.to_json).gsub("\n", "")
+    end
+
+    def policy_data
+      {
+        expiration: @options[:expiration],
+        conditions: [
+          #["starts-with", "$utf8", ""],
+          ["starts-with", "$key", base_key],
+          ["starts-with", "$Content-Type", ""],
+          ["content-length-range", 1, @options[:max_file_size]],
+          {bucket: @options[:bucket]},
+          {acl: @options[:acl]}
+        ]
+      }
+    end
+
+    def signature
+      Base64.encode64(
+        OpenSSL::HMAC.digest(
+          OpenSSL::Digest.new('sha1'),
+          @options[:aws_secret_access_key], policy
+        )
+      ).gsub("\n", "")
+    end
+  end
+end

data/lib/anaconda/version.rb

@@ -1,5 +1,5 @@
 module Anaconda
   module Rails
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: anaconda
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Ben McFadden
@@ -63,6 +63,7 @@ files:
 - lib/anaconda/errors.rb
 - lib/anaconda/form_builder_helpers.rb
 - lib/anaconda/railtie.rb
+- lib/anaconda/s3_uploader.rb
 - lib/anaconda/version.rb
 - lib/generators/anaconda/install_generator.rb
 - lib/generators/anaconda/migration_generator.rb