googlecontacts 0.1.8 → 0.2.0

data/.gitignore

@@ -0,0 +1,4 @@
+*.gem
+.bundle
+Gemfile.lock
+pkg/*

data/Gemfile

@@ -0,0 +1,9 @@
+source "http://rubygems.org"
+
+gemspec
+
+group :test do
+  gem "rake"
+  gem "rspec", "~> 2.7"
+  gem "fakeweb", "~> 1.3.0"
+end

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Pieter Noordhuis
+Copyright (c) 2010-2011 Pieter Noordhuis
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,51 +1,8 @@
-require 'rubygems'
-require 'rake'
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "googlecontacts"
-    gem.summary = %Q{Contacts API on steroids}
-    gem.description = %Q{Google Contacts API implementation}
-    gem.email = "pcnoordhuis@gmail.com"
-    gem.homepage = "http://github.com/pietern/googlecontacts"
-    gem.authors = ["Pieter Noordhuis"]
-    gem.add_development_dependency "rspec", ">= 1.2.9"
-    gem.add_development_dependency "fakeweb", ">= 1.2.8"
-    gem.add_development_dependency "mocha", ">= 0.9.8"
-    gem.add_runtime_dependency "activesupport", ">= 2.3.4"
-    gem.add_runtime_dependency "nokogiri", ">= 1.4.1"
-    gem.add_runtime_dependency "oauth", ">= 0.3.6"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = ['--backtrace', '--color', '--format nested']
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-  spec.rcov_opts += ['--exclude', ENV['GEM_HOME']]
-end
-
-task :spec => :check_dependencies
-
 task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "googlecontacts #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/googlecontacts.gemspec

@@ -0,0 +1,23 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "google_contacts/version"
+
+Gem::Specification.new do |s|
+  s.name        = "googlecontacts"
+  s.version     = GoogleContacts::VERSION
+  s.authors     = ["Pieter Noordhuis"]
+  s.email       = ["pcnoordhuis@gmail.com"]
+  s.homepage    = ""
+  s.summary     = %q{Google Contacts API implementation}
+
+  s.rubyforge_project = "googlecontacts"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  s.add_runtime_dependency "activesupport", "~> 3.0"
+  s.add_runtime_dependency "nokogiri", "~> 1.5.0"
+  s.add_runtime_dependency "oauth", "~> 0.4.5"
+end

data/lib/google_contacts.rb

@@ -1,18 +1,16 @@
 $:.unshift File.dirname(__FILE__)
-require 'rubygems'
-require 'active_support'
-require 'active_support/core_ext/hash'
-require 'active_support/core_ext/module'
-require 'oauth'
-require 'nokogiri'
+require "rubygems"
+require "active_support/basic_object"
+require "active_support/core_ext/hash"
+require "oauth"
+require "nokogiri"
 
-require 'google_contacts/auth'
-require 'google_contacts/wrapper'
-require 'google_contacts/base'
-require 'google_contacts/contact'
-require 'google_contacts/group'
+require "google_contacts/auth"
+require "google_contacts/wrapper"
+require "google_contacts/contact"
+require "google_contacts/group"
 
-require 'google_contacts/proxies/array'
-require 'google_contacts/proxies/hash'
-require 'google_contacts/proxies/emails'
-require 'google_contacts/proxies/tag'
+require "google_contacts/proxies/array"
+require "google_contacts/proxies/hash"
+require "google_contacts/proxies/emails"
+require "google_contacts/proxies/tag"

data/lib/google_contacts/auth.rb

@@ -1,10 +1,10 @@
 module GoogleContacts
   class Auth
     GOOGLE_OAUTH = {
-      :site => 'https://www.google.com',
-      :request_token_path => '/accounts/OAuthGetRequestToken',
-      :authorize_path     => '/accounts/OAuthAuthorizeToken',
-      :access_token_path  => '/accounts/OAuthGetAccessToken',
+      :site => "https://www.google.com",
+      :request_token_path => "/accounts/OAuthGetRequestToken",
+      :authorize_path     => "/accounts/OAuthAuthorizeToken",
+      :access_token_path  => "/accounts/OAuthGetAccessToken",
     }.freeze
 
     class << self
@@ -21,7 +21,7 @@ module GoogleContacts
       self.class.consumer.get_request_token({
         :oauth_callback => options[:callback]
       }, {
-        :scope => 'http://www.google.com/m8/feeds/'
+        :scope => "http://www.google.com/m8/feeds/"
       })
     end
   end

data/lib/google_contacts/base.rb

@@ -1,27 +1,29 @@
+require "time"
+
 module GoogleContacts
   class Base
     NAMESPACES = {
-      'atom'        => 'http://www.w3.org/2005/Atom',
-      'openSearch'  => 'http://a9.com/-/spec/opensearch/1.1/',
-      'gContact'    => 'http://schemas.google.com/contact/2008',
-      'batch'       => 'http://schemas.google.com/gdata/batch',
-      'gd'          => 'http://schemas.google.com/g/2005',
+      "atom"        => "http://www.w3.org/2005/Atom",
+      "openSearch"  => "http://a9.com/-/spec/opensearch/1.1/",
+      "gContact"    => "http://schemas.google.com/contact/2008",
+      "batch"       => "http://schemas.google.com/gdata/batch",
+      "gd"          => "http://schemas.google.com/g/2005",
     }.freeze
 
     attr_reader :xml
     def initialize(wrapper, xml = nil)
-      raise "Cannot create instance of Base" if self.class.name.split(/::/).last == 'Base'
+      raise "Cannot create instance of Base" if self.class.name.split(/::/).last == "Base"
       @wrapper = wrapper
 
       # If a root node is given, create a new XML document based on
       # a deep copy. Otherwise, initialize a new XML document.
-      @xml = if xml.present?
+      @xml = if xml
         self.class.new_xml_document(xml).root
       else
         self.class.initialize_xml_document.root
       end
 
-      @proxies = HashWithIndifferentAccess.new
+      @proxies = Hash.new
       register_base_proxies
     end
 
@@ -40,40 +42,40 @@ module GoogleContacts
     end
 
     def self.feed_for_batch
-      new_xml_document('feed').root
+      new_xml_document("feed").root
     end
 
     # Create new XML::Document that can be used in a
     # Google Contacts batch operation.
     def entry_for_batch(operation)
       root = self.class.new_xml_document(xml).root
-      root.xpath('./xmlns:link'   ).remove
-      root.xpath('./xmlns:updated').remove
+      root.xpath("./xmlns:link"   ).remove
+      root.xpath("./xmlns:updated").remove
 
       if operation == :update || operation == :delete
-        root.at('./xmlns:id').content = url(:edit)
+        root.at("./xmlns:id").content = url(:edit)
       end
 
-      self.class.insert_xml(root, 'batch:id')
-      self.class.insert_xml(root, 'batch:operation', :type => operation)
+      self.class.insert_xml(root, "batch:id")
+      self.class.insert_xml(root, "batch:operation", :type => operation)
 
       root
     end
 
     def new?
-      xml.at_xpath('./xmlns:id').nil?
+      xml.at_xpath("./xmlns:id").nil?
     end
 
     def href
-      xml.at_xpath('./xmlns:id').text.strip unless new?
+      xml.at_xpath("./xmlns:id").text.strip unless new?
     end
 
     def updated_at
-      Time.parse xml.at_xpath('./xmlns:updated').text.strip unless new?
+      Time.parse xml.at_xpath("./xmlns:updated").text.strip unless new?
     end
 
     def url(rel)
-      rel = 'http://schemas.google.com/contacts/2008/rel#photo' if rel == :photo
+      rel = "http://schemas.google.com/contacts/2008/rel#photo" if rel == :photo
       xml.at_xpath(%{xmlns:link[@rel="#{rel}"]})[:href]
     end
 
@@ -101,12 +103,18 @@ module GoogleContacts
       properties[prop] = value
     end
 
-    # Alias the xmlns:title tag be be accessible using #name(=)?
-    alias_attribute :name, :title
+    # Alias "name" to "title"
+    def name
+      method_missing(:title)
+    end
+
+    def name=(v)
+      method_missing(:title=, v)
+    end
 
     protected
     def register_proxy(name, proxy)
-      @proxies[name.to_sym] = proxy
+      @proxies[name.to_s] = proxy
     end
 
     def synchronize_proxies
@@ -114,11 +122,11 @@ module GoogleContacts
     end
 
     def register_base_proxies
-      register_proxy :title,  Proxies::Tag.new(self, :tag => 'xmlns:title')
+      register_proxy :title,  Proxies::Tag.new(self, :tag => "xmlns:title")
       register_proxy :properties, Proxies::Hash.new(self,
-        :tag   => 'gd:extendedProperty',
-        :key   => 'name',
-        :value => 'value')
+        :tag   => "gd:extendedProperty",
+        :key   => "name",
+        :value => "value")
     end
 
     # Try to proxy missing method to one of the proxies
@@ -143,7 +151,7 @@ module GoogleContacts
     def self.insert_xml(parent, tag, attributes = {}, &blk)
       # Construct new node with the right namespace
       matches = tag.match /^((\w+):)?(\w+)$/
-      ns      = matches[2] == 'xmlns' ? 'atom' : (matches[2] || 'atom')
+      ns      = matches[2] == "xmlns" ? "atom" : (matches[2] || "atom")
       tag     = matches[3]
       node = Nokogiri::XML::Node.new(tag, parent)
       node.namespace = namespace(parent, ns) || raise("Unknown namespace: #{ns}")
@@ -169,16 +177,16 @@ module GoogleContacts
     end
 
     def self.initialize_xml_document
-      doc = new_xml_document('entry')
-      insert_xml(doc.root, 'atom:category', {
-        :scheme => 'http://schemas.google.com/g/2005#kind',
+      doc = new_xml_document("entry")
+      insert_xml(doc.root, "atom:category", {
+        :scheme => "http://schemas.google.com/g/2005#kind",
         :term   => const_get(:CATEGORY_TERM)
       })
       doc
     end
 
     def self.decorate_document_with_namespaces(doc)
-      doc.root.default_namespace = NAMESPACES['atom']
+      doc.root.default_namespace = NAMESPACES["atom"]
       NAMESPACES.each_pair do |prefix, href|
         doc.root.add_namespace(prefix, href)
       end

data/lib/google_contacts/contact.rb

@@ -1,18 +1,29 @@
+require "google_contacts/base"
+
 module GoogleContacts
   class Contact < Base
-    CATEGORY_TERM = 'http://schemas.google.com/contact/2008#contact'
+    CATEGORY_TERM = "http://schemas.google.com/contact/2008#contact"
 
-    alias_attribute :name, :title
     def initialize(*args)
       super
       register_proxy :emails, Proxies::Emails.new(self)
       register_proxy :groups, Proxies::Array.new(self,
-        :tag   => 'gContact:groupMembershipInfo',
-        :attr  => 'href')
+        :tag   => "gContact:groupMembershipInfo",
+        :attr  => "href")
+    end
+
+    # Alias "name" to "title"
+    def name
+      method_missing(:title)
+    end
+
+    def name=(v)
+      method_missing(:title=, v)
     end
 
     def email
-      emails.primary.try(:address)
+      primary = emails.primary
+      primary && primary.address
     end
 
     def email=(address)

data/lib/google_contacts/group.rb

@@ -1,9 +1,11 @@
+require "google_contacts/base"
+
 module GoogleContacts
   class Group < Base
-    CATEGORY_TERM = 'http://schemas.google.com/contact/2008#group'
+    CATEGORY_TERM = "http://schemas.google.com/contact/2008#group"
 
     def system_group?
-      @xml.xpath('./gContact:systemGroup').size > 0
+      @xml.xpath("./gContact:systemGroup").size > 0
     end
 
     def inspect

data/lib/google_contacts/proxies/emails.rb

@@ -48,7 +48,7 @@ module GoogleContacts
       def synchronize
         @parent.remove_xml("./gd:email")
         @new.each_pair do |address, email|
-          @parent.insert_xml('gd:email', email)
+          @parent.insert_xml("gd:email", email)
         end
       end
 
@@ -74,11 +74,9 @@ module GoogleContacts
 
       class Email < ::HashWithIndifferentAccess
         DEFAULTS = {
-          :rel => 'http://schemas.google.com/g/2005#home'
+          :rel => "http://schemas.google.com/g/2005#home"
         }.freeze
 
-        alias_attribute :name, :displayName
-
         def initialize(parent, attributes = {})
           super(DEFAULTS)
           @parent = parent
@@ -88,6 +86,15 @@ module GoogleContacts
           end
         end
 
+        # Alias "name" to "displayName"
+        def name
+          method_missing(:displayName)
+        end
+
+        def name=(v)
+          method_missing(:displayName=, v)
+        end
+
         def primary!
           @parent.primary! self[:address]
         end
@@ -103,7 +110,7 @@ module GoogleContacts
         end
 
         def []=(key, value)
-          if "#{key}" == 'address' && self[key]
+          if "#{key}" == "address" && self[key]
             raise "Cannot modify email address"
           end
           super(key, value.to_s)
@@ -116,10 +123,10 @@ module GoogleContacts
         def method_missing(sym, *args, &blk)
           if sym.to_s =~ /^(\w+)(=|\?)?$/
             case $2
-            when '='
+            when "="
               send(:[]=, $1, *args)
-            when '?'
-              send(:[], $1) == 'true'
+            when "?"
+              send(:[], $1) == "true"
             else
               send(:[], $1)
             end

data/lib/google_contacts/proxies/hash.rb

@@ -11,13 +11,13 @@ module GoogleContacts
       end
 
       def reinitialize
-        @current = HashWithIndifferentAccess.new
+        @current = ::HashWithIndifferentAccess.new
         @parent.xml.xpath("./#{@tag}").map do |entry|
           @current[entry[@key]] = entry[@value]
         end
 
         # create a deep copy
-        @new = HashWithIndifferentAccess.new
+        @new = ::HashWithIndifferentAccess.new
         @current.each { |k,v| @new[k.dup] = v.dup }
       end
 

data/lib/google_contacts/proxies/tag.rb

@@ -12,7 +12,7 @@ module GoogleContacts
       end
 
       def reinitialize
-        @current = node.try(:content)
+        @current = node && node.content
         @new     = @current ? @current.dup : nil
       end