haraway 0.1.0.dev.48 → 0.1.0.dev.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb60ec484eb10fe2076801520baa6163341f543c
-  data.tar.gz: e9cbf19c70e7f1a9f4d135cfb75175835b67a48e
+  metadata.gz: 0ba9179cdab2390040d9917b2075bf672916b7f5
+  data.tar.gz: 5bebe1c3091291de9a173ff31479a7582ce6119f
 SHA512:
-  metadata.gz: 3deb0480ab6495742a4da222f66de30fc635f3c940c69c98f98bb788c9f8b12e5376f197723916ef8b33a217d8da63308a7226b60d02f3633b4cfb9042eb8d71
-  data.tar.gz: 98da395867e5fa3bb025b883320008950f02f76f7a7e98f550a7a40259fbbb3de21f42cf0940d073d168e5acca0d73402e27b3b49d9016c7be899adffbf67a6e
+  metadata.gz: d2e8f4dfc088838c5b06dd19f719e915dccd1a3e20a2a0989a40c35bb3bfc099d5a7a95b255bc89809e46d5626c6bb407bd698e86ed1043ed60beb27824f8654
+  data.tar.gz: ddb81fd73cf922ef96e2231bca8cc7b4bbb110fecda089af1698298e432486ebb5c18dd9effe7ace24ff25d9afbfcb5f0c95cbcedf7abf2dbd019591fb4e6930

data/lib/haraway/active_record/asset.rb

@@ -29,7 +29,7 @@ class Haraway::ActiveRecord::Asset
   end
 
   def update_attributes(attributes)
-    @_destroy = (attributes[:_destroy] == "t" || attributes[:_destroy] == "1" || attributes[:_destroy] == 1)
+    @_destroy = (attributes[:_destroy] == "t" || attributes[:_destroy] == "1" || attributes[:_destroy] == 1 || attributes[:_destroy] == true)
     @attributes = attributes.except(:id, :_destroy)
   end
 

data/lib/haraway/active_record/macro.rb

@@ -10,8 +10,8 @@ private
     new_assets = []
 
     attributes.each do |attrs|
-      asset_id  = attrs[:id]
-      asset = old_assets.delete(asset_id)
+      asset_id = attrs[:id]
+      asset    = old_assets.delete(asset_id)
 
       if asset_id.blank? or asset_id == "undefined"
         next
@@ -74,6 +74,8 @@ private
 
       haraway_assets[name] = defn
 
+      attr_accessible name
+
       include Haraway::ActiveRecord::Macro::MetaData
 
       include Module.new.class_eval <<-RUBY, __FILE__, __LINE__+1
@@ -98,6 +100,8 @@ private
 
       haraway_assets[name] = defn
 
+      attr_accessible name
+
       include Haraway::ActiveRecord::Macro::MetaData
 
       include Module.new.class_eval <<-RUBY, __FILE__, __LINE__+1
@@ -107,13 +111,7 @@ private
         end
 
         def #{name}=(value)
-          values = [value]
-
-          haraway_read_assets(#{name.inspect}).each do |old_asset|
-            old_asset.destroy!
-            values.push(old_asset.attributes)
-          end
-
+          values = [value].compact
           haraway_write_assets(#{name.inspect}, values)
         end
 
@@ -167,10 +165,12 @@ private
         Haraway::Committer.new(Haraway.configuration, asset_ids).commit!
         @_haraway_uploaded_assets = nil
       end
+
+      nil
     end
 
     def delete_haraway_assets
-      return self.haraway_deleted_assets.blank?
+      return if self.haraway_deleted_assets.blank?
 
       asset_ids = []
 
@@ -182,6 +182,8 @@ private
         Haraway::Deleter.new(Haraway.configuration, asset_ids).delete!
         @_haraway_deleted_assets = nil
       end
+
+      nil
     end
 
   end

data/lib/haraway/lib_version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haraway
 version: !ruby/object:Gem::Version
-  version: 0.1.0.dev.48
+  version: 0.1.0.dev.50
 platform: ruby
 authors:
 - Simon Menke