gaah 0.1.6 → 0.1.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDhkOTRiM2I1Njk1N2IwODg1ZjA4NTIwYWE4ODhiMDQyMjE5NDA2MA==
+    OWViNTAxOWIxMzM5ZDFhMzJmZWNkYWQ5YjhkZjQwMGQ4N2E1ODJhMw==
   data.tar.gz: !binary |-
-    ZmE0ZTNjZGZiMTE0Y2JiNDVjOTVkOTI0ZDEzMDdiYTBmMTQyNjJiYg==
+    OTUxNThlOTM3ZjYzM2YxYzc5ZjliMTY4ODEzMTYyYmFiZDAxYjA5MA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZmE3OTIyNjU5MmRiY2VlMWZmN2YyMGQ1YWM4ZjkyMDg3ZTc5ZDAzODA3YmEz
-    YmFjNDRlNWM2MjU1MDI2OWVjNGQxNDRhODQyMGY1N2MwN2I5YWJiZjcwZjU4
-    ZDZiNjdmOGNkYjhmZGE3M2JlMjUxYzhmMzgxYzEzM2M4NTYxZTc=
+    MzI0Yzc1ZjMwMGJhOTA5ODY3MTRiM2U3Yjc5YTRhNmQ2NTUxZmE3OTkzODMw
+    OWRjM2M0NGQ2NzI2NWVkNGNhZGExZDZmNTc5OGQ3Zjg5NjI0ZjcwNDFhZWY4
+    YjBiYWFmZmI4NDNjNmFiNzZhYTYxOWUxNWJmNDZlYTA0NzgyYjk=
   data.tar.gz: !binary |-
-    NDc4OGU4MjA1MWM0ODM1MmUyOGE4NDdhZThmMzAzYzVlZDI4NGIwNGMzOTA4
-    YjMyNzNlZWM2NWQ2YTcxYmVlZWE0MmFiMjdkZjJhMGUyZDlkNjBlNTM5YjFk
-    YjFlODEyZGM3YjQzYmQ4NmQxODMyY2RlMGVlZGUwY2VjMmE0Mjk=
+    ZTExYjUyMDNjNmUxNmY2ODU4ZGI4NzU0MjExOTUyNTFlNTUyOTJhY2Q2OTkx
+    Mzg1Yzg1YjhjYmYwMGExNDUzMmMyYjUwMjJkNWZkOTJhODg5YTc0MzdhMGJj
+    NjcxYzk5YzQ0NGNhZmI0OWE4OGUxMmU1NDBmMjIwMjIwYzRlZmU=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gaah (0.1.5)
+    gaah (0.1.7)
       nokogiri (~> 1.5)
       oauth (~> 0.4)
       oauth2 (~> 0.9)

data/lib/gaah/api_model.rb

@@ -3,7 +3,11 @@ module Gaah
     attr_reader :id
 
     def self.batch_create(xml)
-      (xml/:entry).map(&method(:new))
+      if xml.is_a? Array
+        xml.map(&method(:new))
+      else
+        (xml/:entry).map(&method(:new))
+      end
     end
 
     def ==(other)
@@ -12,6 +16,10 @@ module Gaah
 
     private
 
+    def store_json(json)
+      @json = json.is_a?(String) ? JSON.load(json) : json
+    end
+
     def store_xml(xml)
       @xml = xml.is_a?(String) ? Nokogiri::XML(xml) : xml
     end

data/lib/gaah/calendar/api.rb

@@ -9,15 +9,15 @@ module Gaah
         def events(xoauth_requestor_id, options)
           url    = build_api_url(options[:email])
           params = build_api_params(xoauth_requestor_id, options)
-          xml    = ApiClient.instance.get(url, params)
-          events = Nokogiri::XML(xml)/:entry
-          Event.batch_create(events)
+          json   = ApiClient.instance.get(url, params)
+          events = JSON.load(json)
+          Event.batch_create(events['items'])
         end
 
         private
 
         def build_api_url(email)
-          API_URL.sub('EMAIL', email || 'default')
+          API_URL.sub('CAL_ID', email || 'default')
         end
 
         def build_api_params(xoauth_requestor_id, options)
@@ -34,7 +34,8 @@ module Gaah
           time.nil? ? nil : time.strftime('%Y-%m-%dT17:00:00')
         end
 
-        API_URL = 'https://www.google.com/calendar/feeds/EMAIL/private/full'
+       #API_URL = 'https://www.google.com/calendar/feeds/EMAIL/private/full'
+        API_URL = 'https://www.googleapis.com/calendar/v3/calendars/CAL_ID/events'
       end
     end
   end

data/lib/gaah/calendar/event.rb

@@ -1,65 +1,68 @@
 module Gaah
   module Calendar
     class Event < Gaah::ApiModel
-      attr_reader :published, :updated, :title, :content, :status, :who, :when, :where, :author, :transparency, :visibility
+      attr_reader :updated, :summary, :description, :attendees, :when, :location, :creator, :transparency, :visibility
 
-      def initialize(xml)
-        store_xml(xml)
+      def initialize(json)
+        store_json(json)
 
-        @id           = inner_text(:id)
-        @published    = Time.parse(inner_text(:published))
-        @updated      = Time.parse(inner_text(:updated))
-        @title        = inner_text(:title)
-        @content      = inner_text(:content)
-        @status       = tag_value('gd|eventStatus')
-        @where        = attr_value('gd|where', 'valueString')
-        @author       = Who.new((@xml/:author).first)
+        @id           = json['id']
+        @updated      = Time.parse(json['updated'])
+        @summary      = json['summary'].to_s
+        @description  = json['description'].to_s
+        @location     = json['location'].to_s
+        @creator      = Who.new(json['creator']) if json['creator']
         @when         = parse_when
-        @who          = parse_who
-        @transparency = tag_value('gd|transparency')
-        @visibility   = tag_value('gd|visibility')
+        @attendees    = parse_attendees
+        @transparency = json['transparency'].to_s
+        @visibility   = json['visibility'] || 'default'
       end
 
       def to_json(*args)
         {
           id:           @id,
-          published:    @published,
           updated:      @updated,
-          title:        @title,
-          content:      @content,
-          status:       @status,
-          where:        @where,
-          author:       @author,
+          summary:      @summary,
+          description:  @description,
+          location:     @location,
+          creator:      @creator,
           when:         @when,
-          who:          @who,
+          attendees:    @attendees,
           transparency: @transparency,
           visibility:   @visibility,
         }.to_json
       end
 
+      # V2 -> V3
+      def author;  creator;     end
+      def content; description; end
+      def title;   summary;     end
+      def where;   location;    end
+      def who;     attendees;   end
+
       def marshal_dump
-        [@id, @published, @updated, @title, @content, @status, @where, @author, @when, @who, @transparency, @visibility]
+        [@id, nil, @updated, @summary, @description, @location, @creator, @when, @attendees, @transparency, @visibility]
       end
 
       def marshal_load(array)
-        @id, @published, @updated, @title, @content, @status, @where, @author, @when, @who, @transparency, @visibility = array
+        @id, _, @updated, @summary, @description, @location, @creator, @when, @attendees, @transparency, @visibility = array
       end
 
       private
 
-      def store_xml(xml)
+      def store_json(json)
         super
-        unless @xml.attr('gd:kind') == "calendar#event"
-          puts "Possible invalid event xml - gd:kind is #{ @xml.attr('gd:kind') }"
+        unless @json['kind'] == "calendar#event"
+          puts "Possible invalid event json - kind is #{ @json['kind'] }"
         end
       end
 
       def parse_when
-        When.new(attr_value('> gd|when', 'startTime'), attr_value('> gd|when', 'endTime'))
+        When.new(@json['start'], @json['end'])
       end
 
