resty-generators 0.7.1 → 0.7.2

data/lib/generators/resty/setup/templates/seeds.rb

@@ -6,7 +6,7 @@
 #   cities = City.create([{ :name => 'Chicago' }, { :name => 'Copenhagen' }])
 #   Mayor.create(:name => 'Daley', :city => cities.first)
 <% if options[:remote_users] -%>
-u = User.new(:name => "Root", :login => "root")
+u = User.new(:name => "System", :login => "system")
 u.id = 0
 u.save
 <% end -%>

data/lib/generators/resty/setup/templates/session.rb

@@ -1,6 +1,6 @@
 require 'ixtlan/guard/abstract_session'
 <% if options[:remote_users] -%>
-require 'ixtlan/core/heartbeat'
+require 'heartbeat'
 <% end -%>
 
 class Session < Ixtlan::Guard::AbstractSession

data/lib/ixtlan/core/heartbeat.rb

@@ -36,8 +36,14 @@ class Ixtlan::Core::Heartbeat
       last_update = res.local.maximum(:updated_at) || 2000.years.ago
       last_update = last_update.strftime('%Y-%m-%d %H:%M:%S.') + ("%06d" % last_update.usec)
       res.remote.get(:last_changes, :updated_at => last_update).each do |remote|
-        u = res.local.find_by_id(remote.delete('id'))
-        u.update_attributes(res.remote)
+        id = remote.delete('id')
+        u = res.local.find_by_id(id)
+        if u
+          u.update_attributes(remote)
+        else
+          u = res.local.new(remote)
+          u.id = id
+        end
         if u.save
           res.count = res.count + 1
         else

data/lib/ixtlan/core/heartbeat.rb~

@@ -23,15 +23,16 @@ class Ixtlan::Core::Heartbeat
   end
 
   def reg
-    @reg ||= []
+    @reg ||= {}
   end
 
   def register(local, remote)
-    reg << Resource.new(local, remote)
+    reg[local] = Resource.new(local, remote)
   end
 
-  def beat
-    reg.each do |res|
+  def beat(resource = nil)
+    resources = resource.nil? ? reg.values : [reg[resource]]
+    resources.each do |res|
       last_update = res.local.maximum(:updated_at) || 2000.years.ago
       last_update = last_update.strftime('%Y-%m-%d %H:%M:%S.') + ("%06d" % last_update.usec)
       res.remote.get(:last_changes, :updated_at => last_update).each do |remote|

metadata

@@ -2,7 +2,7 @@
 name: resty-generators
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors: 
   - mkristian