ThreeStore 0.0.1.b → 0.0.1

data/.gitignore

@@ -2,5 +2,3 @@
 .bundle
 Gemfile.lock
 pkg/*
-tmp/*
-ThreeStore.yml

data/README.rdoc

@@ -5,34 +5,7 @@ http://travis-ci.org/cowmanifestation/ThreeStore.png ({More info}[http://travis-
 
 == Tutorial
 
-To store something on s3:
-
-Perhaps you are storing your s3 secret access key id and secret access key as environment variables - you can access them like this:
-
-  @store = ThreeStore.new(ENV['S3_KEY'], ENV['S3_SECRET'], 'my-bucket')
-
-If you are storing aforementioned credentials in a yaml file:
-
-  @yaml = 'path_to_my_yaml_file.yml'
-  @store = ThreeStore.new(@yaml[:access_key_id], @yaml[:secret_access_key], 'my-bucket')
-
-To upload a file, use ThreeStore#store_on_s3:
-
-  @store.store_on_s3(:url => 'http://example.com/assets/picture.png', :key => 'picture.png', :content_type => 'image/png', :access => 'public-read')
-
-Options to pass to +store_on_s3+: 
-  * :url, the url or path from which to fetch the file 
-  * :key, the that you wish your object to have on s3
-  * :content_type (optional) - the content type will be inferred from the file extension, but it can be passed in if needed
-  * :access (optional) - Default access is private, but can be set to 'public-read' and maybe even 'public-write'
-  
-(For more information on access level options, look in the Amazon S3 docs: http://aws.amazon.com/documentation)
-
-This will return your file's new location on s3:
-
-  => 'http://s3.amazonaws.com/my-bucket/picture.png'
-
-The destination path is constructed thus: http://s3.amazonaws.com/ + bucket name + key
+TODO
 
 == FAQ
 

data/lib/ThreeStore.rb

@@ -1,30 +1,23 @@
 require 'open-uri'
 require 'aws/s3'
-require 'digest/md5'
 autoload :VERSION, "ThreeStore/version"
 
+# maybe a class:
+# def initalize(key, secret, bucket)
 class ThreeStore
   def initialize(key, secret, bucket)
     AWS::S3::Base.establish_connection!(:access_key_id => key, :secret_access_key => secret)
     @bucket = bucket
   end
 
-  # Options: url (required),
-  #          content_type,
-  #          access_level,
-  #          key (destination on s3)
-
-  def store_on_s3(options)
-    # Deleting :url from options because we don't want it in the options that we pass to s3
-    # and removing some characters that aren't allowed in urls
-    url = options.delete(:url).gsub(/ /, '%20').gsub(/\^/, '%5E')
+  def store_on_s3(url)
+    url.gsub!(/ /, '%20')
     file = open(url)
+    AWS::S3::S3Object.store(url, file.read, @bucket)
+  end
     
-    key = options.delete(:key)
 
-    AWS::S3::S3Object.store(key, file, @bucket, options)
-
-    # Return location on s3
-    "http://s3.amazonaws.com/" + @bucket + "/" + key
-  end
+  # store method should return location of thing being stored
+  # maybe also add a hexdigest to the name
+  # def store(url)
 end

data/lib/ThreeStore/version.rb

@@ -1,3 +1,3 @@
 module Threestore
-  VERSION = "0.0.1.b"
+  VERSION = "0.0.1"
 end

data/spec/lib/ThreeStore_spec.rb

@@ -1,15 +1,10 @@
 require 'spec_helper'
-require 'yaml'
 
 describe ThreeStore do
+  
   before(:all) do
-    @yaml = YAML.load_file('ThreeStore.yml')
-    @test_bucket = @yaml[:test_bucket]
-    @store = ThreeStore.new(@yaml[:access_key_id], @yaml[:secret_access_key], @test_bucket)
-  end
-
-  after(:all) do
-    AWS::S3::Bucket.find(@test_bucket).clear
+    @test_bucket = 'hedgeye-test-bucket-3'
+    @store = ThreeStore.new(ENV['S3_KEY'], ENV['S3_SECRET'], @test_bucket)
   end
 
   it "should establish a connection with s3" do
@@ -17,21 +12,16 @@ describe ThreeStore do
   end
 
   it "should put a given file on s3" do
-    url = @yaml[:test_image]
-    s3_object_path = @store.store_on_s3(:url => url, :key => "hedgeye-button-sprite.png", :access => 'public-read')
+    url = "http://app.quotemedia.com/quotetools/getChart.go?webmasterId=98924&symbol=COMP&chsym=Nasdaq%20Comp&chscale=5d&chtype=AreaChart&chfrmon=on&chfrm=ffffff&chbdron=on&chbdr=cccccc&chbg=ffffff&chbgch=ffffff&chln=465665&chfill=1B57AA&chfill2=c0c9d2&chgrdon=on&chgrd=cccccc&chton=on&chtcol=000000&chxyc=111111&chpcon=on&chpccol=ee0000&chmrg=2&chhig=250&chwid=380"
 
-    open(s3_object_path).read.should == open(url).read
+    @store.store_on_s3(url)
+    AWS::S3::S3Object.exists?(url, @test_bucket).should be_true
   end
 
-  # Regression test because quotemedia urls have spaces and carets for some reason.
-  it "should be able to prcess urls with spaces and carets" do
-    url = "http://app.quotemedia.com/quotetools/getChart.go?webmasterId=500&symbol=^DOW&chsym=^DOW Comp" +
-          "&chscale=5d&chtype=AreaChart&chfrmon=on&chfrm=ffffff&chbdron=on&chbdr=cccccc&chbg=ffffff" +
-          "&chbgch=ffffff&chln=465665&chfill=1B57AA&chfill2=c0c9d2&chgrdon=on&chgrd=cccccc&chton=on" +
-          "&chtcol=000000&chxyc=111111&chpcon=on&chpccol=ee0000&chmrg=2&chhig=250&chwid=380"
-
-    s3_object_path = @store.store_on_s3(:url => url, :key => "quotemedia_chart.png", :content_type => 'image/png', :access => 'public-read')
+  it "should function with a url containing spaces" do
+    url = "http://app.quotemedia.com/quotetools/getChart.go?webmasterId=98924&symbol=COMP&chsym=Nasdaq Comp&chscale=5d&chtype=AreaChart&chfrmon=on&chfrm=ffffff&chbdron=on&chbdr=cccccc&chbg=ffffff&chbgch=ffffff&chln=465665&chfill=1B57AA&chfill2=c0c9d2&chgrdon=on&chgrd=cccccc&chton=on&chtcol=000000&chxyc=111111&chpcon=on&chpccol=ee0000&chmrg=2&chhig=250&chwid=380"
 
-    open(s3_object_path).should be_true
+    @store.store_on_s3(url)
+    AWS::S3::S3Object.exists?(url, @test_bucket).should be_true
   end
 end

metadata

@@ -1,80 +1,57 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ThreeStore
-version: !ruby/object:Gem::Version 
-  hash: 47
-  prerelease: 6
-  segments: 
-  - 0
-  - 0
-  - 1
-  - b
-  version: 0.0.1.b
+version: !ruby/object:Gem::Version
+  version: 0.0.1
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Chenoa Siegenthaler
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-06 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-30 00:00:00.000000000 -05:00
+default_executable: 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: aws-s3
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2156749340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2156749340
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2156748840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 9
-        - 2
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.9.2.2
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2156748840
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2156748340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 5
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.5.0
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *2156748340
 description: Get files from a url and store them on s3
-email: 
+email:
 - cowmanifestation@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .travis.yml
@@ -86,41 +63,31 @@ files:
 - lib/ThreeStore/version.rb
 - spec/lib/ThreeStore_spec.rb
 - spec/spec_helper.rb
+has_rdoc: true
 homepage: http://github.com/cowmanifestation/threestore
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: ThreeStore
-rubygems_version: 1.8.5
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Get files from a url and store them on s3
-test_files: 
+test_files:
 - spec/lib/ThreeStore_spec.rb
 - spec/spec_helper.rb