mdd 2.0.2 → 2.0.3

data/lib/generators/mdd/association/association_generator.rb

@@ -44,33 +44,36 @@ module Mdd
       def model
         case @relation.to_sym 
         when :belongs_to
-          inject_into_class "app/models/#{@model1.space}/#{@model1.singular_name}.rb", @model1.klass.constantize do
-            "\n\tbelongs_to :#{@model2.singular_name}, :class_name => '#{@model2.klass}'\n\tattr_accessible :#{@model2.singular_name.foreign_key}"
+          inject_into_class "app/models/#{@model1.space}/#{@model1.singular_name}.rb", @model1.klass.classify.constantize do
+            ret = []
+            ret << "\n\tbelongs_to :#{@model2.singular_name}, :class_name => '#{@model2.klass}'"
+            ret << "\tattr_accessible :#{@model2.singular_name.foreign_key}"
+            ret.join("\n")
           end
         when :has_one
-          inject_into_class "app/models/#{@model1.space}/#{@model1.singular_name}.rb", @model1.klass.constantize do
+          inject_into_class "app/models/#{@model1.space}/#{@model1.singular_name}.rb", @model1.klass.classify.constantize do
             "\n\thas_one :#{@model2.singular_name}, :class_name => '#{@model2.klass}'\n"
           end
         when :has_many
-          inject_into_class "app/models/#{@model1.space}/#{@model1.singular_name}.rb", @model1.klass.constantize do
+          inject_into_class "app/models/#{@model1.space}/#{@model1.singular_name}.rb", @model1.klass.classify.constantize do
             "\n\thas_many :#{@model2.plural_name}, :class_name => '#{@model2.klass}'\n"
           end
         when :has_and_belongs_to_many
-          inject_into_class "app/models/#{@model1.space}/#{@model1.singular_name}.rb", @model1.klass.constantize do
+          inject_into_class "app/models/#{@model1.space}/#{@model1.singular_name}.rb", @model1.klass.classify.constantize do
             "\n\thas_and_belongs_to_many :#{@model2.plural_name}, :join_table => :#{many_to_many_table_name}\n"
           end
-          inject_into_class "app/models/#{@model2.space}/#{@model2.singular_name}.rb", @model2.klass.constantize do
+          inject_into_class "app/models/#{@model2.space}/#{@model2.singular_name}.rb", @model2.klass.classify.constantize do
             "\n\thas_and_belongs_to_many :#{@model1.plural_name}, :join_table => :#{many_to_many_table_name}\n"
           end
         when :nested_one
-          inject_into_class "app/models/#{@model1.space}/#{@model1.singular_name}.rb", @model1.klass.constantize do
+          inject_into_class "app/models/#{@model1.space}/#{@model1.singular_name}.rb", @model1.klass.classify.constantize do
             # belongs_to
             # attr_accessible attributes
             # attr_nested_attributes 
             "\n\tbelongs_to :#{@model2.singular_name}, :class_name => '#{@model2.klass}'\n\tattr_accessible :#{@model2.singular_name}_attributes, :#{@model2.singular_name.foreign_key}\n\taccepts_nested_attributes_for :#{@model2.singular_name}, :allow_destroy => true\n"
           end
         when :nested_many
-          inject_into_class "app/models/#{@model1.space}/#{@model1.singular_name}.rb", @model1.klass.constantize do
+          inject_into_class "app/models/#{@model1.space}/#{@model1.singular_name}.rb", @model1.klass.classify.constantize do
             # belongs_to
             # attr_accessible attributes
             # attr_nested_attributes 

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

@@ -156,7 +156,7 @@ module Mdd
       def db_seeds
         if ask_question( "Create DB Seeds?")
           copy_file 'db/seeds/site.rb', 'db/seeds/site.rb'
-          create_file 'db/seeds.rb'
+          create_file 'db/seeds.rb' unless File.exist?('db/seeds.rb')
           append_file 'db/seeds.rb' do
              "\nrequire File.expand_path( '../seeds/site', __FILE__ )\n"
           end

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

@@ -79,6 +79,32 @@ module Mdd
           end
         end
       end
+      
+      def locales
+        destination = 'config/locales/mdwa_model_specific.en.yml'
+        inside Rails.root do
+          create_file destination unless File.exist?(destination)
+          append_file destination, "en:\n"
+        end
+        
+        append_file destination, :after => "en:\n" do 
+          lines = []
+          lines <<  "  #{@model.plural_name}:"
+          lines <<  "    create_success: \"#{@model.singular_name.humanize} created.\""
+          lines <<  "    update_success: \"#{@model.singular_name.humanize} updated.\""
+          lines <<  "    destroy_success: \"#{@model.singular_name.humanize} destroyed.\""
+          lines <<  "    index_title: \"#{@model.plural_name.humanize}\""
+          lines <<  "    show_title: \"#{@model.singular_name.humanize}\""
+          lines <<  "    new_title: \"New #{@model.singular_name.humanize}\""
+          lines <<  "    edit_title: \"Edit #{@model.singular_name.humanize}\""
+          @model.attributes.each do |attr|
+            lines <<  "    index_#{attr.name}: \"#{attr.name.humanize}\""
+            lines <<  "    show_#{attr.name}: \"#{attr.name.humanize}\""
+          end
+          lines << "\n"
+          lines.join("\n")
+        end
+      end
 
       def routes
         unless options.skip_interface

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

@@ -6,7 +6,7 @@
 	<div class="inside">
 	<%- @model.attributes.each do |attr| -%>
 		<div class="field">
-			<label><%%= t '<%= @model.plural_name %>.index_<%= attr.name %>' %></label>
+			<label><%%= t '<%= @model.plural_name %>.show_<%= attr.name %>' %></label>
 			<span>
 		<%- if !attr.references? -%>
 	        <%%= @<%= @model.singular_name %>.<%= attr.name %> %>

data/lib/mdd/generators/model_attribute.rb

@@ -7,23 +7,25 @@ module Mdd
 			STATIC_TYPES = [:boolean, :date, :datetime, :decimal, :float, :integer, :string, :text, :time, :timestamp, :file]
 
 			# Sets the attributes variables
-			# Format: <name>:<type>||<model>:<reference>:<reference_type>
+			# Format: <name>:<type>,<model>:<reference>:<reference_type>
 			def initialize( arg )
 
 				# sets the variables by the string
 				split = arg.split(':')
-				self.type = split[1] 
 				self.name = split[0]
 				self.reference = split[2]
 				self.reference_type = split[3]
+				self.type = split[1] # type is the most important, so it's the last for override reasons
+				
+				@raw_string = arg
 			end
+			
+			def raw
+			  @raw_string
+		  end
 
 			def name=(value)
-				if references? and !value.end_with?('_id')
-					@name = "#{value.singularize}_id" 
-				else
-					@name = value
-				end
+				@name = value
 			end
 
 			def type=(value)
@@ -32,8 +34,11 @@ module Mdd
 				else
           value_split = value.split(',')
 					@type = Model.new( value_split.first ) # instance of model
-          @type.specific_model_name = value_split.last if value_split.count > 1
+					@type.specific_model_name = value_split.last if value_split.count > 1
 					raise "Invalid reference type" if @type.nil?
+					
+					# rename attribute name if it's a belongs_to association
+					self.name = @type.singular_name.foreign_key if belongs_to?
 				end
 			end
 

data/lib/mdd/version.rb

@@ -1,3 +1,3 @@
 module Mdd
-  VERSION = "2.0.2"
+  VERSION = "2.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mdd
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-02 00:00:00.000000000 Z
+date: 2012-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails