csl 1.0.0.pre21 → 1.0.0.pre22

data/lib/csl/style/number.rb

@@ -1,29 +1,29 @@
 module CSL
   class Style
 
-		# Numbers are CSL rendering elements which output the number variable
-		# selected with the required variable attribute.
+    # Numbers are CSL rendering elements which output the number variable
+    # selected with the required variable attribute.
     class Number < Node
       attr_struct :variable, :form, :'text-case',
         *Schema.attr(:affixes, :display, :font)
 
       has_no_children
 
-			def has_variable?
-				attribute?(:variable)
-			end
+      def has_variable?
+        attribute?(:variable)
+      end
 
-			def variable
-				attributes[:variable]
-			end
+      def variable
+        attributes[:variable]
+      end
 
-			def has_form?
-				attribute?(:form)
-			end
+      def has_form?
+        attribute?(:form)
+      end
 
-			def form
-				attributes[:form]
-			end
+      def form
+        attributes[:form]
+      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
@@ -34,7 +34,7 @@ module CSL
 
       # @return [Boolean] whether or not the number's format is set to :ordinal
       def ordinal?
-				has_form? && form.to_sym == :ordinal
+        has_form? && form.to_sym == :ordinal
       end
 
       # @return [Boolean] whether or not the number's format is set to :'long-ordinal'

data/lib/csl/style/text.rb

@@ -7,39 +7,39 @@ module CSL
 
       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 has_value?
-				attribute?(:value)
-			end
-
-			def value
-				attributes[:value]
-			end
+      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 has_value?
+        attribute?(:value)
+      end
+
+      def value
+        attributes[:value]
+      end
     end
 
   end

data/lib/csl/treelike.rb

@@ -6,7 +6,7 @@ module CSL
     attr_reader :children
     attr_writer :nodename
 
-		protected :parent=
+    protected :parent=
 
     def self.included(base)
       base.extend(ClassMethods)
@@ -120,9 +120,9 @@ module CSL
     end
 
     # @return [Boolean] true if this node has no child nodes; false otherwise.
-		def empty?
-			children.empty?
-		end
+    def empty?
+      children.empty?
+    end
 
     # Unlinks the node and all its children from its parent node. Returns
     # the old parent node or nil.
@@ -212,10 +212,10 @@ module CSL
 
 
     # Add memoized methods. When processing citations, styles will
-		# typically remain stable; therefore cite processors may opt
-		# to use memoized versions of the following methods. These
-		# versions are marked with an exclamation mark as a reminder
-		# that the return values are cached and potentially outdated.
+    # typically remain stable; therefore cite processors may opt
+    # to use memoized versions of the following methods. These
+    # versions are marked with an exclamation mark as a reminder
+    # that the return values are cached and potentially outdated.
     %w{ ancestors descendants siblings root depth }.each do |name|
       ivar = "@#{name}"
       define_method("#{name}!") do
@@ -261,17 +261,17 @@ module CSL
         end
       end
 
-			def constantize_nodename(name)
-			  return constantize(name) if respond_to?(:constantize)
+      def constantize_nodename(name)
+        return constantize(name) if respond_to?(:constantize)
 
         klass = name.to_s.capitalize.gsub(/(\w)-(\w)/) { [$1, $2.upcase].join }
 
-				if const_defined?(klass)
-				  const_get(klass)
-				else
-					nil
-				end
-			end
+        if const_defined?(klass)
+          const_get(klass)
+        else
+          nil
+        end
+      end
 
 
       private
@@ -315,9 +315,9 @@ module CSL
                 if klass
                   value = klass.new(value)
                 else
-                	# try to force convert value
-                	value = (value.is_a?(String) ? TextNode : Node).new(value)
-                	value.nodename = name.to_s
+                  # try to force convert value
+                  value = (value.is_a?(String) ? TextNode : Node).new(value)
+                  value.nodename = name.to_s
                 end
 
               rescue => e

data/lib/csl/version.rb

@@ -1,3 +1,3 @@
 module CSL  
-  VERSION = '1.0.0.pre21'.freeze
+  VERSION = '1.0.0.pre22'.freeze
 end

data/spec/csl/info_spec.rb

@@ -1,25 +1,50 @@
 require 'spec_helper'
 
 module CSL
-  
+
   describe Info do
-    
+
     it { should_not be_nil }
     it { should_not have_children }
-    
-    let(:info) { Info.new }
-    
+
+    before { @info = Info.new }
+
     describe '#nodename' do
       it 'returns "info"' do
         subject.nodename.should == 'info'
       end
     end
-    
+
+    describe 'license' do
+      it { should_not have_rights }
+      it { should_not be_default_license }
+
+      it 'has no license by default' do
+        @info.license.should be_nil
+      end
+
+      it 'setting a license adds a rights node' do
+        expect { @info.license = 'cc' }.to change { @info.has_rights? }
+      end
+
+      it 'setting the default license creates the default rights node' do
+        @info.default_license!
+        @info.should have_rights
+        @info.should be_default_license
+
+        @info.rights.text = 'cc'
+        @info.should_not be_default_license
+
+        @info.default_license!
+        @info.should be_default_license
+      end
+    end
+
     describe '#children' do
       it 'returns a Info::Children instance' do
-        Info.new.children.should be_a(Info::Children)
+        @info.children.should be_a(Info::Children)
       end
-      
+
       it 'allows to set the id by array accessor' do
         lambda { Info.new.children[:id] = 'foo' }.should_not raise_error
       end
@@ -27,90 +52,90 @@ module CSL
 
     describe '#category' do
       it 'returns an empty list by default' do
-        Info.new.category.should be_empty
+        @info.category.should be_empty
       end
     end
 
     describe 'citation-format' do
       it 'has no citation-format by default' do
-        Info.new.citation_format.should be_nil
+        @info.citation_format.should be_nil
       end
-      
+
       it 'setting a citation-format creates a new category node' do
-        expect { info.citation_format = 'foo' }.to change { info.has_categories? }
+        expect { @info.citation_format = 'foo' }.to change { @info.has_categories? }
       end
 
       it 'setting a citation-format actually sets the citation-format' do
-        expect { info.citation_format = 'bar' }.to change { info.citation_format }.to(:bar)
+        expect { @info.citation_format = 'bar' }.to change { @info.citation_format }.to(:bar)
       end
-      
+
       describe 'given a category node with the citation-attribute set' do
-        before(:all) { info.add_child Info::Category.new(:'citation-format' => 'author') }
-        
+        before { @info.add_child Info::Category.new(:'citation-format' => 'author') }
+
         it 'has a citation format' do
-          info.citation_format.should == :author
+          @info.citation_format.should == :author
         end
-        
+
         it 'setting a citation-format does not create a new category node' do
-          expect { info.citation_format = 'foo' }.not_to change { info.categories.length }
+          expect { @info.citation_format = 'foo' }.not_to change { @info.categories.length }
         end
-        
+
         it 'setting a citation-format actually sets the citation-format' do
-          expect { info.citation_format = 'bar' }.to change { info.citation_format }.to(:bar)
+          expect { @info.citation_format = 'bar' }.to change { @info.citation_format }.to(:bar)
         end
       end
-      
+
       describe 'given a category node without the citation-attribute set' do
-        before(:all) { info.add_child Info::Category.new(:field => 'literature') }
-      
+        before { @info.add_child Info::Category.new(:field => 'literature') }
+
         it 'has no citation-format by default' do
-          info.citation_format.should be_nil
+          @info.citation_format.should be_nil
         end
 
         it 'setting a citation-format creates a new category node' do
-          expect { info.citation_format = 'foo' }.to change { info.categories.length }.from(1).to(2)
+          expect { @info.citation_format = 'foo' }.to change { @info.categories.length }.from(1).to(2)
         end
 
         it 'setting a citation-format actually sets the citation-format' do
-          expect { info.citation_format = 'bar' }.to change { info.citation_format }.to(:bar)
+          expect { @info.citation_format = 'bar' }.to change { @info.citation_format }.to(:bar)
         end
       end
     end
