mdd 3.0.7 → 3.0.8

data/lib/generators/mdwa/templates/templates/scaffold/helper.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 ===entity_code===
-module <%= @entity.klass %>Helper
+module <%= @model.controller_name %>Helper
 end

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

@@ -43,13 +43,27 @@ module Mdwa
       def generate_model_controller_helper_views
         @entities.each do |entity|
           generator_model = entity.generator_model
-          mdwa_template "#{entity.file_name}/model.rb", "app/models/#{generator_model.space}/#{generator_model.singular_name}.rb"
-          mdwa_template "#{entity.file_name}/helper.rb", "app/controllers/#{generator_model.space}/#{generator_model.plural_name}_helper.rb"
-          mdwa_template "#{entity.file_name}/controller.rb", "app/controllers/#{generator_model.space}/#{generator_model.plural_name}_controller.rb"
-
-          Dir.glob("#{Rails.root}/#{MDWA::DSL::TEMPLATES_PATH}#{entity.file_name}/views/*").each do |file|
-            file_name = File.basename(file)
-            mdwa_template "#{entity.file_name}/views/#{file_name}", "app/views/#{generator_model.space}/#{generator_model.plural_name}/#{file_name}"
+          
+          namespaces = Dir.glob("#{Rails.root}/#{MDWA::DSL::TEMPLATES_PATH}#{entity.file_name}/*").select{|d| File.directory?(d) and File.basename(d) != 'views'}
+          if !namespaces.count.zero?
+            namespaces.each do |namespace|
+              mdwa_template "#{entity.file_name}/#{File.basename namespace}/model.rb", "app/models/#{File.basename namespace}/#{generator_model.singular_name}.rb"
+              mdwa_template "#{entity.file_name}/#{File.basename namespace}/helper.rb", "app/helpers/#{File.basename namespace}/#{generator_model.plural_name}_helper.rb"
+              mdwa_template "#{entity.file_name}/#{File.basename namespace}/controller.rb", "app/controllers/#{File.basename namespace}/#{generator_model.plural_name}_controller.rb"
+              Dir.glob("#{namespace}/views/*").each do |file|
+                file_name = File.basename(file)
+                mdwa_template "#{entity.file_name}/#{File.basename namespace}/views/#{file_name}", "app/views/#{File.basename namespace}/#{generator_model.plural_name}/#{file_name}"
+              end
+            end
+          else
+            entity_name = "#{Rails.root}/#{MDWA::DSL::TEMPLATES_PATH}#{entity.file_name}"
+            mdwa_template "#{entity_name}/model.rb", "app/models/#{generator_model.space}/#{generator_model.singular_name}.rb"
+            mdwa_template "#{entity_name}/helper.rb", "app/helpers/#{generator_model.space}/#{generator_model.plural_name}_helper.rb"
+            mdwa_template "#{entity_name}/controller.rb", "app/controllers/#{generator_model.space}/#{generator_model.plural_name}_controller.rb"
+            Dir.glob("#{entity_name}/views/*").each do |file|
+              file_name = File.basename(file)
+              mdwa_template "#{entity.file_name}/views/#{file_name}", "app/views/#{generator_model.space}/#{generator_model.plural_name}/#{file_name}"
+            end
           end
         end
       end
@@ -177,7 +191,7 @@ module Mdwa
           end
           
           # if table is not created yet, ignore
-          next unless model_class.table_exists?
+          next if model_class.nil? or !model_class.table_exists?
           
           # search for changes in this entity
           model_class.columns.each do |column|
@@ -242,7 +256,8 @@ module Mdwa
       private
         
         def mdwa_template(file_to_read, file_to_write)
-          read = File.read("#{Rails.root}/#{MDWA::DSL::TEMPLATES_PATH}/#{file_to_read}")
+          file_path = "#{Rails.root}/#{MDWA::DSL::TEMPLATES_PATH}/#{file_to_read}"
+          read = File.read(file_path)
           erb = ERB.new(read, nil, '-')
 
           create_file "#{Rails.root}/#{file_to_write}", erb.result, :force => true

data/lib/mdwa/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mdd
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-10 00:00:00.000000000 Z
+date: 2012-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -407,7 +407,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2577917960470046169
+      hash: 3429129246663173531
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -416,7 +416,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2577917960470046169
+      hash: 3429129246663173531
 requirements: []
 rubyforge_project: mdd
 rubygems_version: 1.8.24