csl 1.0.0.pre16 → 1.0.0.pre17

data/lib/csl.rb

@@ -23,6 +23,7 @@ require 'csl/treelike'
 require 'csl/node'
 
 require 'csl/info'
+require 'csl/date_part'
 
 require 'csl/locale'
 require 'csl/locale/date'

data/lib/csl/date_part.rb

@@ -0,0 +1,52 @@
+module CSL
+  module DatePart
+
+    def range_delimiter
+      attributes.fetch(:'range-delimiter', '')
+    end
+
+    def has_name?
+      attribute?(:name)
+    end
+
+    def name
+      attributes[:name].to_s
+    end
+
+    def has_form?
+      attribute?(:form)
+    end
+
+    def form
+      case
+      when has_form?
+        attributes[:form].to_s
+      when day?
+        'numeric'
+      else
+        'long'
+      end
+    end
+
+    Schema.values[:date_part][:form].each do |type|
+      pattern = Regexp.new("^#{type}", true)
+
+      define_method("#{type}?".tr('-', '_')) do
+        form =~ pattern
+      end
+    end
+
+    def year?
+      name =~ /year/i
+    end
+
+    def month?
+      name =~ /month/i
+    end
+
+    def day?
+      name =~ /day/i
+    end
+
+  end
+end

data/lib/csl/locale/date.rb

@@ -21,10 +21,23 @@ module CSL
 				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
@@ -35,12 +48,7 @@ module CSL
       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
 
 

data/lib/csl/schema.rb

@@ -91,7 +91,15 @@ module CSL
 			@attributes.values_at(:affixes, :font).flatten)
 
     @attributes.freeze
+
+    @values = Hash.new { |h,k| h.fetch(k.to_sym, nil) }.merge({
+      :date_part => {
+        :form => %w{ numeric numeric-leading-zeros ordinal long short }
+      }
+    })
     
+    @values.freeze
+
     @file = File.expand_path('../../../vendor/schema/csl.rng', __FILE__)
     
     @validators = {
@@ -120,7 +128,7 @@ module CSL
     class << self
       
       attr_accessor :version, :namespace, :types, :variables, :categories,
-        :attributes, :preamble
+        :attributes, :preamble, :values
       
       private :new
       

data/lib/csl/style/date.rb

@@ -2,7 +2,6 @@ module CSL
   class Style
 
     class Date < Node
-
       attr_defaults :'date-parts' => 'year-month-day'
 
       attr_struct :name, :form, :'range-delimiter', :'date-parts', :variable,
@@ -22,6 +21,12 @@ module CSL
         yield self if block_given?
       end
 
+      # @return [Array<String>] the localized date parts to be used
+      def date_parts_filter
+        attributes[:'date-parts'].to_s.split(/-/)
+      end
+      alias parts_filter date_parts_filter
+
       def delimiter
         attributes.fetch(:delimiter, '')
       end
@@ -37,56 +42,37 @@ module CSL
       def has_form?
         attribute?(:form)
       end
+      alias localized? has_form?
 
       def form
         attributes[:form]
       end
 
+      def numeric?
+        attributes[:form].to_s =~ /^numeric$/i
+      end
+
+      def text?
+        attributes[:form].to_s =~ /^text$/i
+      end
+
       def has_date_parts?
         !date_parts.empty?
       end
       alias has_parts? has_date_parts?
 
+      def has_overrides?
+        localized? && has_parts?
+      end
     end
 
     class DatePart < Node
+      has_no_children
+
       attr_struct :name, :form, :'range-delimiter',
         *Schema.attr(:formatting, :periods)
 
-      def range_delimiter
-        attributes.fetch(:'range-delimiter', '')
-      end
-
-      def name
-        attributes[:name].to_s
-      end
-
-      def has_form?
-        attribute?(:form)
-      end
-
-      def form
-        case
-        when has_form?
-          attributes[:form]
-        when has_parent?
-          parent.form
-        else
-          nil
-        end
-      end
-
-      def year?
-        name =~ /year/i
-      end
-
-      def month?
-        name =~ /month/i
-      end
-
-      def day?
-        name =~ /day/i
-      end
+      include CSL::DatePart
     end
 
   end

data/lib/csl/version.rb

@@ -1,3 +1,3 @@
 module CSL  
-  VERSION = '1.0.0.pre16'.freeze
+  VERSION = '1.0.0.pre17'.freeze
 end

data/spec/csl/locale/date_spec.rb

@@ -8,7 +8,7 @@ module CSL
     
     it { should_not be_nil }
     
-    it { should_not be_text }
+    it { should be_text }
     it { should_not be_numeric }
   
     describe '#parts' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csl
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre16
+  version: 1.0.0.pre17
   prerelease: 6
 platform: ruby
 authors:
@@ -109,6 +109,7 @@ files:
 - features/support/env.rb
 - lib/csl.rb
 - lib/csl/compatibility.rb
+- lib/csl/date_part.rb
 - lib/csl/errors.rb
 - lib/csl/extensions.rb
 - lib/csl/info.rb
@@ -182,7 +183,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3642197188366485862
+      hash: -438810669519834613
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: