fog-core 1.28.0 → 1.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3adfecc06e8a5e94b89b4734caca15a4b650984
-  data.tar.gz: 18cad321f56ecf4f8031d220dc8c1bf292b7479a
+  metadata.gz: 92d66fd0343833e7c90dcb8fce05e3104ce86996
+  data.tar.gz: 713e785d1cb64e82f913387ff68137f9e26ba569
 SHA512:
-  metadata.gz: 5f06f19bda33e2a1ec1316f6fcb50e2bbbc940217d9a9f8e6c97304b088a4ae02fcfd81ef8dbb3356b40f2f04f510f44052f99db9918f98388c08c186e679f3b
-  data.tar.gz: 92c242001650b228e5ae34426836f014235d128263c66f96a1d3970135985e7e5f4cf38448e50f53866fc1dbc4e0ba205600f6bf99eae2b40f3c96c4284616c6
+  metadata.gz: 678c115c28500fb036b3cef826cfad6667136dbd165526e8e6ce85511deffd6ef23d5a312439d341f02b8fa281c013bc7a2d724da88f9ec8916c4ee9fa9d0538
+  data.tar.gz: ba7626703891e1a952570dd9dfce2ebe1123d0028ed5ecbae060f8266e630ae503d20323dc80d46eb30cdf32bf1af19080dfb34586e2541f1a28add73e65999c

data/changelog.md

@@ -1,3 +1,9 @@
+1.29.0 02/19/2015
+==========================================================
+
+minor refactoring
+add ability to add additional user agent info to requests
+
 1.28.0 01/30/2015
 ==========================================================
 

data/lib/fog/core/collection.rb

@@ -43,7 +43,7 @@ module Fog
     end
 
     def clear
-      @loaded = true && super
+      @loaded = super
     end
 
     def create(attributes = {})

data/lib/fog/core/connection.rb

@@ -6,6 +6,26 @@ module Fog
     # modifications such as authentication or response object.
     #
     class Connection
+
+      class << self
+        @@user_agents = []
+
+        def add_user_agent(str)
+          if /\S+\/[\d|.]+/.match(str)
+            @@user_agents << str
+          else
+            raise "User Agent must be in <app name>/<app version> notation."
+          end
+        end
+
+        def user_agents
+          agents = @@user_agents.dup
+          agents << "fog/#{Fog::VERSION}" if defined?(Fog::VERSION)
+          agents << "fog-core/#{Fog::Core::VERSION}"
+          agents.uniq.compact.join(" ")
+        end
+      end
+
       # Prepares the connection and sets defaults for any future requests.
       #
       # @param [String] url The destination URL
@@ -34,10 +54,8 @@ module Fog
 
         params[:debug_response] = true unless params.key?(:debug_response)
         params[:headers] ||= {}
-        user_agent = "fog-core/#{Fog::Core::VERSION}"
-        user_agent = "fog/#{Fog::VERSION} #{user_agent}" if defined?(Fog::VERSION)
-        params[:headers]["User-Agent"] ||= user_agent
         params.merge!(:persistent => params.fetch(:persistent, persistent))
+        params[:headers]["User-Agent"] ||= user_agent
         @excon = Excon.new(url, params)
       end
 
@@ -77,6 +95,10 @@ module Fog
 
       private
 
+      def user_agent
+        self.class.user_agents
+      end
+
       def handle_path_prefix_for(params)
         return params unless @path_prefix
 

data/lib/fog/core/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Core
-    VERSION = "1.28.0"
+    VERSION = "1.29.0"
   end
 end

data/spec/connection_spec.rb

@@ -14,20 +14,15 @@ describe Fog::Core::Connection do
     end
   end
 
-  it "writes the Fog::Core::VERSION to the User-Agent header" do
+  it "adds custom user-agents to Fog requests" do
+    Fog::VERSION = 'Version'
+    Fog::Core::Connection.add_user_agent("my-app/1.2")
+
     connection = Fog::Core::Connection.new("http://example.com")
-    assert_equal "fog-core/#{Fog::Core::VERSION}",
+    assert_equal "my-app/1.2 fog/Version fog-core/#{Fog::Core::VERSION}",
                  connection.instance_variable_get(:@excon).data[:headers]["User-Agent"]
-  end
 
-  describe "when Fog is installed" do
-    it "writes the Fog::VERSION to the User-Agent header" do
-      Fog::VERSION = 'Version'
-      connection = Fog::Core::Connection.new("http://example.com")
-      assert_equal "fog/Version fog-core/#{Fog::Core::VERSION}",
-                   connection.instance_variable_get(:@excon).data[:headers]["User-Agent"]
-      Fog.send(:remove_const, :VERSION)
-    end
+    Fog.send(:remove_const, :VERSION)
   end
 
   it "doesn't error when persistence is enabled" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-core
 version: !ruby/object:Gem::Version
-  version: 1.28.0
+  version: 1.29.0
 platform: ruby
 authors:
 - Evan Light
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-30 00:00:00.000000000 Z
+date: 2015-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder