podio 0.6.0 → 0.7.0

data/.travis.yml

@@ -7,3 +7,7 @@ rvm:
 notifications:
   email:
     - fabricius@podio.com
+    - auchenberg@podio.com
+    - haugstrup@podio.com
+    - daniel@podio.com
+    - munz@podio.com

data/LICENSE

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

data/lib/podio.rb

@@ -54,18 +54,19 @@ module Podio
     end
   end
 
-  class OAuthToken < Struct.new(:access_token, :refresh_token, :expires_at, :reference, :refreshed)
+  class OAuthToken < Struct.new(:access_token, :refresh_token, :expires_at, :expires_in, :reference, :refreshed)
     def initialize(params = {})
       self.access_token  = params['access_token']
       self.refresh_token = params['refresh_token']
       self.reference     = params['ref']
       self.expires_at    = Time.now + params['expires_in'] if params['expires_in']
+      self.expires_in    = params['expires_in'] if params['expires_in']
     end
   end
 
   autoload :Client,                   'podio/client'
   autoload :ResponseWrapper,          'podio/response_wrapper'
-                                      
+
   autoload :Action,                   'podio/models/action'
   autoload :ActivationStatus,         'podio/models/activation_status'
   autoload :Activity,                 'podio/models/activity'
@@ -75,7 +76,7 @@ module Podio
   autoload :ApplicationField,         'podio/models/application_field'
   autoload :Bulletin,                 'podio/models/bulletin'
   autoload :ByLine,                   'podio/models/by_line'
-  autoload :Calendar,                 'podio/models/calendar'
+  autoload :CalendarEvent,            'podio/models/calendar_event'
   autoload :CalendarMute,             'podio/models/calendar_mute'
   autoload :Category,                 'podio/models/category'
   autoload :Comment,                  'podio/models/comment'
@@ -89,6 +90,7 @@ module Podio
   autoload :ConversationParticipant,  'podio/models/conversation_participant'
   autoload :EmailSubscriptionSetting, 'podio/models/email_subscription_setting'
   autoload :Embed,                    'podio/models/embed'
+  autoload :ExternalFile,             'podio/models/external_file'
   autoload :FileAttachment,           'podio/models/file_attachment'
   autoload :Filter,                   'podio/models/filter'
   autoload :Form,                     'podio/models/form'
@@ -99,6 +101,7 @@ module Podio
   autoload :ItemDiff,                 'podio/models/item_diff'
   autoload :ItemField,                'podio/models/item_field'
   autoload :ItemRevision,             'podio/models/item_revision'
+  autoload :LinkedAccount,            'podio/models/linked_account'
   autoload :Meeting,                  'podio/models/meeting'
   autoload :MeetingParticipant,       'podio/models/meeting_participiant'
   autoload :News,                     'podio/models/news'
@@ -116,6 +119,7 @@ module Podio
   autoload :QuestionOption,           'podio/models/question_option'
   autoload :Rating,                   'podio/models/rating'
   autoload :Recurrence,               'podio/models/recurrence'
+  autoload :Referral,                 'podio/models/referral'
   autoload :Reminder,                 'podio/models/reminder'
   autoload :Search,                   'podio/models/search'
   autoload :Space,                    'podio/models/space'

data/lib/podio/active_podio/base.rb

@@ -5,8 +5,8 @@ module ActivePodio
   class Base
     extend ActiveModel::Naming, ActiveModel::Callbacks
     include ActiveModel::Conversion
-    
-    class_inheritable_accessor :valid_attributes, :associations
+
+    class_attribute :valid_attributes, :_associations, :_properties
     attr_accessor :attributes, :error_code, :error_message, :error_parameters, :error_propagate
     alias_method :propagate_error?, :error_propagate
 
@@ -16,12 +16,12 @@ module ActivePodio
       self.attributes = Hash[*self.valid_attributes.collect { |n| [n.to_sym, nil] }.flatten].merge(attributes.symbolize_keys)
 
       @values_from_api = options[:values_from_api] # Used to determine if date times should be converted from local to utc, or are already utc
-      
+
       attributes.each do |key, value|
         if self.respond_to?("#{key}=".to_sym)
           self.send("#{key}=".to_sym, value)
         else
-          is_association_hash = value.is_a?(Hash) && self.associations.present? && self.associations.has_key?(key.to_sym) && self.associations[key.to_sym] == :has_one && self.send(key.to_sym).respond_to?(:attributes)
+          is_association_hash = value.is_a?(Hash) && self._associations.present? && self._associations.has_key?(key.to_sym) && self._associations[key.to_sym] == :has_one && self.send(key.to_sym).respond_to?(:attributes)
           if valid_attributes.include?(key.to_sym) || is_association_hash
             # Initialize nested object to get correctly casted values set back, unless the given values are all blank
             if is_association_hash
