json_resume 1.0.3 → 1.0.4

data/lib/json_resume.rb

@@ -1,5 +1,5 @@
-require_relative "json_resume/version"
-require_relative "json_resume/json_resume"
+require_relative 'json_resume/version'
+require_relative 'json_resume/json_resume'
 
 module JsonResume
   # Your code goes here...

data/lib/json_resume/formatter.rb

@@ -1,130 +1,127 @@
-#Hack to generalise call empty? on
-#objects, arrays and hashes
+# Hack to generalise call empty? on
+# objects, arrays and hashes
 class Object
-	def empty?
-		false
-	end
+  def empty?
+    false
+  end
 end
 
 module JsonResume
-	class Formatter
-		attr_reader :hash
-
-		def initialize(hash)
-			@hash = hash
-
-			#recursively defined proc
-			@hash_proc = Proc.new do |k,v|
-				v = k if v.nil? #hack to make it common for hash and array
-				v.delete_if(&@hash_proc) if [Hash,Array].any? { |x| v.instance_of? x }
-				v.empty?
-			end
-		end
-
-		def add_linkedin_github_url
-			@hash["raw_website"] = @hash["bio_data"]["website"].sub(/^https?:\/\//,'') if @hash["bio_data"] && @hash["bio_data"]["website"]
-			@hash["linkedin_url"] = "http://linkedin.com/in/" + @hash["linkedin_id"] if @hash["linkedin_id"]
-			@hash["github_url"] = "http://github.com/" + @hash["github_id"] if @hash["github_id"]
-		end
-
-		def add_last_marker_on_stars
-			return if @hash['bio_data']['stars'].nil?
-			@hash["bio_data"]["stars"] = {
-				"items" => @hash["bio_data"]["stars"].map{ |i| { "name" => i } }
-			}
-			@hash["bio_data"]["stars"]["items"][-1]["last"] = true
-		end
-
-		def add_last_marker_on_skills
-			return if @hash['bio_data']['skills'].nil?
-			@hash['bio_data']['skills']['details'].each do |item|
-				item['items'].map!{|x| {'name'=>x} }
-				item['items'][-1]['last'] = true
-			end
-		end
-
-		def add_last_marker_on_tools
-			return if @hash['bio_data']['other_projects'].nil?
-			@hash['bio_data']['other_projects']['items'].each do |item|
-				next if item['technology_used'].nil?
-				item['technology_used']['tools'].map!{|x| {'name' => x} }
-				item['technology_used']['tools'][-1]['last'] = true
-			end
-		end
-
-		def add_last_marker_on_field field_name
-			return if @hash['bio_data'][field_name].nil?
-			@hash['bio_data'][field_name]['items'].each do |item|
-				next if item['technology_used'].nil?
-				item['technology_used']['tools'].map!{|x| {'name' => x} }
-				item['technology_used']['tools'][-1]['last'] = true
-			end
-		end
-
-		def cleanse
-			@hash.delete_if &@hash_proc
-			self
-		end
-
-		def format_to_output_type
-			format_proc = Proc.new do |k,v|
-				v = k if v.nil?
-				v.each{|x| format_proc.call(x)} if [Hash,Array].any? {|x| v.instance_of? x}
-				format_string v if v.instance_of? String
-			end
-			@hash.each{|x| format_proc.call(x)}
-			self
-		end
-
-		def format_string str
-			raise NotImplementedError.new("format_string not impl in formatter")
-		end
-
-		def is_false? item
-			item == false || item == 'false'
-		end
-
-		def purge_gpa
-			return if @hash['bio_data']['education'].nil?
-			@hash["bio_data"]["education"].delete("show_gpa") if is_false?(@hash["bio_data"]["education"]["show_gpa"]) || @hash["bio_data"]["education"]["schools"].all? {|sch| sch["gpa"].nil? || sch["gpa"].empty?}
-		end
-
-		def add_padding(course)
-			unless @hash["bio_data"].nil? || @hash["bio_data"][course].nil?
-				course_hash = @hash["bio_data"][course]
-				course_hash << {} if course_hash.size % 2 == 1
-				@hash["bio_data"][course] = {
-					"rows" => course_hash.each_slice(2).to_a.map{ |i| { "columns" => i } }
-				}
-			end
-		end
-
-		def format
-			return if @hash["bio_data"].nil?
-
-			cleanse
-
-			format_to_output_type
-
-			add_last_marker_on_stars
-
-			add_last_marker_on_skills
-
-			add_last_marker_on_field 'experience'
-			add_last_marker_on_field 'other_projects'
-
-			purge_gpa
-
-			add_linkedin_github_url
-
-			#make odd listed courses to even
-			["grad_courses", "undergrad_courses"].each do |course|
-				add_padding(course)
-			end
-
-			return self
-		end
-
-
-	end
+  class Formatter
+    attr_reader :hash
+
+    def initialize(hash)
+      @hash = hash
+
+      # recursively defined proc
+      @hash_proc = proc do |k, v|
+        v = k if v.nil? # HACK: to make it common for hash and array
+        v.delete_if(&@hash_proc) if [Hash, Array].any? { |x| v.instance_of? x }
+        v.empty?
+      end
+    end
+
+    def add_linkedin_github_url
+      @hash['raw_website'] = @hash['bio_data']['website'].sub(%r{^https?://}, '') if @hash['bio_data'] && @hash['bio_data']['website']
+      @hash['linkedin_url'] = 'http://linkedin.com/in/' + @hash['linkedin_id'] if @hash['linkedin_id']
+      @hash['github_url'] = 'http://github.com/' + @hash['github_id'] if @hash['github_id']
+    end
+
+    def add_last_marker_on_stars
+      return if @hash['bio_data']['stars'].nil?
+      @hash['bio_data']['stars'] = {
+        'items' => @hash['bio_data']['stars'].map { |i| { 'name' => i } }
+      }
+      @hash['bio_data']['stars']['items'][-1]['last'] = true
+    end
+
+    def add_last_marker_on_skills
+      return if @hash['bio_data']['skills'].nil?
+      @hash['bio_data']['skills']['details'].each do |item|
+        item['items'].map! { |x| { 'name' => x } }
+        item['items'][-1]['last'] = true
+      end
+    end
+
+    def add_last_marker_on_tools
+      return if @hash['bio_data']['other_projects'].nil?
+      @hash['bio_data']['other_projects']['items'].each do |item|
+        next if item['technology_used'].nil?
+        item['technology_used']['tools'].map! { |x| { 'name' => x } }
+        item['technology_used']['tools'][-1]['last'] = true
+      end
+    end
+
+    def add_last_marker_on_field(field_name)
+      return if @hash['bio_data'][field_name].nil?
+      @hash['bio_data'][field_name]['items'].each do |item|
+        next if item['technology_used'].nil?
+        item['technology_used']['tools'].map! { |x| { 'name' => x } }
+        item['technology_used']['tools'][-1]['last'] = true
+      end
+    end
+
+    def cleanse
+      @hash.delete_if(&@hash_proc)
+      self
+    end
+
+    def format_to_output_type
+      format_proc = proc do |k, v|
+        v = k if v.nil?
+        v.each { |x| format_proc.call(x) } if [Hash, Array].any? { |x| v.instance_of? x }
+        format_string v if v.instance_of? String
+      end
+      @hash.each { |x| format_proc.call(x) }
+      self
+    end
+
+    def format_string(_)
+      fail(NotImplementedError.new('format_string not impl in formatter'), '')
+    end
+
+    def item_false?(item)
+      item == false || item == 'false'
+    end
+
+    def purge_gpa
+      return if @hash['bio_data']['education'].nil?
+      @hash['bio_data']['education'].delete('show_gpa') if item_false?(@hash['bio_data']['education']['show_gpa']) || @hash['bio_data']['education']['schools'].all? { |sch| sch['gpa'].nil? || sch['gpa'].empty? }
+    end
+
+    def add_padding(course)
+      return if @hash['bio_data'].nil? || @hash['bio_data'][course].nil?
+      course_hash = @hash['bio_data'][course]
+      course_hash << {} if course_hash.size.odd?
+      @hash['bio_data'][course] = {
+        'rows' => course_hash.each_slice(2).to_a.map { |i| { 'columns' => i } }
+      }
+    end
+
+    def format
+      return if @hash['bio_data'].nil?
+
+      cleanse
+
+      format_to_output_type
+
+      add_last_marker_on_stars
+
+      add_last_marker_on_skills
+
+      add_last_marker_on_field 'experience'
+      add_last_marker_on_field 'other_projects'
+
+      purge_gpa
+
+      add_linkedin_github_url
+
+      # make odd listed courses to even
+      %w(grad_courses undergrad_courses).each do |course|
+        add_padding(course)
+      end
+
+      self
+    end
+  end
 end

data/lib/json_resume/formatter_html.rb

@@ -1,21 +1,21 @@
 require_relative 'formatter'
 
 module JsonResume
- class FormatterHtml < Formatter
-    def format_link str
-        str.gsub!(/\[(.*?)\]\((.*?)\)/, '<a href="\2">\1</a>')
+  class FormatterHtml < Formatter
+    def format_link(str)
+      str.gsub!(/\[(.*?)\]\((.*?)\)/, '<a href="\2">\1</a>')
     end
 
-    def format_autolink str
-        str.gsub!(/<<(\S*?)>>/, '<a href="\1">\1</a>')
+    def format_autolink(str)
+      str.gsub!(/<<(\S*?)>>/, '<a href="\1">\1</a>')
     end
 
-    def format_emphasis str
+    def format_emphasis(str)
       str.gsub!(/\b_(.+?)_\b/, '<i>\1</i>')
       str.gsub!(/\*\*(.+?)\*\*/, '<b>\1</b>')
     end
 
-    def format_string str
+    def format_string(str)
       format_link str
       format_autolink str
       format_emphasis str
@@ -24,8 +24,7 @@ module JsonResume
     def format
       super
 
-      return self
+      self
     end
-
- end
+  end
 end

data/lib/json_resume/formatter_latex.rb

@@ -2,32 +2,31 @@ require_relative 'formatter'
 
 module JsonResume
   class FormatterLatex < Formatter
-
-    def format_slashes str
-        str.gsub!(/\\/, '\textbackslash')
-        str.gsub!(/\{/, '\{')
-        str.gsub!(/\}/, '\}')
+    def format_slashes(str)
+      str.gsub!(/\\/, '\textbackslash')
+      str.gsub!(/\{/, '\{')
+      str.gsub!(/\}/, '\}')
     end
 
-    def format_link str
-        str.gsub!(/\[(.*?)\]\((.*?)\)/, '{\color{see} \href{\2}{\1}}')
+    def format_link(str)
+      str.gsub!(/\[(.*?)\]\((.*?)\)/, '{\color{see} \href{\2}{\1}}')
     end
 
-    def format_autolink str
-        str.gsub!(/<<(\S*?)>>/, '{\color{see} \url{\1}}')
+    def format_autolink(str)
+      str.gsub!(/<<(\S*?)>>/, '{\color{see} \url{\1}}')
     end
 
-    def format_emphasis str
+    def format_emphasis(str)
       str.gsub!(/\b_(.+?)_\b/, '\textit{\1}')
       str.gsub!(/\*\*(.+?)\*\*/, '\textbf{\1}')
     end
 
-    def format_superscripts str
+    def format_superscripts(str)
       str.gsub!(/<sup>(.*?)<\/sup>/, '$^{\1}$')
       str.gsub!(/<sub>(.*?)<\/sub>/, '$_{\1}$')
     end
 
-    def format_symbols str
+    def format_symbols(str)
       str.gsub!(/#/, '\#')
       str.gsub!(/\$/, '\$')
       str.gsub!(/&/, '\\\\&')
@@ -36,7 +35,7 @@ module JsonResume
       str.gsub!(/_/, '\_')
     end
 
-    def format_string str
+    def format_string(str)
       format_slashes str
       format_link str
       format_autolink str
@@ -48,7 +47,7 @@ module JsonResume
     def format
       super
 
-      return self
+      self
     end
   end
 end

data/lib/json_resume/formatter_md.rb

@@ -1,20 +1,19 @@
 require_relative 'formatter'
 
 module JsonResume
- class FormatterMd < Formatter
-    def format_autolink str
-        str.gsub!(/<<(\S*?)>>/, '[\1](\1)')
+  class FormatterMd < Formatter
+    def format_autolink(str)
+      str.gsub!(/<<(\S*?)>>/, '[\1](\1)')
     end
 
-    def format_string str
+    def format_string(str)
       format_autolink str
     end
 
     def format
       super
 
-      return self
+      self
     end
-
- end
+  end
 end

data/lib/json_resume/json_resume.rb

@@ -1,19 +1,19 @@
 require_relative 'reader'
 
 module JsonResume
-	class << self
-		def new(json_input, options = {})
-			options = options.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
-			JsonResume::Core.new(json_input, options)
-		end
-	end
+  class << self
+    def new(json_input, options = {})
+      options = options.each_with_object({}) { |(k, v), memo| memo[k.to_sym] = v }
+      JsonResume::Core.new(json_input, options)
+    end
+  end
 
-	class Core
-		attr_accessor :reader
+  class Core
+    attr_accessor :reader
 
-		def initialize(json_input, options)
-			@reader = Reader.new(json_input, options)
-			@reader.format!
-		end
-	end
+    def initialize(json_input, options)
+      @reader = Reader.new(json_input, options)
+      @reader.format!
+    end
+  end
 end

data/lib/json_resume/reader.rb

@@ -3,34 +3,36 @@ require_relative 'formatter_latex'
 require_relative 'formatter_md'
 require 'rest-client'
 require 'json'
+require 'yaml'
 
 module JsonResume
-	class Reader
-		attr_accessor :hash
+  class Reader
+    attr_accessor :hash
 
-		def initialize(json_input, options)
-      output_type = options[:output_type] || "html" #default html, others latex, md
-			@json_string = case json_input
-               when /^(http|https|www)/ then RestClient.get(json_input)
-						   when /\.json$/i then File.read(json_input)
-						   else json_input
-						   end
+    def initialize(json_input, options)
+      output_type = options[:output_type] || 'html' # default html, others latex, md
+      @json_string = case json_input
+                     when /^(http|https|www)/ then RestClient.get(json_input)
+                     when /\.json$/i then File.read(json_input)
+                     when /\.ya?ml$/i then JSON.dump(YAML.load_file(json_input))
+                     else json_input
+           end
       @output_type = output_type
-			begin
-				@hash = JSON.parse(@json_string)
-			rescue JSON::ParserError => e
-				raise Exception, "Either you entered a file without .json extension or JSON string is wrong: "+e.message
-			end
-		end
+      begin
+        @hash = JSON.parse(@json_string)
+      rescue JSON::ParserError => e
+        raise Exception, 'Either you entered a file without .json extension or JSON string is wrong: ' + e.message
+      end
+    end
 
     def format!
       formatters = {
-        :latex => JsonResume::FormatterLatex,
-        :html => JsonResume::FormatterHtml,
-        :markdown => JsonResume::FormatterMd,
+        latex: JsonResume::FormatterLatex,
+        html: JsonResume::FormatterHtml,
+        markdown: JsonResume::FormatterMd
       }
       type = @output_type.to_sym
       @hash = formatters[type].new(@hash).format.hash
     end
-	end
+  end
 end