mdd 3.0.1 → 3.0.2

data/lib/generators/mdwa/code/code_generator.rb

@@ -70,6 +70,8 @@ module Mdwa
             
             next # nothing's changed, go to the next entity
           end
+          
+          next if entity.user?
         
           # check what changed
           model_class.columns.each do |column|
@@ -78,7 +80,7 @@ module Mdwa
             
             entity_attribute = entity.attributes[column.name]
             # model attribute exists, but not in entity -> was erased
-            if entity_attribute.nil? 
+            if entity_attribute.nil?
               @changes << {:entity => entity, :type => 'remove_column', :column => column.name}
             # attribute exists in model and entity, but changed type
             elsif entity_attribute.type.to_sym != column.type.to_sym

data/lib/generators/mdwa/user/user_generator.rb

@@ -69,7 +69,15 @@ module Mdwa
 
       def model_and_migration        
         # model override
-        template 'model.rb', "app/models/#{@model.space}/#{@model.singular_name}.rb"
+        gsub_file "app/models/#{@model.space}/#{@model.singular_name}.rb", 'ActiveRecord::Base', 'User'
+        inject_into_class "app/models/#{@model.space}/#{@model.singular_name}.rb", @model.model_class do 
+          inj = []
+          inj << "\n\tafter_create :create_#{@model.singular_name}_permission\n"
+          inj << "\tdef create_#{@model.singular_name}_permission"
+          inj << "\t\tself.permissions.push Permission.find_by_name('#{@model.singular_name}')"
+          inj << "\tend"
+          inj.join("\n")
+        end
         
         # override model attributes to not allow field duplicity (causing errorss)
         @model.attributes = []

data/lib/mdwa/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module MDWA
-  VERSION = "3.0.1"
+  VERSION = "3.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mdd
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-16 00:00:00.000000000 Z
+date: 2012-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -310,7 +310,6 @@ files:
 - lib/generators/mdwa/user/templates/controllers/ajax_controller.rb
 - lib/generators/mdwa/user/templates/controllers/controller.rb
 - lib/generators/mdwa/user/templates/migrate.rb
-- lib/generators/mdwa/user/templates/model.rb
 - lib/generators/mdwa/user/templates/views/update.js.erb
 - lib/generators/mdwa/user/user_generator.rb
 - lib/mdd.rb

data/lib/generators/mdwa/user/templates/model.rb

@@ -1,11 +0,0 @@
-class <%= @model.klass %> < User
-  
-	attr_accessible <%= @model.simple_attributes.collect {|a| ":" + a.name }.join(', ') %>
-	
-	after_create :create_<%= @model.singular_name %>_permission
-
-  def create_<%= @model.singular_name %>_permission
-    self.permissions.push Permission.find_by_name("<%= @model.singular_name %>")
-  end
-  
-end