csl 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1cbdc6b606bf9f4652ad841cafd83edfc774fd2
-  data.tar.gz: 7f55aee76c232b8f3760ffa99a47e6f2ef7c7712
+  metadata.gz: 0dd57180de9ed4d48bb5ce00393929be63df55fe
+  data.tar.gz: c20b280f2e9ec6f596d0453fc4862e23cbf50dec
 SHA512:
-  metadata.gz: e5c6c2daa0db1832bfcd0c6d63bf61fe7602818dfb233b4e6d05394695412b760bfbf09b312699f48f33e78e3685ccacd429c2e61d1acac1644b1e40df650ae5
-  data.tar.gz: 4b33db0d2bf6d84e0ee85d4327d227f19ee9e958d63c0c016a2a40db92392aa9e6b860b0a283336bfccba42390605acbcf381f08e20ffbeac376d3d17e7b6fb7
+  metadata.gz: 4d3ddca5ec5ab21e0d9e4ec973356e76f4abae8bf6b75868d7d4ffa7a10bd3853f510f280497302f3cc36f342a58f5238ab3650dc180085d36a595d21a2de4bc
+  data.tar.gz: 2a6911020b2bedc729617cb95c88db7184c5447d897f52d8ebc6ac84dbfd5f92b12a6cba54f78fe871f361eb48b37b4abc3a44b379493c6cb99000595a6d04da

data/csl.gemspec

@@ -4,6 +4,12 @@ $:.unshift lib unless $:.include?(lib)
 
 require 'csl/version'
 
+EXCLUDES = %w{
+  .coveralls.yml
+  .travis.yml
+  .csl.gemspec
+}
+
 Gem::Specification.new do |s|
   s.name        = 'csl'
   s.version     = CSL::VERSION.dup
@@ -26,7 +32,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency('namae', ['~>0.7'])
 
-  s.files        = `git ls-files`.split("\n")
+  s.files        = `git ls-files`.split("\n") - EXCLUDES
   s.test_files   = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables  = []
   s.require_path = 'lib'

data/lib/csl/loader.rb

@@ -18,45 +18,17 @@ module CSL
     #   Locale.load('http://example.com/de.xml') -> locale
     #
     # Resolves the passed-in path/name or string and loads the asset data.
-    # The data will be passed on to the #parse method of the base class.
+    # The data will be passed on to the #parse! method of the base class.
     # Typically, this will return a new instance of the class.
     #
     # @note
-    #   The base class is expected to define a #parse method.
+    #   The base class is expected to define a #parse! method.
     #
     # @raise ParseError
     #
     # @return [Style, Locale] the parsed CSL resource
     def load(input)
-      case
-      when input.respond_to?(:read)
-        data = input.read
-      when input.to_s =~ /^\s*</
-        data = input.to_s
-      else
-
-        input = input.to_s
-
-        case
-        when File.exists?(input)
-          location = input
-        when File.exists?(extend_name(input))
-          location = extend_name(input)
-        when File.exists?(extend_path(input))
-          location = extend_path(input)
-        else
-          location = input
-        end
-
-        Kernel.open(location, 'r:UTF-8') do |io|
-          data = io.read
-        end
-      end
-
-      parse(data)
-
-    rescue => e
-      raise ParseError, "failed to load #{input.inspect}: #{e.message}"
+      parse! extract_data_from(input)
     end
 
     def list
@@ -86,6 +58,37 @@ module CSL
 
       name
     end
+
+    private
+
+    def extract_data_from(input)
+      case
+      when input.respond_to?(:read)
+        input.read
+      when input.to_s =~ /^\s*</
+        input.to_s
+      else
+
+        input = input.to_s
+
+        case
+        when File.exists?(input)
+          location = input
+        when File.exists?(extend_name(input))
+          location = extend_name(input)
+        when File.exists?(extend_path(input))
+          location = extend_path(input)
+        else
+          location = input
+        end
+
+        Kernel.open(location, 'r:UTF-8') do |io|
+          io.read
+        end
+      end
+    rescue => e
+      raise ParseError, "failed to extract CSL data from #{input.inspect}: #{e.message}"
+    end
   end
 
 end

data/lib/csl/parser.rb

@@ -11,7 +11,9 @@ module CSL
     @engines = {
       :nokogiri => lambda { |source|
         Nokogiri::XML::Document.parse(source, nil, nil,
-          Nokogiri::XML::ParseOptions::DEFAULT_XML | Nokogiri::XML::ParseOptions::NOBLANKS | Nokogiri::XML::ParseOptions::NOENT)
+          Nokogiri::XML::ParseOptions::DEFAULT_XML |
+          Nokogiri::XML::ParseOptions::NOBLANKS |
+          Nokogiri::XML::ParseOptions::NOENT)
       },
       :default  => lambda { |source|
         REXML::Document.new(source, :compress_whitespace => :all, :ignore_whitespace_nodes => :all)
@@ -68,7 +70,7 @@ module CSL
       scope = specialize_scope(root, scope)
 
       node.children.each do |child|
-        root << parse_tree(child, scope) unless comment?(child)
+        root << parse_tree(child, scope) unless skip?(child)
       end unless root.textnode?
 
       root
@@ -79,7 +81,12 @@ module CSL
         node.has_text? && node.text
       else
         child = node.children[0]
-        child && child.respond_to?(:text?) && child.text? && child.text
+        return unless child && child.respond_to?(:text?) && child.text?
+
+        text = child.text
+        return if text.to_s.strip.empty?
+
+        text
       end
     end
 
@@ -88,7 +95,18 @@ module CSL
         node.respond_to?(:node_type) &&
         [:comment, :xmldecl, :processing_instruction, 7].include?(node.node_type)
     end
-    alias skip? comment?
+
+    def text?(node)
+      if defined?(Nokogiri)
+        node.is_a?(Nokogiri::XML::Text)
+      else
+        false
+      end
+    end
+
+    def skip?(node)
+      comment?(node) || text?(node)
+    end
 
     def specialize_scope(root, scope = Node)
       case root

data/lib/csl/treelike.rb

@@ -388,6 +388,10 @@ module CSL
           def empty?
             all?(&:nil?)
           end
+          
+          def select(&block)
+            each.select(&block)
+          end
 
           # Adds the node as a child node. Raises ValidationError if none
           # of the Struct members matches the node's name. If there is

data/lib/csl/version.rb

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

data/spec/csl/parser_spec.rb

@@ -36,6 +36,26 @@ module CSL
             end
           end
 
+          describe 'for an empty name node' do
+            ['<name/>', '<name></name>', '<name> </name>'].each do |source|
+              it "returns a Style::Name for #{source.inspect} by default" do
+                Parser.instance.parse!(source).should be_a(Style::Name)
+              end
+
+              it "returns a Style::Name for #{source.inspect} for Style scope" do
+                Parser.instance.parse!(source, Style).should be_a(Style::Name)
+              end
+
+              it "returns a Node for #{source.inspect} for Locale scope" do
+                Parser.instance.parse!(source, Locale).should be_a(Node)
+              end
+
+              it "returns an Info::Name for #{source.inspect} for Info scope" do
+                Parser.instance.parse!(source, Info).should be_a(Info::Name)
+              end
+            end
+          end
+
           describe 'for <foo bar="x"/>' do
             let(:source) { '<foo bar="x"/>' }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csl
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Sylvester Keil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2014-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: namae
@@ -32,12 +32,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .coveralls.yml
 - .document
 - .gitignore
 - .rspec
 - .simplecov
-- .travis.yml
 - .yardopts
 - AGPL
 - BSDL
@@ -141,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A Ruby CSL parser and library

data/.coveralls.yml

@@ -1 +0,0 @@
-service_name: travis-ci

data/.travis.yml

@@ -1,16 +0,0 @@
-language: ruby
-bundler_args: --without debug extra
-script: bundle exec rake test_with_coveralls
-rvm:
-  - 2.1.0
-  - 2.0.0
-  - 1.9.3
-  - jruby-19mode
-  - jruby-head
-  - rbx
-notifications:
-  email:
-    recipients:
-      - sylvester@keil.or.at
-    on_success: change
-    on_failure: always