all_seeing_pi 0.0.1 → 0.0.2

data/.gitignore

@@ -1,2 +1,19 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
 test/fixtures/vcr_cassettes/
 test/aws.yml

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    all_seeing_pi (0.0.1)
+    all_seeing_pi (0.0.2)
       aws-sdk
 
 GEM

data/lib/all_seeing_pi.rb

@@ -1,14 +1,14 @@
 require "all_seeing_pi/version"
-require "all_seeing_pi/palantir"
+require "all_seeing_pi/golem"
 require "all_seeing_pi/camera"
 require "all_seeing_pi/uploader"
 
 module AllSeeingPi
   def self.watch
-    palantir = AllSeeingPi::Palantir.new
+    golem = AllSeeingPi::Golem.new
 
     loop do
-      palantir.spy
+      golem.spy
     end
   end
 end

data/lib/all_seeing_pi/{palantir.rb → golem.rb}

@@ -2,7 +2,7 @@ require 'all_seeing_pi/camera'
 require 'all_seeing_pi/uploader'
 
 module AllSeeingPi
-  class Palantir
+  class Golem
     attr_reader :camera, :uploader
 
     def initialize

data/lib/all_seeing_pi/uploader.rb

@@ -2,7 +2,7 @@ require 'aws-sdk'
 
 module AllSeeingPi
   class Uploader
-    BUCKET = 'all_seeing_pi'
+    BUCKET_PREFIX = 'all_seeing_pi'
 
     attr_reader :s3
 
@@ -12,10 +12,25 @@ module AllSeeingPi
 
     def upload(image_path)
       buckets = s3.buckets
-      buckets.create(BUCKET) unless buckets[BUCKET].exists?
+
+      bucket_name = fetch_or_create_bucket_name(buckets)
+      buckets.create(bucket_name) unless buckets[bucket_name].exists?
 
       filename = File.basename(image_path)
-      buckets[BUCKET].objects[filename].write(:file => image_path)
+      buckets[bucket_name].objects[filename].write(:file => image_path)
+    end
+
+    def fetch_or_create_bucket_name(buckets)
+      bucket_name = buckets.map do |bucket|
+        name = bucket.name
+        name if name.match /all_seeing_pi/
+      end.compact.first
+
+      bucket_name ||= "#{BUCKET_PREFIX}_#{bucket_id}"
+    end
+
+    def bucket_id
+      Time.now.to_f.to_s.split('.').join.to_i
     end
   end
 end

data/lib/all_seeing_pi/version.rb

@@ -1,3 +1,3 @@
 module AllSeeingPi
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/test/test_palantir.rb

@@ -1,32 +1,32 @@
 require 'test_helper'
 
-class PalantirTest < MiniTest::Unit::TestCase
+class GolemTest < MiniTest::Unit::TestCase
   def setup
     @fixture = 'test/fixtures/eye_of_sauron.jpg'
-    @palantir = AllSeeingPi::Palantir.new
+    @golem = AllSeeingPi::Golem.new
   end
 
   def test_spy_sends_capture_to_the_camera
-    @palantir.stubs(:store_image)
+    @golem.stubs(:store_image)
     FileUtils.stubs(:rm)
 
-    @palantir.camera.expects(:capture).returns(@fixture)
-    @palantir.spy
+    @golem.camera.expects(:capture).returns(@fixture)
+    @golem.spy
   end
 
   def test_store_image
-    @palantir.camera.stubs(:capture).returns(@fixture)
+    @golem.camera.stubs(:capture).returns(@fixture)
     FileUtils.stubs(:rm)
 
-    @palantir.uploader.expects(:upload).with(@fixture)
-    @palantir.spy
+    @golem.uploader.expects(:upload).with(@fixture)
+    @golem.spy
   end
 
   def test_spy_deletes_the_image
-    @palantir.camera.stubs(:capture).returns(@fixture)
-    @palantir.stubs(:store_image)
+    @golem.camera.stubs(:capture).returns(@fixture)
+    @golem.stubs(:store_image)
 
     FileUtils.expects(:rm).with(@fixture)
-    @palantir.spy
+    @golem.spy
   end
 end

data/test/test_uploader.rb

@@ -3,12 +3,22 @@ require 'test_helper'
 class UploaderTest < MiniTest::Unit::TestCase
   def setup
     @fixture = 'test/fixtures/eye_of_sauron.jpg'
+    @filename = File.basename(@fixture)
     @uploader = AllSeeingPi::Uploader.new
+    @bucket_name = AllSeeingPi::Uploader::BUCKET_PREFIX
   end
 
   def test_upload
-    VCR.use_cassette('uploader') do
+    VCR.use_cassette('uploader_test_upload') do
       @uploader.upload(@fixture)
+      assert @uploader.s3.buckets[@bucket_name].objects[@filename].exists?, "#{@fixture} was not uploaded."
+    end
+  end
+
+  def test_fetch_or_create_bucket_name
+    VCR.use_cassette('uploader_test_fetch_or_create_bucket_name') do
+      name = @uploader.fetch_or_create_bucket_name(@uploader.s3.buckets)
+      assert_match /#{@bucket_name}/, name
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: all_seeing_pi
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-02 00:00:00.000000000 Z
+date: 2014-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -141,7 +141,7 @@ files:
 - capture.sh
 - lib/all_seeing_pi.rb
 - lib/all_seeing_pi/camera.rb
-- lib/all_seeing_pi/palantir.rb
+- lib/all_seeing_pi/golem.rb
 - lib/all_seeing_pi/uploader.rb
 - lib/all_seeing_pi/version.rb
 - test/fixtures/eye_of_sauron.jpg