citeproc 1.0.0.pre1 → 1.0.0.pre2

data/Rakefile

@@ -33,6 +33,13 @@ end
 require 'cucumber/rake/task'
 Cucumber::Rake::Task.new(:cucumber)
 
+task :release do |t|
+  system "gem build citeproc.gemspec"
+  system "git tag #{CiteProc::VERSION}"
+  system "git push --tags"
+  system "gem push citeproc-#{CiteProc::VERSION}.gem"
+end
+
 task :default => :spec
 
 require 'yard'

data/citeproc.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.date        = Time.now.strftime('%Y-%m-%d')
 
   s.add_runtime_dependency('multi_json', '~>1.3.5')
-  s.add_runtime_dependency('namae', '~>0.1')
+  s.add_runtime_dependency('namae', '~>0.3')
   
   s.add_development_dependency 'cucumber', '~>1.2'
   s.add_development_dependency 'rspec', '~>2.7'

data/lib/citeproc/citation_data.rb

@@ -5,18 +5,18 @@ module CiteProc
 	# have a valid {#id} attribute used to retrieve the correpsonding {Item}
 	# containing the actual bibliographic data.
 	class CitationItem
-		
+
 		include Attributes
-		
+
 		@labels = [
 			:book, :chapter, :column, :figure, :folio, :issue, :line, :note, :opus,
 			:page, :paragraph, :part, :section, :'sub-verbo', :verse, :volume
 		].freeze
-		
+
 		class << self
-			attr_reader :labels			
+			attr_reader :labels
 		end
-		
+
 		# @!attribute id
 		# @return [Symbol,String] the id of the corresponding resource
 
@@ -33,14 +33,14 @@ module CiteProc
 		# @!attribute suppress_author
 		# @return [Boolean] whether or not author names will not be included
 		#   in the citation output for this cite
-  	
+
   	# @!attribute author_only
   	# This optional parameter provides a means for certain demanding styles
   	# that require the processor output to be divided between the main text
   	# and a footnote.
   	# @return [Boolean] whether or not only the author name will be included
   	#   in the citation output for this cite
-  	
+
   	# @!attribute prefix
   	# @return [String] a string to print before cites produced for this item
 
@@ -50,7 +50,7 @@ module CiteProc
 		attr_predicates :id, :locator, :label, :'suppress-author',
 			:'author-only', :prefix, :suffix
 
-		# Attributes added by processor	
+		# Attributes added by processor
 		attr_predicates :sortkeys, :postion, :'first-reference-note-number',
 			:'near-note', :unsorted
 
@@ -70,19 +70,19 @@ module CiteProc
 		end
 
 	end
-	
-	
-	
-	
+
+
+
+
 	class CitationData
-		
+
 		extend Forwardable
 		include Enumerable
-		
+
 		@defaults = {
 			:footnote => 0
 		}.freeze
-		
+
 		@rb2cp = {
 			:id => 'citationID',
 			:items => 'citationItems',
@@ -90,22 +90,22 @@ module CiteProc
 			:footnote => 'noteIndex',
 			:options => 'properties'
 		}
-		
+
 		@cp2rb = @rb2cp.invert.freeze
 		@rb2cp.freeze
-		
+
 		class << self
 			attr_reader :defaults, :cp2rb, :rb2cp
 		end
-		
+
 		attr_accessor :id
-		
+
 		attr_reader :items, :options, :sorted_items
-		
+
 		alias properties options
-		
+
 		def_delegators :@items, :length, :empty?, :[]
-		
+
 		# Some delegators should return self
 		[:push, :<<, :unshift, :concat].each do |m|
 			define_method(m) do |*arguments|
@@ -113,13 +113,13 @@ module CiteProc
 				self
 			end
 		end
-				
+
 		def initialize(attributes = nil, options = {})
 			@options = CitationData.defaults.merge(options)
 			@items, @sorted_items = [], []
 			merge(attributes)
 		end
-		
+
 		def initialize_copy(other)
 			@options = other.options.dup
 			@items = other.items.map(&:dup)
@@ -129,7 +129,7 @@ module CiteProc
 
     def merge(other)
       return self if other.nil?
