infopark_reactor 1.7.2 → 1.8.0

data/lib/reactor/permission.rb

@@ -40,6 +40,14 @@ module Reactor
         return super
       end
 
+      # Wraps around Reactor::Persistence::Base#revert! and ensures
+      # that current user has required permissions to revert the object
+      # @raise [Reactor::NotPermitted] user lacks neccessary permission
+      def revert!
+        ensure_permission_granted(:revert)
+        return super
+      end
+
       # Wraps around Reactor::Persistence::Base#edit! and ensures
       # that current user has required permissions to edit the object
       # @raise [Reactor::NotPermitted] user lacks neccessary permission
@@ -145,6 +153,11 @@ module Reactor
         write?(user)
       end
 
+      # @see #write?
+      def revert?(user = nil)
+        write?(user)
+      end
+
       # @see #write?
       def edit?(user = nil)
         write?(user)

data/lib/reactor/persistence.rb

@@ -34,6 +34,23 @@ module Reactor
         return false
       end
 
+      # Removes the working version of the object,
+      # if it exists
+      # @return [true]
+      def revert
+        return revert!
+      end
+
+      # Removes the working version of the object,
+      # if it exists
+      # @return [true]
+      # @note There is no difference between #revert and #revert!
+      def revert!
+        crul_obj.revert!
+        reload
+        return true
+      end
+
       # Releases the object. Returns true on succes, can raise exceptions
       # @raise [Reactor::AlreadyReleased]
       # @raise [ActiveRecord::RecordInvalid] validations failed
@@ -157,7 +174,7 @@ module Reactor
         clear_aggregation_cache
         clear_association_cache
         fresh_object = Obj.find(self.id, options)
-        @attributes.update(fresh_object.instance_variable_get('@attributes'))
+        @attributes = fresh_object.instance_variable_get('@attributes')
         @attributes_cache = {}
         # RC reload
         @attr_values = nil
@@ -309,7 +326,8 @@ module Reactor
       end
 
       def crul_obj
-        @crul_obj ||= Reactor::Cm::Obj.get(obj_id)
+        #@crul_obj ||= Reactor::Cm::Obj.get(obj_id)
+        @crul_obj ||= Reactor::Cm::Obj.load(obj_id)
       end
 
       def crul_obj_delete
@@ -457,7 +475,6 @@ module Reactor
         end
 
         instance = self.create!(attributes)# do |instance|
-          #debugger
           instance.upload(data_or_io, extension)
           instance.save!
         #end

data/lib/reactor/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module Reactor
-  VERSION = "1.7.2"
+  VERSION = "1.8.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: infopark_reactor
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 55
   prerelease: 
   segments: 
   - 1
-  - 7
-  - 2
-  version: 1.7.2
+  - 8
+  - 0
+  version: 1.8.0
 platform: ruby
 authors: 
 - Tomasz Przedmojski
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-14 00:00:00 +01:00
+date: 2013-03-25 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency