resty-generators 0.7.0 → 0.7.1

data/lib/generators/resty/scaffold/scaffold_generator.rb

@@ -112,7 +112,7 @@ end
 
             content.sub! /new GinFactoryModuleBuilder\(\)/, "new GinFactoryModuleBuilder()\n            .implement(Activity.class, Names.named(\"#{table_name}\"), #{activities_package}.#{class_name}Activity.class)"
 
-            content.sub! /^}/, <<-EOF
+            content.sub! /^\}/, <<-EOF
 
     @Singleton
     public static class #{class_name.pluralize}RestServiceProvider implements Provider<#{restservices_package}.#{class_name.pluralize}RestService> {

data/lib/generators/resty/setup/setup_generator.rb

@@ -13,6 +13,8 @@ module Resty
      
       class_option :menu, :type => :boolean, :default => false
      
+      class_option :remote_users, :type => :boolean, :default => false
+     
       def name
         gwt_module_name
       end
@@ -26,7 +28,7 @@ module Resty
         unless File.read(".gitignore") =~ /^target/
           File.open(".gitignore", "a") { |f| f.puts "target/" }
         end
-        unless File.read(".gitignore") =~ /^*pom/
+        unless File.read(".gitignore") =~ /^\*pom/
           File.open(".gitignore", "a") { |f| f.puts "*pom" }
         end
       end
@@ -120,6 +122,7 @@ module Resty
 
   if ENV['SSO'] == 'true' || ENV['SSO'] == ''
     config.remote_sso_url = "http://localhost:3000"
+    config.remote_token = "be happy"
   end
 end
 ENV
@@ -170,6 +173,13 @@ SESSION
           template 'group.rb', File.join('app', 'models', "group.rb")          
           template 'session.rb', File.join('app', 'models', "session.rb")
           template 'user.rb', File.join('app', 'models', "user.rb")
+          if options[:remote_users]
+            template 'remote_user.rb', File.join('app', 'models', "remote_user.rb")
+            template 'create_users.rb', File.join('db', 'migrate', "0_create_users.rb")
+            template 'heartbeat.rb', File.join('lib', 'heartbeat.rb')
+          end
+          FileUtils.mv(File.join('db', 'seeds.rb'), File.join('db', 'seeds-old.rb'))
+          template 'seeds.rb', File.join('db', 'seeds.rb')
           route <<ROUTE
 resource :session do
     member do

data/lib/generators/resty/setup/templates/MenuPanel.java

@@ -22,6 +22,6 @@ public class <%= application_name %>MenuPanel extends MenuPanel<<%= options[:ses
 
     @Inject
     <%= application_name %>MenuPanel(final PlaceController placeController<% if options[:session] -%>, SessionManager<User> sessionManager<% end %>){
-        super(<% if options[:session] -%>sessionManager<% end -%>);
+        super(<% if options[:session] -%>sessionManager<% end -%>, placeController);
     }
 }

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

@@ -0,0 +1,13 @@
+class CreateUsers < ActiveRecord::Migration
+  def self.up
+    create_table :users do |t|
+      t.string :login
+      t.string :name
+      t.datetime :updated_at
+    end
+  end
+
+  def self.down
+    drop_table :users
+  end
+end

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

@@ -0,0 +1,9 @@
+require 'ixtlan/core/heartbeat'
+class Heartbeat < Ixtlan::Core::Heartbeat
+
+  def initialize
+    super
+    register(User, RemoteUser)
+  end
+
+end

data/lib/generators/resty/setup/templates/heartbeat.rb~

@@ -0,0 +1,8 @@
+class HeartBeat < Ixtlan::Core::Heartbeat
+
+  def initialize
+    super
+    register(User, RemoteUser)
+  end
+
+end

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

@@ -0,0 +1,5 @@
+class RemoteUser < ActiveResource::Base
+  self.site = Rails.application.config.respond_to?(:remote_sso_url) ? Rails.application.config.remote_sso_url : "http://localhost:3000"
+  self.element_name = "user"
+  self.headers['X-SERVICE-TOKEN'] =  Rails.application.config.respond_to?(:remote_service_token) ? Rails.application.config.remote_service_token : 'be happy'
+end

data/lib/generators/resty/setup/templates/remote_user.rb~

@@ -0,0 +1,5 @@
+class RemoteUser < ActiveResource::Base
+  self.site = Rails.application.config.respond_to?(:remote_sso_url) ? Rails.application.config.remote_sso_url : "http://localhost:3000"
+  self.element_name = "user"
+  self.headers['X-SERVICE-TOKEN'] =  Rails.application.config.respond_to?(:remote_token) ? Rails.application.config.remote_token : 'be happy'
+end

data/lib/generators/resty/setup/templates/seed.rb~

@@ -0,0 +1,25 @@
+# This file should contain all the record creation needed to seed the database with its default values.
+# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
+#
+# Examples:
+#
+#   cities = City.create([{ :name => 'Chicago' }, { :name => 'Copenhagen' }])
+#   Mayor.create(:name => 'Daley', :city => cities.first)
+u = User.new(:name => "Root", :login => "root")
+u.id = 0
+u.save
+u.modified_by = u
+u.save
+
+c = Configuration.instance
+<% if defined? Ixtlan::Errors -%>
+c.errors_keep_dumps = 30
+<% end -%>
+<% if defined? Ixtlan:Audit -%>
+c.audit_keep_logs = 90
+<% end -%>
+<% if defined? Ixtlan::Session -%>
+c.idle_session_timeout = 15
+<% end -%>
+c.modified_by = u
+c.save

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

@@ -0,0 +1,29 @@
+# This file should contain all the record creation needed to seed the database with its default values.
+# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
+#
+# Examples:
+#
+#   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.id = 0
+u.save
+<% end -%>
+
+c = Configuration.instance
+if defined? Ixtlan::Errors
+  c.errors_keep_dumps = 30
+end
+if defined? Ixtlan::Audit
+  c.audits_keep_logs = 90
+end
+if defined? Ixtlan::Sessions
+  c.idle_session_timeout = 15
+end
+<% if options[:remote_users] -%>
+c.modified_by = u
+<% else -%>
+# TODO maybe a modified_by= assignment is missing
+<% end -%>
+c.save

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

@@ -0,0 +1,29 @@
+# This file should contain all the record creation needed to seed the database with its default values.
+# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
+#
+# Examples:
+#
+#   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.id = 0
+u.save
+<% end -%>
+
+c = Configuration.instance
+if defined? Ixtlan::Errors
+  c.errors_keep_dumps = 30
+end
+if defined? Ixtlan:Audit
+  c.audit_keep_logs = 90
+end
+if defined? Ixtlan::Session
+  c.idle_session_timeout = 15
+end
+<% if options[:remote_users] -%>
+c.modified_by = u
+<% else -%>
+# TODO maybe a modified_by= assignment is missing
+<% end -%>
+c.save

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

@@ -1,4 +1,7 @@
 require 'ixtlan/guard/abstract_session'
+<% if options[:remote_users] -%>
+require 'ixtlan/core/heartbeat'
+<% end -%>
 
 class Session < Ixtlan::Guard::AbstractSession
   include ActiveModel::Serializers::JSON
@@ -11,8 +14,18 @@ class Session < Ixtlan::Guard::AbstractSession
   def self.authenticate_remote(login, password)
     begin
       auth = Authentication.create(:login => login, :password => password)
+<% if options[:remote_users] -%>
+      user = User.find_by_login(auth.login)
+      if user.nil?
+        heart = Heartbeat.new
+        heart.beat User
+        user = User.find_by_login(auth.login)
+        raise "user #{auth.login} not found" unless user
+      end
+<% else -%>
       user = User.new
       user.login = auth.login
+<% end -%>
       user.name = auth.name
       user.groups = auth.groups
       user

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

@@ -1,4 +1,11 @@
-class User
+class User<% if options[:remote_users] -%> < ActiveRecord::Base
+
+  attr_accessor :groups
+  
+  validates :login, :presence => true
+
+  record_timestamps = false
+<% else -%>
   include ActiveModel::Serializers::JSON
   include ActiveModel::Serializers::Xml
   
@@ -13,6 +20,7 @@ class User
     @name = attributes['name']
     @groups = (attributes['groups'] || []).collect {|g| Group.new g }
   end
+<% end -%>
 
   def self.authenticate(login, password)
     result = User.new
@@ -23,6 +31,9 @@ class User
     elsif password == "behappy"
       result.login = login
       result.name = login.humanize
+<% if options[:remote_users] -%>
+      result.id = 0
+<% end -%>
       result.groups = [Group.new('name' => login)]
     else
       result.log = "wrong password for login: #{login}"
@@ -31,7 +42,7 @@ class User
   end
 
   def self.reset_password(login)
-    Authentication.post(:reset_password, :login=> login)
+    Authentication.post(:reset_password, :login => login)
   end
 
   def log=(msg)
@@ -46,7 +57,8 @@ class User
     end
   end
 
-  def valid?
+<% unless options[:remote_users] -%>
+  def valid?(ignore)
     @log.nil?
   end
 
@@ -54,5 +66,6 @@ class User
     false
   end
   alias :destroyed? :new_record?
+<% end -%>
 
 end

data/lib/ixtlan/core/heartbeat.rb

@@ -0,0 +1,53 @@
+class Ixtlan::Core::Heartbeat
+
+  class Resource
+
+    attr_reader :local, :remote
+    attr_accessor :count, :failure
+
+    def initialize(local, remote)
+      @count = 0
+      @failures = 0
+      @local = local
+      @remote = remote
+    end
+
+    def to_log
+      "update #{@local} - total: #{@count + @failures}  success: #{@count}  failures: #{@failures}"
+    end
+  end
+
+  def initialize
+    @count = 0
+    @failures = 0
+  end
+
+  def reg
+    @reg ||= {}
+  end
+
+  def register(local, remote)
+    reg[local] = Resource.new(local, remote)
+  end
+
+  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|
+        u = res.local.find_by_id(remote.delete('id'))
+        u.update_attributes(res.remote)
+        if u.save
+          res.count = res.count + 1
+        else
+          res.failures = res.failures + 1
+        end
+      end
+    end
+  end
+  def to_log
+    reg.collect { |r| r.to_log }.join('\n')
+  end
+  alias :to_s :to_log
+end

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

@@ -0,0 +1,52 @@
+class Ixtlan::Core::Heartbeat
+
+  class Resource
+
+    attr_reader :local, :remote
+    attr_accessor :count, :failure
+
+    def initialize(local, remote)
+      @count = 0
+      @failures = 0
+      @local = local
+      @remote = remote
+    end
+
+    def to_log
+      "update #{@local} - total: #{@count + @failures}  success: #{@count}  failures: #{@failures}"
+    end
+  end
+
+  def initialize
+    @count = 0
+    @failures = 0
+  end
+
+  def reg
+    @reg ||= []
+  end
+
+  def register(local, remote)
+    reg << Resource.new(local, remote)
+  end
+
+  def beat
+    reg.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|
+        u = res.local.find_by_id(remote.delete('id'))
+        u.update_attributes(res.remote)
+        if u.save
+          res.count = res.count + 1
+        else
+          res.failures = res.failures + 1
+        end
+      end
+    end
+  end
+  def to_log
+    reg.collect { |r| r.to_log }.join('\n')
+  end
+  alias :to_s :to_log
+end

metadata

@@ -2,7 +2,7 @@
 name: resty-generators
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors: 
   - mkristian
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-04 00:00:00 +05:30
+date: 2011-11-20 00:00:00 +05:30
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: 0.1.3
+            version: 0.1.4
     type: :runtime
     version_requirements: *id001
   - !ruby/object:Gem::Dependency 
@@ -107,9 +107,12 @@ files:
   - lib/generators/resty/setup/templates/Mavenfile~
   - lib/generators/resty/setup/templates/gwt.css
   - lib/generators/resty/setup/templates/user.rb
+  - lib/generators/resty/setup/templates/seeds.rb
+  - lib/generators/resty/setup/templates/heartbeat.rb~
   - lib/generators/resty/setup/templates/module.gwt.xml
   - lib/generators/resty/setup/templates/EntryPoint.java
   - lib/generators/resty/setup/templates/GinModule.java
+  - lib/generators/resty/setup/templates/seed.rb~
   - lib/generators/resty/setup/templates/sessions_controller.rb
   - lib/generators/resty/setup/templates/page.html~
   - lib/generators/resty/setup/templates/LoginView.ui.xml
@@ -124,7 +127,10 @@ files:
   - lib/generators/resty/setup/templates/LoginViewImpl.java~
   - lib/generators/resty/setup/templates/ActivityPlace.java~
   - lib/generators/resty/setup/templates/authentication.rb
+  - lib/generators/resty/setup/templates/create_users.rb
+  - lib/generators/resty/setup/templates/remote_user.rb
   - lib/generators/resty/setup/templates/ActivityFactory.java~
+  - lib/generators/resty/setup/templates/seeds.rb~
   - lib/generators/resty/setup/templates/session.rb~
   - lib/generators/resty/setup/templates/LoginActivity.java~
   - lib/generators/resty/setup/templates/ActivityPlace.java
@@ -134,6 +140,8 @@ files:
   - lib/generators/resty/setup/templates/LoginViewImpl.java
   - lib/generators/resty/setup/templates/LoginPlace.java
   - lib/generators/resty/setup/templates/session.rb
+  - lib/generators/resty/setup/templates/remote_user.rb~
+  - lib/generators/resty/setup/templates/heartbeat.rb
   - lib/generators/resty/setup/templates/SessionActivityPlaceActivityMapper.java
   - lib/generators/resty/setup/templates/ActivityFactory.java
   - lib/generators/resty/setup/templates/gitignore
@@ -179,6 +187,8 @@ files:
   - lib/generators/resty/templates/View.java~
   - lib/generators/resty/templates/Editor.java~
   - lib/generators/resty/templates/Activity.java~
+  - lib/ixtlan/core/heartbeat.rb~
+  - lib/ixtlan/core/heartbeat.rb
   - features/step_definitions/simple_steps.rb
   - features/generators.feature
 has_rdoc: true