totter 0.4.0 → 0.4.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c79f1d13ebf748ec4278c88c99dfc1977120ea8a
+  data.tar.gz: 3be1bb08e5691ab79a0b0dbc7638f6b26292206b
+SHA512:
+  metadata.gz: 6f15f1f5be6b0526eda586e812a0d382be1f01f79158f870b5495070d063acc394a3591dd8dd7a10ac2fdb71b211db5ac663fc74aaf5b63b3871758747a1c7cd
+  data.tar.gz: e8eb49e5a830b6f440c6b6c11f9c567460a79cb58a8ad0bbfa10da8413f9249591846d718b0091c9d7d529729cd61debcfc2e7da8b3620612424445b4e219ded

data/lib/totter/client.rb

@@ -1,4 +1,5 @@
 require 'totter/transport'
+require 'uri'
 
 module Totter
   # API client for interacting with the Seesaw API
@@ -50,11 +51,18 @@ module Totter
 
     # Initialize a new client.
     #
-    # @param options [Hash] optionally specify `:access_token`, `:api_scheme`, `:api_host`, `:api_version`, `:client_token`, or `:transport`.
+    # @param options [Hash] optionally specify `:access_token`, `:api_scheme`, `:api_host`, ':api_url', `:api_version`, `:client_token`, or `:transport`.
     def initialize(options = {})
       options = { :access_token => options } if options.is_a? String
       options = self.class.options.merge(options)
 
+      # Parse `api_url` option
+      if url = options.delete(:api_url)
+        uri = URI.parse(url)
+        options[:api_scheme] = uri.scheme
+        options[:api_host] = uri.host + (uri.port != 80 && uri.port != 443 ? ":#{uri.port}" : '')
+      end
+
       @access_token = options[:access_token] if options[:access_token]
       @api_scheme = options[:api_scheme]
       @api_host = options[:api_host]

data/lib/totter/version.rb

@@ -1,4 +1,4 @@
 module Totter
   # Verion of the Totter gem
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/test/totter/client_test.rb

@@ -19,6 +19,12 @@ class ClientTest < Totter::TestCase
 
     client = Totter::Client.new(:api_scheme => 'http', :api_host => 'example.com', :api_version => 42)
     assert_equal 'http://example.com/v42/', client.base_url
+
+    client = Totter::Client.new(:api_url => 'http://example.com')
+    assert_equal 'http://example.com/v1/', client.base_url
+
+    client = Totter::Client.new(:api_url => 'http://localhost:3000')
+    assert_equal 'http://localhost:3000/v1/', client.base_url
   end
 
   def test_ssl?

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: totter
 version: !ruby/object:Gem::Version
-  version: 0.4.0
-  prerelease: 
+  version: 0.4.1
 platform: ruby
 authors:
 - Sam Soffes
@@ -11,12 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-02 00:00:00.000000000 Z
+date: 2013-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -24,7 +22,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -32,7 +29,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -40,7 +36,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -140,27 +135,26 @@ files:
 homepage: https://github.com/seesawco/totter-rb
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby gem for working with the Seesaw API.
 test_files:
 - test/cassettes/avatars/create.yml