lib/csl/locale/date.rb in csl-1.0.0.pre16 vs lib/csl/locale/date.rb in csl-1.0.0.pre17

@@ -19,29 +19,37 @@
       
 			def added_to(node)
 				raise ValidationError, "parent must be locale node: was #{node.inspect}" unless node.is_a?(Locale)
 			end
 
-      %w{ text numeric }.each do |type|
-        define_method("#{type}?") { attributes.form == type }
+      def delimiter
+        attributes.fetch(:delimiter, '')
       end
 
+      def text?
+        !numeric?
+      end
+
+      def numeric?
+        attributes[:form].to_s =~ /^numeric$/i
+      end
+
+      def has_date_parts?
+        !date_parts.empty?
+      end
+      alias has_parts? has_date_parts?
+      
 		end
 
 		# DatePart represent the localized formatting options for an individual
 		# date part (day, month, or year).
 		class DatePart < Node
       has_no_children
 
       attr_struct :name, :form, :'range-delimiter',
         *Schema.attr(:formatting, :periods)
 
-      %w{ day month year }.each do |part|
-        define_method("#{part}?") do
-          attributes.name == part
-        end
-      end
-
+      include CSL::DatePart
 		end
 
 
   end
 end