mdd 3.0.13 → 3.0.14

data/lib/generators/mdwa/sandbox/sandbox_generator.rb

@@ -110,7 +110,7 @@ module Mdwa
         if ask_question("Generate models?")
           copy_file 'app/models/ability.rb', 'app/models/ability.rb'
           copy_file 'app/models/user.rb', 'app/models/user.rb'
-          copy_file 'app/models/administrator.rb', 'app/models/administrator.rb'
+          copy_file 'app/models/administrator.rb', 'app/models/a/administrator.rb'
           copy_file 'app/models/permission.rb', 'app/models/permission.rb'
         end
       end

data/lib/generators/mdwa/sandbox/templates/app/controllers/a/administrators_controller.rb

@@ -4,7 +4,7 @@ class A::AdministratorsController < A::BackendController
   load_and_authorize_resource
   
   def index
-    @administrators = Administrator.paginate :page => params[:page]
+    @administrators = A::Administrator.paginate :page => params[:page]
 
     respond_to do |format|
       format.html # index.html.erb
@@ -12,7 +12,7 @@ class A::AdministratorsController < A::BackendController
   end
 
   def show
-    @administrator = Administrator.find(params[:id])
+    @administrator = A::Administrator.find(params[:id])
 
     respond_to do |format|
       format.html # show.html.erb
@@ -20,7 +20,7 @@ class A::AdministratorsController < A::BackendController
   end
 
   def new
-    @administrator = Administrator.new
+    @administrator = A::Administrator.new
 
     respond_to do |format|
       format.html # new.html.erb
@@ -28,16 +28,16 @@ class A::AdministratorsController < A::BackendController
   end
 
   def edit
-    @administrator = Administrator.find(params[:id])
+    @administrator = A::Administrator.find(params[:id])
   end
 
   def edit_own_account
-    @administrator = Administrator.find(current_user.id)
+    @administrator = A::Administrator.find(current_user.id)
     render 'edit'
   end
 
   def create
-    @administrator = Administrator.new(params[:administrator])
+    @administrator = A::Administrator.new(params[:a_administrator])
 
     respond_to do |format|
       if @administrator.save
@@ -49,15 +49,15 @@ class A::AdministratorsController < A::BackendController
   end
 
   def update
-    @administrator = Administrator.find(params[:id])
+    @administrator = A::Administrator.find(params[:id])
     # if password is blank, delete from params
-    if params[:administrator][:password].blank?
-      params[:administrator].delete :password
-      params[:administrator].delete :password_confirmation
+    if params[:a_administrator][:password].blank?
+      params[:a_administrator].delete :password
+      params[:a_administrator].delete :password_confirmation
     end
 
     respond_to do |format|
-      if @administrator.update_attributes(params[:administrator])
+      if @administrator.update_attributes(params[:a_administrator])
         format.html { redirect_to a_administrators_path, notice: t('administrators.update_success') }
       else
         format.html { render action: "edit" }
@@ -68,7 +68,7 @@ class A::AdministratorsController < A::BackendController
   # DELETE /administrators/1
   # DELETE /administrators/1.json
   def destroy
-    @administrator = Administrator.find(params[:id])
+    @administrator = A::Administrator.find(params[:id])
 
     if current_user.id == params[:id].to_i
       redirect_to a_administrators_path, notice: t('administrators.destroy_cant_delete_own_user')

data/lib/generators/mdwa/sandbox/templates/app/models/administrator.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
-class Administrator < User
+class A::Administrator < User
   after_create :create_super_admin_permission
   
   def create_super_admin_permission

data/lib/generators/mdwa/sandbox/templates/app/views/a/administrators/_administrators.html.erb

@@ -10,7 +10,7 @@
   	<td align="center"><%= link_to administrator.id, edit_a_administrator_path(administrator) %></td>
     <td><%= link_to administrator.name, edit_a_administrator_path(administrator) %></td>
     <td><%= administrator.email %></td>
-    <td><%= link_to t('system.index_remove_label'), [:a, administrator], :method => :delete, :confirm => t('system.index_confirm_deletion') %></td>
+    <td><%= link_to t('system.index_remove_label'), administrator, :method => :delete, :confirm => t('system.index_confirm_deletion') %></td>
   </tr>
 <% end %>
 </table>

data/lib/generators/mdwa/sandbox/templates/app/views/a/administrators/_form.html.erb

@@ -1,4 +1,4 @@
-<%= form_for([:a, @administrator]) do |f| %>
+<%= form_for(@administrator) do |f| %>
 
   <div id="mdwa_error">
    	<%= render '/template/mdwa/crud_error', :object => @administrator %>

data/lib/generators/mdwa/sandbox/templates/db/seeds/site.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 Permission.create( :name => "SuperAdmin" ) if Permission.find_by_name("SuperAdmin").nil?
 
-if Administrator.count.zero?
-	Administrator.create :name => "Administrator", :email => 'admin@admin.com', :password => 'admin123', :password_confirmation => 'admin123'
+if A::Administrator.count.zero?
+	A::Administrator.create :name => "Administrator", :email => 'admin@admin.com', :password => 'admin123', :password_confirmation => 'admin123'
 end

data/lib/generators/mdwa/templates/templates/scaffold/views/_form_fields.html.erb

@@ -1,5 +1,5 @@
 ===entity_code===
-<%- @model.attributes.each do |attr| -%>
+<%- @model.attributes.select{|a| a.name != 'id' and a.name != 'created_at' and a.name != 'updated_at'}.each do |attr| -%>
 <div class="field">
    	<%%= f.label :<%= attr.name %> %> 
 	<%- if attr.type.to_sym == :file -%>

data/lib/generators/mdwa/templates/templates/scaffold/views/_list.html.erb

@@ -3,7 +3,7 @@
   <thead>
       <th class="list_show"><%%= t 'system.index_id' %></th>
       <th class="list_edit"><%%= t 'system.index_edit' %></th>
-    <%- @model.attributes.each do |attr| -%>
+    <%- @model.attributes.select{|a| a.name != 'id' and a.name != 'created_at' and a.name != 'updated_at'}.each do |attr| -%>
       <th><%%= t '<%= @model.plural_name %>.index_<%= attr.name %>' %></th>
     <%- end -%>
     <%- @model.associations.each do |assoc| -%>
@@ -20,7 +20,7 @@
   	<td>
 		<%%= link_to t('system.index_edit_label'), edit_<%= @model.object_name %>_path(<%= @model.singular_name %>) <%= ", :class => 'lightbox various fancybox.ajax'" if @entity.ajax %> %>
 	</td>
-  <%- @model.attributes.each do |attr| -%>
+  <%- @model.attributes.select{|a| a.name != 'id' and a.name != 'created_at' and a.name != 'updated_at'}.each do |attr| -%>
 	<td>
 		<%- if attr.type.to_sym == :file -%>
 		<%% unless <%= @model.singular_name %>.<%= attr.name %>_file_name.blank? %>

data/lib/generators/mdwa/templates/templates/scaffold/views/show.html.erb

@@ -5,7 +5,7 @@
 	</div>
 
 	<div class="inside">
-	<%- @model.attributes.each do |attr| -%>
+	<%- @model.attributes.select{|a| a.name != 'id' and a.name != 'created_at' and a.name != 'updated_at'}.each do |attr| -%>
 		<div class="field">
 			<label><%%= t '<%= @model.plural_name %>.show_<%= attr.name %>' %></label>
 		<%- if attr.type.to_sym == :file -%>

data/lib/generators/mdwa/transform/transform_generator.rb

@@ -199,7 +199,7 @@ module Mdwa
           model_class.columns.each do |column|
             
             # ignore rails default columns and attributes used in associations
-            next if column.name == 'id' or column.name == 'created_at' or column.name == 'updated_at' or column.name.end_with? '_id'
+            next if column.name.end_with? '_id'
                         
             entity_attribute = entity.attributes[column.name]
             # model attribute exists, but not in entity -> was erased
@@ -207,7 +207,8 @@ module Mdwa
               @changes << {:entity => entity, :type => 'remove_column', :column => column.name, :attr_type => column.type}
             # attribute exists in model and entity, but changed type
             elsif entity_attribute.type.to_sym != column.type.to_sym
-              next if entity_attribute.type.to_sym == :file or entity_attribute.type.to_sym == :password or (column.type.to_sym == :integer and entity_attribute.type.to_sym == :float)
+              # ignores files, passwords and float, decimal, integer variations
+              next if entity_attribute.type.to_sym == :file or entity_attribute.type.to_sym == :password or ((column.type.to_sym == :integer or column.type.to_sym == :decimal) and entity_attribute.type.to_sym == :float)
               @changes << {:entity => entity, :type => 'change_column', :column => column.name, :attr_type => entity_attribute.type, :from => column.type}
             end
           end
@@ -310,6 +311,7 @@ module Mdwa
           # migration number
           if ActiveRecord::Base.timestamped_migrations
             @migration_number = Time.now.utc.strftime("%Y%m%d%H%M%S")
+            sleep 1
           else
             @migration_number = "%.3d" % (current_migration_number(Rails.root + 'db/migrate') + 1)
           end

data/lib/mdwa/dsl/entity.rb

@@ -73,6 +73,9 @@ module MDWA
       def after_declaration
         
         # if it's a user and have no attributes, include "name" to prevent errors
+        self.attribute('id', 'integer')
+        self.attribute('created_at', 'datetime')
+        self.attribute('updated_at', 'datetime')
         if user?
           self.attribute('name', 'string')
           self.attribute('email', 'string')
@@ -141,7 +144,8 @@ module MDWA
       # Return an instance of Generators::Model
       #
       def generator_model
-        @generator_model = Generators::Model.new(self.model_name)
+        @generator_model = Generators::Model.new(self.scaffold_name)
+        @generator_model.specific_model_name = self.model_name if(!self.model_name.blank? and self.model_name != self.scaffold_name)
         self.attributes.values.each do |attribute|
           @generator_model.add_attribute Generators::ModelAttribute.new( "#{attribute.name}:#{attribute.type}" )
         end
@@ -168,7 +172,7 @@ module MDWA
       # Selects the default attribute of the entity
       #
       def default_attribute
-        default_attr = self.attributes.first.last # first element value
+        default_attr = self.attributes.values.first # first element value
         self.attributes.each do |key, attr|
           default_attr = attr if attr.default?
         end

data/lib/mdwa/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mdd
 version: !ruby/object:Gem::Version
-  version: 3.0.13
+  version: 3.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-12 00:00:00.000000000 Z
+date: 2012-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -482,7 +482,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3606410943858974791
+      hash: -3153241005913851607
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -491,7 +491,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3606410943858974791
+      hash: -3153241005913851607
 requirements: []
 rubyforge_project: mdd
 rubygems_version: 1.8.24