bibsync 0.0.3 → 0.0.4

data/lib/bibsync.rb

@@ -2,6 +2,7 @@ require 'nokogiri'
 require 'shellwords'
 require 'date'
 require 'pathname'
+require 'forwardable'
 require 'bibsync/version'
 require 'bibsync/utils'
 require 'bibsync/log'

data/lib/bibsync/actions/check_arxiv_versions.rb

@@ -7,8 +7,8 @@ module BibSync
       SliceSize = 20
 
       def initialize(options)
-        raise 'Option :bib is required' unless @bib = options[:bib]
-        raise 'Option :dir is required' unless @dir = options[:dir]
+        raise 'Option --bib is required' unless @bib = options[:bib]
+        raise 'Option --dir is required' unless @dir = options[:dir]
         @update = options[:update]
       end
 

data/lib/bibsync/actions/determine_arxiv_doi.rb

@@ -5,7 +5,7 @@ module BibSync
       include Log
 
       def initialize(options)
-        raise 'Option :bib is required' unless @bib = options[:bib]
+        raise 'Option --bib is required' unless @bib = options[:bib]
         @force = options[:resync]
       end
 
@@ -27,7 +27,7 @@ module BibSync
 
       def determine_arxiv_and_doi(entry)
         if file = entry.file
-          if file[:type] == :PDF && !entry[:arxiv] && !entry[:doi]
+          if file[:type] == 'PDF' && !entry[:arxiv] && !entry[:doi]
             debug('Searching for arXiv or doi identifier in pdf file', key: entry)
             text = `pdftotext -f 1 -l 2 #{Shellwords.escape file[:path]} - 2>/dev/null`
             entry[:arxiv] = $1 if text =~ /arXiv:\s*([\w\.\/\-]+)/

data/lib/bibsync/actions/fetch_from_arxiv.rb

@@ -7,8 +7,8 @@ module BibSync
       include Utils
 
       def initialize(options)
-        raise 'Option :fetch is required' unless @fetch = options[:fetch]
-        raise 'Option :dir is required' unless @dir = options[:dir]
+        raise 'Option --fetch is required' unless @fetch = options[:fetch]
+        raise 'Option --dir is required' unless @dir = options[:dir]
       end
 
       def run

data/lib/bibsync/actions/find_my_citations.rb

@@ -5,8 +5,8 @@ module BibSync
       include Utils
 
       def initialize(options)
-        raise 'Option :bib is required' unless @bib = options[:bib]
-        raise 'Option :citedbyme is required' unless @dir = options[:citedbyme]
+        raise 'Option --bib is required' unless @bib = options[:bib]
+        raise 'Option --citedbyme is required' unless @dir = options[:citedbyme]
         raise "#{@dir} is not a directory" unless File.directory?(@dir)
       end
 

data/lib/bibsync/actions/jabref_format.rb

@@ -5,7 +5,7 @@ module BibSync
       include Log
 
       def initialize(options)
-        raise 'Option :bib is required' unless @bib = options[:bib]
+        raise 'Option --bib is required' unless @bib = options[:bib]
       end
 
       def run

data/lib/bibsync/actions/synchronize_files.rb

@@ -7,8 +7,8 @@ module BibSync
       FileTypes = %w(djvu pdf ps)
 
       def initialize(options)
-        raise 'Option :bib is required' unless @bib = options[:bib]
-        raise 'Option :dir is required' unless @dir = options[:dir]
+        raise 'Option --bib is required' unless @bib = options[:bib]
+        raise 'Option --dir is required' unless @dir = options[:dir]
       end
 
       def run

data/lib/bibsync/actions/synchronize_metadata.rb

@@ -5,7 +5,7 @@ module BibSync
       include Log
 
       def initialize(options)
-        raise 'Option :bib is required' unless @bib = options[:bib]
+        raise 'Option --bib is required' unless @bib = options[:bib]
         @force = options[:resync]
       end
 

data/lib/bibsync/actions/validate.rb

@@ -5,7 +5,7 @@ module BibSync
       include Log
 
       def initialize(options)
-        raise 'Bibliography must be set' unless @bib = options[:bib]
+        raise 'Option --bib is required' unless @bib = options[:bib]
       end
 
       def run

data/lib/bibsync/bibliography.rb

@@ -1,9 +1,12 @@
 module BibSync
   class Bibliography
     include Enumerable
+    extend Forwardable
 
     attr_reader :file
     attr_accessor :save_hook
+    def_delegators :@entries, :empty?, :size
+    def_delegator :@entries, :each_value, :each
 
     def initialize(file = nil)
       @entries, @save_hook = {}, nil
@@ -18,14 +21,6 @@ module BibSync
       @dirty = true
     end
 
-    def empty?
-      @entries.empty?
-    end
-
-    def size
-      @entries.size
-    end
-
     def [](key)
       @entries[key.to_s]
     end
@@ -51,14 +46,9 @@ module BibSync
       Pathname.new(file).realpath.relative_path_from(Pathname.new(bibpath)).to_s
     end
 
-    def each(&block)
-      @entries.each_value(&block)
-    end
-
     def save(file = nil)
       if file
         @file = file
-        @parent_path = nil
         dirty!
       end
 
@@ -82,14 +72,8 @@ module BibSync
       dirty!
     end
 
-    def load(file)
-      parse(File.read(file)) if file && File.exists?(file)
-      @file = file
-      @dirty = false
-    end
-
-    def load!(file)
-      parse(File.read(file))
+    def load(file, check = true)
+      parse(File.read(file)) if !check || (file && File.exists?(file))
       @file = file
       @dirty = false
     end

data/lib/bibsync/command.rb

@@ -30,7 +30,7 @@ module BibSync
         @options[:bib] = bib
       end
 
-      opts.on('-d', '--directory directory', 'Set directory') do |dir|
+      opts.on('-d', '--dir directory', 'Set directory') do |dir|
         @options[:dir] = dir
       end
 

data/lib/bibsync/entry.rb

@@ -1,18 +1,21 @@
 module BibSync
   class Entry
     include Enumerable
+    extend Forwardable
 
     attr_accessor :bibliography, :type
     attr_reader :key
+    def_delegators :@fields, :empty?, :size, :each
 
     def self.parse(text)
       Entry.new.tap {|e| e.parse(text) }
     end
 
     def initialize(fields = {})
+      @fields = {}
       self.key = fields.delete(:key) if fields.include?(:key)
       self.type = fields.delete(:type) if fields.include?(:type)
-      @fields = fields
+      fields.each {|k,v| self[k] = v }
     end
 
     def key=(key)
@@ -39,7 +42,7 @@ module BibSync
         raise 'No bibliography set' unless bibliography
         _, file, type = self[:file].split(':', 3)
         path = File.join(File.absolute_path(File.dirname(bibliography.file)), file)
-        { name: File.basename(path), type: type.upcase.to_sym, path: path }
+        { name: File.basename(path), type: type.upcase, path: path }
       end
     end
 
@@ -68,10 +71,6 @@ module BibSync
       end
     end
 
-    def each(&block)
-      @fields.each(&block)
-    end
-
     def comment?
       type.to_s.downcase == 'comment'
     end
@@ -158,7 +157,7 @@ module BibSync
     end
 
     def convert_key(key)
-      key.to_s.downcase.to_sym
+      key.to_s.downcase
     end
   end
 end

data/lib/bibsync/log.rb

@@ -20,34 +20,16 @@ module BibSync
     self.trace = false
     self.level = :info
 
-    def debug(message, opts = {})
-      log(:debug, message, opts)
-    end
-
-    def info(message, opts = {})
-      log(:info, message, opts)
-    end
-
-    def notice(message, opts = {})
-      log(:notice, message, opts)
-    end
-
-    def warning(message, opts = {})
-      log(:warning, message, opts)
-    end
-
-    def error(message, opts = {})
-      log(:error, message, opts)
+    [:debug, :info, :notice, :warning, :error].each do |level|
+      define_method level do |message, opts = {}|
+        log(level, message, opts)
+      end
     end
 
     def log(level, message, opts = {})
       return if Level.keys.index(level) < Level.keys.index(Log.level)
-      if ex = opts[:ex]
-        message = "#{message} - #{ex.message}"
-      end
-      if color = Level[level]
-        message = "#{color}#{message}#{Reset}"
-      end
+      message = "#{message} - #{opts[:ex].message}" if opts[:ex]
+      message = "#{Level[level]}#{message}#{Reset}" if Level[level]
       if key = opts[:key]
         key = key.key if key.respond_to? :key
         message = "#{key} : #{message}"

data/lib/bibsync/version.rb

@@ -1,3 +1,3 @@
 module BibSync
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/test/test_bibliography.rb

@@ -127,9 +127,6 @@ describe BibSync::Bibliography do
   describe '#load' do
   end
 
-  describe '#load!' do
-  end
-
   describe '#parse' do
   end
 

data/test/test_entry.rb

@@ -49,6 +49,12 @@ describe BibSync::Entry do
   describe '#each' do
   end
 
+  describe '#size' do
+  end
+
+  describe '#empty?' do
+  end
+
   describe '#comment?' do
     it 'should return true for a comment entry' do
       BibSync::Entry.new(type: 'coMMent').comment?.must_equal true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bibsync
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors: