fog-core 1.22.0 → 1.23.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTNmYzY5ZmZiYjA4OTVkZWU2MTA0OTQ3ZmVmZmYxM2M0Y2UxY2ZkMA==
+    ODU0ZTJhZDcwMGI0NzRiNmY1ODdjM2NmMDc2ZDMzYWM5NTk1ZjcwYw==
   data.tar.gz: !binary |-
-    MGJmMDEwODNmZjRiYjA5MTYzMmNkZjA3OTY4NTAzNzAzZGJkZjE0ZQ==
+    MzExN2UxODJlZDg5ZGQzZDIxNjM3YzUzMzc1MDI1MmZmMmJlNzg4Yg==
 SHA512:
   metadata.gz: !binary |-
-    NTNmYzVjYzdjMmJiN2NjMjU3ZmFmYTYxZGJiYTA1MTEzZjBmNWFmMWY3Zjg0
-    NDU0YTcxYWY5ZTU0ODViMGIwMTYyN2IzMWI4YWFlOTVhZjgyYjM5ODU0MTcx
-    ZTY2MGZkZTVmYmFlMDI4NmVlZGFkNWMxMmY1YTcyOWZhNjJlYTc=
+    MTIyZTRhZDg0ZWVjYWY3OTQyNTZhZmY4Y2YzYTBjMDYxYTZhZTQ5N2RiMGRh
+    OTMxODUyOGIxYTIwZmYyZGM3NWU4MTc0NTU0OTU4NjI2MzJkODVjYmYzOThl
+    OTI2N2MxZjdmOTJiN2IzOTVjZDUwODE5NmEyY2FiOGJmNWEwMGU=
   data.tar.gz: !binary |-
-    YTgyMTQ0MWQzOWI5NWM5OWYwNjcxZTE3NWExNWNhZmM1ODU0Y2RlNTNmMDlm
-    NGFjOThlNDNkNDNmMjA4YTlkNTU4NmU0YjRjNmE4Mzk0ZTExODYyODQzMzg4
-    OWVlZmQxNDRlM2U2YzViY2ZhOTA0MGY2YzUwOTFjNjFiZWQ2OWI=
+    NmQ3NDdjZTM4OGY1ZTI1MTc0M2FiNWQ5YmRmM2FlYjlhNDE3MWNhYjEwMmY3
+    NDE0MDNhZDQ5ZTQyYmJhMTliMTI2NzhmZDUyYmVkZThlMDFhMDg0MDA1NTBi
+    OWRkMzNlMDUxNTYyYjM4ZDczNTljZWZmZmY5NDE5YTgwNDEzOTM=

data/Gemfile.1.8.7

@@ -2,6 +2,7 @@ source "https://rubygems.org"
 
 gem 'nokogiri', '~>1.5.11'
 gem 'mime-types', '~>1.16'
+gem 'rest-client', '~> 1.6.7'
 
 group :development, :test do
   gem 'rake', '~> 10.1.0'

data/Rakefile

@@ -24,7 +24,7 @@ end
 #require "tasks/changelog_task"
 #Fog::Rake::ChangelogTask.new
 task :coveralls_push_workaround do
-  use_coveralls = (Gem::Version.new(RUBY_VERSION) > Gem::Version.new('1.9.2'))
+  use_coveralls = (Gem::Version.new(RUBY_VERSION.dup) > Gem::Version.new('1.9.2'))
   if (ENV['COVERAGE'] != 'false') && use_coveralls
     require 'coveralls/rake/task'
     Coveralls::RakeTask.new

data/changelog.md

@@ -1,3 +1,40 @@
+1.23.0 07/16/2014
+==========================================================
+
+attribute whitelisting
+abstract out stringify for possible reuse
+more specific naming
+reorg
+add path_prefix
+fix time conversion to work with XMLRPC
+add more specific per-type attribute tests
+lock down rest-client for 1.8.7
+allow namespace flipflop for dns
+fix identity lookup
+better default attribute value setting
+bump excon
+
+1.22.0 04/17/2014 1c086852e40e4c1ad7ed138834e4a1505ddb1416
+==========================================================
+
+attribute whitelisting
+abstract out stringify for possible reuse
+more specific naming
+reorg
+add path_prefix
+fix time conversion to work with XMLRPC
+add more specific per-type attribute tests
+lock down rest-client for 1.8.7
+allow namespace flipflop for dns
+fix identity lookup
+better default attribute value setting
+bump excon
+
+1.22.0 04/17/2014 1c086852e40e4c1ad7ed138834e4a1505ddb1416
+==========================================================
+
+tests/cleanup/fixes
+
 1.21.1 03/18/2014 3a803405ba60ded421f4bd14677cd3c76cb7e6ab
 ==========================================================
 

data/fog-core.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency('builder')
-  spec.add_dependency('excon', '~>0.33')
+  spec.add_dependency('excon', '~>0.38')
   spec.add_dependency('formatador', '~>0.2')
   spec.add_dependency('mime-types')
   spec.add_dependency('net-scp', '~>1.1')

data/lib/fog/core.rb

@@ -13,6 +13,14 @@ require 'ipaddr'
 # internal core dependencies
 require "fog/version"
 require 'fog/core/attributes'
+require 'fog/core/attributes/default'
+require 'fog/core/attributes/boolean'
+require 'fog/core/attributes/float'
+require 'fog/core/attributes/integer'
+require 'fog/core/attributes/string'
+require 'fog/core/attributes/time'
+require 'fog/core/attributes/timestamp'
+require 'fog/core/attributes/array'
 require 'fog/core/collection'
 require 'fog/core/connection'
 require 'fog/core/credentials'
@@ -32,6 +40,8 @@ require 'fog/core/utils'
 require 'fog/core/wait_for'
 require 'fog/core/wait_for_defaults'
 require 'fog/core/uuid'
+require 'fog/core/stringify_keys'
+require 'fog/core/whitelist_keys'
 
 # service wrappers
 require 'fog/account'

data/lib/fog/core/attributes.rb

@@ -14,92 +14,17 @@ module Fog
         @attributes ||= []
       end
 
+      def default_values
+        @default_values ||= {}
+      end
+
       def attribute(name, options = {})
-        class_eval <<-EOS, __FILE__, __LINE__
-          def #{name}
-            attributes[:#{name}]
-          end
-        EOS
-        case options[:type]
-        when :boolean
-          class_eval <<-EOS, __FILE__, __LINE__
-            def #{name}=(new_#{name})
-              attributes[:#{name}] = case new_#{name}
-              when true,'true'
-                true
-              when false,'false'
-                false
-              end
-            end
-          EOS
-        when :float
-          class_eval <<-EOS, __FILE__, __LINE__
-            def #{name}=(new_#{name})
-              attributes[:#{name}] = new_#{name}.to_f
-            end
-          EOS
-        when :integer
-          class_eval <<-EOS, __FILE__, __LINE__
-            def #{name}=(new_#{name})
-              attributes[:#{name}] = new_#{name}.to_i
-            end
-          EOS
-        when :string
-          class_eval <<-EOS, __FILE__, __LINE__
-            def #{name}=(new_#{name})
-              attributes[:#{name}] = new_#{name}.to_s
-            end
-          EOS
-        when :time
-          class_eval <<-EOS, __FILE__, __LINE__
-            def #{name}=(new_#{name})
-              attributes[:#{name}] = if new_#{name}.nil? || new_#{name} == "" || new_#{name}.is_a?(Time)
-                new_#{name}
-              else
-                Time.parse(new_#{name})
-              end
-            end
-          EOS
-        when :timestamp
-          class_eval <<-EOS, __FILE__, __LINE__
-            def #{name}=(new_#{name})
-              attributes[:#{name}] = Time.at(new_#{name}.to_i)
-            end
-          EOS
-        when :array
-          class_eval <<-EOS, __FILE__, __LINE__
-          def #{name}=(new_#{name})
-            attributes[:#{name}] = [*new_#{name}]
-          end
-          EOS
-        else
-          if squash = options[:squash]
-            class_eval <<-EOS, __FILE__, __LINE__
-              def #{name}=(new_data)
-                if new_data.is_a?(Hash)
-                  if new_data.has_key?(:'#{squash}')
-                    attributes[:#{name}] = new_data[:'#{squash}']
-                  elsif new_data.has_key?("#{squash}")
-                    attributes[:#{name}] = new_data["#{squash}"]
-                  else
-                    attributes[:#{name}] = [ new_data ]
-                  end
-                else
-                  attributes[:#{name}] = new_data
-                end
-              end
-            EOS
-          else
-            class_eval <<-EOS, __FILE__, __LINE__
-              def #{name}=(new_#{name})
-                attributes[:#{name}] = new_#{name}
-              end
-            EOS
-          end
-        end
-        @attributes ||= []
-        @attributes |= [name]
-        for new_alias in [*options[:aliases]]
+        type = options.fetch(:type, 'default').to_s.capitalize
+        default = options.fetch(:default, false)
+        Fog::Attributes::const_get(type).new(self, name, options).create
+        attributes << name
+        default_values[name] = default if default
+        Array(options[:aliases]).each do |new_alias|
           aliases[new_alias] = name
         end
       end

data/lib/fog/core/attributes/array.rb

@@ -0,0 +1,13 @@
+module Fog
+  module Attributes
+    class Array < Default
+      def create_setter
+        model.class_eval <<-EOS, __FILE__, __LINE__
+          def #{name}=(new_#{name})
+            attributes[:#{name}] = [*new_#{name}]
+          end
+        EOS
+      end
+    end
+  end
+end

data/lib/fog/core/attributes/boolean.rb

@@ -0,0 +1,18 @@
+module Fog
+  module Attributes
+    class Boolean < Default
+      def create_setter
+        model.class_eval <<-EOS, __FILE__, __LINE__
+            def #{name}=(new_#{name})
+              attributes[:#{name}] = case new_#{name}
+              when true,'true'
+                true
+              when false,'false'
+                false
+              end
+            end
+        EOS
+      end
+    end
+  end
+end

data/lib/fog/core/attributes/default.rb

@@ -0,0 +1,55 @@
+module Fog
+  module Attributes
+    class Default
+      attr_reader :model, :name, :squash
+      
+      def initialize(model, name, options)
+        @model = model
+        @name = name
+        @squash = options.fetch(:squash, false)
+      end
+
+      def create
+        create_setter
+        create_getter
+      end
+      
+      def create_setter
+        if squash
+          model.class_eval <<-EOS, __FILE__, __LINE__
+              def #{name}=(new_data)
+                if new_data.is_a?(Hash)
+                  if new_data.has_key?(:'#{squash}')
+                    attributes[:#{name}] = new_data[:'#{squash}']
+                  elsif new_data.has_key?("#{squash}")
+                    attributes[:#{name}] = new_data["#{squash}"]
+                  else
+                    attributes[:#{name}] = [ new_data ]
+                  end
+                else
+                  attributes[:#{name}] = new_data
+                end
+              end
+          EOS
+        else
+          model.class_eval <<-EOS, __FILE__, __LINE__
+              def #{name}=(new_#{name})
+                attributes[:#{name}] = new_#{name}
+              end
+          EOS
+        end
+      end
+
+      def create_getter
+        model.class_eval <<-EOS, __FILE__, __LINE__
+          def #{name}
+            if self.class.default_values[:#{name}] && !persisted?
+              return self.class.default_values[:#{name}]
+            end
+            attributes[:#{name}]
+          end
+        EOS
+      end
+    end
+  end
+end

data/lib/fog/core/attributes/float.rb

@@ -0,0 +1,13 @@
+module Fog
+  module Attributes
+    class Float < Default
+      def create_setter
+        model.class_eval <<-EOS, __FILE__, __LINE__
+            def #{name}=(new_#{name})
+              attributes[:#{name}] = new_#{name}.to_f
+            end
+        EOS
+      end
+    end
+  end
+end

data/lib/fog/core/attributes/integer.rb

@@ -0,0 +1,13 @@
+module Fog
+  module Attributes
+    class Integer < Default
+      def create_setter
+        model.class_eval <<-EOS, __FILE__, __LINE__
+            def #{name}=(new_#{name})
+              attributes[:#{name}] = new_#{name}.to_i
+            end
+        EOS
+      end
+    end
+  end
+end

data/lib/fog/core/attributes/string.rb

@@ -0,0 +1,13 @@
+module Fog
+  module Attributes
+    class String < Default
+      def create_setter
+        model.class_eval <<-EOS, __FILE__, __LINE__
+            def #{name}=(new_#{name})
+              attributes[:#{name}] = new_#{name}.to_s
+            end
+        EOS
+      end
+    end
+  end
+end

data/lib/fog/core/attributes/time.rb

@@ -0,0 +1,19 @@
+module Fog
+  module Attributes
+    class Time < Default
+      def create_setter
+        model.class_eval <<-EOS, __FILE__, __LINE__
+            def #{name}=(new_#{name})
+              attributes[:#{name}] = if new_#{name}.nil? || new_#{name} == "" || new_#{name}.is_a?(::Time)
+                new_#{name}
+              elsif new_#{name}.respond_to?(:to_time)
+                new_#{name}.to_time
+              else
+                ::Time.parse(new_#{name})
+              end
+            end
+        EOS
+      end
+    end
+  end
+end

data/lib/fog/core/attributes/timestamp.rb

@@ -0,0 +1,17 @@
+module Fog
+  module Attributes
+    class Timestamp < Default
+      def create_setter
+        model.class_eval <<-EOS, __FILE__, __LINE__
+            def #{name}=(new_#{name})
+              if new_#{name}.respond_to?(:to_i)
+                attributes[:#{name}] = Fog::Time.at(new_#{name}.to_i)
+              else
+                attributes[:#{name}] = Fog::Time.parse(new_#{name}.to_s)
+              end
+            end
+        EOS
+      end
+    end
+  end
+end

data/lib/fog/core/connection.rb

@@ -16,6 +16,7 @@ module Fog
       # @option params [Hash<Symbol, String>] :headers The default headers to supply in a request. Only used if params[:headers] is not supplied to Connection#request
       # @option params [String] :host The destination host's reachable DNS name or IP, in the form of a String
       # @option params [String] :path Default path; appears after 'scheme://host:port/'. Only used if params[:path] is not supplied to Connection#request
+      # @option params [String] :path_prefix Sticky version of the "path" arg. :XSpath_prefix => "foo/bar" with a request with :path => "blech" sends a request to path "foo/bar/blech"
       # @option params [Fixnum] :port The port on which to connect, to the destination host
       # @option params [Hash]   :query Default query; appended to the 'scheme://host:port/path/' in the form of '?key=value'. Will only be used if params[:query] is not supplied to Connection#request
       # @option params [String] :scheme The protocol; 'https' causes OpenSSL to be used
@@ -23,8 +24,15 @@ module Fog
       # @option params [Fixnum] :retry_limit Set how many times we'll retry a failed request.  (Default 4)
       # @option params [Class] :instrumentor Responds to #instrument as in ActiveSupport::Notifications
       # @option params [String] :instrumentor_name Name prefix for #instrument events.  Defaults to 'excon'
-      #
       def initialize(url, persistent=false, params={})
+        if params[:path_prefix]
+          if params[:path]
+            raise ArgumentError, "optional arg 'path' is invalid when 'path_prefix' is provided"
+          end
+
+          @path_prefix = params.delete(:path_prefix)
+        end
+
         unless params.has_key?(:debug_response)
           params[:debug_response] = true
         end
@@ -53,7 +61,7 @@ module Fog
       # @raise [Excon::Errors::SocketError]
       #
       def request(params, &block)
-        @excon.request(params, &block)
+        @excon.request(handle_path_prefix_for(params), &block)
       end
 
       # Make {#request} available even when it has been overidden by a subclass
@@ -67,6 +75,16 @@ module Fog
       def reset
         @excon.reset
       end
+
+      private
+
+      def handle_path_prefix_for(params)
+        return params unless @path_prefix
+
+        params[:path] = params[:path].sub(/^\//, "")
+        params[:path] = "#{@path_prefix}/#{params[:path]}"
+        params
+      end
     end
   end
 end

data/lib/fog/core/stringify_keys.rb

@@ -0,0 +1,27 @@
+module Fog
+  module StringifyKeys
+
+    # Returns a new hash with all keys converted to strings.
+    def self.stringify(hash)
+      self.transform_hash(hash) {|hash, key, value|
+        hash[key.to_s] = value
+      }
+    end
+
+    private
+
+    # http://devblog.avdi.org/2009/11/20/hash-transforms-in-ruby/
+    def self.transform_hash(original, options={}, &block)
+      original.inject({}){|result, (key,value)|
+        value = if (options[:deep] && Hash === value)
+                  transform_hash(value, options, &block)
+                else
+                  value
+                end
+        block.call(result,key,value)
+        result
+      }
+    end
+
+  end
+end

data/lib/fog/core/whitelist_keys.rb

@@ -0,0 +1,8 @@
+module Fog
+  module WhitelistKeys
+    def self.whitelist(hash, valid_keys)
+      valid_hash = StringifyKeys.stringify(hash)
+      valid_hash.select {|k,v| valid_keys.include?(k)}
+    end
+  end
+end

data/lib/fog/dns.rb

@@ -14,10 +14,14 @@ module Fog
       else
         if self.providers.include?(provider)
           require "fog/#{provider}/dns"
-          return Fog::DNS.const_get(Fog.providers[provider]).new(attributes)
+          begin
+            Fog::DNS.const_get(Fog.providers[provider])
+          rescue
+            Fog::const_get(Fog.providers[provider])::DNS
+          end.new(attributes)
+        else
+          raise ArgumentError.new("#{provider} is not a recognized dns provider")
         end
-
-        raise ArgumentError.new("#{provider} is not a recognized dns provider")
       end
     end
 

data/lib/fog/identity.rb

@@ -17,7 +17,7 @@ module Fog
       begin
         Fog::Identity.const_get(Fog.providers[provider]).new(attributes)
       rescue
-        Fog::const_get(Fog.providers[provider]).const_get("Identity").new(attributes)
+        Fog::const_get(Fog.providers[provider])::Identity.new(attributes)
       end
     end
 

data/lib/fog/version.rb

@@ -1,3 +1,3 @@
 module Fog
-  VERSION = "1.22.0"
+  VERSION = "1.23.0"
 end

data/spec/connection_spec.rb

@@ -30,4 +30,71 @@ describe Fog::Core::Connection do
     }
     Fog::Core::Connection.new("http://example.com", true, options)
   end
+
+  describe ":path_prefix" do
+    it "does not emit a warning when provided this argument in the initializer" do
+      $stderr = StringIO.new
+      
+      Fog::Core::Connection.new("http://example.com", false, :path_prefix => "foo")
+      
+      assert_empty($stderr.string)
+    end
+
+    it "raises when the 'path' arg is present and this arg is supplied" do
+      assert_raises(ArgumentError) do
+        Fog::Core::Connection.new("http://example.com", false, :path_prefix => "foo", :path => "bar")
+      end
+    end
+  end
+
+  describe "#request" do
+    describe "default behavior" do
+      it "supplies the 'path' arg directly to Excon" do
+        spy = Object.new
+        spy.instance_eval do
+          def params
+            @params
+          end
+          def new(_, params)
+            @params = params
+          end
+        end
+
+        Object.stub_const("Excon", spy) do
+          c = Fog::Core::Connection.new("http://example.com", false, :path => "bar")
+          assert_equal("bar", spy.params[:path])
+        end
+      end
+    end
+
+    describe "with path_prefix supplied to the initializer" do
+      let(:spy) {
+        Object.new.tap { |spy|
+          spy.instance_eval do
+            def new(*args); self; end
+            def params; @params; end
+            def request(params)
+              @params = params
+            end
+          end
+        }
+      }
+
+      it "uses the initializer-supplied :path_prefix arg with #request :arg to formulate a path to send to Excon.request" do
+        Object.stub_const("Excon", spy) do
+          c = Fog::Core::Connection.new("http://example.com", false, :path_prefix => "foo")
+          c.request(:path => "bar")
+          assert_equal("foo/bar", spy.params[:path])
+        end
+      end
+      
+      it "does not introduce consecutive '/'s into the path if 'path' starts with a '/'" do
+        Object.stub_const("Excon", spy) do
+          c = Fog::Core::Connection.new("http://example.com", false, :path_prefix => "foo")
+          c.request(:path => "/bar")
+          assert_equal("foo/bar", spy.params[:path])
+        end
+      end
+    end
+  end
 end

data/spec/fog_attribute_spec.rb

@@ -1,27 +1,39 @@
 require 'spec_helper'
+require 'xmlrpc/datetime'
 
 class FogAttributeTestModel < Fog::Model
+  identity  :id
   attribute :key, :aliases => "keys", :squash => "id"
   attribute :time, :type => :time
   attribute :bool, :type => :boolean
+  attribute :float, :type => :float
+  attribute :integer, :type => :integer
+  attribute :string, :type => :string
+  attribute :timestamp, :type => :timestamp
+  attribute :array, :type => :array
+  attribute :default, :default => 'default_value'
 end
 
 describe "Fog::Attributes" do
-  
+
   let(:model) { FogAttributeTestModel.new }
 
+  it "should not create alias for nil" do
+    FogAttributeTestModel.aliases.must_equal({ "keys" => :key })
+  end
+
   describe "squash 'id'" do
     it "squashes if the key is a String" do
       model.merge_attributes("keys" => {:id => "value"})
       assert_equal"value", model.key
     end
-      
+
     it "squashes if the key is a Symbol" do
       model.merge_attributes("keys" => {"id" => "value"})
       assert_equal "value", model.key
     end
   end
-    
+
   describe ":type => time" do
     it "returns nil when provided nil" do
       model.merge_attributes(:time => nil)
@@ -38,6 +50,12 @@ describe "Fog::Attributes" do
       model.merge_attributes(:time => now.to_s)
       assert_equal Time.parse(now.to_s), model.time
     end
+
+    it "returns a Time object when passed a XMLRPC::DateTime object" do
+      now = XMLRPC::DateTime.new(2000, 7, 8, 10, 20, 34)
+      model.merge_attributes(:time => now)
+      assert_equal now.to_time, model.time
+    end
   end
 
   describe ":type => :boolean" do
@@ -66,4 +84,102 @@ describe "Fog::Attributes" do
       refute model.bool
     end
   end
+
+  describe ":type => :float" do
+    it "returns an integer as float" do
+      model.merge_attributes(:float => 1)
+      assert_in_delta 1.0, model.float
+    end
+
+    it "returns a string as float" do
+      model.merge_attributes(:float => '1')
+      assert_in_delta 1.0, model.float
+    end
+  end
+
+  describe ":type => :integer" do
+    it "returns a float as integer" do
+      model.merge_attributes(:integer => 1.5)
+      assert_in_delta 1, model.integer
+    end
+
+    it "returns a string as integer" do
+      model.merge_attributes(:integer => '1')
+      assert_in_delta 1, model.integer
+    end
+  end
+
+  describe ":type => :string" do
+    it "returns a float as string" do
+      model.merge_attributes(:string => 1.5)
+      assert_equal '1.5', model.string
+    end
+
+    it "returns a integer as string" do
+      model.merge_attributes(:string => 1)
+      assert_equal '1', model.string
+    end
+  end
+
+  describe ":type => :timestamp" do
+    it "returns a date as time" do
+      model.merge_attributes(:timestamp => Date.new(2008, 10, 12))
+      assert_equal '2008-10-12 00:00', model.timestamp.strftime('%Y-%m-%d %M:%S')
+      assert_instance_of Fog::Time, model.timestamp
+    end
+
+    it "returns a time as time" do
+      model.merge_attributes(:timestamp => Time.mktime(2007, 11, 1, 15, 25))
+      assert_equal '2007-11-01 25:00', model.timestamp.strftime('%Y-%m-%d %M:%S')
+      assert_instance_of Fog::Time, model.timestamp
+    end
+
+    it "returns a date_time as time" do
+      model.merge_attributes(:timestamp => DateTime.new(2007, 11, 1, 15, 25, 0))
+      assert_equal '2007-11-01 25:00', model.timestamp.strftime('%Y-%m-%d %M:%S')
+      assert_instance_of Fog::Time, model.timestamp
+    end
+  end
+
+  describe ":type => :array" do
+    it "returns an empty array as an empty array" do
+      model.merge_attributes(:array => [])
+      assert_equal [], model.array
+    end
+
+    it "returns a single element as array" do
+      model.merge_attributes(:array => 1.5)
+      assert_equal [ 1.5 ], model.array
+    end
+
+    it "returns an array as array" do
+      model.merge_attributes(:array => [ 1, 2 ])
+      assert_equal [ 1, 2 ], model.array
+    end
+  end
+
+  describe ":default => 'default_value'" do
+    it "should return nil when default is not defined on a new object" do
+      assert_equal model.bool, nil
+    end
+
+    it "should return the value of the object when default is not defined" do
+      model.merge_attributes({ :bool => false })
+      assert_equal model.bool, false
+    end
+
+    it "should return the default value on a new object" do
+      assert_equal model.default, 'default_value'
+    end
+
+    it "should return the value of the persisted object" do
+      model.merge_attributes({ :id => 'some-crazy-id', :default => 23 })
+      assert_equal model.default, 23
+    end
+
+    it "should return nil on a persisted object without a value" do
+      model.merge_attributes({ :id => 'some-crazy-id' })
+      assert_equal model.default, nil
+    end
+  end
 end

data/tests/core/stringify_keys_tests.rb

@@ -0,0 +1,29 @@
+input_hash = {
+  :name => 'test-server',
+  :flavor => '123'
+}
+
+output_hash = {
+  'name' => 'test-server',
+  'flavor' => '123'
+}
+
+Shindo.tests('Fog::StringifyKeys', 'core') do
+
+  tests('keys') do
+
+    tests('stringifies symbols') do
+      returns(output_hash) {
+        Fog::StringifyKeys.stringify(input_hash)
+      }
+    end
+
+    tests('skips strings') do
+      returns(output_hash) {
+        Fog::StringifyKeys.stringify(output_hash)
+      }
+    end
+
+  end
+
+end

data/tests/core/whitelist_keys_tests.rb

@@ -0,0 +1,24 @@
+input_hash = {
+  :name => 'test-server',
+  :flavor => '123',
+  :size => '12345'
+}
+
+output_hash = {
+  'name' => 'test-server',
+  'flavor' => '123'
+}
+
+valid_keys = %w{flavor name}
+
+Shindo.tests('Fog::WhitelistKeys', 'core') do
+
+  tests('whitelist_keys') do
+    tests('excludes invalid values') do
+      returns(output_hash) {
+        Fog::WhitelistKeys.whitelist(input_hash, valid_keys)
+      }
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-core
 version: !ruby/object:Gem::Version
-  version: 1.22.0
+  version: 1.23.0
 platform: ruby
 authors:
 - Evan Light
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-17 00:00:00.000000000 Z
+date: 2014-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.33'
+        version: '0.38'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.33'
+        version: '0.38'
 - !ruby/object:Gem::Dependency
   name: formatador
   requirement: !ruby/object:Gem::Requirement
@@ -219,6 +219,14 @@ files:
 - lib/fog/compute/models/server.rb
 - lib/fog/core.rb
 - lib/fog/core/attributes.rb
+- lib/fog/core/attributes/array.rb
+- lib/fog/core/attributes/boolean.rb
+- lib/fog/core/attributes/default.rb
+- lib/fog/core/attributes/float.rb
+- lib/fog/core/attributes/integer.rb
+- lib/fog/core/attributes/string.rb
+- lib/fog/core/attributes/time.rb
+- lib/fog/core/attributes/timestamp.rb
 - lib/fog/core/collection.rb
 - lib/fog/core/connection.rb
 - lib/fog/core/credentials.rb
@@ -234,11 +242,13 @@ files:
 - lib/fog/core/scp.rb
 - lib/fog/core/service.rb
 - lib/fog/core/ssh.rb
+- lib/fog/core/stringify_keys.rb
 - lib/fog/core/time.rb
 - lib/fog/core/utils.rb
 - lib/fog/core/uuid.rb
 - lib/fog/core/wait_for.rb
 - lib/fog/core/wait_for_defaults.rb
+- lib/fog/core/whitelist_keys.rb
 - lib/fog/dns.rb
 - lib/fog/identity.rb
 - lib/fog/image.rb
@@ -280,6 +290,8 @@ files:
 - spec/utils_spec.rb
 - spec/uuid_spec.rb
 - spec/wait_for_spec.rb
+- tests/core/stringify_keys_tests.rb
+- tests/core/whitelist_keys_tests.rb
 homepage: https://github.com/fog/fog-core
 licenses:
 - MIT
@@ -300,7 +312,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: Shared classes and tests for fog providers and services.