fog-core 1.27.2 → 1.27.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb0c85564583ea60af61b0763f78fee6089c8230
-  data.tar.gz: 8f4cf853cd883f2906163109271902bf9f658544
+  metadata.gz: 05926065513096bbd243c048472185d94fff85dc
+  data.tar.gz: 07586ba0a3850cb661496316589f8e691bd38972
 SHA512:
-  metadata.gz: 4517193ec6b81e6962b98f1c1c0f5882f4f7611ebf131941c6efbe3f6792bb69cd69d4595bfcf26765d9b67360d3efc59063bc3b8e6a7f0c695e13028dbc89d0
-  data.tar.gz: c13706aa2a55be66ded1df68e013621757a06d02ef0cb9ee0b11100478274c266a7e376b55c2f1b8066cf319dbd7a7857f09ef917dd2e409f4214b0cfe98ea31
+  metadata.gz: b3c1803c12f6e915226ec157457d769ede0c28debdd5ce9651a253f662d6b651df268ff8748a3070e6836fa3cd84badfb805fd4b9aea0fc3a3ad0065f51544d2
+  data.tar.gz: 29295752f87c18ae39bed3385f9976ff3140106d6446d339c370c3015bad8f4b13dec7cdb0d1a7b76cde270459d68be2e3a09d60e7d744dbcb0b0a2b9327799d

data/changelog.md

@@ -1,3 +1,10 @@
+1.27.3  12/01/2012
+==========================================================
+
+rubocop fixes for fog collection
+simpler ruby version checking/skipping
+fix requires_one
+
 1.27.2 18/12/2014
 ==========================================================
 

data/lib/fog/core.rb

@@ -66,3 +66,6 @@ require "fog/storage"
 require "fog/support"
 require "fog/volume"
 require "fog/vpn"
+
+# Utility
+require 'fog/formatador'

data/lib/fog/core/attributes.rb

@@ -155,7 +155,8 @@ module Fog
       end
 
       def requires_one(*args)
-        return unless missing_attributes(args).length == args.length
+        missing = missing_attributes(args)
+        return unless missing.length == args.length
         raise(ArgumentError, "#{missing[0...-1].join(", ")} or #{missing[-1]} are required for this operation")
       end
 

data/lib/fog/core/collection.rb

@@ -1,10 +1,12 @@
 require "fog/core/deprecated_connection_accessors"
 
 module Fog
+  # Fog::Collection
   class Collection < Array
     extend Fog::Attributes::ClassMethods
     include Fog::Attributes::InstanceMethods
     include Fog::Core::DeprecatedConnectionAccessors
+    
 
     attr_reader :service
 
@@ -41,8 +43,7 @@ module Fog
     end
 
     def clear
-      @loaded = true
-      super
+      @loaded = true && super
     end
 
     def create(attributes = {})
@@ -52,8 +53,7 @@ module Fog
     end
 
     def destroy(identity)
-      object = new(:identity => identity)
-      object.destroy
+      new(:identity => identity).destroy
     end
 
     # Creates a new Fog::Collection based around the passed service
@@ -70,34 +70,11 @@ module Fog
     end
 
     def inspect
-      Thread.current[:formatador] ||= Formatador.new
-      data = "#{Thread.current[:formatador].indentation}<#{self.class.name}\n"
-      Thread.current[:formatador].indent do
-        unless self.class.attributes.empty?
-          data << "#{Thread.current[:formatador].indentation}"
-          data << self.class.attributes.map { |attribute| "#{attribute}=#{send(attribute).inspect}" }.join(",\n#{Thread.current[:formatador].indentation}")
-          data << "\n"
-        end
-        data << "#{Thread.current[:formatador].indentation}["
-        unless self.empty?
-          data << "\n"
-          Thread.current[:formatador].indent do
-            data << map(&:inspect).join(", \n")
-            data << "\n"
-          end
-          data << Thread.current[:formatador].indentation
-        end
-        data << "]\n"
-      end
-      data << "#{Thread.current[:formatador].indentation}>"
-      data
+      Fog::Formatador.new(self)
     end
 
     def load(objects)
-      clear
-      objects.each do |object|
-        self << new(object)
-      end
+      clear && objects.each { |object| self << new(object) }
       self
     end
 
@@ -118,8 +95,7 @@ module Fog
     end
 
     def reload
