podio 0.2.0 → 0.2.1

data/Rakefile

@@ -1,3 +1,4 @@
+require 'rake'
 require 'rake/testtask'
 require 'bundler'
 
@@ -5,6 +6,9 @@ Bundler::GemHelper.install_tasks
 
 desc 'Run tests'
 Rake::TestTask.new(:test) do |t|
+  #ENV['ENABLE_STUBS'] = 'true'
+  t.ruby_opts = ["-rubygems"] if defined? Gem
+  t.libs << "lib" << "test"
   t.pattern = 'test/**/*_test.rb'
   t.verbose = true
 end

data/lib/podio.rb

@@ -1,11 +1,12 @@
 require 'faraday'
 require 'active_support/core_ext'
 
+require 'podio/middleware/json_request'
 require 'podio/middleware/date_conversion'
 require 'podio/middleware/logger'
 require 'podio/middleware/oauth2'
 require 'podio/middleware/podio_api'
-require 'podio/middleware/yajl_response'
+require 'podio/middleware/json_response'
 require 'podio/middleware/error_response'
 require 'podio/middleware/response_recorder'
 
@@ -48,6 +49,7 @@ module Podio
 
   autoload :Application,        'podio/areas/application'
   autoload :Category,           'podio/areas/app_store'
+  autoload :Connection,         'podio/areas/connection'
   autoload :Contact,            'podio/areas/contact'
   autoload :File,               'podio/areas/file'
   autoload :Form,               'podio/areas/form'

data/lib/podio/areas/connection.rb

@@ -0,0 +1,31 @@
+module Podio
+  module Connection
+    include Podio::ResponseWrapper
+    extend self
+
+    def create(attributes)
+      response = Podio.connection.post do |req|
+        req.url '/connection/'
+        req.body = attributes
+      end
+
+      response.body['connection_id']
+    end
+
+    def reload(id)
+      Podio.connection.post("/connection/#{id}/load").body
+    end
+
+    def find(id)
+      member Podio.connection.get("/connection/#{id}").body
+    end
+
+    def delete(id)
+      Podio.connection.delete("/connection/#{id}").status
+    end
+
+    def all(options={})
+      list Podio.connection.get('/connection/').body
+    end
+  end
+end

data/lib/podio/areas/contact.rb

@@ -11,8 +11,8 @@ module Podio
       }.body
     end
 
-    def find(user_id)
-      member Podio.connection.get("/contact/#{user_id}").body
+    def find(profile_id)
+      member Podio.connection.get("/contact/#{profile_id}/v2").body
     end
 
     def find_all_for_org(org_id, options={})
@@ -23,7 +23,24 @@ module Podio
         req.url("/contact/org/#{org_id}", options)
       }.body
     end
-    
+
+    def find_all_for_space(space_id, options={})
+      options.assert_valid_keys(:key, :value, :limit, :offset, :type, :order)
+      options[:type] ||= 'full'
+
+      list Podio.connection.get { |req|
+        req.url("/contact/space/#{space_id}", options)
+      }.body
+    end
+
+    def find_all_for_connection(connection_id)
+      list Podio.connection.get("/contact/connection/#{connection_id}").body
+    end
+
+    def find_all_for_connection_type(connection_type)
+      list Podio.connection.get("/contact/connection/#{connection_type}").body
+    end
+
     def find_for_org(org_id)
       member Podio.connection.get("/org/#{org_id}/profile").body
     end
@@ -31,6 +48,10 @@ module Podio
     def totals_by_org
       Podio.connection.get("/contact/totals/").body
     end
+
+    def totals_by_org_and_space
+      Podio.connection.get("/contact/totals/v2/").body
+    end
     
   end
 end

data/lib/podio/client.rb

@@ -73,13 +73,13 @@ module Podio
 
     def configure_connection
       Faraday::Connection.new(:url => api_url, :headers => configured_headers, :request => {:client => self}) do |builder|
-        builder.use Faraday::Request::Yajl
+        builder.use Middleware::JsonRequest
         builder.use Middleware::PodioApi
         builder.use Middleware::OAuth2
         builder.use Middleware::Logger
         builder.adapter(*default_adapter)
         builder.use Middleware::ResponseRecorder if @record_mode
-        builder.use Middleware::YajlResponse
+        builder.use Middleware::JsonResponse
         builder.use Middleware::ErrorResponse
         builder.use Middleware::DateConversion
       end

data/lib/podio/error.rb

