glibrary 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4ac86212be3fab6a235e0216dad02d0f839d9aa47dd156e3c7a9a4d1859e96a
-  data.tar.gz: fc6357e250be3d23b5581b230ad5b2ab33c450acd080fa71392a2da66ca8ef93
+  metadata.gz: 500668b0fef4bc0c293f2f6cb76922df63fdd885f2b7c3bbac04a32f75dbe9cc
+  data.tar.gz: d0f87c340194b3ab7f543f94c99601d2f20ce571694e3ce5ac51dda30f41e65d
 SHA512:
-  metadata.gz: 050d5cb1869f8bc163d26eb4fe623acae8582ccd26f4c8b177fc0bca8bbe6c8b3cc9db6802c857b396375bfc77c32eb92d1a70cd855446387f34a96077f1d800
-  data.tar.gz: ed586d2e862b1c2402016447b75a3e3be642b590363359b35cf97b495e0fe5c4a885f9a390a24379c81b08e813210875d723ca8f38bff3c4619aa8825d634dd1
+  metadata.gz: f16dab8aeeb001c3470a0bfe513a398ac4d235fbfd024fe3f148fa5273eb2c81e3a931cbefc138191bbb3b0994e4f151b517a64c52d16e5d153dcda78b456b6e
+  data.tar.gz: b045b4f3bbdc9afa329afd481dc3301115fd06406d7b6c1270f46737888e13de254ad88ddecb4ff01e91fce8ab6f4ec30f2816fea83c8b35ccac109eca332848

data/bin/glibrary

@@ -5,6 +5,7 @@ require 'io/console'
 require_relative '../modules/api_query'
 require_relative '../modules/command_line_parse'
 require_relative '../modules/errors'
+require_relative '../modules/error_handler'
 require_relative '../modules/exec_helper'
 require_relative '../modules/google_api_url'
 require_relative '../modules/user_prompt'
@@ -16,44 +17,37 @@ require_relative '../lib/user_library'
 include ExecHelper
 include UserPrompt
 include CommandLineParse
+include ErrorHandler
 
 CURRENT_DIR = File.join(File.dirname(__FILE__))
 DEFAULT_FILENAME =  File.join File.expand_path("..", CURRENT_DIR), "saved_libraries", "library.json"
 
 process_args!
 
-options = {}
-filename = DEFAULT_FILENAME
-filename, options = CommandLineParse::command_line_parse!(filename, options)
+@options = {}
+@filename = DEFAULT_FILENAME
+command_line_parse!
 
-prepare_filename_for_os!(filename)
+prepare_filename_for_os!
 
-persistent_library = UserLibrary.new(filename: filename)
+if @options.nil?
 
-temp_booklist = UserLibrary.new(nonpersistent: true)
+  with_library_mode_error_handling do
+    (@library = UserLibrary.new(filename: @filename)).pretty_print
+    library_mode_user_prompt
+  end
 
-begin
-  search_results = ExecHelper::perform_search(options)
-  search_results.selected_results.each { |info| temp_booklist.add(UserBook.new(info)) }
+else
 
-  temp_booklist.pretty_print
+  with_search_mode_error_handling do
+    @persistent_library = UserLibrary.new(filename: @filename)
+    @temp_booklist = UserLibrary.new(nonpersistent: true)
 
-  search_user_prompt(temp_booklist, persistent_library)
+    search_results = perform_search
+    search_results.selected_results.each { |info| @temp_booklist.add(UserBook.new(info)) }
+    @temp_booklist.pretty_print
+
+    search_mode_user_prompt
+  end
 
-rescue UserQuits
-  puts "\nThanks for browsing. Library file saved"
-  puts ""
-rescue Errno::EACCES
-  puts "\nYou don't have permission to write to the file you specified.  Quitting immediately"
-  puts ""
-rescue NoInternetError
-  puts "\nNo internet connection.  Please connect to the internet and try again."
-  puts ""
-rescue SearchError 
-  puts "\nThere was an error with your query; be careful to format it well"
-  puts ""
-rescue NoResults
-  puts "\nNo results."
-  puts ""
 end
-exit

data/lib/user_library.rb

@@ -97,12 +97,12 @@ class UserLibrary
     def set_filename(name)
       @nonpersistent = false
       @filename = name
-      prepare_filename_for_os!(@filename)
+      prepare_filename_for_os!
     end
 
     def determine_filename!
       @filename = File.absolute_path(@filename)
-      prepare_filename_for_os!(@filename)
+      prepare_filename_for_os!
     end
 
     def get_raw_JSON_data

data/modules/command_line_parse.rb

@@ -6,11 +6,9 @@ require_relative '../lib/user_library'
 module CommandLineParse
   require 'optparse'
   include Errors
-  include UserPrompt
-  include ExecHelper
 
-  def handle_nonexistent_file(filename, library)
-    (puts "Library file not found, cannot display."; exit) if library
+  def handle_nonexistent_file
+    (puts "Library file not found, cannot display."; exit)
     puts "Creating new file"
   end
 
@@ -21,46 +19,40 @@ module CommandLineParse
     puts ""
   end
 
-
-  def command_line_parse!(filename, o, suppress = nil)
-
+  def command_line_parse!
     OptionParser.new do |opts|
       opts.banner = "Usage: glibrary [options...] [query]"
-      @library = library = opts.default_argv.include?("-l")
 
       opts.on("-t", "--title=TITLE", "Specify a title keyword") do |t|
-        o[:title] = t
+        @options[:title] = t
       end
 
       opts.on("-a", "--author=AUTHOR", "Specify an author keyword") do |a|
-        o[:author] = a
+        @options[:author] = a
       end
 
       opts.on("-p", "--publisher=PUBLISHER", "Specify a publisher keyword") do |p|
-        o[:publisher] = p
+        @options[:publisher] = p
       end
 
       opts.on("-f", "--lib-file=LIBFILE",
               "Select a library save file. Otherwise, a default save file will be used.") do |libfile|
-        filename = File.absolute_path(libfile)
-        handle_nonexistent_file(filename, library) unless File.exist?(filename)
+        @filename = File.absolute_path(libfile)
+        handle_nonexistent_file if ARGV.include?("-l") && !File.exist?(@filename)
       end
 
       opts.on("-l", "--library", "See your library; ignores all search options") do
-        prepare_filename_for_os!(filename)
-        unless suppress
-          (l = UserLibrary.new(filename: filename)).pretty_print
-          library_mode_user_prompt(l) 
-          exit
-        end
+        @options = nil
+        return
       end
 
       opts.on("-h", "--help", "Prints this help") do
         print_help_message(opts)
         exit
       end
-
     end.parse!
-    return [(@filename = filename), o]
+
+    @options[:search] = ARGV.join('+')
+    
   end
 end

data/modules/error_handler.rb

@@ -0,0 +1,38 @@
+require_relative 'errors'
+
+module ErrorHandler
+  def with_library_mode_error_handling
+    begin
+      yield
+    rescue UserQuits
+      puts "\nEnjoy your day."
+    rescue Errno::EACCES
+      puts "\nYou don't have permission to write to the file you specified.  Quitting immediately"
+      puts ""
+    end
+    exit
+  end
+    
+  def with_search_mode_error_handling
+    begin 
+      yield
+    rescue UserQuits
+      puts "\nThanks for browsing. Library file saved"
+      puts ""
+    rescue Errno::EACCES
+      puts "\nYou don't have permission to write to the file you specified.  Quitting immediately"
+      puts ""
+    rescue NoInternetError
+      puts "\nNo internet connection.  Please connect to the internet and try again."
+      puts ""
+    rescue SearchError 
+      puts "\nThere was an error with your query; be careful to format it well"
+      puts ""
+    rescue NoResults
+      puts "\nNo results."
+      puts ""
+    end
+    exit
+  end
+
+end

data/modules/exec_helper.rb

@@ -8,13 +8,13 @@ module ExecHelper
     args << args.delete("-l") if args.include?("-l")
   end
 
-  def prepare_filename_for_os!(filename)
-    filename.gsub!(/\//, '\\') if ENV.values.any? { |v| v =~ /[A-Z]:\\Windows/i }
+  def prepare_filename_for_os!
+    @filename.gsub!(/\//, '\\') if ENV.values.any? { |v| v =~ /[A-Z]:\\Windows/i }
   end
 
-  def perform_search(o)
-    search = o[:search] || ARGV.join('+')
-    s = BookSearch.new(search: search, title: o[:title], author: o[:author], 
-                       publisher: o[:publisher])
+  def perform_search
+    search = @options[:search] || ARGV.join('+')
+    s = BookSearch.new(search: search, title: @options[:title], author: @options[:author], 
+                       publisher: @options[:publisher])
   end
 end

data/modules/user_prompt.rb

@@ -26,14 +26,15 @@ module UserPrompt
     return s
   end
 
-  def library_mode_user_prompt(library)
+  def library_mode_user_prompt
     while true
       begin
         i = prompt( "Select a book number to delete, or type \"q\" to quit: ", /\A([0-9]+|[qQ])\Z/,
-               library )
+               @library )
 
-        library.delete(i)
-        library.pretty_print
+        @library.delete(i)
+        @library.save
+        @library.pretty_print
 
         puts "Your library now looks like this."
         puts ""
@@ -41,25 +42,20 @@ module UserPrompt
         puts "\nSorry, your selection was invalid. Please try again."
       rescue NotABook
         puts "\nSorry, your selection was invalid. Make sure your selection is in the provided range."
-      rescue UserQuits
-        library.save
-        puts "\nEnjoy your day."
-        exit
       end
     end
   end
 
 
-  def search_user_prompt(temp_booklist, persistent_library)
+  def search_mode_user_prompt
     while true
       begin
-
         i = prompt( "Enter a number (1-5) to add a book to your reading list (or q to quit): ",
-                /\A[1-5]|[qQ]\Z/, temp_booklist )
-        selected_book = temp_booklist[i]
+                /\A[1-5]|[qQ]\Z/, @temp_booklist )
+        selected_book = @temp_booklist[i]
 
-        persistent_library << selected_book
-        persistent_library.save
+        @persistent_library << selected_book
+        @persistent_library.save
 
         handle_successful_prompt_completion(selected_book)
         puts "Would you like to add another?"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glibrary
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Peter Engelbert
@@ -24,6 +24,7 @@ files:
 - lib/user_library.rb
 - modules/api_query.rb
 - modules/command_line_parse.rb
+- modules/error_handler.rb
 - modules/errors.rb
 - modules/exec_helper.rb
 - modules/google_api_url.rb