haraway 0.1.0.dev.42 → 0.1.0.dev.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1afabdbd3be764cd7e82ebc8b19c3810b9381ad2
-  data.tar.gz: 154d53b45fe5413401667a5ce6ab3e5bfe23c728
+  metadata.gz: c42a03882347769823295c1322c0c0638dd68919
+  data.tar.gz: bae0d2c6b482c4e0ce7ed6afc917ec8c579a309a
 SHA512:
-  metadata.gz: 6356ca1f05064fc11b7819b30c0677406115cca1688fc56cf9206e68e07c835b52831fed040dc2f39cf79a946ba1fc7e40737777fa89724071211f416e232162
-  data.tar.gz: 7a65f08c212a0442663fbc1d7a47d66485266dbb192f903fc81f5de2ffde40226d08ab912a5dc92b26fe204b20249b6e11d8fa3920df7e28178ced2a42e77c17
+  metadata.gz: 428009490c6595b716f286eecce7d5f6caf1090af9a0b7c5f62d51981dec5a12cace72efbfdcaad0ca9cae148a5d4b7011f89e6dd1f9f84f5e402e4d2c177967
+  data.tar.gz: 7d91576d51de903a766579e24881f82fdfe2ded20765a7a1de3a9272382afc4909ae91cd0311f36ba0a99b75ba532a69960999f2a546768c7fd288d01943d51b

data/lib/haraway.rb

@@ -9,6 +9,8 @@ module Haraway
   require "haraway/deployer"
   require "haraway/committer"
   require "haraway/deleter"
+  require "haraway/ingress"
+  require "haraway/json_stream_reader"
 
   begin # Load the Rails adapter
     require "rails/engine"

data/lib/haraway/active_record/macro.rb

@@ -154,7 +154,6 @@ private
       end
 
       if asset_ids.size > 0
-        puts "asset_ids=#{asset_ids.inspect}"
         Haraway::Committer.new(Haraway.configuration, asset_ids).commit!
         @_haraway_uploaded_assets = nil
       end

data/lib/haraway/deployer.rb

@@ -29,9 +29,8 @@ private
         raise "Deploy failed: #{resp.code} #{resp.message}\n#{resp.body}"
       end
 
-      resp.read_body do |segment|
-        segment.gsub!("\x00", "")
-        $stdout.print segment
+      Haraway::JsonStreamReader.read(resp) do |msg|
+        $stdout.puts msg.inspect
         $stdout.flush
       end
 

data/lib/haraway/ingress.rb

@@ -0,0 +1,50 @@
+class Haraway::Ingress
+
+  def initialize(config)
+    @config = config
+  end
+
+  def ingest_url(url, profile)
+    metadata = nil
+
+    creds = @config.credentials
+    token = creds.make_authentication_message("uploader")
+
+    call do |http|
+      req = Net::HTTP::Post.new("/upload")
+      req.set_form_data({
+        "token"   => token,
+        "profile" => profile.to_s,
+        "src_url" => url.to_s
+      })
+
+      http.request(req) do |resp|
+        if resp.code != "200"
+          raise "Upload failed: #{resp.code} #{resp.message}\n#{resp.body}"
+        end
+
+        Haraway::JsonStreamReader.read(resp) do |msg|
+          if msg["success"] == true
+            metadata = msg["metadata"] || {}
+            metadata["id"] = msg["id"]
+          end
+        end
+      end
+    end
+
+    if metadata == nil
+      raise "Upload failed"
+    end
+
+    return metadata
+  end
+
+private
+
+  def call
+    Net::HTTP.start("api."+@config.endpoint, :use_ssl => @config.use_ssl) do |http|
+      yield(http)
+    end
+  end
+
+end

data/lib/haraway/json_stream_reader.rb

@@ -0,0 +1,23 @@
+module Haraway::JsonStreamReader
+
+  require 'json'
+
+  def self.read(resp, &block)
+    buffer = ""
+
+    resp.read_body do |segment|
+      buffer.concat segment
+
+      while idx = buffer.index("\n")
+        chunk  = buffer[0...idx]
+        buffer = buffer[(idx+1)..-1]
+
+        if chunk.size > 0
+          msg = JSON.load(chunk)
+          yield(msg)
+        end
+      end
+    end
+  end
+
+end

data/lib/haraway/lib_version.rb

@@ -1,6 +1,6 @@
 module Haraway
   VERSION = "0.1.0"
-  BUILD   = "42"
+  BUILD   = "45"
 
   if BUILD != ("{{BUILD_NUMBER" + "}}") # prevent sed replacement (see script/ci)
     BUILD_VERSION = "#{VERSION}.dev.#{BUILD}"

data/lib/haraway/tags_helper.rb

@@ -3,7 +3,7 @@ module Haraway::TagsHelper
   def self.render(config, ttl=nil)
     creds  = config.credentials
     scheme = config.use_ssl ? "https" : "http"
-    ttl    = ttl || 900
+    ttl    = ttl || 14400
 
     mac = creds.make_authentication_message("uploader", (Time.now + ttl).to_i)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haraway
 version: !ruby/object:Gem::Version
-  version: 0.1.0.dev.42
+  version: 0.1.0.dev.45
 platform: ruby
 authors:
 - Simon Menke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,8 @@ files:
 - lib/haraway/deployer.rb
 - lib/haraway/formtastic.rb
 - lib/haraway/formtastic/inputs_helper.rb
+- lib/haraway/ingress.rb
+- lib/haraway/json_stream_reader.rb
 - lib/haraway/lib_version.rb
 - lib/haraway/profile.rb
 - lib/haraway/rails.rb