@@ -6,5 +6,6 @@ module Podio
     class ServerError < StandardError; end
     class NotFoundError < StandardError; end
     class GoneError < StandardError; end
+    class Unavailable < StandardError; end
   end
 end

data/lib/podio/middleware/error_response.rb

@@ -22,6 +22,8 @@ module Podio
               raise Error::GoneError, "#{finished_env[:method].to_s.upcase} #{finished_env[:url]}"
             when 500
               raise Error::ServerError, finished_env[:body].inspect
+            when 502, 503
+              raise Error::Unavailable, finished_env[:body].inspect
           end
         end
       end

data/lib/podio/middleware/json_request.rb

@@ -0,0 +1,20 @@
+module Podio
+  module Middleware
+    class JsonRequest < Faraday::Middleware
+      begin
+        require 'multi_json'
+
+      rescue LoadError, NameError => e
+        self.load_error = e
+      end
+
+      def call(env)
+        env[:request_headers]['Content-Type'] = 'application/json'
+        if env[:body] && !env[:body].respond_to?(:to_str)
+          env[:body] = MultiJson.encode(env[:body])
+        end
+        @app.call env
+      end
+    end
+  end
+end

data/lib/podio/middleware/{yajl_response.rb → json_response.rb}

@@ -1,15 +1,17 @@
-# Custom Yajl until I find a way to only parse the body once in
+# Custom Json response until I find a way to only parse the body once in
 # the OAuth2 retry case
 #
 module Podio
   module Middleware
-    class YajlResponse < Faraday::Response::Middleware
+    class JsonResponse < Faraday::Response::Middleware
       begin
-        require 'yajl'
+        require 'multi_json'
 
         def self.register_on_complete(env)
           env[:response].on_complete do |finished_env|
-            finished_env[:body] = parse(finished_env[:body]) if finished_env[:body].is_a?(String)
+            if finished_env[:body].is_a?(String) && finished_env[:status] < 500
+              finished_env[:body] = parse(finished_env[:body])
+            end
           end
         end
       rescue LoadError, NameError => e
@@ -22,7 +24,7 @@ module Podio
       end
 
       def self.parse(body)
-        Yajl::Parser.parse(body)
+        MultiJson.decode(body)
       rescue Object => err
         raise Faraday::Error::ParsingError.new(err)
       end

data/lib/podio/version.rb

@@ -1,3 +1,3 @@
 module Podio
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/podio.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'faraday', '~> 0.5.1'
   s.add_runtime_dependency 'activesupport', '~> 3.0'
-  s.add_runtime_dependency 'yajl-ruby', '~> 0.7'
+  s.add_runtime_dependency 'multi_json', '~> 0.0.5'
 
   s.description       = <<desc
 The humble beginnings of the Ruby wrapper for the Podio API.

data/test/app_store_test.rb

@@ -1,6 +1,6 @@
-require_relative 'test_helper'
+require 'test_helper'
 
-class AppStoreTest < ActiveSupport::TestCase
+class AppStoreTest < Test::Unit::TestCase
   test 'should find single category' do
     category = Podio::Category.find(1)
 

data/test/client_test.rb

@@ -1,6 +1,6 @@
-require_relative 'test_helper'
+require 'test_helper'
 
-class ClientTest < ActiveSupport::TestCase
+class ClientTest < Test::Unit::TestCase
   def setup
     Podio.configure do |config|
       config.api_url = 'https://api.podio.com'

data/test/contact_test.rb

@@ -1,6 +1,6 @@
-require_relative 'test_helper'
+require 'test_helper'
 
-class ContactTest < ActiveSupport::TestCase
+class ContactTest < Test::Unit::TestCase
   test 'should find single contact' do
     contact = Podio::Contact.find(1)
 
@@ -16,11 +16,11 @@ class ContactTest < ActiveSupport::TestCase
   end
 
   test 'should find all for org filtered by key' do
-    contacts = Podio::Contact.find_all_for_org(1, :key => 'organization', :value => 'kolios')
+    contacts = Podio::Contact.find_all_for_org(1, :key => 'organization', :value => 'Hoist')
 
     assert contacts.size > 0
     contacts.each do |contact|
-      assert_equal 'kolios', contact['organization']
+      assert_equal 'Hoist', contact['organization']
     end
   end
 end

data/test/item_test.rb

@@ -1,6 +1,6 @@
-require_relative 'test_helper'
+require 'test_helper'
 
