bibtex-ruby 4.0.3 → 4.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9de82cd417f354a88a91476f719c5e74d7a50770
-  data.tar.gz: 169a387d3f991820f7acd9b12f56d8419e4cd624
+  metadata.gz: 8dfc396ec0cd2efd0f5f64425c8e9ffd767da58c
+  data.tar.gz: 857697705ed8d3cf337beba83c088808cb88bb61
 SHA512:
-  metadata.gz: 4ae3525c8dc076d32f4bad9283dfb8a813ff182419ad98af8499057bfd5b4c2d5a42595977972ae862c8a5ad272d75e9981d186f5de16829e9faccbf8d5ccb00
-  data.tar.gz: dba0dc62e3b76afe70c0afe4adea9f32a6a772df365e32c21e581aa9cfcb954a78b6f114bea0df7040f37e9c152624614419a1c0f8b2df2df105b099e34f36e4
+  metadata.gz: 111bf7910b6e38a5aeb40ad2d128fe06d5ee992e1ea64fb1503c445b63256b714fe6ef6fd9a43ac9ad4e4bb28d7677ad82d711c6ee723efff2457a9cae569b62
+  data.tar.gz: 538da62b61ae3e58fda93839ad712c95ef949552be07157a66e712f58e8faa1d58538e977019ec202df69aace8beda7d5689bd966fe888665c59c0fd41894263

data/History.txt

@@ -1,3 +1,7 @@
+4.0.4 / 2014-10-10
+==================
+* added !~ matcher for queries (@temporaer)
+
 4.0.0 / 2014-07-08
 ==================
 

data/README.md

@@ -150,11 +150,11 @@ Instead of parsing strings you can also create BibTeX elements directly in
 Ruby:
 
     > bib = BibTeX::Bibliography.new
-    
+
 Using a Hash:
 
     > bib << BibTeX::Entry.new({
-        :type => :book,
+        :bibtex_type => :book,
         :key => :rails,
         :address => 'Raleigh, North Carolina',
         :author => 'Ruby, Sam and Thomas, Dave, and Hansson, David Heinemeier',
@@ -236,7 +236,7 @@ query functionality with the exception of yielding to a block. For instance:
 
     # 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]']
@@ -248,6 +248,8 @@ query functionality with the exception of yielding to a block. For instance:
     => Returns all books whose keywords attribute matches /^ruby/
     bib.q('@book[keywords ~= ruby]')
     => Returns all books whose keywords attribute matches /ruby/
+    bib['@book[keywords!~ruby]']
+    => Returns all books whose keywords attribute does not match /ruby/ or don't have keywords attribute
 
     bib.q('@article[year<=2007]')
     => Returns all articles published in 2007 or earlier
@@ -522,7 +524,7 @@ because these tokens will be concatenated using BibTeX's '#' operator).
       Year = {2009}
     }
     END
-    => [{:key=>:pickaxe, :type=>:book,
+    => [{:bibtex_key=>:pickaxe, :bibtex_type=>:book,
       :address=>"{Raleigh, North Carolina}",
       :author=>"{Thomas, Dave, and Fowler, Chad, and Hunt, Andy}",
       :publisher=>"{The Pragmatic Bookshelf}",
@@ -535,7 +537,7 @@ quotes; therefore you can simply add the :quotes option with an empty string:
     >> BibTeX.parse(<<-END).to_a(:quotes => '')
     ...
     END
-    => [{:key=>:pickaxe, :type=>:book,
+    => [{:bibtex_key=>:pickaxe, :bibtex_type=>:book,
       :address=>"Raleigh, North Carolina",
       :author=>"Thomas, Dave, and Fowler, Chad, and Hunt, Andy",
       :publisher=>"The Pragmatic Bookshelf",

data/features/bibtex.feature

@@ -5,11 +5,11 @@ Feature: Parse BibTeX files
 	Scenario: A BibTeX file with lots of objects and comments
 		When I parse the following file:
 		"""
-		%%
-		%% This BibTeX file contains all the examples of valid BibTeX objects
-		%% in Xavier Decoret's `A summary of BibTeX' at
-		%% http://artis.imag.fr/~Xavier.Decoret/resources/xdkbibtex/bibtex_summary.html
-		%%
+    ##
+    ## This BibTeX file contains all the examples of valid BibTeX objects
+    ## in Xavier Decoret's `A summary of BibTeX' at
+    ## http://artis.imag.fr/~Xavier.Decoret/resources/xdkbibtex/bibtex_summary.html
+    ##
 
 		@Article{py03,
 		  author = {Xavier D\'ecoret},

data/features/query.feature

@@ -59,6 +59,8 @@ Feature: Searching in BibTeX bibliographies
 		Then there should be exactly 3 matches
 		When I search for "@*[year=2007]"
 		Then there should be exactly 1 match
+		When I search for "@*[keywords!~lex]"
+		Then there should be exactly 2 matches
 		
 	@query
 	Scenario: Find entries using compound queries

data/lib/bibtex/elements.rb

@@ -55,11 +55,11 @@ module BibTeX
     def values_at(*arguments)
       []
     end
-    
+
     def digest(*arguments)
       [type, content].join('|')
     end
-  
+
     # Invokes BibTeX string replacement on this element.
     def replace(*arguments); self; end
 
@@ -187,11 +187,11 @@ module BibTeX
     def inspect
       "#<#{self.class} #{content.gsub(/\n/, ' ')}>"
     end
-    
+
     private
-    
+
     def meets_condition?(condition)
-      property, operator, value = condition.split(/\s*([!~\/\^<>]?=)\s*/)
+      property, operator, value = condition.split(/\s*([!~\/\^<>]?=|!~)\s*/)
 
       if property.nil?
         true
@@ -208,6 +208,8 @@ module BibTeX
             !actual.nil? && actual.to_s.match("^#{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 '>='

data/lib/bibtex/entry.rb

@@ -382,7 +382,7 @@ module BibTeX
     # Returns false if the entry is one of the standard entry types and does not have
     # definitions of all the required fields for that type.
     def valid?
-      REQUIRED_FIELDS[@type].all? do |f|
+      REQUIRED_FIELDS[type].all? do |f|
         f.is_a?(Array) ? !(f & fields.keys).empty? : !fields[f].nil?
       end
     end

data/lib/bibtex/version.rb

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

data/test/bibtex/test_entry.rb

@@ -594,20 +594,20 @@ module BibTeX
 
     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']
@@ -617,11 +617,46 @@ module BibTeX
 
         assert @e.meet? ['author ~= .']
         assert @e.meet? ['author ~= [a-z]*']
-        
-        assert @e.meet? ['author ^= P\w+']        
 
+        assert @e.meet? ['author ^= P\w+']
+      end
+    end
+
+    describe '#valid?' do
+      before {
+        @misc = Entry.new
+        @book = Entry.new({ :bibtex_type => :book })
+        @article = Entry.new({ :bibtex_type => :article })
+      }
+
+      it 'is true by default' do
+        assert @misc.valid?
+      end
+
+      it 'is not true by default for types with mandatory fields' do
+        refute @book.valid?
+        refute @article.valid?
+      end
+
+      it 'is true only if all mandatory fields are present' do
+        @book.update({
+          :author => 'Henry James',
+          :title => 'What Maisie Knew',
+          :year => 1897,
+          :publisher => 'Heineman'
+        })
+
+        assert @book.valid?
+
+        @book.delete :publisher
+        refute @book.valid?
+
+        @book.publisher = 'Heineman'
+        assert @book.valid?
+
+        @book.delete :year
+        refute @book.valid?
       end
-      
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibtex-ruby
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.0.4
 platform: ruby
 authors:
 - Sylvester Keil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2014-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: latex-decode
@@ -145,23 +145,23 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.1.8
 signing_key: 
 specification_version: 4
 summary: A BibTeX parser, converter and API for Ruby.
 test_files:
-- test/bibtex/entry/test_rdf_converter.rb
-- test/bibtex/test_bibliography.rb
-- test/bibtex/test_elements.rb
-- test/bibtex/test_entry.rb
-- test/bibtex/test_filters.rb
+- test/bibtex/test_value.rb
 - test/bibtex/test_lexer.rb
-- test/bibtex/test_name_parser.rb
 - test/bibtex/test_names.rb
 - test/bibtex/test_parser.rb
-- test/bibtex/test_string.rb
+- test/bibtex/test_bibliography.rb
+- test/bibtex/test_filters.rb
 - test/bibtex/test_utilities.rb
-- test/bibtex/test_value.rb
+- test/bibtex/test_string.rb
+- test/bibtex/test_entry.rb
+- test/bibtex/test_name_parser.rb
+- test/bibtex/test_elements.rb
+- test/bibtex/entry/test_rdf_converter.rb
 - test/test_bibtex.rb
 - test/test_export.rb
 has_rdoc: yard