cite-me 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4294bdd7411a11b4f54a5999609c34463df298e4
-  data.tar.gz: 50bbdab53ff45ebd1f6ca0b841f4c5454f0e0ade
+  metadata.gz: 1b0db38c1ffd2e754041782d7e6267d7a789f83e
+  data.tar.gz: a0d4bb3526f8d0c537007f6119255a6b2ca08a7e
 SHA512:
-  metadata.gz: acd33ff621f50748fd2af269138a42a00955845a6245870a2643bd24ec9787556cc43a338c4da64a8084c5de0c3d5a4fda5d877ee05af6142dd1d45ce81bdbae
-  data.tar.gz: 4a8e6e11653cf1911ee0ca63682ec223437f62adc94a11077d912ec147fbd8003875b1195cdf1eecbcb2b2504bc34d09b53482f99c1dac5305460a4a3f6d92ac
+  metadata.gz: cd7d91f316f65f7514205aaf2977a2d2dbf3ccc4dde63a298468d843a3a1d409514a93771956b4645062bbe94f16ab345793ad74f71896bad9f9cb0c0a5277d2
+  data.tar.gz: 31e27f25ad696956347def3e2e901494faac56f9cfec9f567821947c74ec70514fd23467470f41a80e28943820f3e05ef989413d7612898a2ef36e0c3717f1d1

data/lib/cite_me.rb

@@ -1,7 +1,8 @@
+require 'pry'
 class Cite_Me 
   # Usage: 
   #    >> citation = Cite_Me.new
-  #    >> source = { type: 'book',
+  #    >> source = { source_type: 'book',
   #               authors: ['Jacob Smith'],
   #                 title: 'The Art of Writing Code',
   #   city_of_publication: 'Indianapolis',
@@ -19,22 +20,22 @@ class Cite_Me
   end
 
   def generate_citation(options)
-    case options[:type]
+   clean_options = clean_hash(options)
+    case clean_options[:source_type]
     when 'book'
-      mla_book_generate_citation(options)
+      mla_book_generate_citation(clean_options)
     when 'magazine'
-      mla_magazine_generate_citation(options)
+      mla_magazine_generate_citation(clean_options)
     when 'web'
-      mla_web_generate_citation(options)
+      mla_web_generate_citation(clean_options)
     end
   end
   
   private
 
-  def mla_book_generate_citation(options)
-   clean_options = clean_hash(options)
+  def mla_book_generate_citation(clean_options)
    output = ''
-   output <<  authors(clean_options[:authors]) || authors(clean_options[:author])
+   output << author_info(clean_options) 
    output <<  "<i>" + clean_options[:title] + "</i>. " if clean_options[:title]
    output <<  clean_options[:city_of_publication] + ": " if clean_options[:city_of_publication]
    output <<  clean_options[:publisher] + ", " if clean_options[:publisher]
@@ -44,10 +45,9 @@ class Cite_Me
    output
   end
 
-  def mla_magazine_generate_citation(options)
-   clean_options = clean_hash(options)
+  def mla_magazine_generate_citation(clean_options)
    output = ''
-   output <<  authors(clean_options[:authors]) || authors(clean_options[:author])
+   output << author_info(clean_options) 
    output <<  %{"#{clean_options[:title_of_article]}." }
    output <<  "<i>" + clean_options[:title_of_periodical] + "</i> "
    output <<  clean_options[:publication_date] + ": "
@@ -57,12 +57,11 @@ class Cite_Me
    output
   end
   
-  def mla_web_generate_citation(options)
-   clean_options = clean_hash(options)
+  def mla_web_generate_citation(clean_options)
    output = ''
-   output <<  authors(clean_options[:authors]) || authors(clean_options[:author])
+   output << author_info(clean_options)
    output <<  "<i>" + clean_options[:name_of_site] + "</i>. "
-  output << clean_options[:name_of_organization] + ", "
+   output << clean_options[:name_of_organization] + ", "
    output <<  clean_options[:date_of_creation] + ". "
    output <<  'Web. ' 
    output <<  clean_options[:date_of_access] + "."
@@ -98,7 +97,11 @@ class Cite_Me
     author_string
   end
 
-  def year_of_publication(option)
+  def author_info(clean_options)
+   author_info = clean_options[:authors] ? authors(clean_options[:authors]) : authors(clean_options[:author])
+  end
+
+   def year_of_publication(option)
     if option
       option.to_s + ". "
     else
@@ -108,11 +111,18 @@ class Cite_Me
   
   def clean_hash(options)
     clean_options = {}
+    options = options.attributes if !options.is_a? Hash
+
+    ## delete any " in key (usually from ActiveRecord object) and turn it to a symbol
+    ## we also call to_s on any present values in case a date or year is saved
+    ## as an integer in the database
     options.map do |key, value|
       if value == ''
-        clean_options[key] = nil
+        cleaned_key = ( key.is_a? Symbol ) ? key : key.delete('"').to_sym
+        clean_options[cleaned_key] = nil
       else
-        clean_options[key] = value
+        cleaned_key = ( key.is_a? Symbol ) ? key : key.delete('"').to_sym
+        clean_options[cleaned_key] = value
       end
     end
     clean_options

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cite-me
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Jacob Smith
@@ -10,8 +10,8 @@ bindir: bin
 cert_chain: []
 date: 2014-02-07 00:00:00.000000000 Z
 dependencies: []
-description: Properly MLA formatted citations (suitable for a bibliography) from a
-  passed hash.
+description: Properly MLA formatted citations (suitable for a bibliography) from ActiveRecord
+  object.attributes or hash.
 email: jacob.wesley.smith@gmail.com
 executables: []
 extensions: []