csl 1.0.0.pre21 → 1.0.0.pre22

data/spec/csl/locale/term_spec.rb

@@ -12,6 +12,12 @@ module CSL
 			end
 		end
 
+    describe '.specialize' do
+      it 'filters the passed in hash to contain only match-able entries' do
+        Locale::Term.specialize({ :form => 'short', :foo => 'bar' }).should == { :form => 'short' }
+      end
+    end
+
 		describe '#ordinalize' do
 
 		  describe "given standard English terms" do

data/spec/csl/style/choose_spec.rb

@@ -17,12 +17,20 @@ module CSL
         describe 'when the node has a single condition' do
           let(:node) { Choose::Block.new(:'is-numeric' => 'edition' )}
           
-          it 'returns an array with an array containing the type and value of the condition' do
-            node.conditions.should == [[:'is-numeric', 'edition']]
+          it 'returns an array with an array containing the type, matcher and values of the condition' do
+            node.conditions.should == [[:'is-numeric', :all?, ['edition']]]
+          end
+
+          describe 'when the condition has multiple values' do
+            before { node[:'is-numeric'] << ' issue' }
+            
+            it 'it splits the values in the conditions list' do
+              node.conditions.should == [[:'is-numeric', :all?, ['edition', 'issue']]]
+            end
           end
           
           describe 'when the node has two conditions' do
-            before(:each) { node[:disambiguate] = 'true' }
+            before { node[:disambiguate] = 'true' }
             
             it 'returns an array with two elements' do
               node.conditions.should have_exactly(2).items
@@ -30,16 +38,24 @@ module CSL
             
             it 'returns both conditions as arrays' do
               node.conditions.map(&:first).sort.should == [:disambiguate, :'is-numeric']
-              node.conditions.map(&:last).sort.should == ['edition', 'true']
+              node.conditions.map(&:last).sort.should == [['edition'], ['true']]
             end
           end
         end
         
-        describe 'when the node has a single condition with multiple values' do
-          let(:node) { Choose::Block.new(:variable => 'author editor' )}
+        describe 'when the node has a condition with a match override' do
+          let(:node) { Choose::Block.new(:'variable-any' => 'author editor' )}
           
-          it 'expands the conditions in the result' do
-            node.conditions.should == [[:variable, 'author'], [:variable, 'editor']]
+          it 'strips the match override from the type name and inserts it as the matcher' do
+            node.conditions.should == [[:variable, :any?, ['author', 'editor']]]
+          end
+          
+          describe 'other conditions' do
+            before { node[:position] = 'false' }
+            
+            it 'are not affected by the override' do
+              node.conditions.map { |c| c[1].to_s }.sort.should == %w{ all? any? }
+            end
           end
         end
       end

data/spec/csl/style/label_spec.rb

@@ -8,7 +8,7 @@ module CSL
     it { should_not be_never_pluralize }
 
     describe '.terms' do
-      Hash[%w{
+      Hash[*%w{
         page              page
         issue             issue
         edition           edition
@@ -17,7 +17,7 @@ module CSL
         chapter-number    chapter
       }].each do |variable, term|
         it "returns #{term.inspect} for #{variable.inspect}" do
-          Label.terms[variable].should == term
+          Style::Label.terms[variable].should == term
         end
       end
     end
@@ -26,19 +26,6 @@ module CSL
       before(:each) { Style::Names.new << subject }
 
       it { should be_names_label }
-
-      describe '#variable' do
-        before(:each) { subject.parent[:variable] = 'editor' }
-
-        it 'returns the names variable(s)' do
-          subject.variable.should == 'editor'
-        end
-
-        it 'returns the names variable(s) even when the local attribute is set' do
-          subject[:variable] = 'page'
-          subject.variable.should == 'editor'
-        end
-      end
     end
 
     describe '#term' do

data/spec/csl/style_spec.rb

@@ -2,15 +2,30 @@ require 'spec_helper'
 
 module CSL
   describe Style do
-    let(:style) { Style.new }
+    before do
+      @style = Style.new
+    end
 
     it 'has a 1.x version by default' do
-      Style.new[:version].should match(/1\.\d+(\.\d+)?/)
+      @style[:version].should match(/1\.\d+(\.\d+)?/)
+    end
+
+    it 'has the default version' do
+      @style.default_attribute?(:version).should be_true
+    end
+
+    it 'has a the default namespace attribute' do
+      @style[:xmlns].should == CSL::Schema.namespace
+      @style.default_attribute?(:xmlns).should be_true
     end
 
     describe '#to_xml' do
       it 'returns an empty style' do
-        Style.new.to_xml.should match(/^<style[^>]*\/>/)
+        @style.to_xml.should match(/^<style[^>]*\/>/)
+      end
+
+      it 'includes the xml namespace' do
+        @style.to_xml.should match(CSL::Schema.namespace)
       end
 
       it 'supports round-trip for apa style' do
@@ -33,47 +48,47 @@ module CSL
       it { should_not have_bibliography }
 
       describe 'when it has a title' do
-        before(:all) { style.title = 'foo' }
+        before { @style.title = 'foo' }
 
-        it { style.should have_info }
+        it { @style.should have_info }
 
         it 'info.title is a text node' do
-          style.info.title.should be_a(TextNode)
+          @style.info.title.should be_a(TextNode)
         end
 
         it '#title returns the title as a string' do
-          style.title.should be_a(String)
+          @style.title.should be_a(String)
         end
       end
     end
 
     describe '#id accessor' do
       it 'returns nil by default' do
-        Style.new.id.should be_nil
+        @style.id.should be_nil
       end
 
       it 'writer sets the id to the passed-in string' do
-        expect { style.id = 'foobar' }.to change { style.id }.from(nil).to('foobar')
+        expect { @style.id = 'foobar' }.to change { @style.id }.from(nil).to('foobar')
       end
     end
 
     describe 'independent and dependent styles' do
       it 'styles are independent by default' do
-        Style.new.should be_independent
+        @style.should be_independent
       end
 
       it 'styles do not have independent-parent links by default' do
-        Style.new.should_not have_independent_parent_link
+        @style.should_not have_independent_parent_link
       end
 
       it 'when setting an independet-parent link a style becomes dependent' do
-        expect { style.independent_parent_link = 'foo' }.to change { style.independent? }
+        expect { @style.independent_parent_link = 'foo' }.to change { @style.independent? }
       end
     end
 
     describe 'macros' do
       it 'has no macros by default' do
-        Style.new.should_not have_macros
+        @style.should_not have_macros
       end
 
       it 'raises a validation error when adding a macro without name' do
@@ -81,23 +96,23 @@ module CSL
       end
 
       describe 'when it has an "author" macro' do
-        before(:all) { style << Style::Macro.new(:name => 'author') }
+        before { @style << Style::Macro.new(:name => 'author') }
 
         it 'has macros' do
-          style.should have_macros
+          @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)
+          @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)
+          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 }
+          expect { @style.delete @style.macros['author'] }.to change { @style.macros.length }
         end
       end
     end

data/spec/spec_helper.rb

@@ -1,6 +1,11 @@
 begin
-  require 'simplecov'
-  require 'debugger'
+  if RUBY_VERSION < '1.9'
+    # require 'debug'
+    # Debugger.start
+  else
+    require 'simplecov'
+    require 'debugger'
+  end
 rescue LoadError
   # ignore
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: csl
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre21
-  prerelease: 6
+  version: 1.0.0.pre22
 platform: ruby
 authors:
 - Sylvester Keil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-21 00:00:00.000000000 Z
+date: 2013-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: namae
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,61 +20,12 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.3'
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.7'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
-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"
+description: "\n\t\tA Ruby parser and library for the Citation Style Language (CSL),\n\t\tan
+  open XML-based language to describe the formatting of citations\n\t\tand bibliographies.\n\t\t"
 email:
 - http://sylvester.keil.or.at
 executables: []
@@ -171,30 +120,26 @@ files:
 homepage: https://github.com/inukshuk/csl-ruby
 licenses:
 - AGPL
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1739872005928970958
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A Ruby CSL parser and library
 test_files:
 - features/locales/loading.feature