@@ -40,26 +40,26 @@ module ActivePodio
       @belongs_to = options[:belongs_to] # Allows has_one associations to communicate their changed content back to their parent model
       @values_from_api = false
     end
-    
+
     def persisted?
       ! self.new_record?
     end
-    
+
     def new_record?
       ! (self.respond_to?(:id) && self.id.present?)
     end
-    
+
     def to_param
       local_id = self.id if self.respond_to?(:id)
       local_id = nil if local_id == self.object_id # Id still returns object_id in Ruby 1.8.7, JRuby and Rubinius
       local_id.try(:to_s)
     end
-    
+
     def [](attribute)
       @attributes ||= {}
       @attributes[attribute.to_sym]
     end
-    
+
     def []=(attribute, value)
       @attributes ||= {}
       @attributes[attribute.to_sym] = value
@@ -68,22 +68,58 @@ module ActivePodio
         @belongs_to[:model][@belongs_to[:as]][attribute.to_sym] = value
       end
     end
-    
+
     def ==(other)
       !self.nil? && !other.nil? && self.respond_to?(:id) && other.respond_to?(:id) && self.id == other.id
     end
     alias :eql? :==
-    
+
     def hash
       self.id.hash if self.respond_to?(:id)
     end
-    
+
     def as_json(options={})
-      self.attributes
+      options ||= {}
+      result = {}
+      result.merge!(:id => self.id) if self.respond_to?(:id)
+
+      if options[:formatted]
+        self.valid_attributes.each do |name|
+          result[name] = json_friendly_value(self.send(name), options)
+        end
+
+        unless options[:nested] == false
+          if self._associations.respond_to?(:each)
+            self._associations.each do |name, type|
+              case type
+              when :has_one
+                result[name] = self.send(name).as_json(options.except(:methods))
+              when :has_many
+                result[name] = self.send(name).collect { |assoc| assoc.as_json(options.except(:methods)) }
+              end
+            end
+          end
+        end
+      else
+        result.merge!(self.attributes)
+      end
+
+      if options[:methods]
+        options[:methods].each do |name|
+          result[name] = json_friendly_value(self.send(name), options)
+        end
+      end
+
+      result
+    end
+
+    # Override this in models where the class name doesn't match the ref type
+    def api_friendly_ref_type
+      self.class.name.downcase
     end
-    
+
     private
-    
+
       def klass_for_association(options)
         klass_name = options[:class]
         raise "Missing class name of associated model. Provide with :class => 'MyClass'." unless klass_name.present?
@@ -95,7 +131,7 @@ module ActivePodio
         end
         return klass
       end
-      
+
       def any_values_present_recursive?(values)
         values.any? do |value|
           if value.respond_to?(:values)
@@ -106,15 +142,28 @@ module ActivePodio
         end
       end
 
+      def json_friendly_value(ruby_value, options)
+        if options[:formatted]
+          json_value = case ruby_value.class.name
+          when "DateTime", "Time"
+            ruby_value.iso8601
+          else
+            ruby_value
+          end
+        else
+          ruby_value
+        end
+      end
+
     class << self
-      
+
       public
-      
+
       # Defines the the supported attributes of the model
       def property(name, type = :string, options = {})
         self.valid_attributes ||= []
         self.valid_attributes << name
-    
+
         case type
         when :datetime
           define_datetime_accessor(name, options)
@@ -131,11 +180,11 @@ module ActivePodio
           define_generic_accessor(name)
         end
       end
-    
+
       # Wraps a single hash provided from the API in the given model
       def has_one(name, options = {})
-        self.associations ||= {}
-        self.associations[name] = :has_one
+        self._associations ||= {}
+        self._associations[name] = :has_one
 
         self.send(:define_method, name) do
           klass = klass_for_association(options)
@@ -151,12 +200,16 @@ module ActivePodio
           end
           instance
         end
+
+        self.send(:define_method, "clear_#{name}") do
+          self.instance_variable_set("@#{name}_has_one_instance", nil)
+        end
       end
-    
+
       # Wraps a collection of hashes from the API to a collection of the given model
       def has_many(name, options = {})
-        self.associations ||= {}
-        self.associations[name] = :has_many
+        self._associations ||= {}
+        self._associations[name] = :has_many
 
         self.send(:define_method, name) do
           klass = klass_for_association(options)
@@ -172,23 +225,23 @@ module ActivePodio
           end
           instances
         end
-    
+
         self.send(:define_method, "#{name}?") do
           self.send(name).length > 0
         end
       end
-    
+
       # Returns a single instance of the model
       def member(response)
         new(response, :values_from_api => true)
       end
-    
+
       # Returns a simple collection model instances
       def list(response)
         response.map! { |item| new(item, :values_from_api => true) }
         response
       end
-    
+
       # Returns a struct that includes:
       # * all: A collection model instances
       # * count: The number of returned records
@@ -198,7 +251,7 @@ module ActivePodio
         result.all.map! { |item| new(item, :values_from_api => true) }
         result
       end
-    
+
       def delegate_to_hash(hash_name, *attribute_names)
         options = attribute_names.extract_options!
         options.reverse_merge!(:prefix => false, :setter => false)
@@ -218,7 +271,7 @@ module ActivePodio
           end
         end
       end
-      
+
       # Wraps the given methods in a begin/rescue block
       # If no error occurs, the return value of the method, or true if nil is returned, is returned
       # If a Podio::PodioError occurs, the method returns false and the error can be read from the error_message accessor
@@ -237,7 +290,7 @@ module ActivePodio
               parameters  = ex.response_body["error_parameters"]
               propagate  = ex.response_body["error_propagate"]
             end
-          
+
             if success
               return result || true
             else
@@ -248,43 +301,46 @@ module ActivePodio
               return false
             end
           end
-        
+
           alias_method_chain method_name, :api_errors_handled
         end
       end
-    
+
       private
-    
+
         def define_generic_accessor(name, options = {})
           options.reverse_merge!(:getter => true, :setter => true)
-    
+
           if(options[:getter])
             self.send(:define_method, name) do
               self[name.to_sym]
             end
           end
-    
+
           if(options[:setter])
             self.send(:define_method, "#{name}=") do |value|
               self[name.to_sym] = value
             end
           end
         end
-    
+
         def define_datetime_accessor(name, options = {})
           self.send(:define_method, name) do
             options[:convert_timezone] == false ? self[name.to_sym].try(:to_datetime) : self[name.to_sym].try(:to_datetime).try(:in_time_zone)
           end
-    
+
           self.send(:define_method, "#{name}=") do |value|
-            
+
             # TODO: This should eventually be done on all date times
             # This option is a temporary fix while API transitions to UTC only
             if options[:convert_incoming_local_datetime_to_utc] && value.present? && !@values_from_api
-              value = value.try(:to_datetime) unless value.is_a?(DateTime)
-              value = Time.zone.local_to_utc(value)
+              value = if value.is_a?(DateTime)
+                Time.zone.local_to_utc(value)
+              else
+                Time.zone.parse(value).try(:utc).try(:to_datetime)
+              end
             end
-            
+
             self[name.to_sym] = if value.is_a?(DateTime)
               value.try(:to_s, :db)
             else
@@ -292,12 +348,12 @@ module ActivePodio
             end
           end
         end
-    
+
         def define_date_accessor(name)
           self.send(:define_method, name) do
             self[name.to_sym].try(:to_date)
           end
-    
+
           self.send(:define_method, "#{name}=") do |value|
             self[name.to_sym] = if value.is_a?(Date)
               value.try(:to_s, :db)
@@ -312,7 +368,7 @@ module ActivePodio
             end
           end
         end
-    
+
         def define_integer_accessor(name)
           self.send(:define_method, name) do
             if self[name.to_sym].present?
@@ -321,7 +377,7 @@ module ActivePodio
               nil
             end
           end
-    
+
           self.send(:define_method, "#{name}=") do |value|
             if value.present?
               self[name.to_sym] = value.to_i
@@ -330,7 +386,7 @@ module ActivePodio
             end
           end
         end
-    
+
         def define_boolean_accessors(name)
           self.send(:define_method, "#{name}?") do
             if self[name.to_sym].present?
@@ -339,7 +395,7 @@ module ActivePodio
               nil
             end
           end
-    
+
           self.send(:define_method, "#{name}=") do |value|
             if value == true || value == false
               self[name.to_sym] = value
@@ -350,29 +406,40 @@ module ActivePodio
             end
           end
         end
-    
+
         def define_array_accessors(name)
           unless name.to_s == name.to_s.pluralize
             self.send(:define_method, name) do
               self[name.to_sym] || []
             end
-    
+
             self.send(:define_method, "#{name}=") do |array|
               self[name.to_sym] = array.respond_to?(:reject) ? array.reject(&:blank?) : array
             end
           end
-    
+
           self.send(:define_method, name.to_s.pluralize) do
             self[name.to_sym] || []
           end
-    
+
           self.send(:define_method, "#{name.to_s.pluralize}=") do |array|
             self[name.to_sym] = array.respond_to?(:reject) ? array.reject(&:blank?) : array
           end
-    
+
           self.send(:define_method, "default_#{name.to_s.singularize}") do
             self[name.to_sym].try(:first).presence
           end
+
+          self.send(:define_method, "default_#{name.to_s.singularize}=") do |value|
+            if self[name.to_sym].try(:first).present?
+              self[name.to_sym][0] = value
+            else
+              self[name.to_sym] = [value]
+            end
+
+            self[name.to_sym].compact!
+
+          end
         end
     end
   end