csl 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 817790ad5486590a4f7f83ba761a6c80dd86c4e8
-  data.tar.gz: d2bbaa7cc6980ca486425e635378a4f7c5323ce3
+  metadata.gz: d1cbdc6b606bf9f4652ad841cafd83edfc774fd2
+  data.tar.gz: 7f55aee76c232b8f3760ffa99a47e6f2ef7c7712
 SHA512:
-  metadata.gz: 175868d94c06e78355ca2f511f0ce9c256d301f3e88dc83aa316cb6ace02c73a31b285b1b095e1d7639bfa2b32e958210723523e6ad11cba956c003f7a29b378
-  data.tar.gz: ba50730dee3d8c1735a79597ed5caae09d02162fdbbe4adcb4ec51e6af5d6f35db96b2a74043f304f70b8aa87c3111c0b225821e170628270098f9b9451b3925
+  metadata.gz: e5c6c2daa0db1832bfcd0c6d63bf61fe7602818dfb233b4e6d05394695412b760bfbf09b312699f48f33e78e3685ccacd429c2e61d1acac1644b1e40df650ae5
+  data.tar.gz: 4b33db0d2bf6d84e0ee85d4327d227f19ee9e958d63c0c016a2a40db92392aa9e6b860b0a283336bfccba42390605acbcf381f08e20ffbeac376d3d17e7b6fb7

data/Gemfile

@@ -24,6 +24,9 @@ end
 group :extra do
   gem 'guard', '~>2.2'
   gem 'guard-rspec'
+  gem 'bond'
+  gem 'diff-lcs'
+  gem 'pry'
   gem 'guard-cucumber'
   gem 'rb-fsevent', '~>0.9', :platforms => [:ruby]
 

data/Rakefile

@@ -13,16 +13,14 @@ $:.unshift(File.join(File.dirname(__FILE__), './lib'))
 require 'csl/version'
 
 
-desc 'Run an IRB session with CSL loaded'
-task :console, [:script] do |t,args|
+desc 'Run a Pry session with CSL loaded'
+task :console do
   ARGV.clear
 
-  require 'irb'
-  require 'irb/completion'
+  require 'pry'
   require 'csl'
 
-  IRB.conf[:SCRIPT] = args.script
-  IRB.start
+  Pry.start
 end
 
 require 'rspec/core'
@@ -49,6 +47,16 @@ end
 
 task :default => [:spec, :cucumber]
 
+task :check_warnings do
+  $VERBOSE = true
+  require 'csl'
+
+  CSL::Style.new
+  CSL::Locale.new
+
+  puts CSL::VERSION
+end
+
 begin
   require 'yard'
   YARD::Rake::YardocTask.new

data/lib/csl/extensions.rb

@@ -14,7 +14,7 @@ module CSL
           options
         end
       end
-  
+
       def symbolize_keys!
         replace(symbolize_keys)
       end
@@ -54,10 +54,6 @@ class Hash
   include CSL::Extensions::StringifyKeys unless method_defined?(:stringify_keys)
 end
 
-class Module
-  include CSL::Extensions::Nesting
-end
-
 class Object
   include CSL::Extensions::Blank unless method_defined?(:blank?)
 end

data/lib/csl/loader.rb

@@ -22,7 +22,7 @@ module CSL
     # Typically, this will return a new instance of the class.
     #
     # @note
-    #   The base class is exepcted to define a #parse method.
+    #   The base class is expected to define a #parse method.
     #
     # @raise ParseError
     #
@@ -88,4 +88,4 @@ module CSL
     end
   end
 
-end
+end

data/lib/csl/locale.rb

@@ -130,6 +130,10 @@ module CSL
       yield self if block_given?
     end
 
+    def initialize_copy(other)
+      @parent, @ancestors, @descendants, @siblings, @root, @depth = nil
+      initialize(other.attributes.to_hash.merge(:lang => other.to_s))
+    end
 
     def added_to(node)
       raise ValidationError, "not allowed to add locale to #{node.nodename}" unless

data/lib/csl/name_options.rb

@@ -33,7 +33,7 @@ module CSL
 
         style ||= root
 
-        if !root? && style.respond_to?(inheritable_options)
+        if !style.equal?(self) && style.respond_to?(inheritable_options)
           options = style.send(inheritable_options).merge(options)
         end
 

data/lib/csl/node.rb

@@ -3,6 +3,7 @@ module CSL
   class Node
 
     extend Forwardable
+    extend Extensions::Nesting
 
     include Enumerable
     include Comparable
@@ -233,7 +234,7 @@ module CSL
     end
 
     def initialize_copy(other)
-      super
+      @parent, @ancestors, @descendants, @siblings, @root, @depth = nil
       initialize(other.attributes)
     end
 
@@ -431,7 +432,7 @@ module CSL
       }.compact]
     end
 
-    
+
     # @return [Hash] the node's formatting options
     def formatting_options
       options = attributes_for Schema.attr(:formatting)
@@ -567,7 +568,7 @@ module CSL
 
     def initialize(argument = '')
       case
-      when argument.is_a?(Hash)
+      when argument.respond_to?(:each_pair)
         super
       when argument.respond_to?(:to_s)
         super({})
@@ -578,6 +579,11 @@ module CSL
       end
     end
 
+    def initialize_copy(other)
+      super
+      @text = other.text
+    end
+
     def textnode?
       true
     end

data/lib/csl/style/bibliography.rb

@@ -22,7 +22,7 @@ module CSL
 
       def sort_keys
         return [] unless sort?
-        children[:sort].descendants
+        children[:sort].sort_keys
       end
 
       def substitute_subsequent_authors?

data/lib/csl/style/citation.rb

@@ -10,6 +10,11 @@ module CSL
       attr_children :sort, :layout
 
       alias sort? has_sort?
+
+      def sort_keys
+        return [] unless sort?
+        children[:sort].sort_keys
+      end
     end
 
   end

data/lib/csl/style/names.rb

@@ -12,15 +12,15 @@ module CSL
 
       inherits :names_options
 
-      alias labels label
-
       def initialize(attributes = {})
         super(attributes)
-        children[:label] = []
-
         yield self if block_given?
       end
 
+      def prefix_label?
+        has_label? && has_name? && children.index(label) < children.index(name)
+      end
+
       def delimiter(node = nil, style = nil)
         attributes.fetch(:delimiter) do
           inherited_names_options(node, style)[:delimiter] || ''
@@ -97,7 +97,7 @@ module CSL
       def truncate(names, subsequent = false)
         limit = truncate_at(subsequent)
 
-        return names if limit.zero?
+        return [] if limit.zero?
         names.take limit
       end
 

data/lib/csl/style/sort.rb

@@ -3,21 +3,22 @@ module CSL
 
     class Sort < Node
 
-      attr_children :key
-
-      alias keys key
+      #attr_children :key
+      #alias_child :sort_keys, :key
 
       def initialize(attributes = {})
         super(attributes)
-        children[:key] = []
-
         yield self if block_given?
       end
 
+      alias sort_keys children
+      alias sort_keys? has_children?
+      alias has_sort_keys? has_children?
+
       class Key < Node
 
         attr_struct :variable, :macro, :sort,
-          :'names-use-min', :'names-use-first', :'names-use-last'
+          :'names-min', :'names-use-first', :'names-use-last'
 
         attr_defaults :sort => 'ascending'
 
@@ -26,8 +27,8 @@ module CSL
         def name_options
           options = {}
 
-          options[:'et-al-use-min'] = options[:'et-al-subsequent-use-min'] =
-            attributes[:'names-use-min'] if attribute? :'names-use-min'
+          options[:'et-al-min'] = options[:'et-al-subsequent-min'] =
+            attributes[:'names-min'] if attribute? :'names-min'
 
           options[:'et-al-use-first'] = options[:'et-al-subsequent-use-first'] =
             attributes[:'names-use-first'] if attribute? :'names-use-first'

data/lib/csl/treelike.rb

@@ -354,6 +354,11 @@ module CSL
 
           def initialize(attrs = {})
             super(*attrs.symbolize_keys.values_at(*keys))
+            @order = []
+          end
+
+          def index(node, &block)
+            @order.index(node, &block)
           end
 
           # @return [<Symbol>] a list of symbols representing the names/keys
@@ -362,23 +367,19 @@ module CSL
             __class__.keys
           end
 
-          alias original_each each
 
           def count
-            values.reject { |c| c.nil? || c.empty? }.length
+            values.reject { |c| c.nil? || c.is_a?(Array) && c.empty? }.length
           end
 
+          alias original_each each
+
           # Iterates through all children. Nil values are skipped and Arrays
           # expanded.
           def each
             if block_given?
-              original_each do |node|
-                if node.kind_of?(Array)
-                  node.select { |n| !n.nil? }.each(&Proc.new)
-                else
-                  yield node unless node.nil?
-                end
-              end
+              order.each(&Proc.new)
+              self
             else
               to_enum
             end
@@ -407,6 +408,9 @@ module CSL
               self[node.nodename] = [current, node]
             end
 
+            # Add to @order to keep track of node ordering
+            @order << node
+
             self
           end
 
@@ -430,6 +434,9 @@ module CSL
               end
             end
 
+            # Delete node from ordered list as well
+            @order.delete(node)
+
             if deleted.nil? && block_given?
               yield
             else
@@ -445,6 +452,10 @@ module CSL
             end
           end
 
+          protected
+
+          attr_reader :order
+
           private
 
           def resolve(nodename)

data/lib/csl/version.rb

@@ -1,3 +1,3 @@
 module CSL
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.2.0'.freeze
 end

data/spec/csl/info_spec.rb

@@ -145,6 +145,30 @@ module CSL
       end
     end
 
+    describe '#dup' do
+      it 'does not copy ancestors' do
+        apa = Style.load(:apa).info
+        apa.should be_a(Info)
+
+        apa.should_not be_root
+        apa.dup.should be_root
+      end
+    end
+
+    describe '#deep_copy' do
+      it 'copies the full sub-tree' do
+        apa = Style.load(:apa).info
+        apa.should be_a(Info)
+
+        xml = apa.to_xml
+
+        copy = apa.deep_copy
+
+        apa.to_xml.should == xml # original unchanged!
+        copy.to_xml.should == xml
+      end
+    end
+
     describe '#pretty_print' do
       it 'returns an empty info element by default' do
         subject.pretty_print.should == '<info/>'
@@ -172,8 +196,8 @@ module CSL
 
     let(:poe) {
       Info::Author.new { |a|
-        a.email = 'poe@baltimore.com'
         a.name = 'E. A. Poe'
+        a.email = 'poe@baltimore.com'
       }
     }
 
@@ -236,4 +260,19 @@ module CSL
 
   end
 
-end
+  describe Info::Rights do
+    it { should_not be_nil }
+
+    describe '#dup' do
+      it 'copies attributes and text' do
+        r = Info::Rights.new('foo')
+        r[:license] = 'bar'
+
+        c = r.dup
+        c.text.should == 'foo'
+        c[:license].should == 'bar'
+      end
+    end
+  end
+
+end

data/spec/csl/style/citation_spec.rb

@@ -2,6 +2,6 @@ require 'spec_helper'
 
 module CSL
   describe Style::Citation do
-  
+
   end
-end
+end

data/spec/csl/style/sort_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module CSL
   describe Style::Sort do
-
+    it { should_not have_sort_keys }
   end
 
   describe Style::Sort::Key do

data/spec/csl/style_spec.rb

@@ -39,6 +39,20 @@ module CSL
       end
     end
 
+    describe '#deep_copy' do
+      it 'works on apa style' do
+        apa = Style.load(:apa)
+        apa.should be_a(Style)
+
+        xml = apa.to_xml
+
+        copy = apa.deep_copy
+
+        apa.to_xml.should == xml # original unchanged!
+        copy.to_xml.should == xml
+      end
+    end
+
     describe '#children' do
 
       it { should_not have_info }

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: csl
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Sylvester Keil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
+date: 2014-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: namae
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
 description: "\n\t\tA Ruby parser and full API for the Citation Style Language (CSL),\n\t\tan
@@ -32,13 +32,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".coveralls.yml"
-- ".document"
-- ".gitignore"
-- ".rspec"
-- ".simplecov"
-- ".travis.yml"
-- ".yardopts"
+- .coveralls.yml
+- .document
+- .gitignore
+- .rspec
+- .simplecov
+- .travis.yml
+- .yardopts
 - AGPL
 - BSDL
 - Gemfile
@@ -131,17 +131,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A Ruby CSL parser and library