podio 0.5.1 → 0.6.0

data/.travis.yml

@@ -0,0 +1,9 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - jruby
+  - rbx
+notifications:
+  email:
+    - fabricius@podio.com

data/Gemfile

@@ -1,3 +1,5 @@
 source "http://rubygems.org"
 
+gem 'rake'
+
 gemspec

data/Rakefile

@@ -4,6 +4,8 @@ require 'bundler'
 
 Bundler::GemHelper.install_tasks
 
+task :default => [:test]
+
 desc 'Run tests'
 Rake::TestTask.new(:test) do |t|
   ENV['ENABLE_STUBS'] = 'true'

data/lib/podio.rb

@@ -3,7 +3,7 @@ require 'active_support/core_ext'
 
 require 'podio/error'
 require 'podio/middleware/json_request'
-require 'podio/middleware/date_conversion'
+#require 'podio/middleware/date_conversion'
 require 'podio/middleware/logger'
 require 'podio/middleware/oauth2'
 require 'podio/middleware/json_response'
@@ -66,22 +66,31 @@ module Podio
   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'
   autoload :AppStoreShare,            'podio/models/app_store_share'
   autoload :Application,              'podio/models/application'
   autoload :ApplicationEmail,         'podio/models/application_email'
   autoload :ApplicationField,         'podio/models/application_field'
   autoload :Bulletin,                 'podio/models/bulletin'
   autoload :ByLine,                   'podio/models/by_line'
+  autoload :Calendar,                 'podio/models/calendar'
+  autoload :CalendarMute,             'podio/models/calendar_mute'
   autoload :Category,                 'podio/models/category'
   autoload :Comment,                  'podio/models/comment'
   autoload :Connection,               'podio/models/connection'
   autoload :Contact,                  'podio/models/contact'
+  autoload :Contract,                 'podio/models/contract'
+  autoload :ContractAccounting,       'podio/models/contract_accounting'
+  autoload :ContractPrice,            'podio/models/contract_price'
   autoload :Conversation,             'podio/models/conversation'
   autoload :ConversationMessage,      'podio/models/conversation_message'
   autoload :ConversationParticipant,  'podio/models/conversation_participant'
   autoload :EmailSubscriptionSetting, 'podio/models/email_subscription_setting'
   autoload :Embed,                    'podio/models/embed'
   autoload :FileAttachment,           'podio/models/file_attachment'
+  autoload :Filter,                   'podio/models/filter'
   autoload :Form,                     'podio/models/form'
   autoload :Hook,                     'podio/models/hook'
   autoload :Importer,                 'podio/models/importer'
@@ -90,6 +99,8 @@ module Podio
   autoload :ItemDiff,                 'podio/models/item_diff'
   autoload :ItemField,                'podio/models/item_field'
   autoload :ItemRevision,             'podio/models/item_revision'
+  autoload :Meeting,                  'podio/models/meeting'
+  autoload :MeetingParticipant,       'podio/models/meeting_participiant'
   autoload :News,                     'podio/models/news'
   autoload :Notification,             'podio/models/notification'
   autoload :NotificationGroup,        'podio/models/notification_group'
@@ -104,60 +115,25 @@ module Podio
   autoload :QuestionAnswer,           'podio/models/question_answer'
   autoload :QuestionOption,           'podio/models/question_option'
   autoload :Rating,                   'podio/models/rating'
+  autoload :Recurrence,               'podio/models/recurrence'
+  autoload :Reminder,                 'podio/models/reminder'
   autoload :Search,                   'podio/models/search'
   autoload :Space,                    'podio/models/space'
   autoload :SpaceContact,             'podio/models/space_contact'
-  autoload :SpaceInvite,              'podio/models/space_invite'
+  autoload :SpaceInvitation,          'podio/models/space_invitation'
   autoload :SpaceMember,              'podio/models/space_member'
   autoload :Status,                   'podio/models/status'
+  autoload :StreamMute,               'podio/models/stream_mute'
+  autoload :StreamObject,             'podio/models/stream_object'
   autoload :Subscription,             'podio/models/subscription'
   autoload :Tag,                      'podio/models/tag'
+  autoload :TagSearch,                'podio/models/tag_search'
   autoload :Task,                     'podio/models/task'
   autoload :TaskLabel,                'podio/models/task_label'
   autoload :User,                     'podio/models/user'
+  autoload :UserMail,                 'podio/models/user_mail'
   autoload :UserStatus,               'podio/models/user_status'
   autoload :Via,                      'podio/models/via'
   autoload :Widget,                   'podio/models/widget'
 
-
-  # autoload :Application,        'podio/areas/application'
-  # autoload :Bulletin,           'podio/areas/bulletin'
-  # autoload :Category,           'podio/areas/app_store'
-  # autoload :AppStoreShare,      'podio/areas/app_store'
-  # autoload :Comment,            'podio/areas/comment'
-  # autoload :Connection,         'podio/areas/connection'
-  # autoload :Contact,            'podio/areas/contact'
-  # autoload :Conversation,       'podio/areas/conversation'
-  # autoload :Email,              'podio/areas/email'
-  # autoload :File,               'podio/areas/file'
-  # autoload :Form,               'podio/areas/form'
-  # autoload :Email,              'podio/areas/email'
-  # autoload :Hook,               'podio/areas/hook'
-  # autoload :Item,               'podio/areas/item'
-  # autoload :ItemDiff,           'podio/areas/item'
-  # autoload :ItemField,          'podio/areas/item'
-  # autoload :ItemRevision,       'podio/areas/item'
-  # autoload :Importer,           'podio/areas/importer'
-  # autoload :Integration,        'podio/areas/integration'
-  # autoload :News,               'podio/areas/news'
-  # autoload :Notification,       'podio/areas/notification'
-  # autoload :NotificationGroup,  'podio/areas/notification'
-  # autoload :OAuth,              'podio/areas/oauth'
-  # autoload :OAuthClient,        'podio/areas/oauth'
-  # autoload :Organization,       'podio/areas/organization'
-  # autoload :OrganizationMember, 'podio/areas/organization_member'
-  # autoload :OrganizationProfile, 'podio/areas/organization_profile'
-  # autoload :Rating,             'podio/areas/rating'
-  # autoload :Search,             'podio/areas/search'
-  # autoload :Space,              'podio/areas/space'
-  # autoload :SpaceInvite,        'podio/areas/space'
-  # autoload :SpaceMember,        'podio/areas/space'
-  # autoload :Status,             'podio/areas/status'
-  # autoload :Subscription,       'podio/areas/subscription'
-  # autoload :Tag,                'podio/areas/tag'
-  # autoload :Task,               'podio/areas/task'
-  # autoload :TaskLabel,          'podio/areas/task'
-  # autoload :User,               'podio/areas/user'
-  # autoload :UserStatus,         'podio/areas/user_status'
-  # autoload :Widget,             'podio/areas/widget'
 end

data/lib/podio/active_podio/base.rb

@@ -6,20 +6,39 @@ module ActivePodio
     extend ActiveModel::Naming, ActiveModel::Callbacks
     include ActiveModel::Conversion
     
-    class_inheritable_accessor :valid_attributes
-    attr_accessor :attributes, :error_code, :error_message, :error_parameters
+    class_inheritable_accessor :valid_attributes, :associations
+    attr_accessor :attributes, :error_code, :error_message, :error_parameters, :error_propagate
+    alias_method :propagate_error?, :error_propagate
 
-    def initialize(attributes = {})
+    def initialize(attributes = {}, options = {})
       self.valid_attributes ||= []
       attributes ||= {}
       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) 
-        elsif valid_attributes.include?(key.to_sym)
-          self.send(:[]=, key.to_sym, value)
+          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)
+          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
+              attributes = self.send(key.to_sym).attributes
+              if any_values_present_recursive?(attributes.values)
+                value = attributes
+              else
+                value = nil
+              end
+            end
+            self.send(:[]=, key.to_sym, value)
+          end
         end
       end
+
+      @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?
@@ -31,7 +50,9 @@ module ActivePodio
     end
     
     def to_param
-      return self.id.try(:to_s) if self.respond_to?(:id)
+      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)
@@ -42,10 +63,14 @@ module ActivePodio
     def []=(attribute, value)
       @attributes ||= {}
       @attributes[attribute.to_sym] = value
+      if @belongs_to.present? && value.present?
+        @belongs_to[:model][@belongs_to[:as]] ||= {}
+        @belongs_to[:model][@belongs_to[:as]][attribute.to_sym] = value
+      end
     end
     
     def ==(other)
-      self.respond_to?(:id) && other.respond_to?(:id) && self.id == other.id
+      !self.nil? && !other.nil? && self.respond_to?(:id) && other.respond_to?(:id) && self.id == other.id
     end
     alias :eql? :==
     
@@ -70,19 +95,29 @@ module ActivePodio
         end
         return klass
       end
+      
+      def any_values_present_recursive?(values)
+        values.any? do |value|
+          if value.respond_to?(:values)
+            any_values_present_recursive?(value.values)
+          else
+            value.present?
+          end
+        end
+      end
 
     class << self
       
       public
       
       # Defines the the supported attributes of the model
-      def property(name, type = :string)
+      def property(name, type = :string, options = {})
         self.valid_attributes ||= []
         self.valid_attributes << name
     
         case type
         when :datetime
-          define_datetime_accessor(name)
+          define_datetime_accessor(name, options)
         when :date
           define_date_accessor(name)
         when :integer
@@ -99,13 +134,16 @@ module ActivePodio
     
       # 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.send(:define_method, name) do
           klass = klass_for_association(options)
           instance = self.instance_variable_get("@#{name}_has_one_instance")
           unless instance.present?
             property = options[:property] || name.to_sym
             if self[property].present?
-              instance = klass.new(self[property])
+              instance = klass.new(self[property], :belongs_to => { :model => self, :as => property })
               self.instance_variable_set("@#{name}_has_one_instance", instance)
             else
               instance = nil
@@ -117,6 +155,9 @@ module ActivePodio
     
       # 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.send(:define_method, name) do
           klass = klass_for_association(options)
           instances = self.instance_variable_get("@#{name}_has_many_instances")
@@ -139,12 +180,12 @@ module ActivePodio
     
       # Returns a single instance of the model
       def member(response)
-        new(response)
+        new(response, :values_from_api => true)
       end
     
       # Returns a simple collection model instances
       def list(response)
-        response.map! { |item| new(item) }
+        response.map! { |item| new(item, :values_from_api => true) }
         response
       end
     
@@ -154,21 +195,24 @@ module ActivePodio
       # * total_count: The total number of records matching the given conditions
       def collection(response)
         result = Struct.new(:all, :count, :total_count).new(response['items'], response['filtered'], response['total'])
-        result.all.map! { |item| new(item) }
+        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! || { :prefix => false, :setter => false }
+        options = attribute_names.extract_options!
+        options.reverse_merge!(:prefix => false, :setter => false)
         options.assert_valid_keys(:prefix, :setter)
         attribute_names.each do |attribute_name|
           hash_index = attribute_name.to_s.gsub(/[\?!]/, '')
           method_name = "#{options[:prefix] ? "#{hash_name}_" : ''}#{attribute_name}"
           self.send(:define_method, method_name) do
+            self.send("#{hash_name}=", {}) unless self.send(hash_name)
             self.send(hash_name)[hash_index]
           end
           if options[:setter]
             self.send(:define_method, "#{method_name}=") do |value|
+              self.send("#{hash_name}=", {}) unless self.send(hash_name)
               self.send(hash_name)[hash_index] = value
             end
           end
@@ -177,7 +221,7 @@ module ActivePodio
       
       # 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::BadRequestError occurs, the method returns false and the error can be read from the error_message accessor
+      # If a Podio::PodioError occurs, the method returns false and the error can be read from the error_message accessor
       # If another error occurs, it is still raised
       def handle_api_errors_for(*method_names)
         method_names.each do |method_name|
@@ -186,11 +230,12 @@ module ActivePodio
             begin
               result = self.send("#{method_name}_without_api_errors_handled", *args)
               success = true
-            rescue Podio::BadRequestError, Podio::AuthorizationError => ex
+            rescue Podio::PodioError => ex
               success = false
               code        = ex.response_body["error"]
               message     = ex.response_body["error_description"]
               parameters  = ex.response_body["error_parameters"]
