bibtex-ruby 2.2.2 → 2.3.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    Mzc1YjdjZmZiYzYyY2UxODIwZWI4YmI2NDAyYmViNWQ1ZTMwNjQyZg==
+  data.tar.gz: !binary |-
+    NGEwOTAzMzNjMDk2YTkwYTc0ODJiYWQzOTYyYzBiYjNjZjU0NjFkMg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ZmUwOTM3YjhkY2Q1OWFmMGJkMDg1NDc3MjI4NTY0MTYzMzg5MmFhZWZlYmM4
+    MmFhZmQ5N2ViYWUyNmU2ZTI2NDgyNjFjNGViNTczOWU2ZDE1MzE0OGZkZTI0
+    OWIxOGZkNDEyODk3YzA3MTNhNzM0ZDIwOTVlNzcyNTAzZTZiZGQ=
+  data.tar.gz: !binary |-
+    MTU2Y2VmZmVkOTZiMzA1NmE2N2M5YzgyOTRlYzY1OGI0MjQ2YWZmM2ZlZDI3
+    MDFmMTlkY2UzM2EyYWFmN2Q5NjQ1YWFhMmViMjNlMmJlOTlmNzY3ZWVhNDkx
+    ZWQ5YWRkZjcyZTEzMTQzODkyNTk2ZjdhNmJmZjY5ODY1MGI4ZGY=

data/Gemfile

@@ -1,11 +1,11 @@
-source :rubygems
+source 'https://rubygems.org'
 gemspec
 
 # RDF Export
 gem 'rdf', '~>0.3'
 
 group :debug do
-	gem 'debugger', :require => false, :platforms => [:mri_19]
+	gem 'debugger', :require => false, :platforms => [:mri_19, :mri_20]
 	gem 'ruby-debug', :require => false, :platforms => [:mri_18]
 end
 
@@ -24,7 +24,7 @@ group :extra do
 end
 
 group :profile do
-	gem 'ruby-prof', ['~>0.10'], :platforms => [:mri_19, :mri_19]
+	gem 'ruby-prof', ['~>0.10'], :platforms => [:mri_19, :mri_20]
 	gem 'gnuplot', ['~>2.4']
 	gem 'simplecov'
 end

data/Gemfile.lock

@@ -1,78 +1,80 @@
 PATH
   remote: .
   specs:
-    bibtex-ruby (2.2.2)
+    bibtex-ruby (2.3.0)
       latex-decode (>= 0.0.6)
       multi_json (~> 1.3)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    addressable (2.3.2)
-    builder (3.0.0)
+    addressable (2.3.3)
+    builder (3.2.0)
+    coderay (1.0.9)
     columnize (0.3.6)
-    cucumber (1.2.1)
+    cucumber (1.2.3)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 2.11.0)
-      json (>= 1.4.6)
-    debugger (1.2.0)
+      gherkin (~> 2.11.6)
+      multi_json (~> 1.3)
+    debugger (1.5.0)
       columnize (>= 0.3.1)
-      debugger-linecache (~> 1.1.1)
-      debugger-ruby_core_source (~> 1.1.3)
-    debugger-linecache (1.1.2)
-      debugger-ruby_core_source (>= 1.1.1)
-    debugger-ruby_core_source (1.1.3)
-    diff-lcs (1.1.3)
-    ffi (1.1.5)
-    gherkin (2.11.2)
-      json (>= 1.4.6)
-    gnuplot (2.5.0)
-    guard (1.3.2)
-      listen (>= 0.4.2)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.2.0)
+    debugger-linecache (1.2.0)
+    debugger-ruby_core_source (1.2.0)
+    diff-lcs (1.2.2)
+    formatador (0.2.4)
+    gherkin (2.11.7)
+      multi_json (~> 1.3)
+    gnuplot (2.6.2)
+    guard (1.7.0)
+      formatador (>= 0.2.4)
+      listen (>= 0.6.0)
+      lumberjack (>= 1.0.2)
+      pry (>= 0.9.10)
       thor (>= 0.14.6)
-    guard-cucumber (1.2.0)
+    guard-cucumber (1.4.0)
       cucumber (>= 1.2.0)
       guard (>= 1.1.0)
     guard-minitest (0.5.0)
       guard (>= 0.4)
-    json (1.7.5)
-    latex-decode (0.0.12)
+    latex-decode (0.1.0)
       unicode (~> 0.4)
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
-    listen (0.4.7)
-      rb-fchange (~> 0.0.5)
-      rb-fsevent (~> 0.9.1)
-      rb-inotify (~> 0.8.8)
-    minitest (2.12.1)
-    minitest-colorize (0.0.4)
-      minitest (~> 2.0)
-    multi_json (1.3.6)
-    racc (1.4.8)
-    rake (0.9.2.2)
-    rb-fchange (0.0.5)
-      ffi
-    rb-fsevent (0.9.1)
-    rb-inotify (0.8.8)
-      ffi (>= 0.5.0)
+    listen (0.7.3)
+    lumberjack (1.0.3)
+    method_source (0.8.1)
+    minitest (4.7.0)
+    minitest-colorize (0.0.5)
+      minitest (>= 2.0)
+    multi_json (1.7.2)
+    pry (0.9.12)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    racc (1.4.9)
+    rake (10.0.4)
+    rb-fsevent (0.9.3)
     rbx-require-relative (0.0.9)
-    rdf (0.3.8)
+    rdf (0.3.11.1)
       addressable (>= 2.2.6)
-    redcarpet (2.1.1)
+    redcarpet (2.2.2)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
-    ruby-prof (0.11.2)
-    simplecov (0.6.4)
+    ruby-prof (0.13.0)
+    simplecov (0.7.1)
       multi_json (~> 1.0)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
-    thor (0.16.0)
-    unicode (0.4.3)
-    yard (0.8.2.1)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    slop (3.4.4)
+    thor (0.18.1)
+    unicode (0.4.4)
+    yard (0.8.5.2)
 
 PLATFORMS
   ruby

data/History.txt

@@ -1,3 +1,9 @@
+2.3.0 / 2013-06-04
+==================
+
+* Add attribute-only queries (thanks to @ashinkarov)
+* Add negated queries (thanks to @ashinkarov)
+
 2.2.2 / 2013-15-01
 ==================
 

data/Manifest

@@ -37,6 +37,7 @@ features/support
 features/support/env.rb
 lib
 lib/bibtex
+lib/bibtex.rb
 lib/bibtex/bibliography.rb
 lib/bibtex/bibtex.y
 lib/bibtex/compatibility.rb
@@ -45,9 +46,9 @@ lib/bibtex/entry.rb
 lib/bibtex/error.rb
 lib/bibtex/extensions.rb
 lib/bibtex/filters
+lib/bibtex/filters.rb
 lib/bibtex/filters/latex.rb
 lib/bibtex/filters/linebreaks.rb
-lib/bibtex/filters.rb
 lib/bibtex/lexer.rb
 lib/bibtex/name_parser.rb
 lib/bibtex/names.rb
@@ -58,7 +59,6 @@ lib/bibtex/ruby.rb
 lib/bibtex/utilities.rb
 lib/bibtex/value.rb
 lib/bibtex/version.rb
-lib/bibtex.rb
 test
 test/benchmark.rb
 test/bibtex

data/README.md

@@ -211,24 +211,39 @@ query functionality with the exception of yielding to a block. For instance:
     => Returns the second and third elements or nil
     bib[1..2]
     => Same as above
+
     bib[:key]
     => Returns the first entry with key 'key' or nil
     bib['key']
     => Returns all entries with key 'key' or []
+
     bib['@article']
     => Returns all entries of type 'article' or []
+    bib['!@book']
+    => Returns all entries of any type other than 'book' or []
     bib['@preamble']
     => Returns all preamble objects (this is the same as Bibliography#preambles) or []
     bib[/ruby/]
     => Returns all objects that match 'ruby' anywhere or []
+
+    bib['@incollection[booktitle]']
+    => Returns all in-collection entries with a booktitle or []
+
+    # note that the above includes entries inheriting the book title
+    # from a cross-referenced entry!
+    
     bib['@book[keywords=ruby]']
     => Returns all books whose keywords attribute equals 'ruby' or []
     bib['@book[keywords!=ruby]']
     => Returns all books whose keywords attribute does not equal 'ruby'
     bib['@book[keywords/=ruby]']
     => Same as above
-    bib.q('@book[keywords^=ruby]')
+
+    bib.q('@book[keywords ^= ruby]')
+    => Returns all books whose keywords attribute matches /^ruby/
+    bib.q('@book[keywords ~= ruby]')
     => Returns all books whose keywords attribute matches /ruby/
+
     bib.q('@article[year<=2007]')
     => Returns all articles published in 2007 or earlier
     bib.query('@book') { |e| e.keywords.split(/,/).length > 1 }

data/lib/bibtex/bibliography.rb

@@ -227,7 +227,7 @@ module BibTeX
           nil
         when arguments[0].is_a?(Symbol)
           entries[arguments[0]]
-        when arguments[0].respond_to?(:start_with?) && !arguments[0].start_with?('@')
+        when arguments[0].respond_to?(:start_with?) && !arguments[0].start_with?('@', '!@')
           entries[arguments[0]]
         else
           query(*arguments)
@@ -448,8 +448,8 @@ module BibTeX
     #   bib.query('@*')      #=> same as above
     #   bib.query(:first, '@book, @article')
     #     #=> returns the first book or article or nil
-    #   bib.query('@book[year=2011], @article)
-    #     #=> returns all books published in 2011 and all articles
+    #   bib.query('@book[year<=2011], @article)
+    #     #=> returns all books published in 2011 or earlier and all articles
     #   bib.query('@book, @article) { |o| o.year == '2011' }
     #     #=> returns all books and articles published in 2011
     #   bib.query('@book[year=2011], @article[year=2011])

data/lib/bibtex/elements.rb

@@ -102,8 +102,8 @@ module BibTeX
       when /^\/(.+)\/$/
         to_s.match(Regexp.new($1))
       when /@(\*|\w+)(?:\[([^\]]*)\])?/
-        query.scan(/@(\*|\w+)(?:\[([^\]]*)\])?/).any? do |type, condition|
-          if has_type?(type)
+        query.scan(/(!)?@(\*|\w+)(?:\[([^\]]*)\])?/).any? do |non, type, condition|
+          if (non ? !has_type?(type) : has_type?(type))
             if condition.nil? || condition.empty?
               true
             else
@@ -192,21 +192,25 @@ module BibTeX
       if property.nil?
         true
       else
-        actual = respond_to?(property) ? send(property) : nil
-
-        case operator
-        when '!=', '/='
-          actual.nil? || actual.to_s != value
-        when '^='
-          !actual.nil? && actual.to_s.match("^#{value}")
-        when '~='
-          !actual.nil? && actual.to_s.match(value)
-        when '<='
-          !actual.nil? && actual.to_i <= value.to_i
-        when '>='
-          !actual.nil? && actual.to_i >= value.to_i
+        if operator.nil? && value.nil?
+          respond_to?(:provides?) && provides?(property)
         else
-          !actual.nil? && actual.to_s == value
+          actual = respond_to?(property) ? send(property) : nil
+
+          case operator
+          when '!=', '/='
+            actual.nil? || actual.to_s != value
+          when '^='
+            !actual.nil? && actual.to_s.match("^#{value}")
+          when '~='
+            !actual.nil? && actual.to_s.match(value)
+          when '<='
+            !actual.nil? && actual.to_i <= value.to_i
+          when '>='
+            !actual.nil? && actual.to_i >= value.to_i
+          else
+            !actual.nil? && actual.to_s == value
+          end
         end
       end
     end

data/lib/bibtex/name_parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.8
+# This file is automatically generated by Racc 1.4.9
 # from Racc grammer file "".
 #
 

data/lib/bibtex/parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.8
+# This file is automatically generated by Racc 1.4.9
 # from Racc grammer file "".
 #
 

data/lib/bibtex/version.rb

@@ -19,8 +19,8 @@
 module BibTeX
   module Version    
     MAJOR = 2
-    MINOR = 2
-    PATCH = 2
+    MINOR = 3
+    PATCH = 0
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.').freeze

data/test/bibtex/test_bibliography.rb

@@ -70,11 +70,11 @@ module BibTeX
         @string{ foo = "foobar" }
         @misc{flanagan-1,
           title={{Foo Bar}},
-          author={Flanagan, Dav}
+          author={Flanagan, Dav and Thomas Segaran}
         }
         @misc{flanagan-2,
           title={{Foo Bar}},
-          author={Flanagan, David}
+          author={Flanagan, David and Matsumoto, Yukihiro}
         }
         END
       end
@@ -95,7 +95,7 @@ module BibTeX
 
       describe '#extend_initials!' do
         it 'extends the initials of all names to the longest prototype' do
-          assert_equal "Ruby, Sam Thomas, Dave Hansson Heinemeier, David Flanagan, David Matsumoto, Y. Segaran, T.",
+          assert_equal "Ruby, Sam Thomas, Dave Hansson Heinemeier, David Flanagan, David Matsumoto, Yukihiro Segaran, Thomas",
             @bib.extend_initials!.names.map(&:sort_order).uniq.join(' ')
         end
       end
@@ -170,6 +170,16 @@ module BibTeX
         assert_equal 2, @bib['@book'].length
         assert_equal 1, @bib['@article'].length
         assert_equal 0, @bib['@collection'].length
+        assert_equal 1, @bib['@string'].length
+      end
+
+      it 'supports queries by negated type string' do
+        assert_equal 4, @bib['!@book'].length
+        assert_equal 5, @bib['!@article'].length
+        assert_equal 6, @bib['!@collection'].length
+        assert_equal 1, @bib['!@*'].length
+        assert_equal 4, @bib['!@misc'].length
+        assert_equal 5, @bib['!@string'].length
       end
 
       it 'supports queries by type string and selector' do
@@ -199,6 +209,11 @@ module BibTeX
         assert_equal 1, @bib['@*[keywords~=rails]'].length
       end
 
+      it 'supports queries with attribute conditions' do
+        assert_equal 2, @bib['@*[keywords]'].length
+        assert_equal 0, @bib['@*[foobar]'].length
+      end
+
       it 'supports queries with start-pattern conditions' do
         assert_equal 2, @bib['@*[keywords^=ruby]'].length
       end

data/test/bibtex/test_entry.rb

@@ -492,5 +492,36 @@ module BibTeX
       end
     end
 
+    describe '#meet?' do
+      before { @e = Entry.new }
+      
+      it 'returns true for an empty condition list' do
+        assert @e.meet? []
+        assert @e.meet? ['']
+      end
+      
+      it 'it returns true when all conditions hold' do
+        refute @e.meet? ['author = Edgar']
+        
+        @e.author = 'Poe, Edgar A.'
+
+        refute @e.meet? ['author = Edgar']
+        refute @e.meet? ['author = Poe, Edgar']
+        
+        assert @e.meet? ['author = Poe, Edgar A.']
+
+        assert @e.meet? ['author ^= Poe']
+        refute @e.meet? ['author ^= Edgar']
+
+        assert @e.meet? ['author ~= Edgar']
+
+        assert @e.meet? ['author ~= .']
+        assert @e.meet? ['author ~= [a-z]*']
+        
+        assert @e.meet? ['author ^= P\w+']        
+
+      end
+      
+    end
   end
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: bibtex-ruby
 version: !ruby/object:Gem::Version
-  version: 2.2.2
-  prerelease: 
+  version: 2.3.0
 platform: ruby
 authors:
 - Sylvester Keil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-15 00:00:00.000000000 Z
+date: 2013-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: latex-decode
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -99,6 +94,7 @@ files:
 - features/step_definitions/name_steps.rb
 - features/strings.feature
 - features/support/env.rb
+- lib/bibtex.rb
 - lib/bibtex/bibliography.rb
 - lib/bibtex/bibtex.y
 - lib/bibtex/compatibility.rb
@@ -106,9 +102,9 @@ files:
 - lib/bibtex/entry.rb
 - lib/bibtex/error.rb
 - lib/bibtex/extensions.rb
+- lib/bibtex/filters.rb
 - lib/bibtex/filters/latex.rb
 - lib/bibtex/filters/linebreaks.rb
-- lib/bibtex/filters.rb
 - lib/bibtex/lexer.rb
 - lib/bibtex/name_parser.rb
 - lib/bibtex/names.rb
@@ -119,7 +115,6 @@ files:
 - lib/bibtex/utilities.rb
 - lib/bibtex/value.rb
 - lib/bibtex/version.rb
-- lib/bibtex.rb
 - test/benchmark.rb
 - test/bibtex/test_bibliography.rb
 - test/bibtex/test_elements.rb
@@ -150,33 +145,26 @@ files:
 homepage: http://inukshuk.github.com/bibtex-ruby
 licenses:
 - GPL-3
+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: -2827953330493505322
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2827953330493505322
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A BibTeX parser, converter and API for Ruby.
 test_files:
 - test/bibtex/test_bibliography.rb