lib/activefacts/generate/ruby.rb in activefacts-0.8.9 vs lib/activefacts/generate/ruby.rb in activefacts-0.8.10

@@ -143,15 +143,15 @@
         puts "    maybe :"+role_name
       end
 
       def binary_dump(role, role_name, role_player, mandatory = nil, one_to_one = nil, readings = nil, other_role_name = nil, other_method_name = nil)
         # Find whether we need the name of the other role player, and whether it's defined yet:
-        if role_name.camelcase(true) == role_player.name.gsub(/ /,'').sub(/^[a-z]/) {|i| i.upcase}
+        if role_name.camelcase == role_player.name.gsub(/ /,'').sub(/^[a-z]/) {|i| i.upcase}
           # Don't use Class name if implied by rolename
           role_reference = nil
         else
-          role_reference = ":class => "+concept_reference(role_player)
+          role_reference = ":class => "+object_type_reference(role_player)
         end
         other_role_name = ":counterpart => :"+other_role_name.gsub(/ /,'_') if other_role_name
 
         line = "    #{one_to_one ? "one_to_one" : "has_one" } " +
                 [ ":"+role_name.gsub(/ /,'_'),
@@ -165,14 +165,14 @@
         line += "\# See #{role_player.name.gsub(/ /,'')}.#{other_method_name}" if other_method_name
         puts line
         #puts "    \# REVISIT: #{other_role_name} has values restricted to #{role.role_value_constraint}\n" if role.role_value_constraint
       end
 
-      def concept_reference concept
-        if !@concept_types_dumped[concept]
-          '"'+concept.name.gsub(/ /,'')+'"'
+      def object_type_reference object_type
+        if !@object_types_dumped[object_type]
+          '"'+object_type.name.gsub(/ /,'')+'"'
         else
-          role_reference = concept.name.gsub(/ /,'')
+          role_reference = object_type.name.gsub(/ /,'')
         end
       end
 
     end
   end