+              propagate  = ex.response_body["error_propagate"]
             end
           
             if success
@@ -198,7 +243,8 @@ module ActivePodio
             else
               @error_code       = code
               @error_message    = message
-              @error_parameters = parameters
+              @error_parameters = parameters || {}
+              @error_propagate  = propagate
               return false
             end
           end
@@ -225,12 +271,20 @@ module ActivePodio
           end
         end
     
-        def define_datetime_accessor(name)
+        def define_datetime_accessor(name, options = {})
           self.send(:define_method, name) do
-            self[name.to_sym].try(:to_datetime).try(:in_time_zone)
+            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)
+            end
+            
             self[name.to_sym] = if value.is_a?(DateTime)
               value.try(:to_s, :db)
             else
@@ -248,7 +302,13 @@ module ActivePodio
             self[name.to_sym] = if value.is_a?(Date)
               value.try(:to_s, :db)
             else
-              value.try(:to_s)
+              value = value.try(:to_s)
+              if defined?(I18n) && value.present? && !(value =~ /^\d{4}-\d{2}-\d{2}$/) # If we have I18n available, assume that we are in Rails and try to convert the string to a date to convert it to ISO 8601
+                value_as_date = Date.strptime(value, I18n.t('date.formats.default')) rescue nil
+                value_as_date.nil? ? value.try(:to_s) : value_as_date.try(:to_s, :db)
+              else
+                value
+              end
             end
           end
         end
@@ -298,7 +358,7 @@ module ActivePodio
             end
     
             self.send(:define_method, "#{name}=") do |array|
-              self[name.to_sym] = array.reject(&:blank?) if array.respond_to?(:reject)
+              self[name.to_sym] = array.respond_to?(:reject) ? array.reject(&:blank?) : array
             end
           end
     
@@ -307,7 +367,7 @@ module ActivePodio
           end
     
           self.send(:define_method, "#{name.to_s.pluralize}=") do |array|
-            self[name.to_sym] = array.reject(&:blank?) if array.respond_to?(:reject)
+            self[name.to_sym] = array.respond_to?(:reject) ? array.reject(&:blank?) : array
           end
     
           self.send(:define_method, "default_#{name.to_s.singularize}") do

data/lib/podio/client.rb

@@ -72,6 +72,17 @@ module Podio
       @oauth_token
     end
 
+    # Sign in with an OpenID, only available for Podio
+    def authenticate_with_openid(identifier)
+      response = @oauth_connection.post do |req|
+        req.url '/oauth/token_by_openid', :grant_type => 'openid', :client_id => api_key, :client_secret => api_secret, :identifier => identifier
+      end
+
+      @oauth_token = OAuthToken.new(response.body)
+      configure_oauth
+      @oauth_token
+    end
+
     def oauth_token=(new_oauth_token)
       @oauth_token = new_oauth_token.is_a?(Hash) ? OAuthToken.new(new_oauth_token) : new_oauth_token
       configure_oauth
@@ -91,7 +102,7 @@ module Podio
       headers = @headers.dup
       headers['User-Agent']      = 'Podio Ruby Library'
       headers['authorization']   = "OAuth2 #{oauth_token.access_token}" if oauth_token
-      headers['X-Podio-Dry-Run'] = '1'                                  if @test_mode
+      headers['X-Podio-Dry-Run'] = @test_mode                           if @test_mode
 
       headers
     end
@@ -114,9 +125,9 @@ module Podio
         builder.adapter(*default_adapter)
 
         # first response middleware defined get's executed last
-        builder.use Middleware::DateConversion
+        # builder.use Middleware::DateConversion
         builder.use Middleware::ErrorResponse
-        builder.use Middleware::JsonResponse unless raw
+        builder.use Middleware::JsonResponse
         builder.use Middleware::ResponseRecorder if @record_mode
       end
     end

data/lib/podio/models/action.rb

@@ -0,0 +1,15 @@
+class Podio::Action < ActivePodio::Base
+  property :action_id, :integer
+  property :type, :string
+  property :data, :hash
+  property :text, :string
+
+  alias_method :id, :action_id
+  
+  class << self
+    def find(id)
+      member Podio.connection.get("/action/#{id}").body
+    end
+  end
+  
+end