podio 0.5.0 → 0.5.1

data/.gitignore

@@ -1,3 +1,4 @@
 pkg/*
 *.gem
 .bundle
+.DS_Store

data/lib/podio.rb

@@ -100,6 +100,9 @@ module Podio
   autoload :OrganizationMember,       'podio/models/organization_member'
   autoload :OrganizationProfile,      'podio/models/organization_profile'
   autoload :Profile,                  'podio/models/profile'
+  autoload :Question,                 'podio/models/question'
+  autoload :QuestionAnswer,           'podio/models/question_answer'
+  autoload :QuestionOption,           'podio/models/question_option'
   autoload :Rating,                   'podio/models/rating'
   autoload :Search,                   'podio/models/search'
   autoload :Space,                    'podio/models/space'

data/lib/podio/active_podio/base.rb

@@ -159,11 +159,19 @@ module ActivePodio
       end
     
       def delegate_to_hash(hash_name, *attribute_names)
+        options = attribute_names.extract_options! || { :prefix => false, :setter => false }
+        options.assert_valid_keys(:prefix, :setter)
         attribute_names.each do |attribute_name|
           hash_index = attribute_name.to_s.gsub(/[\?!]/, '')
-          self.send(:define_method, attribute_name) do
+          method_name = "#{options[:prefix] ? "#{hash_name}_" : ''}#{attribute_name}"
+          self.send(:define_method, method_name) do
             self.send(hash_name)[hash_index]
           end
+          if options[:setter]
+            self.send(:define_method, "#{method_name}=") do |value|
+              self.send(hash_name)[hash_index] = value
+            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, :connection, :raw_connection
-    attr_accessor :oauth_token, :stubs, :current_http_client
+    attr_reader :api_url, :api_key, :api_secret, :oauth_token, :connection, :raw_connection
+    attr_accessor :stubs, :current_http_client
 
     def initialize(options = {})
       @api_url = options[:api_url] || 'https://api.podio.com'
@@ -72,6 +72,11 @@ module Podio
       @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
+    end
+
     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

data/lib/podio/models/application.rb

@@ -36,6 +36,12 @@ class Podio::Application < ActivePodio::Base
       }.body
     end
 
+    def get_calculations(app_id)
+      list Podio.connection.get { |req|
+        req.url("/app/#{app_id}/calculation/", {})
+      }.body
+    end
+
     def update_order(space_id, app_ids = [])
       response = Podio.connection.put do |req|
         req.url "/app/space/#{space_id}/order"
@@ -52,6 +58,18 @@ class Podio::Application < ActivePodio::Base
       end
       response.body['app_id']
     end
+
+    def update(app_id, attributes)
+      response = Podio.connection.put do |req|
+        req.url "/app/#{app_id}"
+        req.body = attributes
+      end
+      response.status
+    end
+
+    def delete_field(app_id, field_id)
+      Podio.connection.delete("/app/#{app_id}/field/#{field_id}").status
+    end
     
     def deactivate(id)
       Podio.connection.post("/app/#{id}/deactivate").body

data/lib/podio/models/application_field.rb

@@ -6,7 +6,7 @@ class Podio::ApplicationField < ActivePodio::Base
 
   alias_method :id, :field_id
   delegate_to_hash :config, :label, :description, :delta, :settings, :required?, :visible?
-  delegate_to_hash :settings, :allowed_values, :referenceable_types, :allowed_currencies, :valid_types
+  delegate_to_hash :settings, :allowed_values, :referenceable_types, :allowed_currencies, :valid_types, :options, :multiple
   
   class << self
     def find(app_id, field_id)

data/lib/podio/models/comment.rb

@@ -15,6 +15,7 @@ class Podio::Comment < ActivePodio::Base
   has_one :created_by, :class => 'ByLine'
   has_one :created_via, :class => 'Via'
   has_many :files, :class => 'FileAttachment'
+  has_many :questions, :class => 'Question'
 
   alias_method :id, :comment_id
   attr_accessor :commentable_type, :commentable_id

data/lib/podio/models/conversation.rb

@@ -11,10 +11,13 @@ class Podio::Conversation < ActivePodio::Base
   
   # When outputting conversation(s)
   property :created_on, :datetime
+  has_one :embed, :class => 'Embed'
+  has_one :embed_file, :class => 'FileAttachment'
   has_one :created_by, :class => 'ByLine'
   has_many :files, :class => 'FileAttachment'
   has_many :messages, :class => 'ConversationMessage'
   has_many :participants_full, :class => 'ConversationParticipant'
+
   
   alias_method :id, :conversation_id
   alias_method :name, :subject # So tasks can refer to ref.name on all types of references
@@ -52,10 +55,10 @@ class Podio::Conversation < ActivePodio::Base
       response.body
     end
     
-    def create_reply(conversation_id, text, file_ids = [])
+    def create_reply(conversation_id, text, file_ids=[], embed_id=nil, embed_file_id=nil)
       response = Podio.connection.post do |req|
         req.url "/conversation/#{conversation_id}/reply"
-        req.body = { :text => text, :file_ids => file_ids }
+        req.body = {:text => text, :file_ids => file_ids, :embed_id => embed_id, :embed_file_id => embed_file_id}
       end
       response.body['message_id']
     end

data/lib/podio/models/conversation_message.rb

@@ -5,6 +5,8 @@ class Podio::ConversationMessage < ActivePodio::Base
   property :text, :string
   property :created_on, :datetime
 
+  has_one :embed, :class => 'Embed'
+  has_one :embed_file, :class => 'FileAttachment'
   has_one :created_by, :class => 'ByLine'
   has_many :files, :class => 'FileAttachment'
   

data/lib/podio/models/file_attachment.rb

@@ -18,37 +18,23 @@ class Podio::FileAttachment < ActivePodio::Base
   end
   
   class << self
-
-    # Accepts an open file stream along with a content type and a file name and uploads the file to Podio
-    # Returns an instantiated FileAttachment model with id, link, name and mimetype set
-    # If you use Ruby on Rails 3 or higher you can also pass the file in params directly to +upload_from_rails_param+
-    def upload(file_stream, content_type, file_name)
+    # Accepts an open file stream along with a file name and uploads the file to Podio
+    def upload(file_stream, file_name)
       response = Podio.client.raw_connection.post do |req|
+        req.options[:timeout] = 1200
         req.url "/file/v2/"
-        req.body = {:source => Faraday::UploadIO.new(file_stream, content_type, file_name), :filename => file_name}
+        req.body = {:source => Faraday::UploadIO.new(file_stream, nil, nil), :filename => file_name}
       end
-      file_attributes = ActiveSupport::JSON.decode(response.body) # Using raw_connection means response is not automatically decoded to json
-      file_attributes.merge!(:name => file_name, :mimetype => content_type)
-      member file_attributes
-    end
-    
-    # Accepts a ActionDispatch::Http::UploadedFile or similar and uploads the file to Podio
-    # Optionally attaches the file to the given ref type and ref id
-    # Returns an instantiated FileAttachment model with id, link, name and mimetype set
-    def upload_from_rails_param(uploaded_file, ref_type = nil, ref_id = nil)
-      p uploaded_file
-      file_attachment = self.upload(uploaded_file.tempfile, uploaded_file.content_type, uploaded_file.original_filename)
-      if ref_type.present? && ref_id.present?
-        self.attach(file_attachment.id, ref_type, ref_id)
-      end
-      file_attachment
+
+      # Using raw_connection means response is not automatically decoded to json
+      member MultiJson.decode(response.body)
     end
-    
+
     # Attach a file to an existing reference
     def attach(id, ref_type, ref_id)
       Podio.connection.post do |req|
         req.url "/file/#{id}/attach"
-        req.body = { :ref_type => ref_type, :ref_id => ref_id }
+        req.body = {:ref_type => ref_type, :ref_id => ref_id}
       end
     end
 
@@ -64,6 +50,10 @@ class Podio::FileAttachment < ActivePodio::Base
       member Podio.connection.get("/file/#{id}").body
     end
 
+    def find_raw(id)
+      Podio.client.raw_connection.get("/file/#{id}/raw").body
+    end
+
     def find_for_app(app_id, options={})
       collection Podio.connection.get { |req|
         req.url("/file/app/#{app_id}/", options)

data/lib/podio/models/form.rb

@@ -18,6 +18,12 @@ class Podio::Form < ActivePodio::Base
       response.body['form_id']
     end
 
+    def find_all_for_app(app_id)
+      list Podio.connection.get { |req|
+        req.url("/form/app/#{app_id}/")
+      }.body
+    end
+
     def find(form_id)
       member Podio.connection.get("/form/#{form_id}").body
     end

data/lib/podio/models/importer.rb

@@ -1,12 +1,13 @@
 class Podio::Importer < ActivePodio::Base
   
   class << self
-    def process_file(file_id, app_id, mappings)
+    def process_file(file_id, app_id, mappings, tags_column_id)
       response = Podio.connection.post do |req|
         req.url "/importer/#{file_id}/process"
         req.body = {
           :app_id => app_id,
-          :mappings => mappings
+          :mappings => mappings,
+          :tags_column_id => tags_column_id
         }
       end
 

data/lib/podio/models/item.rb

@@ -16,9 +16,11 @@ class Podio::Item < ActivePodio::Base
   property :conversations, :array
   property :tasks, :array
   property :references, :array
+  property :refs, :array
   property :tags, :array
   property :subscribed, :boolean
   property :user_ratings, :hash
+  property :link, :string
 
   has_many :revisions, :class => 'ItemRevision'
   has_many :files, :class => 'FileAttachment'

data/lib/podio/models/question.rb

@@ -0,0 +1,32 @@
+class Podio::Question < ActivePodio::Base
+
+  property :question_id, :integer
+  property :text, :string
+  property :ref, :hash
+
+  has_many :answers, :class => 'QuestionAnswer'
+  has_many :options, :class => 'QuestionOption'
+
+  alias_method :id, :question_id
+
+  class << self
+
+    def create(ref_type, ref_id, text, options)
+      response = Podio.connection.post do |req|
+        req.url "/question/#{ref_type}/#{ref_id}/"
+        req.body = {:text => text, :options => options }
+      end
+      member response.body
+    end
+
+    def answer(question_id, ref_type, ref_id, question_option_id)
+      response = Podio.connection.post do |req|
+        req.url "/question/#{question_id}/#{ref_type}/#{ref_id}/"
+        req.body = {:question_option_id => question_option_id }
+      end
+      
+      response.status
+    end
+
+  end
+end

data/lib/podio/models/question_answer.rb

@@ -0,0 +1,5 @@
+class Podio::QuestionAnswer < ActivePodio::Base
+  property :question_option_id, :integer
+
+  has_one :user, :class => 'User'
+end

data/lib/podio/models/question_option.rb

@@ -0,0 +1,6 @@
+class Podio::QuestionOption < ActivePodio::Base
+
+  property :question_option_id, :integer
+  property :text, :string
+  
+end

data/lib/podio/models/space.rb

@@ -8,6 +8,8 @@ class Podio::Space < ActivePodio::Base
   property :members, :integer
   property :role, :string
   property :rights, :array
+  property :post_on_new_app, :bool
+  property :post_on_new_member, :bool
   
   has_one :created_by, :class => 'ByLine'
 
@@ -19,6 +21,10 @@ class Podio::Space < ActivePodio::Base
     self.space_id = response['space_id']
   end
   
+  def update
+    self.class.update(self.space_id, :name => self.name, :post_on_new_app => self.post_on_new_app, :post_on_new_member => self.post_on_new_member, :url_label => self.url_label)
+  end
+  
   class << self
     def create(attributes)
       response = Podio.connection.post do |req|
@@ -29,6 +35,14 @@ class Podio::Space < ActivePodio::Base
       response.body
     end
 
+    def update(space_id, attributes)
+      Podio.connection.put("/space/#{space_id}", attributes).status
+    end
+
+    def delete(id)
+      Podio.connection.delete("/space/#{id}").status
+    end
+
     def find(id)
       member Podio.connection.get("/space/#{id}").body
     end
@@ -40,6 +54,14 @@ class Podio::Space < ActivePodio::Base
     def find_all_for_org(org_id)
       list Podio.connection.get("/org/#{org_id}/space/").body
     end
+    
+    def validate_url_label(org_id, url_label)
+      Podio.connection.post { |req|
+        req.url "/space/org/#{org_id}/url/validate"
+        req.body = {:url_label => url_label}
+      }.body
+    end
+    
   end
 end
 

data/lib/podio/models/space_invite.rb

@@ -15,11 +15,15 @@ class Podio::SpaceInvite < ActivePodio::Base
     self.class.create(self.space_id, self.role, self.attributes.except(:contacts))
   end
 
+  def save_member
+    self.class.create_member(self.space_id, self.role, self.attributes.except(:contacts))
+  end
+
   def accept(invite_code)
     self.class.accept(invite_code)
   end
   
-  handle_api_errors_for :save, :accept # Call must be made after the methods to handle have been defined
+  handle_api_errors_for :save, :save_member, :accept # Call must be made after the methods to handle have been defined
   
   class << self
     def create(space_id, role, attributes={})
@@ -31,6 +35,15 @@ class Podio::SpaceInvite < ActivePodio::Base
       response.body
     end
 
+    def create_member(space_id, role, attributes={})
+      response = Podio.connection.post do |req|
+        req.url "/space/#{space_id}/member/"
+        req.body = attributes.merge(:role => role)
+      end
+
+      response.body
+    end
+
     def accept(invite_code)
       response = Podio.connection.post do |req|
         req.url '/space/invite/accept'
@@ -49,9 +62,19 @@ class Podio::SpaceInvite < ActivePodio::Base
       response.body
     end
 
+    def decline_member(invite_code)
+      Podio.connection.delete("/space/membership?invite_code=#{invite_code}").status
+
+      response.body
+    end
+
     def find(invite_code)
       member Podio.connection.get("/space/invite/status?invite_code=#{ERB::Util.url_encode(invite_code)}").body
     end
+
+    def find_member(invite_code)
+      member Podio.connection.get("/space/membership?invite_code=#{ERB::Util.url_encode(invite_code)}").body
+    end
     
   end
 end

data/lib/podio/models/status.rb

@@ -10,6 +10,8 @@ class Podio::Status < ActivePodio::Base
 
   has_one :created_by, :class => 'Contact'
   has_one :created_via, :class => 'Via'
+  has_one :embed, :class => 'Embed'
+  has_one :embed_file, :class => 'FileAttachment'
   has_many :comments, :class => 'Comment'
   has_many :conversations, :class => 'Conversation'
   has_many :tasks, :class => 'Task'

data/lib/podio/version.rb

@@ -1,3 +1,3 @@
 module Podio
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

data/podio.gemspec

@@ -15,11 +15,11 @@ Gem::Specification.new do |s|
   s.test_files        = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths     = ['lib']
 
-  s.add_runtime_dependency 'faraday', '~> 0.7.0'
-  s.add_runtime_dependency 'activesupport', '~> 3.0.0'
-  s.add_runtime_dependency 'activemodel', '~> 3.0.0'
-  s.add_runtime_dependency 'i18n', '>= 0.4.2'
-  s.add_runtime_dependency 'multi_json', '~> 0.0.5'
+  s.add_dependency('faraday', '~> 0.7.0')
+  s.add_dependency('activesupport', '~> 3.0.0')
+  s.add_dependency('activemodel', '~> 3.0.0')
+  s.add_dependency('i18n', '~> 0.5.0')
+  s.add_dependency('multi_json', '~> 0.0.5')
 
   s.description       = <<desc
 The official Ruby wrapper for the Podio API used and maintained by the Podio team

data/test/active_podio_test.rb

@@ -10,6 +10,7 @@ class ActivePodioTest < Test::Unit::TestCase
     property :test_id, :integer
     property :string, :string
     property :hash_property, :hash
+    property :other_hash_property, :hash
     property :datetime, :datetime
     property :date, :date
     property :integer, :integer
@@ -24,6 +25,8 @@ class ActivePodioTest < Test::Unit::TestCase
     alias_method :id, :test_id
     
     delegate_to_hash :hash_property, :key1, :key2, :really?
+    delegate_to_hash :other_hash_property, :key3, :prefix => true, :setter  => true
+    
     
     def save(exception_class = nil)
       if exception_class
@@ -156,11 +159,18 @@ class ActivePodioTest < Test::Unit::TestCase
     assert_equal 'other association 2', @test.different_associations[1].string
   end
   
-  test 'should expose methods defined by delegate to hash' do
+  test 'should expose getter methods defined by delegate to hash' do
     @test = TestModel.new(:hash_property => {'key1' => 'value1', 'key2' => 'value2', 'really' => true})
     assert_equal 'value1', @test.key1
     assert @test.really?
   end
+
+  test 'should expose prefixed getter and setter methods defined by delegate to hash' do
+    @test = TestModel.new(:other_hash_property => {'key3' => 'value3'})
+    assert_equal 'value3', @test.other_hash_property_key3
+    @test.other_hash_property_key3 = 'new'
+    assert_equal 'new', @test.other_hash_property_key3
+  end
   
   test 'should handle non failing api requests' do
     @test = TestModel.new
@@ -229,12 +239,12 @@ class ActivePodioTest < Test::Unit::TestCase
   
   test 'should initialize nil attributes when constructed without given attributes' do
     @test = TestModel.new
-    assert_equal({:string=>nil, :test_id=>nil, :hash_property=>nil, :datetime=>nil, :date=>nil, :integer=>nil, :boolean=>nil, :array=>nil}, @test.attributes)
+    assert_equal({:string=>nil, :test_id=>nil, :hash_property=>nil, :other_hash_property=>nil, :datetime=>nil, :date=>nil, :integer=>nil, :boolean=>nil, :array=>nil}, @test.attributes)
   end
 
   test 'should accept unknown properties when constructed' do
     @test = TestModel.new(:unknown => 'attribute')
-    assert_equal({:string=>nil, :test_id=>nil, :hash_property=>nil, :datetime=>nil, :date=>nil, :integer=>nil, :boolean=>nil, :array=>nil, :unknown => 'attribute'}, @test.attributes)
+    assert_equal({:string=>nil, :test_id=>nil, :hash_property=>nil, :other_hash_property=>nil, :datetime=>nil, :date=>nil, :integer=>nil, :boolean=>nil, :array=>nil, :unknown => 'attribute'}, @test.attributes)
   end
   
   test 'should use id for ==' do
@@ -250,7 +260,7 @@ class ActivePodioTest < Test::Unit::TestCase
   
   test 'should return attributes for as_json' do
     @test = TestModel.new(:test_id => 42)
-    assert_equal({:string=>nil, :test_id=>42, :hash_property=>nil, :datetime=>nil, :date=>nil, :integer=>nil, :boolean=>nil, :array=>nil}, @test.as_json)
+    assert_equal({:string=>nil, :test_id=>42, :hash_property=>nil, :other_hash_property=>nil, :datetime=>nil, :date=>nil, :integer=>nil, :boolean=>nil, :array=>nil}, @test.as_json)
   end
   
 end

data/test/client_test.rb

@@ -52,16 +52,32 @@ class ClientTest < Test::Unit::TestCase
   test 'should automatically refresh an expired token' do
     # this token is already expired in the test database
     # Podio.client.oauth_token = Podio::OAuthToken.new('access_token' => '30da4594eef93528c11df7fb5deb989cd629ea7060a1ce1ced628d19398214c942bcfe0334cf953ef70a80ea1afdfd80183d5c75d19c1f5526ca4c6f6f3471ef', 'refresh_token' => '82e7a11ae187f28a25261599aa6229cd89f8faee48cba18a75d70efae88ba665ced11d43143b7f5bebb31a4103662b851dd2db1879a3947b843259479fccfad3', 'expires_in' => -10)
-    
+
     login_as(:professor)
     Podio.client.reset
-  
+
     assert_nothing_raised do
       response = Podio.connection.get("/org/")
       assert_equal 200, response.status
     end
   end
-  
+
+  test 'setting the oauth_token should reconfigure the connection' do
+    podio = Podio::Client.new
+    assert_nil podio.connection.headers['authorization']
+
+    podio.oauth_token = Podio::OAuthToken.new('access_token' => 'access', 'refresh_token' => 'refresh')
+    assert_equal 'OAuth2 access', podio.connection.headers['authorization']
+  end
+
+  test 'setting the oauth_token as a hash should reconfigure the connection' do
+    podio = Podio::Client.new
+    assert_nil podio.connection.headers['authorization']
+
+    podio.oauth_token = {'access_token' => 'access', 'refresh_token' => 'refresh'}
+    assert_equal 'OAuth2 access', podio.connection.headers['authorization']
+  end
+
   test 'should be able to make arbitrary requests' do
     login_as(:professor)
     response = Podio.connection.get("/org/")

metadata

@@ -2,7 +2,7 @@
 name: podio
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - Florian Munz
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-24 00:00:00 Z
+date: 2011-07-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: faraday
@@ -52,9 +52,9 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.4.2
+        version: 0.5.0
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -131,6 +131,9 @@ files:
 - lib/podio/models/organization_member.rb
 - lib/podio/models/organization_profile.rb
 - lib/podio/models/profile.rb
+- lib/podio/models/question.rb
+- lib/podio/models/question_answer.rb
+- lib/podio/models/question_option.rb
 - lib/podio/models/rating.rb
 - lib/podio/models/search.rb
 - lib/podio/models/space.rb