podio 0.7.0 → 0.8.0

data/Rakefile

@@ -8,24 +8,8 @@ task :default => [:test]
 
 desc 'Run tests'
 Rake::TestTask.new(:test) do |t|
-  ENV['ENABLE_STUBS'] = 'true'
-  ENV['ENABLE_RECORD'] = 'false'
   t.ruby_opts = ["-rubygems"] if defined? Gem
   t.libs << "lib" << "test"
   t.pattern = 'test/**/*_test.rb'
   t.verbose = true
 end
-
-desc 'Record responses'
-task :record do
-  ENV['ENABLE_RECORD'] = 'true'
-  ENV['ENABLE_STUBS'] = 'false'
-
-  Dir['test/**/*_test.rb'].each do |f|
-    ruby("-Ilib:test", f)
-
-    folder_name = f.match(/test\/(.+)_test.rb/)[1]
-    FileUtils.mkdir_p("test/fixtures/#{folder_name}")
-    FileUtils.mv(Dir.glob('*.rack'), "test/fixtures/#{folder_name}")
-  end
-end

data/lib/podio.rb

@@ -8,7 +8,6 @@ require 'podio/middleware/logger'
 require 'podio/middleware/oauth2'
 require 'podio/middleware/json_response'
 require 'podio/middleware/error_response'
-require 'podio/middleware/response_recorder'
 
 require 'podio/active_podio/base'
 require 'podio/active_podio/updatable'
@@ -71,9 +70,12 @@ module Podio
   autoload :ActivationStatus,         'podio/models/activation_status'
   autoload :Activity,                 'podio/models/activity'
   autoload :AppStoreShare,            'podio/models/app_store_share'
+  autoload :AppStoreCategory,         'podio/models/app_store_category'
   autoload :Application,              'podio/models/application'
   autoload :ApplicationEmail,         'podio/models/application_email'
   autoload :ApplicationField,         'podio/models/application_field'
+  autoload :AccountProvider,          'podio/models/account_provider'
+  autoload :Batch,                    'podio/models/batch'
   autoload :Bulletin,                 'podio/models/bulletin'
   autoload :ByLine,                   'podio/models/by_line'
   autoload :CalendarEvent,            'podio/models/calendar_event'
@@ -102,8 +104,7 @@ module Podio
   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 :LinkedAccountData,        'podio/models/linked_account_data'
   autoload :News,                     'podio/models/news'
   autoload :Notification,             'podio/models/notification'
   autoload :NotificationGroup,        'podio/models/notification_group'
@@ -119,6 +120,7 @@ module Podio
   autoload :QuestionOption,           'podio/models/question_option'
   autoload :Rating,                   'podio/models/rating'
   autoload :Recurrence,               'podio/models/recurrence'
+  autoload :Reference,                'podio/models/reference'
   autoload :Referral,                 'podio/models/referral'
   autoload :Reminder,                 'podio/models/reminder'
   autoload :Search,                   'podio/models/search'
@@ -138,6 +140,7 @@ module Podio
   autoload :UserMail,                 'podio/models/user_mail'
   autoload :UserStatus,               'podio/models/user_status'
   autoload :Via,                      'podio/models/via'
+  autoload :View,                     'podio/models/view'
   autoload :Widget,                   'podio/models/widget'
 
 end

data/lib/podio/active_podio/base.rb

@@ -6,27 +6,35 @@ module ActivePodio
     extend ActiveModel::Naming, ActiveModel::Callbacks
     include ActiveModel::Conversion
 
-    class_attribute :valid_attributes, :_associations, :_properties
+    class_attribute :valid_attributes, :_associations, :_properties, :json_attributes
     attr_accessor :attributes, :error_code, :error_message, :error_parameters, :error_propagate
     alias_method :propagate_error?, :error_propagate
 
     def initialize(attributes = {}, options = {})
       self.valid_attributes ||= []
-      attributes ||= {}
+      attributes = {} if attributes.blank?
       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
 
+      self.initialize_attributes(attributes)
+
+      @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 initialize_attributes(attributes)
       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) || self.send(key.to_sym).nil?)
           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)
+              self.send(:[]=, key.to_sym, value) if self.send(key.to_sym).nil? # If not set by constructor, set here to get typed values back
+              attributes = self.send(key.to_sym).try(:attributes)
+              if attributes.present? && any_values_present_recursive?(attributes.values)
                 value = attributes
               else
                 value = nil
@@ -36,9 +44,6 @@ module ActivePodio
           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?
@@ -84,7 +89,7 @@ module ActivePodio
       result.merge!(:id => self.id) if self.respond_to?(:id)
 
       if options[:formatted]
-        self.valid_attributes.each do |name|
+        (self.valid_attributes + (self.json_attributes || [])).uniq.each do |name|
           result[name] = json_friendly_value(self.send(name), options)
         end
 
@@ -123,12 +128,8 @@ module ActivePodio
       def klass_for_association(options)
         klass_name = options[:class]
         raise "Missing class name of associated model. Provide with :class => 'MyClass'." unless klass_name.present?
-        klass = nil
-        begin
-          klass = klass_name.constantize
-        rescue
-          klass = "Podio::#{klass_name}".constantize
-        end
+        klass = klass_name.constantize rescue nil
+        klass = "Podio::#{klass_name}".constantize unless klass.respond_to?(:ancestors) && klass.ancestors.include?(ActivePodio::Base)
         return klass
       end
 
@@ -147,8 +148,17 @@ module ActivePodio
           json_value = case ruby_value.class.name
           when "DateTime", "Time"
             ruby_value.iso8601
-          else
+          when "Array"
+            ruby_value.collect { |rv| json_friendly_value(rv, options) }
+          when "Hash"
+            ruby_value.each { |key, value| ruby_value[key] = json_friendly_value(value, options) }
             ruby_value
+          else
+            if ruby_value.kind_of?(ActivePodio::Base)
+              ruby_value.as_json(options)
+            else
+              ruby_value
+            end
           end
         else
           ruby_value
@@ -169,6 +179,8 @@ module ActivePodio
           define_datetime_accessor(name, options)
         when :date
           define_date_accessor(name)
+        when :time
+          define_time_accessor(name)
         when :integer
           define_integer_accessor(name)
         when :boolean
@@ -216,7 +228,7 @@ module ActivePodio
           instances = self.instance_variable_get("@#{name}_has_many_instances")
           unless instances.present?
             property = options[:property] || name.to_sym
-            if self[property].present?
+            if self[property].present? && self[property].respond_to?(:map)
               instances = self[property].map { |attributes| klass.new(attributes) }
               self.instance_variable_set("@#{name}_has_many_instances", instances)
             else
@@ -306,6 +318,11 @@ module ActivePodio
         end
       end
 
+      def output_attribute_as_json(*attributes)
+        self.json_attributes ||= []
+        self.json_attributes += attributes
+      end
+
       private
 
         def define_generic_accessor(name, options = {})
@@ -344,14 +361,14 @@ module ActivePodio
             self[name.to_sym] = if value.is_a?(DateTime)
               value.try(:to_s, :db)
             else
-              value.try(:to_s)
+              value.try(:to_s).try(:presence)
             end
           end
         end
 
         def define_date_accessor(name)
           self.send(:define_method, name) do
-            self[name.to_sym].try(:to_date)
+            self[name.to_sym].try(:to_date) rescue nil
           end
 
           self.send(:define_method, "#{name}=") do |value|
@@ -361,14 +378,29 @@ module ActivePodio
               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)
+                value_as_date.nil? ? value : value_as_date.try(:to_s, :db)
               else
-                value
+                value.try(:presence)
               end
             end
           end
         end
 
+        def define_time_accessor(name)
+          self.send(:define_method, name) do
+            self[name.to_sym]
+          end
+
+          self.send(:define_method, "#{name}=") do |value|
+            time = if value.is_a?(DateTime) || value.is_a?(Time)
+              value
+            else
+              Time.strptime(value, I18n.t('time.formats.timeonly')) rescue Time.strptime(value, '%H:%M:%S') rescue value
+            end
+            self[name.to_sym] = time.respond_to?(:strftime) ? time.strftime('%H:%M') : time.presence
+          end
+        end
+
         def define_integer_accessor(name)
           self.send(:define_method, name) do
             if self[name.to_sym].present?

data/lib/podio/active_podio/updatable.rb

@@ -1,22 +1,17 @@
 # Adds functionality related to updating to an +ActivePodio+ model
 module ActivePodio
   module Updatable
-    extend ActiveSupport::Concern
-  
-    module InstanceMethods
-      def update_attributes(attributes)
-        attributes.each do |key, value|
-          self.send("#{key}=".to_sym, value.presence)
-        end
+    def update_attributes(attributes)
+      attributes.each do |key, value|
+        self.send("#{key}=".to_sym, value.presence)
       end
+    end
 
-      def remove_nil_values(input_hash)
-        input_hash.inject({}) do |hash, (key, value)|
-          hash[key] = value if value.present?
-          hash
-        end
+    def remove_nil_values(input_hash)
+      input_hash.inject({}) do |hash, (key, value)|
+        hash[key] = value unless value.nil?
+        hash
       end
     end
-  
   end
-end
+end

data/lib/podio/client.rb

@@ -1,7 +1,7 @@
 module Podio
   class Client
-    attr_reader :api_url, :api_key, :api_secret, :oauth_token, :connection, :raw_connection
-    attr_accessor :stubs, :current_http_client
+    attr_reader :api_url, :api_key, :api_secret, :oauth_token, :connection, :trusted_connection
+    attr_accessor :stubs, :current_http_client, :headers
 
     def initialize(options = {})
       @api_url = options[:api_url] || 'https://api.podio.com'
@@ -17,7 +17,6 @@ module Podio
         @stubs = Faraday::Adapter::Test::Stubs.new
       end
       @test_mode   = options[:test_mode]
-      @record_mode = options[:record_mode]
 
       setup_connections
     end
@@ -42,7 +41,9 @@ module Podio
     # sign in as a user using the server side flow
     def authenticate_with_auth_code(authorization_code, redirect_uri)
       response = @oauth_connection.post do |req|
-        req.url '/oauth/token', :grant_type => 'authorization_code', :client_id => api_key, :client_secret => api_secret, :code => authorization_code, :redirect_uri => redirect_uri
+        req.url '/oauth/token'
+        req.headers['Content-Type'] = 'application/x-www-form-urlencoded'
+        req.body = {:grant_type => 'authorization_code', :client_id => api_key, :client_secret => api_secret, :code => authorization_code, :redirect_uri => redirect_uri}
       end
 
       @oauth_token = OAuthToken.new(response.body)
@@ -53,7 +54,9 @@ module Podio
     # Sign in as a user using credentials
     def authenticate_with_credentials(username, password)
       response = @oauth_connection.post do |req|
-        req.url '/oauth/token', :grant_type => 'password', :client_id => api_key, :client_secret => api_secret, :username => username, :password => password
+        req.url '/oauth/token'
+        req.headers['Content-Type'] = 'application/x-www-form-urlencoded'
+        req.body = {:grant_type => 'password', :client_id => api_key, :client_secret => api_secret, :username => username, :password => password}
       end
 
       @oauth_token = OAuthToken.new(response.body)
@@ -64,7 +67,22 @@ module Podio
     # Sign in as an app
     def authenticate_with_app(app_id, app_token)
       response = @oauth_connection.post do |req|
-        req.url '/oauth/token', :grant_type => 'app', :client_id => api_key, :client_secret => api_secret, :app_id => app_id, :app_token => app_token
+        req.url '/oauth/token'
+        req.headers['Content-Type'] = 'application/x-www-form-urlencoded'
+        req.body = {:grant_type => 'app', :client_id => api_key, :client_secret => api_secret, :app_id => app_id, :app_token => app_token}
+      end
+
+      @oauth_token = OAuthToken.new(response.body)
+      configure_oauth
+      @oauth_token
+    end
+
+    # Sign in with an transfer token, only available for Podio
+    def authenticate_with_transfer_token(transfer_token)
+      response = @oauth_connection.post do |req|
+        req.url '/oauth/token'
+        req.headers['Content-Type'] = 'application/x-www-form-urlencoded'
+        req.body = {:grant_type => 'transfer_token', :client_id => api_key, :client_secret => api_secret, :transfer_token => transfer_token}
       end
 
       @oauth_token = OAuthToken.new(response.body)
@@ -81,14 +99,15 @@ module Podio
 
       @oauth_token = OAuthToken.new(response.body)
       configure_oauth
-
-      [@oauth_token, response['new_user_created']]
+      [@oauth_token, response.body['new_user_created']]
     end
 
     # Sign in with an OpenID, only available for Podio
     def authenticate_with_openid(identifier, type)
       response = @oauth_connection.post do |req|
-        req.url '/oauth/token_by_openid', :grant_type => type, :client_id => api_key, :client_secret => api_secret, :identifier => identifier
+        req.url '/oauth/token_by_openid'
+        req.headers['Content-Type'] = 'application/x-www-form-urlencoded'
+        req.body = {:grant_type => type, :client_id => api_key, :client_secret => api_secret, :identifier => identifier}
       end
 
       @oauth_token = OAuthToken.new(response.body)
@@ -96,6 +115,7 @@ module Podio
       @oauth_token
     end
 
+    # reconfigure the client with a different access token
     def oauth_token=(new_oauth_token)
       @oauth_token = new_oauth_token.is_a?(Hash) ? OAuthToken.new(new_oauth_token) : new_oauth_token
       configure_oauth
@@ -103,7 +123,9 @@ module Podio
 
     def refresh_access_token
       response = @oauth_connection.post do |req|
-        req.url '/oauth/token', :grant_type => 'refresh_token', :refresh_token => oauth_token.refresh_token, :client_id => api_key, :client_secret => api_secret
+        req.url '/oauth/token'
+        req.headers['Content-Type'] = 'application/x-www-form-urlencoded'
+        req.body = {:grant_type => 'refresh_token', :refresh_token => oauth_token.refresh_token, :client_id => api_key, :client_secret => api_secret}
       end
 
       @oauth_token = OAuthToken.new(response.body)
@@ -115,7 +137,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'] = @test_mode                           if @test_mode
+      headers['X-Podio-Dry-Run'] = @test_mode.to_s                      if @test_mode
 
       headers
     end
@@ -124,14 +146,15 @@ module Podio
 
     def setup_connections
       @connection = configure_connection
-      @raw_connection = configure_connection(true)
       @oauth_connection = configure_oauth_connection
+      @trusted_connection = configure_trusted_connection
     end
 
-    def configure_connection(raw=false)
+    def configure_connection
       Faraday::Connection.new(:url => api_url, :headers => configured_headers, :request => {:client => self}) do |builder|
-        builder.use Middleware::JsonRequest unless raw
-        builder.use Faraday::Request::Multipart if raw
+        builder.use Middleware::JsonRequest
+        builder.use Faraday::Request::Multipart
+        builder.use Faraday::Request::UrlEncoded
         builder.use Middleware::OAuth2
         builder.use Middleware::Logger
 
@@ -141,7 +164,6 @@ module Podio
         # builder.use Middleware::DateConversion
         builder.use Middleware::ErrorResponse
         builder.use Middleware::JsonResponse
-        builder.use Middleware::ResponseRecorder if @record_mode
       end
     end
 
@@ -157,9 +179,16 @@ module Podio
       conn
     end
 
+    def configure_trusted_connection
+      conn = @connection.dup
+      conn.options[:client] = self
+      conn.headers.delete('authorization')
+      conn.basic_auth(api_key, api_secret)
+      conn
+    end
+
     def configure_oauth
       @connection = configure_connection
-      @raw_connection = configure_connection(true)
     end
   end
 end

data/lib/podio/error.rb

@@ -19,4 +19,13 @@ module Podio
   class GoneError < PodioError; end
   class RateLimitError < PodioError; end
   class UnavailableError < PodioError; end
+
+  class RequestableAuthorizationError < AuthorizationError
+    attr_reader :request_access_info
+
+    def initialize(response_body, response_status, url)
+      @request_access_info = response_body['error_parameters']
+      super
+    end
+  end
 end

data/lib/podio/middleware/error_response.rb

@@ -20,7 +20,11 @@ module Podio
               raise AuthorizationError.new(env[:body], env[:status], env[:url])
             end
           when 403
-            raise AuthorizationError.new(env[:body], env[:status], env[:url])
+            if env[:body]['error'] == 'requestable_forbidden'
+              raise RequestableAuthorizationError.new(env[:body], env[:status], env[:url])
+            else
+              raise AuthorizationError.new(env[:body], env[:status], env[:url])
+            end
           when 404
             raise NotFoundError.new(env[:body], env[:status], env[:url])
           when 409