-      
+
       case other
       when String, /^\s*\{/
         other = MulitJson.decode(other, :symbolize_keys => true)
@@ -144,10 +144,10 @@ module CiteProc
       end
 
 			other = convert_from_citeproc(other)
-			
+
 			items.concat(Array(other.delete(:items)).map { |i| CitationItem.create!(i) })
 			sorted_items.concat(Array(other.delete(:sorted_items)))
-			
+
 			properties = other.delete(:options)
 			options.merge!(convert_from_citeproc(Hash[properties])) unless properties.nil?
 
@@ -155,9 +155,9 @@ module CiteProc
 
       self
     end
-		
+
 		alias update merge
-		
+
 		def each
 			if block_given?
 				items.each(&Proc.new)
@@ -174,46 +174,46 @@ module CiteProc
 		def index
 			options[:footnote]
 		end
-		
+
 		def footnote?
 			options[:footnote] > 0
 		end
-		
+
 		def to_citeproc
 			cp = {}
-			
+
 			cp[CitationData.rb2cp[:items]] = items.map(&:to_citeproc)
 			cp[CitationData.rb2cp[:options]] = { CitationData.rb2cp[:footnote] => index }
-			
+
 			cp[CitationData.rb2cp[:id]] = id if processed?
-			
+
 			cp
 		end
-		
+
 		def to_json
 			MultiJson.encode(to_citeproc)
 		end
-		
+
 		alias to_s to_json
-		
+
 		# @return [String] a human-readable representation of the citation data
 		def inspect
 			"#<CiteProc::CitationData items=[#{length}]>"
 		end
-		
+
 		private
-		
+
 		def convert_from_citeproc(hash)
 			hash = hash.symbolize_keys
-			
+
 			CitationData.cp2rb.each do |cp, rb|
 				cp = cp.to_sym
 				hash[rb] = hash.delete(cp) if hash.has_key?(cp)
 			end
-			
+
 			hash
 		end
-		
+
 	end
-	
+
 end

data/lib/citeproc/item.rb

@@ -82,6 +82,22 @@ module CiteProc
       @attributes = other.attributes.deep_copy
     end
     
+		# @param name [Symbol] the name of the variable
+		#
+		# @param options [Hash]
+		# @option options [:short] :form (nil) when given, the variable's
+		#   short form will be returned if available.
+		#
+		# @return [Variable, nil] the matching variable
+		def variable(name, options = {})
+			if options.key?(:form) && options[:form].to_sym == :short
+				var = attributes["#{name}-short"]
+				return var unless var.nil?
+			end
+			
+			attributes[name]
+		end
+		
     # Calls a block once for each field in the item, passing the field's
     # name-value pair as parameters.
     #

data/lib/citeproc/version.rb

@@ -1,3 +1,3 @@
 module CiteProc
-  VERSION = '1.0.0.pre1'.freeze
+  VERSION = '1.0.0.pre2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: citeproc
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre1
+  version: 1.0.0.pre2
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70221817636060 !ruby/object:Gem::Requirement
+  requirement: &70261116434580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,21 @@ dependencies:
         version: 1.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *70221817636060
+  version_requirements: *70261116434580
 - !ruby/object:Gem::Dependency
   name: namae
-  requirement: &70221817635560 !ruby/object:Gem::Requirement
+  requirement: &70261116433900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70221817635560
+  version_requirements: *70261116433900
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70221817635100 !ruby/object:Gem::Requirement
+  requirement: &70261116433180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.2'
   type: :development
   prerelease: false
-  version_requirements: *70221817635100
+  version_requirements: *70261116433180
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70221817634600 !ruby/object:Gem::Requirement
+  requirement: &70261116448700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70221817634600
+  version_requirements: *70261116448700
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70221817634140 !ruby/object:Gem::Requirement
+  requirement: &70261116448200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70221817634140
+  version_requirements: *70261116448200
 description: ! "\n    A cite processor interface for Citation Style Language (CSL)
   styles.\n    "
 email:
@@ -134,6 +134,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1866054154081185825
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: