all_seeing_pi 0.0.3 → 0.0.5

data/all_seeing_pi.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "mocha"
   spec.add_development_dependency "pry"
-  spec.add_development_dependency "vcr"
-  spec.add_development_dependency "webmock"
-  spec.add_runtime_dependency "aws-sdk"
+  spec.add_runtime_dependency "fog"
+  spec.add_runtime_dependency "phashion"
+  spec.add_runtime_dependency "httparty"
 end

data/capture.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-DATE=$(date +%Y-%m-%d_%H-%M-%S-%N)
+DATE=$(date +%Y-%m-%d-%H-%M-%S-%N)
 
 raspistill -vf -hf -t 0 -o $DATE.jpg
 echo $DATE.jpg

data/lib/all_seeing_pi.rb

@@ -1,5 +1,5 @@
 require "all_seeing_pi/version"
-require "all_seeing_pi/golem"
+require "all_seeing_pi/gollum"
 require "all_seeing_pi/camera"
 require "all_seeing_pi/uploader"
 require "all_seeing_pi/configuration"
@@ -19,10 +19,14 @@ module AllSeeingPi
   end
 
   def self.watch
-    golem = AllSeeingPi::Golem.new
+    golem = AllSeeingPi::Gollum.new
 
     loop do
       golem.spy
     end
   end
+
+  def self.report(msg)
+    puts msg unless ENV['ALL_SEEING_PI_ENV'] == 'test'
+  end
 end

data/lib/all_seeing_pi/camera.rb

@@ -1,7 +1,14 @@
 module AllSeeingPi
   class Camera
+    attr_reader :script
+
+    def initialize
+      path = '../../../capture.sh'
+      @script = AllSeeingPi.config[:capture_script] || File.expand_path(path, __FILE__)
+    end
+
     def capture
-      `./capture.sh`.strip
+      `#{script}`.strip
     end
   end
 end

data/lib/all_seeing_pi/configuration.rb

@@ -1,6 +1,6 @@
 module AllSeeingPi
   class Configuration
-    attr_accessor :aws_key, :aws_secret, :redis_host, :redis_password
+    attr_accessor :aws_key, :aws_secret, :palantir_url, :directory_name, :capture_script, :palantir_access_token
 
     def initialize
       reset!

data/lib/all_seeing_pi/gollum.rb

@@ -0,0 +1,52 @@
+require 'all_seeing_pi/camera'
+require 'all_seeing_pi/uploader'
+require 'phashion'
+require 'httparty'
+
+module AllSeeingPi
+  class Gollum
+    attr_reader :camera, :uploader
+
+    def initialize
+      @camera = AllSeeingPi::Camera.new
+      @uploader = AllSeeingPi::Uploader.new
+    end
+
+    def spy
+      image_path = @camera.capture
+      return unless File.exists?(image_path)
+
+      AllSeeingPi.report "Captured #{image_path}"
+
+      url = store_image(image_path)
+      phash = get_phash(image_path)
+      send_to_palantir(image_path, phash, url)
+
+      FileUtils.rm(image_path)
+    end
+
+    def get_phash(image_path)
+      Phashion::Image.new(image_path).fingerprint
+    end
+
+    def store_image(image_path)
+      @uploader.upload(image_path)
+    end
+
+    def send_to_palantir(image_path, phash, url)
+      data = {
+        :name => File.basename(image_path),
+        :phash => phash,
+        :url => url,
+        :directory_name => AllSeeingPi.config[:directory_name]
+      }
+
+      HTTParty.post(
+        "#{AllSeeingPi.config[:palantir_url]}/api/images",
+        :query => { :image => data, :access_token => AllSeeingPi.config[:palantir_access_token]}
+      )
+
+      AllSeeingPi.report "Sent to Palantir - name: #{data[:name]}, phash: #{data[:phash]}, directory: #{data[:directory_name]}"
+    end
+  end
+end

data/lib/all_seeing_pi/uploader.rb

@@ -1,36 +1,40 @@
-require 'aws-sdk'
+require 'fog'
 
 module AllSeeingPi
   class Uploader
-    BUCKET_PREFIX = 'all_seeing_pi'
+    DIRECTORY_PREFIX = 'all-seeing-pi'
 
-    attr_reader :s3
+    attr_reader :client
 
     def initialize
-      @s3 = AWS::S3.new
-      require 'pry'; binding.pry if $debug
+      @client = Fog::Storage.new(
+        provider: 'AWS',
+        aws_access_key_id: AllSeeingPi.config[:aws_key],
+        aws_secret_access_key: AllSeeingPi.config[:aws_secret]
+      )
     end
 
     def upload(image_path)
-      buckets = s3.buckets
+      directories = client.directories
 
-      bucket_name = fetch_or_create_bucket_name(buckets)
-      buckets.create(bucket_name) unless buckets[bucket_name].exists?
+      directory_name = fetch_or_create_directory_name(directories)
+      directory = directories.get(directory_name) || directories.create(key: directory_name)
 
       filename = File.basename(image_path)
-      buckets[bucket_name].objects[filename].write(:file => image_path)
+      image = directory.files.create(key: filename, body: File.open(image_path), public: true)
+      image.public_url
     end
 
-    def fetch_or_create_bucket_name(buckets)
-      bucket_name = buckets.map do |bucket|
-        name = bucket.name
-        name if name.match /all_seeing_pi/
+    def fetch_or_create_directory_name(directories)
+      directory_name = directories.map do |directory|
+        key = directory.key
+        key if key.match /#{DIRECTORY_PREFIX}/
       end.compact.first
 
-      bucket_name ||= "#{BUCKET_PREFIX}_#{bucket_id}"
+      AllSeeingPi.config[:directory_name] ||= "#{DIRECTORY_PREFIX}-#{directory_id}"
     end
 
-    def bucket_id
+    def directory_id
       Time.now.to_f.to_s.split('.').join.to_i
     end
   end

data/lib/all_seeing_pi/version.rb

@@ -1,3 +1,3 @@
 module AllSeeingPi
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
 end

data/test/test_gollum.rb

@@ -0,0 +1,81 @@
+require 'test_helper'
+require 'json'
+
+class GollumTest < MiniTest::Unit::TestCase
+  def setup
+    Fog.mock!
+    AllSeeingPi.config.load_config_from_file('test/all_seeing_pi.yml')
+
+    @fixture = 'test/fixtures/eye_of_sauron.jpg'
+    @filename = File.basename(@fixture)
+    @golem = AllSeeingPi::Gollum.new
+    @phash = @golem.get_phash(@fixture)
+    @palantir_url = 'http://all-seeing-pi.com/api/images'
+    @public_url = 'http://public-url.com'
+
+    @image_data = {
+      :name => @filename,
+      :phash => @phash,
+      :url => @public_url,
+      :directory_name => AllSeeingPi.config[:directory_name]
+    }
+    @token = AllSeeingPi.config[:palantir_access_token]
+  end
+
+  def test_spy_sends_capture_to_the_camera
+    @golem.stubs(:store_image)
+    FileUtils.stubs(:rm)
+    HTTParty.stubs(:post)
+
+    @golem.camera.expects(:capture).returns(@fixture)
+    @golem.spy
+  end
+
+  def test_store_image
+    @golem.camera.stubs(:capture).returns(@fixture)
+    FileUtils.stubs(:rm)
+    HTTParty.stubs(:post)
+
+    @golem.uploader.expects(:upload).with(@fixture)
+    @golem.spy
+  end
+
+  def test_spy_deletes_the_image
+    @golem.camera.stubs(:capture).returns(@fixture)
+    @golem.stubs(:store_image)
+    HTTParty.stubs(:post)
+
+    FileUtils.expects(:rm).with(@fixture)
+    @golem.spy
+  end
+
+  def test_spy_calculates_the_phash
+    @golem.camera.stubs(:capture).returns(@fixture)
+    FileUtils.stubs(:rm)
+    HTTParty.stubs(:post)
+
+    image = mock(:fingerprint)
+    Phashion::Image.expects(:new).with(@fixture).returns(image)
+    @golem.spy
+  end
+
+  def test_spy_sends_palantir_the_image_details
+    @golem.camera.stubs(:capture).returns(@fixture)
+    @golem.stubs(:store_image).returns(@public_url)
+    FileUtils.stubs(:rm)
+    HTTParty.stubs(:post)
+
+    @golem.expects(:send_to_palantir).with(@fixture, @phash, @public_url)
+    @golem.spy
+  end
+
+  def test_send_to_palantir_uses_uri_from_config
+    HTTParty.expects(:post).with( @palantir_url, { :query => { :image => @image_data, :access_token => @token } } )
+    @golem.send_to_palantir(@fixture, @phash, @public_url)
+  end
+
+  def test_send_to_palantir_posts_the_image_data
+    HTTParty.expects(:post).with( @palantir_url, { :query => { :image => @image_data, :access_token => @token } } )
+    @golem.send_to_palantir(@fixture, @phash, @public_url)
+  end
+end

data/test/test_helper.rb

@@ -2,18 +2,6 @@ require 'minitest/autorun'
 
 Bundler.require
 
-require 'vcr'
 require 'mocha'
 
-VCR.configure do |c|
-  c.cassette_library_dir = 'test/fixtures/vcr_cassettes'
-  c.hook_into :webmock
-end
-
-AllSeeingPi.config.load_config_from_file('test/all_seeing_pi.yml')
-
-AWS.config(
-  access_key_id: AllSeeingPi.config[:aws_key],
-  secret_access_key: AllSeeingPi.config[:aws_secret]
-)
 ENV['ALL_SEEING_PI_ENV'] = 'test'

data/test/test_uploader.rb

@@ -2,24 +2,28 @@ require 'test_helper'
 
 class UploaderTest < MiniTest::Unit::TestCase
   def setup
+    Fog.mock!
+    AllSeeingPi.config.load_config_from_file('test/all_seeing_pi.yml')
+
     @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_test_upload') do
-      @uploader.upload(@fixture)
-      assert @uploader.s3.buckets[@bucket_name].objects[@filename].exists?, "#{@fixture} was not uploaded."
-    end
+    @uploader.upload(@fixture)
+    assert @uploader.client.directories.get(AllSeeingPi.config[:directory_name]).files.head(@filename)
+  end
+
+  def test_upload_returns_public_url
+    regex = /#{AllSeeingPi::Uploader::DIRECTORY_PREFIX}.*\/#{@filename}/
+    public_url = @uploader.upload(@fixture)
+    assert public_url.match(regex), "Expected #{regex.inspect} to match #{public_url}"
   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
+  def test_fetch_or_create_directory_name
+    name = @uploader.fetch_or_create_directory_name(@uploader.client.directories)
+    assert_match /#{AllSeeingPi::Uploader::DIRECTORY_PREFIX}/, name
   end
 
   def test_uploader_uses_credentials_from_config

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: all_seeing_pi
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-05 00:00:00.000000000 Z
+date: 2014-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -76,14 +76,14 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: vcr
+  name: fog
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -92,14 +92,14 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: phashion
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -108,7 +108,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: httparty
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -142,15 +142,15 @@ files:
 - lib/all_seeing_pi.rb
 - lib/all_seeing_pi/camera.rb
 - lib/all_seeing_pi/configuration.rb
-- lib/all_seeing_pi/golem.rb
+- lib/all_seeing_pi/gollum.rb
 - lib/all_seeing_pi/uploader.rb
 - lib/all_seeing_pi/version.rb
 - test/fixtures/eye_of_sauron.jpg
 - test/test_all_seeing_pi.rb
 - test/test_camera.rb
 - test/test_configuration.rb
+- test/test_gollum.rb
 - test/test_helper.rb
-- test/test_palantir.rb
 - test/test_uploader.rb
 homepage: http://github.com/1337807/all_seeing_pi
 licenses:
@@ -182,7 +182,7 @@ test_files:
 - test/test_all_seeing_pi.rb
 - test/test_camera.rb
 - test/test_configuration.rb
+- test/test_gollum.rb
 - test/test_helper.rb
-- test/test_palantir.rb
 - test/test_uploader.rb
 has_rdoc: 

data/lib/all_seeing_pi/golem.rb

@@ -1,31 +0,0 @@
-require 'all_seeing_pi/camera'
-require 'all_seeing_pi/uploader'
-
-module AllSeeingPi
-  class Golem
-    attr_reader :camera, :uploader
-
-    def initialize
-      @camera = AllSeeingPi::Camera.new
-      @uploader = AllSeeingPi::Uploader.new
-    end
-
-    def spy
-      image_path = @camera.capture
-      return unless File.exists?(image_path)
-
-      report "Captured #{image_path}"
-
-      store_image(image_path)
-      FileUtils.rm(image_path)
-    end
-
-    def report(msg)
-      puts msg unless ENV['ALL_SEEING_PI_ENV'] == 'test'
-    end
-
-    def store_image(image_path)
-      @uploader.upload(image_path)
-    end
-  end
-end

data/test/test_palantir.rb

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