csl 1.0.0.pre6 → 1.0.0.pre7

data/lib/csl/locale.rb

@@ -62,11 +62,11 @@ module CSL
     private :attributes
     undef_method :[]=
 
-    # call-seq:
-    #   Locale.new                                         -> default
-    #   Locale.new('en')                                   -> American English
-    #   Locale.new('en', :'punctuation-in-quote' => fales) -> with style-options
-    #   Locale.new(:lang => 'en-GB', :version => '1.0')    -> British English
+    # @example
+    #   Locale.new                                         #-> default
+    #   Locale.new('en')                                   #-> American English
+    #   Locale.new('en', :'punctuation-in-quote' => fales) #-> with style-options
+    #   Locale.new(:lang => 'en-GB', :version => '1.0')    #-> British English
     #
     # Returns a new locale. In the first form, the language/regions is set
     # to the default language and region. In the second form the

data/lib/csl/schema.rb

@@ -88,7 +88,7 @@ module CSL
     @attributes.each_value { |v| v.map!(&:to_sym).freeze }
 
 		@attributes[:formatting] = [:'text-case'].concat(
-			@attributes.values_at(:affixes, :quotes, :font).flatten)
+			@attributes.values_at(:affixes, :font).flatten)
 
     @attributes.freeze
     

data/lib/csl/style/layout.rb

@@ -4,6 +4,9 @@ module CSL
     class Layout < Node
       attr_struct *Schema.attr(:affixes, :font, :delimiter)
     
+			def delimiter
+				attributes.fetch(:delimiter, '')
+			end
     end
     
   end

data/lib/csl/style/number.rb

@@ -1,12 +1,20 @@
 module CSL
   class Style
-    
+
     class Number < Node
       attr_struct :variable, :form, :'text-case',
         *Schema.attr(:affixes, :display, :font)
 
       has_no_children
 
+			def has_variable?
+				attribute?(:variable)
+			end
+
+			def variable
+				attributes[:variable]
+			end
+
       # @return [Boolean] whether or not the number's format is set to
       #   :numeric; also returns true if the number's form attribute is not
       #   set or nil.
@@ -16,19 +24,19 @@ module CSL
 
       # @return [Boolean] whether or not the number's format is set to :ordinal
       def ordinal?
-        attribute?(:form) && attributes.form.to_sym == :ordinal
+				attribute?(:form) && attributes.form.to_sym == :ordinal
       end
-      
+
       # @return [Boolean] whether or not the number's format is set to :'long-ordinal'
       def long_ordinal?
         attribute?(:form) && attributes.form.to_sym == :'long-ordinal'
       end
-      
+
       # @return [Boolean] whether or not the number's format is set to :roman
       def roman?
         attribute?(:form) && attributes.form.to_sym == :roman
       end
-            
+
     end
 
   end

data/lib/csl/style/text.rb

@@ -3,9 +3,47 @@ module CSL
 
     class Text < Node
       attr_struct :variable, :macro, :term, :form, :plural, :value,
-        *Schema.attr(:formatting, :display, :periods)
+        *Schema.attr(:formatting, :display, :quotes, :periods)
 
       has_no_children
+
+			def has_variable?
+				attribute?(:variable)
+			end
+
+			def variable
+				attributes[:variable]
+			end
+			
+			def variable_options
+				attributes_for :form
+			end
+
+			def has_macro?
+				attribute?(:macro)
+			end
+
+			# @return [Macro, nil]
+			def macro
+				raise unless parent.respond_to?(:macros)
+				parent.macros[attributes[:macro]]
+			end
+
+			def has_term?
+				attribute?(:term)
+			end
+
+			def term_options
+				attributes_for :term, :plural, :form
+			end
+
+			def has_value?
+				attribute?(:value)
+			end
+
+			def value
+				attributes[:value]
+			end
     end
 
   end

data/lib/csl/version.rb

@@ -1,3 +1,3 @@
 module CSL  
-  VERSION = '1.0.0.pre6'.freeze
+  VERSION = '1.0.0.pre7'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csl
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre6
+  version: 1.0.0.pre7
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: namae
-  requirement: &70235476097460 !ruby/object:Gem::Requirement
+  requirement: &70168631472240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70235476097460
+  version_requirements: *70168631472240
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70235476095920 !ruby/object:Gem::Requirement
+  requirement: &70168631469080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *70235476095920
+  version_requirements: *70168631469080
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70235476095040 !ruby/object:Gem::Requirement
+  requirement: &70168631491820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70235476095040
+  version_requirements: *70168631491820
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70235476093880 !ruby/object:Gem::Requirement
+  requirement: &70168631488840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70235476093880
+  version_requirements: *70168631488840
 description: ! "\n\t\tA Ruby parser and library for the Citation Style Language (CSL),
   an open\n\t\tXML-based language to describe the formatting of citations and\n\t\tbibliographies.\n\t\t"
 email:
@@ -164,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1174116000555446406
+      hash: -1756583950197893123
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: