csl 1.0.0.pre13 → 1.0.0.pre14

data/Gemfile

@@ -16,6 +16,7 @@ group :extra do
   gem 'guard', '~>1.2'
   gem 'guard-rspec', '~>1.1'
   gem 'guard-cucumber', '~>1.2'
+  gem 'rb-fsevent', '~>0.9.1', :platforms => [:mri_19, :rbx]
 
 	gem 'yard', '~>0.8', :platforms => [:mri_19]
 	gem 'redcarpet', '~>2.1', :platforms => [:mri_19]

data/lib/csl/loader.rb

@@ -23,16 +23,22 @@ module CSL
     #
     # @note
     #   The base class is exepcted to define a #parse method.
+    #
+    # @raise ParseError
+    #
+    # @return [Style, Locale] the parsed CSL resource
     def load(input)
       case
       when input.respond_to?(:read)
         data = input.read
       when input.to_s =~ /^\s*</
-        data = input
+        data = input.to_s
       else
 
+        input = input.to_s
+
 				case
-				when File.exists?(input.to_s)
+				when File.exists?(input)
 					location = input
 				when File.exists?(extend_name(input))
 					location = extend_name(input)

data/lib/csl/locale/term.rb

@@ -26,6 +26,8 @@ module CSL
         options = Term.specialize(options)
         options[:name] = name = name.to_s
 
+        # TODO default to long form
+
         term = registry[name].detect { |t| t.match?(options) }
         return term unless term.nil? && options.delete(:'gender-form')
 

data/lib/csl/style/label.rb

@@ -8,20 +8,33 @@ module CSL
 
       has_no_children
 
+      @variables = [:locator, :page].concat(Schema.variables[:number]).freeze
+
+      class << self
+        attr_reader :variables
+      end
+
       def has_variable?
+        return parent.has_variable? if names_label?
         attribute?(:variable)
       end
 
+      # The value of the node's variable attribute. If the {Label}
+      # is the child of a {Names} node, returns the parent's variable
+      # attribute instead.
+      #
+      # @return [String] the value of the node's variable attribute
       def variable
+        return parent.variable if name_label?
         attributes[:variable]
       end
 
-      def locator?
-        variable.to_s =~ /^locator$/i
-      end
+      Label.variables.each do |type|
+        pattern = Regexp.new("^#{type}", true)
 
-      def page?
-        variable.to_s =~ /^page$/i
+        define_method("#{type}?".tr('-', '_')) do
+          variable.to_s =~ pattern
+        end
       end
 
       def always_pluralize?
@@ -32,6 +45,12 @@ module CSL
         attributes[:plural].to_s =~ /^never$/i
       end
 
+      # @return [Boolean] whether or not the {Label} is inside a {Names} node
+      def names_label?
+        parent.is_a?(Names)
+      end
+      alias name_label? names_label?
+
     end
 
   end

data/lib/csl/style/names.rb

@@ -1,26 +1,34 @@
 module CSL
   class Style
-    
+
     class Names < Node
-      
-      attr_struct :variable, *Schema.attr(:names, :delimiter, :affixes, :display, :font)      
-      
+
+      attr_struct :variable, *Schema.attr(:names, :delimiter, :affixes, :display, :font)
+
       attr_children :name, :'et-al', :label, :substitute
-      
+
       alias labels label
-      
+
       def initialize(attributes = {})
         super(attributes)
         children[:label] = []
-        
+
         yield self if block_given?
       end
-      
+
+      def has_variable?
+        attribute?(:variable)
+      end
+
+      def variable
+        attributes[:variable]
+      end
+
     end
-    
-    
+
+
     class Name < Node
-    
+
       attr_struct :form, *Schema.attr(:name, :affixes, :font, :delimiter)
 
       attr_children :'name-part'
@@ -33,14 +41,14 @@ module CSL
 
         yield self if block_given?
       end
-      
+
     end
 
     class NamePart < Node
       has_no_children
       attr_struct :name, :'text-case', *Schema.attr(:affixes, :font)
     end
-    
+
     class EtAl < Node
       has_no_children
       attr_struct :term, *Schema.attr(:affixes, :font)
@@ -48,7 +56,7 @@ module CSL
 
     class Substitute < Node
     end
-    
-    
+
+
   end
 end

data/lib/csl/version.rb

@@ -1,3 +1,3 @@
 module CSL  
-  VERSION = '1.0.0.pre13'.freeze
+  VERSION = '1.0.0.pre14'.freeze
 end

data/spec/csl/style_spec.rb

@@ -10,11 +10,17 @@ module CSL
 
     describe '#to_xml' do
       it 'returns an empty style' do
-        Style.new.to_xml.should match(/<style[^>]*\/>/)
+        Style.new.to_xml.should match(/^<style[^>]*\/>/)
       end
 
       it 'supports round-trip for apa style' do
-        Style.parse(Style.load(:apa).to_xml).should be_a(Style)
+        apa = Style.load(:apa)
+        apa.should be_a(Style)
+
+        xml = apa.to_xml
+        xml.should match(/^<style[^>]*>/)
+
+        Style.parse(xml).should be_a(Style)
       end
     end
 
@@ -73,23 +79,23 @@ module CSL
       it 'raises a validation error when adding a macro without name' do
         expect { Style.new << Style::Macro.new }.to raise_error(ValidationError)
       end
-      
+
       describe 'when it has an "author" macro' do
         before(:all) { style << Style::Macro.new(:name => 'author') }
 
         it 'has macros' do
           style.should have_macros
         end
-        
+
         it 'the macro is registered in the macros hash' do
           style.macros.should have_key('author')
           style.macros['author'].should be_a(Style::Macro)
         end
-        
+
         it 'raises a validation error when adding a macro with a duplicate name' do
           expect { style << Style::Macro.new(:name => 'author') }.to raise_error(ValidationError)
         end
-        
+
         it 'unregisters the macro when it is deleted' do
           expect { style.delete style.macros['author'] }.to change { style.macros.length }
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csl
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre13
+  version: 1.0.0.pre14
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-17 00:00:00.000000000 Z
+date: 2013-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: namae
@@ -182,7 +182,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2590038154395651463
+      hash: -4493018161482760031
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: