review_and_approve 0.0.5 → 0.0.6

data/README.md

@@ -60,16 +60,19 @@ review_and_approve :cache_key => Proc.new{|object, method_name| #Generate key st
 ```
 
 ### Showing differences from published version
-A method called `published_version` is defined on the model that provides access to cached methods as of the last published version. For example:
+Methods called `published_version` and `current_version` are defined on the model that provides access to cached methods as of the last published or current versions. For example:
 
 ```ruby
   @product.published_version(:as_json)   
   # => returns the as_json hash from the last time the product was published
 
+  @product.current_version(:as_json)
+  # => returns the as_json hash for the current iteration. It is advisable to use this to avoid getting bogged down by changes to date/time and other fields because of just saving and retrieving from your cache(i.e. database)
+
   # Rendering the differences
   render :partial => "review_and_approve/delta", 
     :locals => {:published => @product.published_version(:as_json),
-                 :current => @product.as_json}
+                 :current => @product.current_version(:as_json)}
   # Given two hashes (before/after), this will render the changes in a table
 
   #styling the differences

data/app/views/review_and_approve/_delta.html.erb

@@ -1,5 +1,6 @@
 <% published ||= {} %>
-<% diff_keys = published.diff(current).keys %>
+<% diff = ReviewAndApprove::HashDiff.diff(published,current) %>
+<% diff_keys = diff.keys %>
 <div class="review_and_approve">
 <% if diff_keys.count > 0 %>
   <table>
@@ -13,14 +14,7 @@
 
     <tbody>
       <% diff_keys.each do |key| %>
-        <tr>
-          <td><%= key rescue "" %></td>
-          <%# if !published.is_a? Hash and !published.is_a? Array %>
-            <td><%= published || "<BLANK>" %></td>
-            <td><%= current || "<BLANK>" %></td>
-          <%# end %>
-        </tr>
-        <%#= render :partial => 'review_and_approve/line_item', :locals => {:published => published[key], :current => current[key], :key => key, :depth => 0} %>
+        <%= render :partial => 'review_and_approve/line_item', :locals => {:key => key, :diff_val => diff[key], :depth => -1} %>
       <% end %>
     </tbody>
 

data/app/views/review_and_approve/_line_item.html.erb

@@ -1,30 +1,19 @@
-<% puts "in line item with" %>
-<% puts "published:#{published rescue ""}" %>
-<% puts "current:#{current rescue ""}" %>
-<% puts "key:#{key rescue ""}" %>
-<% current ||= {} %>
+
 <tr>
   <% (0..depth).each do %>
     <td></td>
   <% end %>
   <td><%= key rescue "" %></td>
-  <% if !published.is_a? Hash and !published.is_a? Array %>
-    <td><%= published || "<BLANK>" %></td>
-    <td><%= current || "<BLANK>" %></td>
+  <% if diff_val.is_a? Array  %>
+    <td><%= diff_val[0] || "<BLANK>" %></td>
+    <td><%= diff_val[1] || "<BLANK>" %></td>
   <% end %>
 </tr>
-<% if published.is_a? Array %>
-  <% published.each do |item| %>
-    <% if current. %>
-      <% pub = (published.include? item) ? item : nil %>
-      <% cur = (current.include? item) ? item : nil %>
-      <%= render :partial => 'review_and_approve/line_item', 
-        :locals => {:depth => depth+1, :published => pub, :current => cur} %>
-    <% end %>
+<% if diff_val.is_a? Hash %>
+  <% diff_val.keys.each do |key| %>
+    <%= render :partial => 'review_and_approve/line_item', :locals => {:key => key, :diff_val => diff_key[key], :depth => depth+1} %>
   <% end %>
-<% end %>
-<% if published.is_a? Hash %>
-  <% published.diff(current).keys.each do |key| %>
-    <%= render :partial => 'review_and_approve/line_item', :locals => {:published => published[key], :current => current[key], :key => key, :depth => depth+1} %>
-  <% end %>
-<% end %> 
+<% elsif !diff_val.is_a? Array or diff_val.length>2 %>
+  <% debugger %>
+  <% raise Exception.new %>
+<% end %>

data/lib/review_and_approve/hash_diff.rb

@@ -0,0 +1,18 @@
+module ReviewAndApprove
+  module HashDiff
+    def diff(orig, other)
+      (orig.keys + other.keys).uniq.inject({}) do |memo, key|
+        unless orig[key] == other[key]
+          if orig[key].kind_of?(Hash) &&  other[key].kind_of?(Hash)
+            memo[key] = ReviewAndApprove::HashDiff.diff(orig[key], other[key])
+          else
+            memo[key] = [orig[key], other[key]] 
+          end
+        end
+        memo
+      end
+    end
+
+    module_function :diff
+  end
+end

data/lib/review_and_approve/model_additions.rb

@@ -36,20 +36,32 @@ module ReviewAndApprove
         #If we are publishing the record
         if published and (published==true or published=="true" or published=="on" or self.send(field).to_i>0 rescue false) #in case the field gets set to "0" and "1"
           methods.each do |method|
-            # Refresh all caches
-            cr = CacheRecord.find_or_initialize_by_key(key_proc.call(self, method))
+            # Refresh published cache
+            cr = CacheRecord.find_or_initialize_by_key("#{key_proc.call(self, method)}_published_version")
             cr.cache_data =  self.send(method)
             cr.save
           end
         end
 
+        methods.each do |method|
+          #Refresh current value cache
+          cr = CacheRecord.find_or_initialize_by_key("#{key_proc.call(self, method)}_current_version")
+          cr.cache_data = self.send(method)
+          cr.save
+        end
+
         true
       end
 
       send(:define_method, :published_version) do |method_name|
-        CacheRecord.find_by_key(key_proc.call(self, method_name)).cache_data rescue nil
+        CacheRecord.find_by_key("#{key_proc.call(self, method_name)}_published_version").cache_data rescue nil
       end
 
+      send(:define_method, :current_version) do |method_name|
+        CacheRecord.find_by_key("#{key_proc.call(self, method_name)}_current_version").cache_data rescue nil
+      end
+
+
       send(:define_method, :mass_assignment_authorizer) do |role = :default|
         # force add the :publish attribute into attr_accessible
         super(role) + [field]

data/lib/review_and_approve/version.rb

@@ -1,3 +1,3 @@
 module ReviewAndApprove
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/review_and_approve.rb

@@ -5,6 +5,7 @@ require "review_and_approve/controller_additions"
 require "review_and_approve/railtie" if defined? Rails
 require 'active_record'
 require "review_and_approve/cache_record"
+require 'review_and_approve/hash_diff'
 
 module ReviewAndApprove
 

metadata

@@ -2,7 +2,7 @@
 name: review_and_approve
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Paramveer Singh
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-23 00:00:00 Z
+date: 2013-05-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -119,6 +119,7 @@ files:
 - lib/review_and_approve/cache_record.rb
 - lib/review_and_approve/controller_additions.rb
 - lib/review_and_approve/engine.rb
+- lib/review_and_approve/hash_diff.rb
 - lib/review_and_approve/model_additions.rb
 - lib/review_and_approve/railtie.rb
 - lib/review_and_approve/version.rb