-      def parse_who
-        (@xml/'gd|who').map {|attendee| Who.new(attendee) }
+      def parse_attendees
+        (@json['attendees'] || []).map {|attendee| Who.new(attendee) }
       end
     end
   end

data/lib/gaah/calendar/when.rb

@@ -3,8 +3,13 @@ module Gaah
     class When
       attr_accessor :start_time, :end_time
       def initialize(start_time, end_time)
-        @start_time = Time.parse(start_time)
-        @end_time   = Time.parse(end_time)
+        if start_time.is_a? Hash
+          @start_time = Time.parse(start_time.values.first)
+          @end_time   = Time.parse(end_time.values.first)
+        else
+          @start_time = Time.parse(start_time)
+          @end_time   = Time.parse(end_time)
+        end
       end
 
       def to_json(*args)

data/lib/gaah/calendar/who.rb

@@ -1,27 +1,10 @@
 module Gaah
   module Calendar
     class Who
-      attr_reader :name, :email, :aliases
-      def initialize(xml)
-        @aliases = []
-
-        case xml.name
-        when 'author'
-          @name  = (xml/:name).inner_text
-          @email = (xml/:email).inner_text
-        when 'who'
-          @name  = xml.attr(:valueString)
-          @email = xml.attr(:email)
-        when 'entry'
-          @name  = (xml/:title).inner_text
-          (xml/'gd|email').each do |gd_email|
-            email = gd_email.attr('address')
-            @aliases << email
-            @email = email if gd_email.attr('primary') == 'true'
-          end
-        else
-          raise "Invalid person record #{xml.name}"
-        end
+      attr_reader :name, :email
+      def initialize(json)
+        @name  = json['displayName'].to_s
+        @email = json['email'].to_s
       end
 
       def catch_all_user?
@@ -30,9 +13,8 @@ module Gaah
 
       def to_json(*args)
         {
-          name:    name,
-          email:   email,
-          aliases: aliases,
+          name:  name,
+          email: email,
         }.to_json
       end
 

data/lib/gaah/resource/api.rb

@@ -14,7 +14,7 @@ module Gaah
           url    = "https://apps-apis.google.com/a/feeds/calendar/resource/2.0/#{Gaah.domain}"
           xml    = ApiClient.instance.get(url)
           parsed = Nokogiri::XML(xml)
-          
+
           current_list = Resource.batch_create(parsed/:entry)
           next_link    = (parsed/'link[rel=next]').first
 

data/lib/gaah/version.rb

@@ -1,3 +1,3 @@
 module Gaah
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/spec/fixtures/calendar.json

@@ -0,0 +1,135 @@
+{
+  "kind": "calendar#events",
+  "etag": "\"foo\"",
+  "summary": "_me",
+  "updated": "2013-08-26T22:16:43.629Z",
+  "timeZone": "America/Los_Angeles",
+  "accessRole": "owner",
+  "defaultReminders": [{
+    "method": "popup",
+    "minutes": 10
+  }],
+  "items": [{
+    "kind": "calendar#event",
+    "etag": "\"bar1\"",
+    "id": "one",
+    "status": "confirmed",
+    "htmlLink": "https://www.google.com/calendar/event?eid=one",
+    "created": "2012-12-05T23:51:16.000Z",
+    "updated": "2012-12-13T22:00:00Z",
+    "summary": "Holiday Dinner",
+    "description": "Holiday party time!",
+    "location": "Prospect, 300 Spear St, San Francisco, CA 94105",
+    "creator": {
+      "email": "alice@example.com",
+      "displayName": "Alice McAlice"
+    },
+    "organizer": {
+      "email": "bob@example.com",
+      "displayName": "Bob O'Bob"
+    },
+    "start": {
+      "dateTime": "2012-12-14T18:30:00-08:00"
+    },
+    "end": {
+      "dateTime": "2012-12-14T21:30:00-08:00"
+    },
+    "iCalUID": "foo@google.com",
+    "visibility": "private",
+    "sequence": 0,
+    "attendees": [{
+      "email": "bob@example.com",
+      "displayName": "Bob-Bob O'Bob",
+      "responseStatus": "needsAction"
+    }, {
+      "email": "alice@example.com",
+      "displayName": "Alice McAlice",
+      "organizer": true,
+      "self": true,
+      "responseStatus": "accepted"
+    }, {
+      "email": "chris@example.com",
+      "displayName": "Chris Christiansen",
+      "responseStatus": "accepted"
+    }],
+    "reminders": {
+      "useDefault": true
+    }
+  }, {
+    "kind": "calendar#event",
+    "etag": "\"bar2\"",
+    "id": "dos",
+    "status": "confirmed",
+    "htmlLink": "https://www.google.com/calendar/event?eid=two",
+    "created": "2012-12-18T16:34:06.000Z",
+    "updated": "2012-12-19T19:49:46.817Z",
+    "summary": "Meet for WeWork Walkthrough",
+    "location": "795 Folsom",
+    "creator": {
+      "email": "david@notexample.com"
+    },
+    "organizer": {
+      "email": "david@notexample.com"
+    },
+    "start": {
+      "dateTime": "2012-12-19T10:15:00-08:00"
+    },
+    "end": {
+      "dateTime": "2012-12-19T11:15:00-08:00"
+    },
+    "iCalUID": "bar@google.com",
+    "sequence": 0,
+    "transparency": "transparent",
+    "attendees": [{
+      "email": "bob@example.com",
+      "responseStatus": "accepted"
+    }, {
+      "email": "alice@example.com",
+      "displayName": "Alice McAlice",
+      "self": true,
+      "responseStatus": "declined"
+    }],
+    "reminders": {
+      "useDefault": true
+    }
+  }, {
+    "kind": "calendar#event",
+    "etag": "\"baz\"",
+    "id": "three",
+    "status": "confirmed",
+    "htmlLink": "https://www.google.com/calendar/event?eid=three",
+    "created": "2013-02-11T19:42:44.000Z",
+    "updated": "2013-02-12T00:55:43.590Z",
+    "summary": "Weekly Sync",
+    "creator": {
+      "email": "alice@example.com",
+      "displayName": "Alice McAlice"
+    },
+    "organizer": {
+      "email": "alice@example.com",
+      "displayName": "Alice McAlice"
+    },
+    "start": {
+      "dateTime": "2013-02-11T17:00:00-08:00"
+    },
+    "end": {
+      "dateTime": "2013-02-11T17:30:00-08:00"
+    },
+    "iCalUID": "tres@google.com",
+    "sequence": 0,
+    "attendees": [{
+      "email": "alice@example.com",
+      "displayName": "Alice McAlice",
+      "organizer": true,
+      "responseStatus": "accepted"
+    }, {
+      "email": "bob@example.com",
+      "displayName": "Bob McBob",
+      "self": true,
+      "responseStatus": "needsAction"
+    }],
+    "reminders": {
+      "useDefault": true
+    }
+  }]
+}

data/spec/models/event_spec.rb

@@ -3,97 +3,90 @@ include Gaah::Calendar
 
 describe Event do
   let(:xml)    { fixture('calendar.xml') }
-  let(:events) { Nokogiri::XML(xml)/:entry }
+  let(:json)   { fixture('calendar.json') }
+  #let(:events) { Nokogiri::XML(xml)/:entry }
+  let(:events) { JSON.load(json)['items'] }
   let(:event)  { Event.new(events.first) }
 
   describe '#initialize' do
+    subject { event }
     it 'parses ID' do
-      event.id.should == 'http://www.google.com/calendar/feeds/bobert%40example.com/events/n9ommrehhjm5dc6q89ofkm3f8g'
-    end
-
-    it 'parses published time' do
-      event.published.should == Time.parse('2013-03-25T16:49:48.000Z')
+      subject.id.should == 'one'
     end
 
     it 'parses updated time' do
-      event.updated.should == Time.parse('2013-03-25T17:03:10.000Z')
+      subject.updated.should == Time.parse('2012-12-13 22:00:00 UTC')
     end
 
-    it 'parses title' do
-      event.title.should == 'MomCorp'
+    it 'parses summary' do
+      subject.summary.should == 'Holiday Dinner'
     end
 
-    it 'parses content' do
-      event.content.should == ''
+    it 'parses description' do
+      subject.description.should == 'Holiday party time!'
     end
 
-    it 'parses status' do
-      event.status.should == 'confirmed'
-    end
+    describe :attendees do
+      let(:subject) { event.attendees }
 
-    describe :who do
-      let(:who) { event.who }
+      it 'parses all attendees' do
+        subject.length.should == 3
+      end
 
-      it 'parses who' do
-        who.length.should == 2
-        who.first.should be_an_instance_of(Gaah::Calendar::Who)
+      it 'parses Who object' do
+        subject.first.should be_an_instance_of(Gaah::Calendar::Who)
       end
 
       it 'parses name' do
-        who.first.name.should == 'Bobert Jones'
+        subject.first.name.should == "Bob-Bob O'Bob"
       end
 
       it 'parses email' do
-        who.first.email.should == 'bobert@example.com'
+        subject.first.email.should == 'bob@example.com'
       end
     end
 
     describe :when do
-      let(:_when) { event.when }
+      let(:subject) { event.when }
 
-      it 'parses when' do
-        _when.should be_an_instance_of(When)
-      end
+      it { should be_an_instance_of(When) }
 
       it 'parses start_time' do
-        _when.start_time.should == Time.parse('2013-04-01 10:00:00 -0700')
+        subject.start_time.should == Time.parse('2012-12-14 18:30:00 -0800')
       end
 
       it 'parses end_time' do
-        _when.end_time.should == Time.parse('2013-04-01 11:00:00 -0700')
+        subject.end_time.should == Time.parse('2012-12-14 21:30:00 -0800')
       end
     end
 
-    it 'parses where' do
-      event.where.should == ''
+    it 'parses location' do
+      subject.location.should == "Prospect, 300 Spear St, San Francisco, CA 94105"
     end
 
     describe :author do
       let(:author) { event.author }
 
       it 'parses email' do
-        author.email.should == "bobert@example.com"
+        author.email.should == "alice@example.com"
       end
 
       it 'parses name' do
-        author.name.should == "Bobert Jones"
+        author.name.should == "Alice McAlice"
       end
     end
 
     it 'parses transparency' do
-      event.transparency.should == 'opaque'
+      subject.transparency.should == ''
     end
 
     it 'parses visibility' do
-      event.visibility.should == 'default'
+      subject.visibility.should == 'private'
     end
   end
 
   describe '.batch_create' do
-    let(:processed_events) { Event.batch_create(events) }
-
-    it 'parses events' do
-      processed_events.count.should == 10
-    end
+    let(:subject) { Event.batch_create(events) }
+    it { subject.count.should == 3 }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gaah
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Hwan-Joon Choi
@@ -107,6 +107,7 @@ files:
 - lib/gaah/resource/api.rb
 - lib/gaah/resource/resource.rb
 - lib/gaah/version.rb
+- spec/fixtures/calendar.json
 - spec/fixtures/calendar.xml
 - spec/fixtures/provisioning.xml
 - spec/models/event_spec.rb
@@ -137,6 +138,7 @@ signing_key:
 specification_version: 4
 summary: Limited API Wrapper for Google Apps API.
 test_files:
+- spec/fixtures/calendar.json
 - spec/fixtures/calendar.xml
 - spec/fixtures/provisioning.xml
 - spec/models/event_spec.rb