csl 1.0.0.pre20 → 1.0.0.pre21

data/lib/csl/schema.rb

@@ -82,6 +82,10 @@ module CSL
       },
       :names => %w{
         names-delimiter
+      },
+      :conditionals => %w{
+        disambiguate is-numeric  is-uncertain-date locator
+        position type variable
       }
     })
     

data/lib/csl/style/choose.rb

@@ -1,16 +1,37 @@
 module CSL
   class Style
-    
+
     class Choose < Node
 
       class Block < Node
-        
-        def self.matches?(nodename)
-          nodename.to_s =~ /^if(-else)?|else$/
+        attr_struct :match, *Schema.attr(:conditionals)
+
+        attr_defaults :match => 'all'
+
+        class << self
+          def matches?(nodename)
+            nodename.to_s =~ /^if(-else)?|else$/
+          end
         end
         
+        def conditions
+          attributes_for(*Schema.attr(:conditionals)).map { |type, values|
+            values.to_s.split(/\s+/).map { |value| [type, value] }
+          }.flatten(1)
+        end
+
+        def matcher
+          case attributes[:match]
+          when 'any'
+            :any?
+          when 'none'
+            :none?
+          else
+            :all?
+          end
+        end 
       end
     end
-    
+
   end
 end

data/lib/csl/version.rb

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

data/spec/csl/style/choose_spec.rb

@@ -1,7 +1,50 @@
 require 'spec_helper'
 
 module CSL
-  describe Style::Choose do
+  class Style
+
+    describe Choose do
+
+    end
+
+    describe Choose::Block do
+      
+      describe '#conditions' do
+        it 'returns an empty list by default' do
+          Choose::Block.new.conditions.should be_empty
+        end
+        
+        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']]
+          end
+          
+          describe 'when the node has two conditions' do
+            before(:each) { node[:disambiguate] = 'true' }
+            
+            it 'returns an array with two elements' do
+              node.conditions.should have_exactly(2).items
+            end
+            
+            it 'returns both conditions as arrays' do
+              node.conditions.map(&:first).sort.should == [:disambiguate, :'is-numeric']
+              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' )}
+          
+          it 'expands the conditions in the result' do
+            node.conditions.should == [[:variable, 'author'], [:variable, 'editor']]
+          end
+        end
+      end
+      
+    end
   
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csl
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre20
+  version: 1.0.0.pre21
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-20 00:00:00.000000000 Z
+date: 2013-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: namae
@@ -183,7 +183,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -883385539411668909
+      hash: -1739872005928970958
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: