haraway 0.1.0.dev.46 → 0.1.0.dev.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cc9e079d245eac803a6f5ad0767cbc9f1fff7f8
-  data.tar.gz: d686d738f27090974f51e11ce4ed39e353a25fb9
+  metadata.gz: a5c551d80699f6209c2e7ec9e66e02c04eccb5a0
+  data.tar.gz: 3c756a320f549230206f99f9d791416f43b97286
 SHA512:
-  metadata.gz: 11a11a38c7b36f90467f531442c36d97ad957995b6175825ca84f742e8e23dc4731e86f942614672d99c7bb96f21e99800d89fac16ffe20f99a49c9aadb4188e
-  data.tar.gz: 2ed68a6c0b604311be44c62340f244bb260feb1e2ca897c30aec1c21ab40d726f8dc7a61cdaef4d05e1ec6ae7eb4d553b65744744b72b0880f265e52fe435d45
+  metadata.gz: 4be6b6917602ab8d490e9615e7092249b38a95cbf9dbf2a1915cc363deed57d460c1f8f6eedf7434200a76f9b2bda94d1440f39b211c8506074d043608585114
+  data.tar.gz: a29cf0aee875795c7403fe32a79b5e87589de6ab50d0eff9043360d0ac66a9198a6b666261b27bbde2ae7094e71a867a6a7b9f35b1d1040e626d2404c00b900d

data/lib/haraway/active_record/asset.rb

@@ -13,6 +13,10 @@ class Haraway::ActiveRecord::Asset
     !!@_destroy
   end
 
+  def destroy!
+    @_destroy = true
+  end
+
   def url(version=nil)
     if version.nil?
       self.url("original")
@@ -29,6 +33,13 @@ class Haraway::ActiveRecord::Asset
     @attributes = attributes.except(:id, :_destroy)
   end
 
+  def attributes
+    attributes = @attributes.dup
+    attributes[:id] = @id
+    attributes[:_destroy] = true if @_destroy
+    attributes.with_indifferent_access
+  end
+
   def method_missing(m, *a, &b)
     case m.to_s
 

data/lib/haraway/active_record/macro.rb

@@ -106,7 +106,14 @@ private
         end
 
         def #{name}=(value)
-          haraway_write_assets(#{name.inspect}, [value])
+          values = [value]
+
+          haraway_read_assets(#{name.inspect}).each do |old_asset|
+            old_asset.destroy!
+            values.push(old_asset.attributes)
+          end
+
+          haraway_write_assets(#{name.inspect}, values)
         end
 
         self

data/lib/haraway/config.rb

@@ -37,11 +37,8 @@ class Haraway::Config
       @config.secret_key = v
     end
 
-    def pusher_key=(v)
-      @config.pusher_key = v
-    end
-
     def profile(name, &block)
+      name = name.to_s
       profile = Haraway::Profile.new(name, &block)
       @config.profiles[name] = profile
     end

data/lib/haraway/deleter.rb

@@ -13,9 +13,10 @@ class Haraway::Deleter
     token = creds.make_authentication_message("manager")
 
     Net::HTTP.start("api."+@config.endpoint, :use_ssl => @config.use_ssl) do |http|
-      req = Net::HTTP::Post.new("/v1/#{@config.access_key}/delete?token="+token)
+      req = Net::HTTP::Post.new("/delete")
       req["Content-Type"] = "text/json; charset=utf-8"
-      req.body = JSON.dump(@assets)
+      req["Authorization"] = "haraway-token #{token}"
+      req.body = JSON.dump({ :asset_ids => @assets })
 
       resp = http.request(req)
       if resp.code != "200"

data/lib/haraway/lib_version.rb

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

data/lib/haraway/profile.rb

@@ -26,6 +26,7 @@ class Haraway::Profile
     end
 
     def version(name, &block)
+      name = name.to_s
       version = Haraway::Version.new(name, &block)
       version.validate!
       @profile.versions[name] = version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haraway
 version: !ruby/object:Gem::Version
-  version: 0.1.0.dev.46
+  version: 0.1.0.dev.47
 platform: ruby
 authors:
 - Simon Menke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2014-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler