assistly 0.1.1 → 0.1.2

data/lib/assistly/configuration.rb

@@ -65,7 +65,7 @@ module Assistly
     # @see http://en.blog.wordpress.com/2009/12/12/twitter-api/
     # @see http://staff.tumblr.com/post/287703110/api
     # @see http://developer.typepad.com/typepad-twitter-api/twitter-api.html
-    DEFAULT_ENDPOINT = "https://#{DEFAULT_SUBDOMAIN}.assistly.com/api/#{DEFAULT_VERSION}/".freeze
+    # DEFAULT_ENDPOINT = "https://#{self.subdomain}.assistly.com/api/#{Assistly.version}/"
 
     # @private
     attr_accessor *VALID_OPTIONS_KEYS
@@ -90,7 +90,7 @@ module Assistly
       self.adapter            = DEFAULT_ADAPTER
       self.consumer_key       = DEFAULT_CONSUMER_KEY
       self.consumer_secret    = DEFAULT_CONSUMER_SECRET
-      self.endpoint           = DEFAULT_ENDPOINT
+      self.endpoint           = "https://#{Assistly.subdomain}.assistly.com/api/#{Assistly.version}/"
       self.format             = DEFAULT_FORMAT
       self.oauth_token        = DEFAULT_OAUTH_TOKEN
       self.oauth_token_secret = DEFAULT_OAUTH_TOKEN_SECRET

data/lib/assistly/version.rb

@@ -1,4 +1,4 @@
 module Assistly
   # The version of the gem
-  VERSION = '0.1.1'.freeze unless defined?(::Assistly::VERSION)
+  VERSION = '0.1.2'.freeze unless defined?(::Assistly::VERSION)
 end

data/spec/assistly_spec.rb

@@ -45,11 +45,11 @@ describe Assistly do
     end
   end
 
-  describe ".endpoint" do
-    it "should return the default endpoint" do
-      Assistly.endpoint.should == Assistly::Configuration::DEFAULT_ENDPOINT
-    end
-  end
+  # describe ".endpoint" do
+  #   it "should return the default endpoint" do
+  #     Assistly.endpoint.should == Assistly::Configuration::DEFAULT_ENDPOINT
+  #   end
+  # end
 
   describe ".endpoint=" do
     it "should set the endpoint" do
@@ -57,6 +57,34 @@ describe Assistly do
       Assistly.endpoint.should == 'http://tumblr.com/'
     end
   end
+  
+  describe ".subdomain=" do
+    before do
+      Assistly.subdomain = "zencoder"
+    end
+    
+    it "should set the subdomain" do
+      Assistly.subdomain.should == "zencoder"
+    end
+    
+    it "should change the endpoint" do
+      Assistly.endpoint.should == "https://zencoder.assistly.com/api/#{Assistly::Configuration::DEFAULT_VERSION}/"
+    end
+  end
+  
+  describe ".version=" do
+    before do
+      Assistly.version = "v4"
+    end
+    
+    it "should set the subdomain" do
+      Assistly.version.should == "v4"
+    end
+    
+    it "should change the endpoint" do
+      Assistly.endpoint.should == "https://#{Assistly::Configuration::DEFAULT_SUBDOMAIN}.assistly.com/api/v4/"
+    end
+  end
 
   describe ".format" do
     it "should return the default format" do

data/spec/faraday/response_spec.rb

@@ -20,7 +20,7 @@ describe Faraday::Response do
 
       before do
         stub_get('users/1.json').
-          with(:headers => {'Accept'=>'application/json', 'User-Agent'=>'Assistly Ruby Gem 0.1'}).
+          with(:headers => {'Accept'=>'application/json', 'User-Agent'=>Assistly::Configuration::DEFAULT_USER_AGENT}).
           to_return(:status => status)
       end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: assistly
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Chris Warren