put_bucket_lifecycle.rb in fog-aws-0.8.0

- old
+ new

@@ -8,17 +8,17 @@
         # * lifecycle [Hash]:
         #   * Rules [Array] object expire rules
         #     * ID [String] Unique identifier for the rule
         #     * Prefix [String] Prefix identifying one or more objects to which the rule applies
         #     * Enabled [Boolean] if rule is currently being applied
-        #     * Expiration [Hash] Container for the object expiration rule.
-        #       * Days [Integer] lifetime, in days, of the objects that are subject to the rule
+        #     * [NoncurrentVersion]Expiration [Hash] Container for the object expiration rule.
+        #       * [Noncurrent]Days [Integer] lifetime, in days, of the objects that are subject to the rule
         #       * Date [Date] Indicates when the specific rule take effect.
         #         The date value must conform to the ISO 8601 format. The time is always midnight UTC.
-        #     * Transition [Hash] Container for the transition rule that describes when objects transition
+        #     * [NoncurrentVersion]Transition [Hash] Container for the transition rule that describes when objects transition
         #       to the Glacier storage class
-        #       * Days [Integer] lifetime, in days, of the objects that are subject to the rule
+        #       * [Noncurrent]Days [Integer] lifetime, in days, of the objects that are subject to the rule
         #       * Date [Date] Indicates when the specific rule take effect.
         #         The date value must conform to the ISO 8601 format. The time is always midnight UTC.
         #       * StorageClass [String] Indicates the Amazon S3 storage class to which you want the object
         #         to transition to.
         #
@@ -31,27 +31,50 @@
               lifecycle['Rules'].each do |rule|
                 Rule {
                   ID rule['ID']
                   Prefix rule['Prefix']
                   Status rule['Enabled'] ? 'Enabled' : 'Disabled'
-                  unless (rule['Expiration'] or rule['Transition'])
+                  unless (rule['Expiration'] or rule['Transition'] or rule['NoncurrentVersionExpiration'] or rule['NoncurrentVersionTransition'])
                     Expiration { Days rule['Days'] }
                   else
                     if rule['Expiration']
                       if rule['Expiration']['Days']
                         Expiration { Days rule['Expiration']['Days'] }
                       elsif rule['Expiration']['Date']
                         Expiration { Date rule['Expiration']['Date'].is_a?(Time) ? rule['Expiration']['Date'].utc.iso8601 : Time.parse(rule['Expiration']['Date']).utc.iso8601 }
                       end
                     end
+                    if rule['NoncurrentVersionExpiration']
+                      if rule['NoncurrentVersionExpiration']['NoncurrentDays']
+                        NoncurrentVersionExpiration { NoncurrentDays rule['NoncurrentVersionExpiration']['NoncurrentDays'] }
+                      elsif rule['NoncurrentVersionExpiration']['Date']
+                        NoncurrentVersoinExpiration {
+                          if Date rule['NoncurrentVersionExpiration']['Date'].is_a?(Time)
+                            rule['NoncurrentVersionExpiration']['Date'].utc.iso8601
+                          else
+                            Time.parse(rule['NoncurrentVersionExpiration']['Date']).utc.iso8601
+                          end
+                        }
+                      end
+                    end
                     if rule['Transition']
                       Transition {
                         if rule['Transition']['Days']
                           Days rule['Transition']['Days']
                         elsif rule['Transition']['Date']
                           Date rule['Transition']['Date'].is_a?(Time) ? time.utc.iso8601 : Time.parse(time).utc.iso8601
                         end
                         StorageClass rule['Transition']['StorageClass'].nil? ? 'GLACIER' : rule['Transition']['StorageClass']
+                      }
+                    end
+                    if rule['NoncurrentVersionTransition']
+                      NoncurrentVersionTransition {
+                        if rule['NoncurrentVersionTransition']['NoncurrentDays']
+                          NoncurrentDays rule['NoncurrentVersionTransition']['NoncurrentDays']
+                        elsif rule['NoncurrentVersionTransition']['Date']
+                          Date rule['NoncurrentVersionTransition']['Date'].is_a?(Time) ? time.utc.iso8601 : Time.parse(time).utc.iso8601
+                        end
+                        StorageClass rule['NoncurrentVersionTransition']['StorageClass'].nil? ? 'GLACIER' : rule['NoncurrentVersionTransition']['StorageClass']
                       }
                     end
                   end
                 }
               end