omnicontacts 0.3.2 → 0.3.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    omnicontacts (0.3.1)
+    omnicontacts (0.3.3)
       json
       rack
 

data/lib/omnicontacts.rb

@@ -1,6 +1,6 @@
 module OmniContacts
   
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 
   autoload :Builder, "omnicontacts/builder"
   autoload :Importer, "omnicontacts/importer"

data/lib/omnicontacts/http_utils.rb

@@ -11,43 +11,6 @@ module OmniContacts
 
     module_function
 
-    # return has of birthday day, month and year
-    def birthday_format month, day, year
-      return {:day => day.to_i, :month => month.to_i, :year => year.to_i}if year && month && day
-      return {:day => day.to_i, :month => month.to_i, :year => nil} if !year && month && day
-      return nil if (!year && !month) || (!year && !day)
-    end
-
-    # normalize the name
-    def normalize_name name
-      return nil if name.nil?
-      name.chomp!
-      name = name.split(' ').map(&:capitalize).join(' ')
-      name.squeeze!(' ')
-      name.strip!
-      return name
-    end
-
-    # create a full name given the individual first and last name
-    def full_name first_name, last_name
-      return "#{first_name} #{last_name}" if first_name && last_name
-      return "#{first_name}" if first_name && !last_name
-      return "#{last_name}" if !first_name && last_name
-      return nil
-    end
-
-    # create a username/name from a given email
-    def email_to_name username_or_email
-      username_or_email = username_or_email.split('@').first if username_or_email.include?('@')
-      if group = (/(?<first>[a-z|A-Z]+)[\.|_](?<last>[a-z|A-Z]+)/).match(username_or_email)
-        first_name = normalize_name(group[:first])
-        last_name = normalize_name(group[:last])
-        return first_name, last_name, "#{first_name} #{last_name}"
-      end
-      username = normalize_name(username_or_email)
-      return username, nil, username
-    end
-
     def query_string_to_map query_string
       query_string.split('&').reduce({}) do |memo, key_value|
         (key, value) = key_value.split('=')

data/lib/omnicontacts/importer/facebook.rb

@@ -1,9 +1,11 @@
+require "omnicontacts/parse_utils"
 require "omnicontacts/middleware/oauth2"
 require "json"
 
 module OmniContacts
   module Importer
     class Facebook < Middleware::OAuth2
+      include ParseUtils
 
       attr_reader :auth_host, :authorize_path, :auth_token_path, :scope
 

data/lib/omnicontacts/importer/gmail.rb

@@ -1,8 +1,10 @@
+require "omnicontacts/parse_utils"
 require "omnicontacts/middleware/oauth2"
 
 module OmniContacts
   module Importer
     class Gmail < Middleware::OAuth2
+      include ParseUtils
 
       attr_reader :auth_host, :authorize_path, :auth_token_path, :scope
 

data/lib/omnicontacts/importer/hotmail.rb

@@ -1,9 +1,11 @@
 require "omnicontacts/middleware/oauth2"
+require "omnicontacts/parse_utils"
 require "json"
 
 module OmniContacts
   module Importer
     class Hotmail < Middleware::OAuth2
+      include ParseUtils
 
       attr_reader :auth_host, :authorize_path, :auth_token_path, :scope
 

data/lib/omnicontacts/importer/yahoo.rb

@@ -1,9 +1,11 @@
+require "omnicontacts/parse_utils"
 require "omnicontacts/middleware/oauth1"
 require "json"
 
 module OmniContacts
   module Importer
     class Yahoo < Middleware::OAuth1
+      include ParseUtils
 
       attr_reader :auth_host, :auth_token_path, :auth_path, :access_token_path
 

data/lib/omnicontacts/parse_utils.rb

@@ -0,0 +1,42 @@
+module OmniContacts
+  module ParseUtils
+
+    # return has of birthday day, month and year
+    def birthday_format month, day, year
+      return {:day => day.to_i, :month => month.to_i, :year => year.to_i}if year && month && day
+      return {:day => day.to_i, :month => month.to_i, :year => nil} if !year && month && day
+      return nil if (!year && !month) || (!year && !day)
+    end
+
+    # normalize the name
+    def normalize_name name
+      return nil if name.nil?
+      name.chomp!
+      name = name.split(' ').map(&:capitalize).join(' ')
+      name.squeeze!(' ')
+      name.strip!
+      return name
+    end
+
+    # create a full name given the individual first and last name
+    def full_name first_name, last_name
+      return "#{first_name} #{last_name}" if first_name && last_name
+      return "#{first_name}" if first_name && !last_name
+      return "#{last_name}" if !first_name && last_name
+      return nil
+    end
+
+    # create a username/name from a given email
+    def email_to_name username_or_email
+      username_or_email = username_or_email.split('@').first if username_or_email.include?('@')
+      if group = (/(?<first>[a-z|A-Z]+)[\.|_](?<last>[a-z|A-Z]+)/).match(username_or_email)
+        first_name = normalize_name(group[:first])
+        last_name = normalize_name(group[:last])
+        return first_name, last_name, "#{first_name} #{last_name}"
+      end
+      username = normalize_name(username_or_email)
+      return username, nil, username
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omnicontacts
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-15 00:00:00.000000000 Z
+date: 2013-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -104,6 +104,7 @@ files:
 - lib/omnicontacts/middleware/base_oauth.rb
 - lib/omnicontacts/middleware/oauth1.rb
 - lib/omnicontacts/middleware/oauth2.rb
+- lib/omnicontacts/parse_utils.rb
 - omnicontacts.gemspec
 - spec/omnicontacts/authorization/oauth1_spec.rb
 - spec/omnicontacts/authorization/oauth2_spec.rb