-class ItemTest < ActiveSupport::TestCase
+class ItemTest < Test::Unit::TestCase
   test 'should find single item' do
     item = Podio::Item.find(1)
 
@@ -17,14 +17,14 @@ class ItemTest < ActiveSupport::TestCase
   end
 
   test 'should find items by external id' do
-    items = Podio::Item.find_all_by_external_id(1, 'Foo generator')
+    items = Podio::Item.find_all_by_external_id(1, 'Bar generator')
 
     assert items['count'] > 0
     assert items['total_count'] > 0
 
     assert items['all'].is_a?(Array)
     items['all'].each do |item|
-      assert_equal 'Foo generator', item['external_id']
+      assert_equal 'Bar generator', item['external_id']
     end
   end
 

data/test/organization_test.rb

@@ -1,6 +1,6 @@
-require_relative 'test_helper'
+require 'test_helper'
 
-class OrganizationTest < ActiveSupport::TestCase
+class OrganizationTest < Test::Unit::TestCase
   test 'should find single organization' do
     org = Podio::Organization.find(1)
 

data/test/space_test.rb

@@ -1,14 +1,14 @@
-require_relative 'test_helper'
+require 'test_helper'
 
-class SpaceTest < ActiveSupport::TestCase
-  test 'should find single space' do
+class SpaceTest < Test::Unit::TestCase
+  def test_should_find_single_space
     space = Podio::Space.find(1)
 
     assert_equal 1, space['space_id']
     assert_equal 'API', space['name']
   end
 
-  test 'should find all for org' do
+  def test_should_find_all_for_org
     spaces = Podio::Space.find_all_for_org(1)
 
     assert spaces.is_a?(Array)

data/test/test_helper.rb

@@ -1,6 +1,5 @@
 require 'test/unit'
 require 'yajl'
-require 'active_support'
 
 require 'podio'
 
@@ -8,9 +7,28 @@ require 'podio'
 ENABLE_STUBS  = ENV['ENABLE_STUBS'] == 'true'
 ENABLE_RECORD = ENV['ENABLE_RECORD'] == 'true'
 
-class ActiveSupport::TestCase
-  setup :set_podio_client
-  setup :stub_responses if ENABLE_STUBS
+class Test::Unit::TestCase
+
+  def setup
+    set_podio_client
+    stub_responses if ENABLE_STUBS
+  end
+
+  # test "verify something" do
+  #   ...
+  # end
+  def self.test(name, &block)
+    test_name = "test_#{name.gsub(/\s+/,'_')}".to_sym
+    defined = instance_method(test_name) rescue false
+    raise "#{test_name} is already defined in #{self}" if defined
+    if block_given?
+      define_method(test_name, &block)
+    else
+      define_method(test_name) do
+        flunk "No implementation provided for #{name}"
+      end
+    end
+  end
 
   def set_podio_client(user_id = 1)
     Podio.client = Podio::Client.new(

data/test/widget_test.rb

@@ -1,6 +1,6 @@
-require_relative 'test_helper'
+require 'test_helper'
 
-class WidgetTest < ActiveSupport::TestCase
+class WidgetTest < Test::Unit::TestCase
   test 'should find single widget' do
     widget = Podio::Widget.find(1)
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Florian Munz
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-23 00:00:00 +01:00
+date: 2011-01-28 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,7 +47,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: yajl-ruby
+  name: multi_json
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -56,8 +56,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 7
-        version: "0.7"
+        - 0
+        - 5
+        version: 0.0.5
   type: :runtime
   version_requirements: *id003
 description: |
@@ -79,6 +80,7 @@ files:
 - lib/podio.rb
 - lib/podio/areas/app_store.rb
 - lib/podio/areas/application.rb
+- lib/podio/areas/connection.rb
 - lib/podio/areas/contact.rb
 - lib/podio/areas/file.rb
 - lib/podio/areas/form.rb
@@ -94,11 +96,12 @@ files:
 - lib/podio/error.rb
 - lib/podio/middleware/date_conversion.rb
 - lib/podio/middleware/error_response.rb
+- lib/podio/middleware/json_request.rb
+- lib/podio/middleware/json_response.rb
 - lib/podio/middleware/logger.rb
 - lib/podio/middleware/oauth2.rb
 - lib/podio/middleware/podio_api.rb
 - lib/podio/middleware/response_recorder.rb
-- lib/podio/middleware/yajl_response.rb
 - lib/podio/response_wrapper.rb
 - lib/podio/version.rb
 - podio.gemspec