review_and_approve 0.0.4 → 0.0.5

data/README.md

@@ -35,7 +35,10 @@ end
 
 To mark existing data as published:
 
-    $ bundle exec rake review_and_approve:create_caches
+    $ bundle exec rake review_and_approve:create_caches 
+      # => Marks all records of all classes using review_and_approve as published
+    $ bundle exec rake review_and_approve:create_caches[Product, AnotherClass]
+      # => Only mark the records for listed classes
 
 Use Cancan or other authorization mechanism to define a custom ability to 'publish' the records
 Make sure your controller has access to current_ability method and it returns true or false on can? :publish, @product
@@ -74,9 +77,9 @@ A method called `published_version` is defined on the model that provides access
   check out delta.css in the gem and override the styles in your application
 ```
 
-## Limitations
+## Limitations and Warnings
 * only certified on Rails 3.1, ruby 1.9.2
-* Currently depends on the application to call attr_accessible
+* Currently depends on the application to set up attr_accessible properly, else all mass-assignment would be disabled (You *should* have attr_accessible set up on rails 3.x anyway)
 
 
 ## Contributing
@@ -84,5 +87,6 @@ A method called `published_version` is defined on the model that provides access
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+4. Run all tests to confirm they pass (`bundle exec rake`)
+5. Push to the branch (`git push origin my-new-feature`)
+6. Create new Pull Request

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

@@ -10,15 +10,20 @@
         <th scope="col" class="rounded-q4">Current Value</th>
       </tr>
     </thead>
-    <% diff_keys.each do |key| %>
+
     <tbody>
-      <tr>
-        <td><%= key %></td>
-        <td><%= published[key] || "<BLANK>" %></td>
-        <td><%= current[key] || "<BLANK>" %></td>
-      </tr>
+      <% 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} %>
+      <% end %>
     </tbody>
-    <% end %>
+
   </table>
 <% else %>
   Latest version is published

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

@@ -0,0 +1,30 @@
+<% 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>
+  <% 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 %>
+  <% 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 %> 

data/lib/review_and_approve/model_additions.rb

@@ -34,12 +34,12 @@ module ReviewAndApprove
       send(:define_method, :review_and_approve_after_save_callback) do |publish = false|
         published = self.send(field) || publish
         #If we are publishing the record
-        if published and (published==true or published=="true" or self.send(field).to_i>0 rescue false) #in case the field gets set to "0" and "1"
+        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
-            CacheRecord.find_or_initialize_by_key(key_proc.call(self, method)).tap do |cr|
-              cr.cache_data =  self.send(method)
-            end.save
+            cr = CacheRecord.find_or_initialize_by_key(key_proc.call(self, method))
+            cr.cache_data =  self.send(method)
+            cr.save
           end
         end
 
@@ -58,7 +58,7 @@ module ReviewAndApprove
       validates_each field do |record, attr, value|
         able = Thread.current[:reviewAndApprove_current_ability].try(:can?, :publish, record)
         # if user can not publish the record, create an error.
-        if !able and value and (value==true or value=="true" or value.to_i>0 rescue false)
+        if !able and value and (value==true or value=="true" or value=="on" or value.to_i>0 rescue false)
           record.errors[attr] << "can not be marked as true by this user"
         end
       end

data/lib/review_and_approve/version.rb

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

data/lib/tasks/review_and_approve.rake

@@ -1,10 +1,18 @@
 desc 'Create caches for existing data'
 namespace :review_and_approve do
-  task :create_caches => :environment do
+  task :create_caches, [:arg1, :arg2, :arg3, :arg4, :arg5] => :environment do |t, args|
     puts "In review_and_approve:create_caches"
-    ActiveRecord::Base.subclasses.select{|model| 
-      model._using_rev_app? rescue false
-      }.each do |model|
+    
+    models = []
+    if args.count > 0
+      models = args.map{|k,v| v.constantize rescue nil}.compact
+    else
+      models = ActiveRecord::Base.subclasses.select{|model| 
+        model._using_rev_app? rescue false
+      }
+    end
+
+    models.each do |model|
       
       puts "Processing #{model.name}"
       model.find_each do |obj|

metadata

@@ -2,7 +2,7 @@
 name: review_and_approve
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Paramveer Singh
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-20 00:00:00 Z
+date: 2013-05-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -113,6 +113,7 @@ files:
 - app/assets/stylesheets/review_and_approve/application.css
 - app/assets/stylesheets/review_and_approve/delta.css
 - app/views/review_and_approve/_delta.html.erb
+- app/views/review_and_approve/_line_item.html.erb
 - lib/generators/review_and_approve/install/install_generator.rb
 - lib/generators/review_and_approve/install/templates/create_cache_records.rb
 - lib/review_and_approve/cache_record.rb