-      clear
-      lazy_load
+      clear && lazy_load
       self
     end
 
@@ -137,18 +113,20 @@ module Fog
       all
     end
   end
-
-  # Base class for collection classes whose 'all' method returns only a single page of results and passes the
-  # 'Marker' option along as self.filters[:marker]
+  # Base class for collection classes whose 'all' method returns only a single
+  # page of results and passes the 'Marker' option along as
+  # self.filters[:marker]
   class PagedCollection < Collection
     def each(collection_filters = filters)
       if block_given?
-        begin
+        Kernel.loop do
+          break unless filters[:marker]
           page = all(collection_filters)
-          # We need to explicitly use the base 'each' method here on the page, otherwise we get infinite recursion
+          # We need to explicitly use the base 'each' method here on the page,
+          #  otherwise we get infinite recursion
           base_each = Fog::Collection.instance_method(:each)
           base_each.bind(page).call { |item| yield item }
-        end while self.filters[:marker]
+        end
       end
       self
     end

data/lib/fog/core/logger.rb

@@ -31,9 +31,9 @@ module Fog
       channel = @channels[key]
       if channel
         message = if channel.tty?
-                    value.gsub(Formatador::PARSE_REGEX) { "\e[#{Formatador::STYLES[$1.to_sym]}m" }.gsub(Formatador::INDENT_REGEX, "")
+                    value.gsub(::Formatador::PARSE_REGEX) { "\e[#{::Formatador::STYLES[$1.to_sym]}m" }.gsub(::Formatador::INDENT_REGEX, "")
                   else
-                    value.gsub(Formatador::PARSE_REGEX, "").gsub(Formatador::INDENT_REGEX, "")
+                    value.gsub(::Formatador::PARSE_REGEX, "").gsub(::Formatador::INDENT_REGEX, "")
                   end
         channel.write(message)
       end

data/lib/fog/core/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Core
-    VERSION = "1.27.2"
+    VERSION = "1.27.3"
   end
 end

data/lib/fog/formatador.rb

@@ -0,0 +1,66 @@
+module Fog
+  # Fog::Formatador
+  class Formatador
+    attr_accessor :object, :string, :formatador
+
+    def initialize(obj)
+      @object = obj
+      @formatador ||= ::Formatador.new
+    end
+
+    def to_s
+      return string unless string.nil?
+      init_string
+      indent { string << object_string }
+      (string << "#{indentation}>").dup
+    end
+
+    private
+
+    def indent(&block)
+      formatador.indent(&block)
+    end
+
+    def indentation
+      formatador.indentation
+    end
+
+    def init_string
+      @string = "#{indentation}<#{object.class.name}\n"
+    end
+
+    def object_string
+      "#{attribute_string}#{nested_objects_string}"
+    end
+
+    def attribute_string
+      if object.attributes.empty?
+        "#{indentation}#{object_attributes}\n"
+      else
+        ""
+      end
+    end
+
+    def nested_objects_string
+      if object.empty?
+        nested = "#{indentation}[\n"
+        indent { nested << indentation + inspect_object }
+        nested << "#{indentation}\n#{indentation}]\n"
+        nested
+      else
+        ""
+      end
+    end
+
+    def object_attributes
+      attrs = object.class.attributes.map do |attr|
+        "#{attr}=#{object.send(attr).inspect}"
+      end
+      attrs.join(",\n#{indentation}")
+    end
+
+    def inspect_object
+      object.map { |o| indentation + o.inspect }.join(", \n#{indentation}")
+    end
+  end
+end

data/spec/fog_attribute_spec.rb

@@ -59,6 +59,14 @@ class FogAttributeTestModel < Fog::Model
   def service
     Service.new
   end
+
+  def requires_one_test
+    requires_one :key, :time
+  end
+
+  def requires_test
+    requires :string, :integer
+  end
 end
 
 describe "Fog::Attributes" do
@@ -334,6 +342,37 @@ describe "Fog::Attributes" do
     end
   end
 
