ixtlan-core 0.4.0 → 0.4.1

data/lib/generators/rails/erb/scaffold/index.html.erb

@@ -29,7 +29,7 @@
 <%% if allowed?(:<%= table_name %>, :destroy) %>
 <% end -%>
     <td><% if options[:optimistic] && options[:timestamps] -%>
-<%%= link_to 'Destroy', <%= singular_table_name %>_path(<%= singular_table_name %>) + "?<%= singular_table_name %>[updated_at]=#{<%= singular_table_name %>.updated_at.utc.strftime('%Y-%m-%d %H:%M:%S.%N')}", :confirm => 'Are you sure?', :method => :delete %><% else -%><%%= link_to 'Destroy', <%= singular_table_name %>, :confirm => 'Are you sure?', :method => :delete %>
+<%%= link_to 'Destroy', <%= singular_table_name %>_path(<%= singular_table_name %>) + "?<%= singular_table_name %>[updated_at]=#{<%= singular_table_name %>.updated_at.utc.strftime('%Y-%m-%d %H:%M:%S') + ("%06d" % <%= singular_table_name %>.updated_at.utc)}", :confirm => 'Are you sure?', :method => :delete %><% else -%><%%= link_to 'Destroy', <%= singular_table_name %>, :confirm => 'Are you sure?', :method => :delete %>
 <% end -%></td>
 <% if defined? ::Ixtlan::Guard -%>
 <%% end %>

data/lib/ixtlan/core/optimistic_active_record.rb

@@ -7,7 +7,8 @@ module Ixtlan
           def self.optimistic_find(updated_at, *args)
             updated_at_date = new(:updated_at => updated_at).updated_at
             # try different ways to use the date
-            first(:conditions => ["id = ? and updated_at = ?", args[0], updated_at_date]) || first(:conditions => ["id = ? and updated_at = ?", args[0], updated_at])
+            # TODO maybe there is a nicer way ??
+            first(:conditions => ["id = ? and updated_at <= ? and updated_at >= ?", args[0], updated_at, updated_at_date - 0.001]) || first(:conditions => ["id = ? and updated_at <= ? and updated_at >= ?", args[0], updated_at_date, updated_at_date - 0.001])
             # TODO make it work with different PKs
           end
         end

metadata

@@ -2,7 +2,7 @@
 name: ixtlan-core
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
   - mkristian
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-23 00:00:00 +05:30
+date: 2011-07-24 00:00:00 +05:30
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency