mdd 3.0.15 → 3.0.16

data/app/helpers/mdwa_helper.rb

@@ -11,7 +11,7 @@ module MdwaHelper
   end
 
   def encode_results_to_autocomplete(results, field_name)
-    return results.collect{ |c| "{label: '#{c.send field_name}', value: '#{c.id}'}"  }.join( ',' )
+    return results.collect{ |c| "{label: '#{c.send field_name}', value: '#{c.id}'}"  }.join( ',' ).html_safe
   end
   
   def file_icon_path( file_name, size = 'medium' )

data/lib/generators/mdwa/entity/templates/entity.rb

@@ -8,15 +8,20 @@ MDWA::DSL.entities.register "<%= name.singularize.camelize %>" do |e|
   # "reset_password_sent_at", "remember_created_at", "sign_in_count", "current_sign_in_at", "last_sign_in_at", 
   # "current_sign_in_ip", "last_sign_in_ip", "created_at", "updated_at"
   e.user        = true
+  e.ajax        = false  # ajax works fine, but it can create errors in the "My Account" button.
+  e.resource    = true
+  e.scaffold_name = 'a/<%= name.singularize.underscore %>' # mdwa sandbox specific code?
+  e.model_name = 'a/<%= name.singularize.underscore %>' # use specific model name? or different namespace?
   <%- end -%>
   
   <%- unless options.no_comments -%>
+  <%- if !options.user %>
   # e.purpose   = %q{To-do} # what does this entity do?
   # e.resource  = true      # should it be stored like a resource?
   # e.ajax      = true      # scaffold with ajax?
-  # e.user      = false     # is this entity a loggable user?
   # e.scaffold_name = 'a/<%= name.singularize.underscore %>' # mdwa sandbox specific code?
   # e.model_name = 'a/<%= name.singularize.underscore %>' # use specific model name? or different namespace?
+  <% end %>
 
   ##
   ## Define entity attributes
@@ -39,6 +44,7 @@ MDWA::DSL.entities.register "<%= name.singularize.camelize %>" do |e|
   #   a.composition = true
   #   a.description = 'This entity has a composite address.'
   #   a.skip_views  = false
+  #   a.style       = :default
   # end
 
   ##

data/lib/generators/mdwa/requirement/templates/requirement.rb

@@ -3,19 +3,19 @@ require 'mdwa/dsl'
 MDWA::DSL.requirements.register do |r|
   
   r.summary     = '<%= @summary %>'
-  <%- unless options.no_comments %>
-  # r.alias       = '<%= @requirement.alias %>' # alias is the unique requirement name and it's created automatically, you can override with this argument.
-  # r.description = %q{Detailed description of the requirement.}
+  r.alias       = '<%= @requirement.alias %>' # alias is the unique requirement name and it's created automatically, you can override it with this argument.
+  r.description = %q{Detailed description of the requirement.}
   
+  <%- unless options.no_comments %>
   #
   # Entities involved in this requirement.
   # Use an array of entity names.
-  # r.entities    = ['ProjectGroup', 'Project', 'Task', 'Milestone']
+  # r.entities    = ['ProjectGroup', 'Project']
   
   # 
   # Users involved in this requirement.
   # Use an array of user names.
-  # r.users       = ['Administrator', 'TeamMember']
+  # r.users       = ['Administrator']
   <% end %>
     
 end

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

@@ -66,6 +66,7 @@ module Mdwa
         if ask_question("Create javascripts?")
           directory 'app/assets/javascripts/jquery', 'app/assets/javascripts/jquery'
           directory 'app/assets/javascripts/mdwa/template', 'app/assets/javascripts/mdwa/template'
+          empty_directory 'app/assets/javascripts/app'
 
           if ask_question("Create manifests?")
             copy_file 'app/assets/javascripts/mdwa/login_manifest.js', 'app/assets/javascripts/mdwa/login_manifest.js'
@@ -80,6 +81,7 @@ module Mdwa
           directory 'app/assets/stylesheets/jquery', 'app/assets/stylesheets/jquery'
           directory 'app/assets/stylesheets/mdwa/template', 'app/assets/stylesheets/mdwa/template'
           directory 'app/assets/stylesheets/mdwa/login', 'app/assets/stylesheets/mdwa/login'
+          empty_directory 'app/assets/stylesheets/app'
 
           if ask_question("Create manifests?")
             copy_file 'app/assets/stylesheets/mdwa/login_manifest.css', 'app/assets/stylesheets/mdwa/login_manifest.css'
@@ -124,6 +126,7 @@ module Mdwa
 
         if ask_question("Generate views?")
           copy_file 'app/views/template/_leftbar.html.erb', 'app/views/template/mdwa/_leftbar.html.erb'
+          empty_directory 'app/views/template/leftbar'
           directory 'app/views/public', 'app/views/public'
           directory 'app/views/a/administrators', 'app/views/a/administrators'
           directory 'app/views/a/home', 'app/views/a/home'
@@ -176,14 +179,23 @@ module Mdwa
       
       def migrations
         if ask_question( "Generate migrations?" )
-          migration_template 'db/migrate/devise_create_users.rb', 'db/migrate/devise_create_users.rb'
-          sleep( 1.0 )
-          migration_template 'db/migrate/create_permissions.rb', 'db/migrate/create_permissions.rb'
-          sleep( 1.0 )
-          migration_template 'db/migrate/create_user_permissions.rb', 'db/migrate/create_user_permissions.rb'
-          sleep( 1.0 )
           
-          rake "db:migrate" if ask_question( "Run rake db:migrate?" )
+          create_migrations = true
+          begin
+            create_migrations = false if User.table_exists?
+          rescue
+          end
+          
+          if create_migrations
+            migration_template 'db/migrate/devise_create_users.rb', 'db/migrate/devise_create_users.rb'
+            sleep 1
+            migration_template 'db/migrate/create_permissions.rb', 'db/migrate/create_permissions.rb'
+            sleep 1
+            migration_template 'db/migrate/create_user_permissions.rb', 'db/migrate/create_user_permissions.rb'
+            sleep 1
+          
+            rake "db:migrate" if ask_question( "Run rake db:migrate?" )
+          end
         end
       end
 

data/lib/generators/mdwa/sandbox/templates/app/assets/javascripts/mdwa/system_manifest.js

@@ -6,4 +6,5 @@
 //= require jquery_ujs
 //= require_tree ../jquery
 //= require jquery_nested_form
-//= require_tree ./template
+//= require_tree ./template
+//= require_tree ../app

data/lib/generators/mdwa/sandbox/templates/app/assets/stylesheets/mdwa/system_manifest.css

@@ -11,4 +11,5 @@
  *= require_tree ../jquery
  *= require ./template/backend
  *= require ./template/leftbar
+ *= require_tree ../app
 */

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

@@ -9,7 +9,7 @@ class User < ActiveRecord::Base
   has_and_belongs_to_many :permissions
   
   def has_permission?(permission)
-    return !!self.permissions.find_by_name(permissao.to_s.camelize)
+    return !!self.permissions.find_by_name(permission.to_s.camelize)
   end
   
 end

data/lib/generators/mdwa/sandbox/templates/config/locales/mdwa.en.yml

@@ -11,6 +11,7 @@ en:
     logged_info_logout: "(Logout)"
     logged_info_edit_account: "My Account"
     cancel_button: "Cancel"
+    save_button: "Save"
     index_id: "ID"
     index_edit: "Edit"
     index_edit_label: "Edit"

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

@@ -1,5 +1,5 @@
 ===entity_code===
-<%%= <%= 'nested_' if @model.nested_many? %>form_for(<%= @model.to_route_object('@') %><%= ", :remote => true, :html => {:class => :mdwa_ajax #{',:multipart => true' if @model.attributes.select{|attr| attr.type.to_sym == :file}.count.zero?}}" if @entity.ajax %>) do |f| %>
+<%%= <%= 'nested_' if @model.nested_many? %>form_for(<%= @model.to_route_object('@') %><%= ", :remote => true, :html => {:class => :mdwa_ajax #{',:multipart => true' unless @model.attributes.select{|attr| attr.type.to_sym == :file}.count.zero?}}" if @entity.ajax %>) do |f| %>
 
 	<div id="mdwa_error">
 	   	<%%= render '/template/mdwa/crud_error', :object => @<%= @model.singular_name %> %>
@@ -17,7 +17,7 @@
 		<%- else -%>
 		<%%= link_to t('system.cancel_button'), '#', :class => :cancel %> 
 		<%- end -%>
-	    <%%= f.submit :class => :button %>
+	    <%%= f.submit t('system.save_button'), :class => :button %>
 	</div>
 
 <%% end %>

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

@@ -14,10 +14,10 @@
 
 <%% @<%= @model.plural_name %>.each do |<%= @model.singular_name %>| %>
   <tr class="<%%= cycle 'odd_line', 'even_line' %>" >
-    <td>
+    <td class="list_show">
 		<%%= link_to <%= @model.singular_name %>.id, <%= @model.object_name %>_path(<%= @model.singular_name %>) <%= ", :class => 'lightbox various fancybox.ajax'" if @entity.ajax %> %>
 	</td>
-  	<td>
+  	<td class="list_edit">
 		<%%= 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.select{|a| a.name != 'id' and a.name != 'created_at' and a.name != 'updated_at'}.each do |attr| -%>
@@ -47,7 +47,7 @@
       <%- end -%>
     </td>
     <%- end -%>
-    <td>
+    <td class="list_remove">
 		<%%= link_to t('system.index_remove_label'), <%= @model.to_route_object %>, :method => :delete, <%= ':remote => true,' if @entity.ajax %> :data => {:confirm => t('system.index_confirm_deletion')} %>
 	</td>
   </tr>

data/lib/mdwa/dsl/entity.rb

@@ -87,7 +87,7 @@ module MDWA
       
       #
       # Declares one attribute of the list using the block given.
-      def attribute(name, type)
+      def attribute(name, type, options = {})
         if type.to_sym == :file
           fields = ['_file_name','_content_type', '_file_size', '_updated_at']
           fields.each do |f|
@@ -101,6 +101,8 @@ module MDWA
           attr = EntityAttribute.new(self)
           attr.name = name
           attr.type = type
+          attr.default = options[:default] unless options[:default].blank?
+          attr.style = options[:style] unless options[:style].blank?
           attr.raise_errors_if_invalid!
           self.attributes[attr.name] = attr
         end

data/lib/mdwa/dsl/entity_association.rb

@@ -5,7 +5,7 @@ module MDWA
     class EntityAssociation
       
       attr_accessor :source, :destination, :destination_view
-      attr_accessor :name, :type, :composition, :description, :skip_views
+      attr_accessor :name, :type, :composition, :description, :skip_views, :style
       
       ACCEPTED_TYPES = [:one_to_many, :many_to_one, :one_to_one, :one_to_one_not_navigable, :many_to_many]
       
@@ -28,6 +28,10 @@ module MDWA
         skip_views
       end
       
+      def skip_views!
+        self.skip_views = true
+      end
+      
       #
       # Return the mapped type for the code generation.
       #

data/lib/mdwa/dsl/entity_attribute.rb

@@ -6,7 +6,7 @@ module MDWA
 
     class EntityAttribute
       
-      attr_accessor :entity, :name, :type, :default
+      attr_accessor :entity, :name, :type, :default, :style
       
       ACCEPTED_TYPES = MDWA::Generators::ModelAttribute::STATIC_TYPES
       

data/lib/mdwa/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mdd
 version: !ruby/object:Gem::Version
-  version: 3.0.15
+  version: 3.0.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-13 00:00:00.000000000 Z
+date: 2012-09-20 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: 2156169632613244192
+      hash: 2040248424844879994
 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: 2156169632613244192
+      hash: 2040248424844879994
 requirements: []
 rubyforge_project: mdd
 rubygems_version: 1.8.24