-    
+
     describe 'link accessors' do
       it { should_not have_self_link }
       it { should_not have_documentation_link }
       it { should_not have_template_link }
-      
+
       it 'self_link is nil by default' do
-        Info.new.self_link.should be_nil
+        @info.self_link.should be_nil
       end
 
       it 'returns nil if no suitable link is set' do
         Info.new {|i| i.link = {:href => 'foo', :rel => 'documentation'} }.self_link.should be_nil
       end
-      
+
       it 'returns the href value of the link if it is set' do
         Info.new {|i| i.link = {:href => 'foo', :rel => 'self'} }.self_link.should == 'foo'
       end
-      
+
       it 'setter changes the value of existing link' do
         info = Info.new {|i| i.link = {:href => 'foo', :rel => 'self'} }
         expect { info.self_link = 'bar' }.to change { info.self_link }.from('foo').to('bar')
       end
 
       it 'setter creates new link node if link did not exist' do
-        expect { info.self_link = 'bar' }.to change { info.has_self_link? }
-        info.links[0].should be_a(Info::Link)
+        expect { @info.self_link = 'bar' }.to change { @info.has_self_link? }
+        @info.links[0].should be_a(Info::Link)
       end
-      
+
     end
-    
+
     describe '#to_xml' do
       it 'returns an empty info element by default' do
         subject.to_xml.should == '<info/>'
       end
-      
+
       it 'prints the id if present' do
         Info.new { |i| i.set_child_id 'apa' }.to_xml.should == '<info><id>apa</id></info>'
       end
@@ -119,7 +144,7 @@ module CSL
         Info.new { |i| i.category = {:'citation-format' => 'author'} }.to_xml.should == '<info><category citation-format="author"/></info>'
       end
     end
-    
+
     describe '#pretty_print' do
       it 'returns an empty info element by default' do
         subject.pretty_print.should == '<info/>'
@@ -129,19 +154,19 @@ module CSL
         Info.new { |i| i.set_child_id 'apa' }.pretty_print.should == "<info>\n  <id>apa</id>\n</info>"
       end
     end
-    
+
     describe '#tags' do
       it 'returns a list with an empty info element by default' do
         subject.tags.should == ['<info/>']
       end
-      
+
       it 'returns a nested list if id is present' do
         Info.new { |i| i.set_child_id 'apa' }.tags.should == ['<info>', ['<id>apa</id>'], '</info>']
       end
-      
+
     end
   end
-  
+
   describe Info::Author do
     it { should_not be_nil }
 
@@ -156,7 +181,7 @@ module CSL
       it 'returns nil by default' do
         subject.name.should be nil
       end
-      
+
       it 'returns the name if set' do
         poe.name.to_s.should == 'E. A. Poe'
       end
@@ -173,42 +198,42 @@ module CSL
         poe.email.to_s.should == 'poe@baltimore.com'
       end
     end
-    
+
     describe '#to_xml' do
       it 'returns an empty author by default' do
         subject.to_xml.should == '<author/>'
       end
-            
+
       it 'prints all children' do
         poe.to_xml.should == '<author><name>E. A. Poe</name><email>poe@baltimore.com</email></author>'
-      end      
+      end
     end
-    
+
   end
-  
+
   describe Info::Contributor do
-    
+
     it { should_not be_nil }
-    
+
     let(:bruce) { Info::Contributor.new { |c| c.name = "Bruce D'Arcus" } }
-    
+
     describe '#name' do
       it 'returns the name' do
         bruce.name.to_s.should == "Bruce D'Arcus"
       end
     end
-    
-    
+
+
     describe '#to_xml' do
       it 'returns an empty contributor by default' do
         subject.to_xml.should == '<contributor/>'
       end
-      
+
       it 'prints the name tag if present' do
         bruce.to_xml.should == "<contributor><name>Bruce D'Arcus</name></contributor>"
-      end      
+      end
     end
-    
+
   end
-  
+
 end