+  describe "#requires_one" do
+    it "should require at least one attribute is supplied" do
+      FogAttributeTestModel.new(:key => :key, :time => Time.now).requires_one_test
+      FogAttributeTestModel.new(:time => Time.now).requires_one_test
+      FogAttributeTestModel.new(:key => :key).requires_one_test
+      FogAttributeTestModel.new(:key => :key, :integer => 1).requires_one_test
+
+      assert_raises ArgumentError do
+        FogAttributeTestModel.new(:integer => 1).requires_one_test
+      end
+    end
+  end
+
+  describe "#requires" do
+    it "should require all attributes are supplied" do
+      FogAttributeTestModel.new(:string => "string", :integer => 1).requires_test
+
+      assert_raises ArgumentError do
+        FogAttributeTestModel.new(:integer => 1).requires_test
+      end
+
+      assert_raises ArgumentError do
+        FogAttributeTestModel.new(:string => "string").requires_test
+      end
+
+      assert_raises ArgumentError do
+        FogAttributeTestModel.new(:key => :key).requires_test
+      end
+    end
+  end
+
   describe ".has_many_identities" do
     it "should return an instance of Fog::Association" do
       model.many_identities = ["456"]

data/spec/formatador_spec.rb

@@ -0,0 +1,57 @@
+require "spec_helper"
+
+class TestCase < Fog::Collection
+  def all
+  end
+  def map(*_args)
+    %w(foo bar)
+  end
+
+  def self.attributes
+    %w(this that)
+  end
+
+  def this
+    %w(this that)
+  end
+
+  def that
+    %w(that this)
+  end
+end
+
+test_case_str = <<-EOL
+  <TestCase
+    this=["this", "that"],
+    that=["that", "this"]
+    [
+      foo, 
+      bar    
+    ]
+  >
+EOL
+
+test_case_str.chomp!
+
+describe Fog::Formatador do
+
+  def setup
+    @formatador = Fog::Formatador.new(TestCase.new)
+  end
+
+  it "raises for missing required arguments" do
+    assert_raises(ArgumentError) { Fog::Formatador.new }
+  end
+
+  it "should instansiate" do
+    @formatador.must_be_instance_of Fog::Formatador
+  end
+
+  it "should respond to_s" do
+    @formatador.must_respond_to :to_s
+  end
+
+  it "should give a string representation of object with proper indentation" do
+    "#{@formatador}".must_equal test_case_str
+  end
+end

data/spec/spec_helper.rb

@@ -1,5 +1,3 @@
-require "rubygems"
-
 require "minitest/autorun"
 require "minitest/spec"
 require "minitest/stub_const"

data/spec/storage_spec.rb

@@ -94,15 +94,15 @@ describe "Fog::Storage" do
   end
 
   describe ".get_body_size" do
-    current_version = Gem::Version.new(RUBY_VERSION)
-
-    # Ruby 1.8 doesn't support string encodings, so we can't test that
-    if current_version >= Gem::Version.new("1.9.0")
-      it "doesn't alter the encoding of the string passed to it" do
+    it "doesn't alter the encoding of the string passed to it" do
+      # Ruby 1.8 doesn't support string encodings, so we can't test that
+      if RUBY_VERSION >= "1.9.3"
         body = "foo".encode("UTF-8")
         Fog::Storage.get_body_size(body)
 
         assert_equal("UTF-8", body.encoding.to_s)
+      else
+        skip
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-core
 version: !ruby/object:Gem::Version
-  version: 1.27.2
+  version: 1.27.3
 platform: ruby
 authors:
 - Evan Light
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2015-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -272,6 +272,7 @@ files:
 - lib/fog/core/wait_for_defaults.rb
 - lib/fog/core/whitelist_keys.rb
 - lib/fog/dns.rb
+- lib/fog/formatador.rb
 - lib/fog/identity.rb
 - lib/fog/image.rb
 - lib/fog/metering.rb
@@ -304,6 +305,7 @@ files:
 - spec/fake_app/models/model.rb
 - spec/fake_app/requests/request.rb
 - spec/fog_attribute_spec.rb
+- spec/formatador_spec.rb
 - spec/identity_spec.rb
 - spec/mocking_spec.rb
 - spec/service_spec.rb
@@ -351,6 +353,7 @@ test_files:
 - spec/fake_app/models/model.rb
 - spec/fake_app/requests/request.rb
 - spec/fog_attribute_spec.rb
+- spec/formatador_spec.rb
 - spec/identity_spec.rb
 - spec/mocking_spec.rb
 - spec/service_spec.rb