aliyun-ess 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 025f758c3035ddf7daae931fed705da8fccbbbb2
-  data.tar.gz: 1890e4f10e57d42d4b8f6c22e4564e1d7ee07311
+  metadata.gz: 9b55fac45d4545646bdf5d05c10d6247ca88196b
+  data.tar.gz: 2dbdaa0905cc29d214b8feef97a35ffe10e403b3
 SHA512:
-  metadata.gz: 2237322e9210316219024599d42dcb460117607d76ff42c6ec72cfa8641f784f117b23bd478b299d2d7fb283284044bc9fd1835fbb5499296388acad523dbf32
-  data.tar.gz: 9914fa384832da5fd7a5c04d1fbba0be4f02360f8e631d6a34ec782ea3f3b0e62c5fe6476b619a0e23be8147892ef98bc306727479398d5fbea58cd02d6a692a
+  metadata.gz: 19b63079b007d1e02b93ff5b71c46063b3fd82ed0114279540b0dd82c33fc071ce05185874e5ce3ac24368a19997088255deb698e45f1316fe7020f90503f1b1
+  data.tar.gz: 6c10c8171b2224a7d6f32958006f73bff98b08457229c8a1bb83ae0ec546e29e572f5d67ef8ec5e89ca859ecc8a6b45b1171d0ea3a77e0debcd6a414014ef790

data/lib/aliyun/ess.rb

@@ -14,7 +14,7 @@ require 'byebug'
 $:.unshift(File.dirname(__FILE__))
 
 require 'ess/version'
-require 'ess/extensions' unless defined? Aliyun::OSS
+require 'ess/extensions'
 require 'ess/exceptions'
 require 'ess/error'
 require 'ess/authentication'
@@ -25,6 +25,7 @@ require 'ess/service'
 require 'ess/collection'
 require 'ess/scaling_group'
 require 'ess/scaling_rule'
+require 'ess/scaling_instance'
 require 'ess/response'
 
 

data/lib/aliyun/ess/extensions.rb

@@ -25,40 +25,24 @@ class String
     string
   end unless public_method_defined? :camelize
 
-  if RUBY_VERSION >= '1.9'
-    def valid_utf8?
-      dup.force_encoding('UTF-8').valid_encoding?
-    end
-  else
-    def valid_utf8?
-      scan(Regexp.new('[^\x00-\xa0]', nil, 'u')) { |s| s.unpack('U') }
-      true
-    rescue ArgumentError
-      false
-    end
-  end
+  def valid_utf8?
+    dup.force_encoding('UTF-8').valid_encoding?
+  end unless public_method_defined? :valid_utf8?
   
-  # All paths in in OSS have to be valid unicode so this takes care of 
+  # All paths in in ESS have to be valid unicode so this takes care of 
   # cleaning up any strings that aren't valid utf-8 according to String#valid_utf8?
-  if RUBY_VERSION >= '1.9'
-    def remove_extended!
-      sanitized_string = ''
-      each_byte do |byte|
-        character = byte.chr
-        sanitized_string << character if character.ascii_only?
-      end
-      sanitized_string
-    end
-  else
-    def remove_extended!
-      #gsub!(/[\x80-\xFF]/) { "%02X" % $&[0] }
-      gsub!(Regext.new('/[\x80-\xFF]')) { "%02X" % $&[0] }
+  def remove_extended!
+    sanitized_string = ''
+    each_byte do |byte|
+      character = byte.chr
+      sanitized_string << character if character.ascii_only?
     end
-  end
+    sanitized_string
+  end unless public_method_defined? :remove_extended!
   
   def remove_extended
     dup.remove_extended!
-  end
+  end unless public_method_defined? :remove_extended
 end
 
 class CoercibleString < String
@@ -85,7 +69,7 @@ class CoercibleString < String
     # so unless the string looks like that, don't even try, otherwise it might convert an object's
     # key from something like '03 1-2-3-Apple-Tree.mp3' to Sat Feb 03 00:00:00 CST 2001.
     def datetime_format
-      /^\d{4}-\d{2}-\d{2}\w\d{2}:\d{2}:\d{2}/
+      /^\d{4}-\d{2}-\d{2}\w\d{2}:\d{2}/
     end
 end
 
@@ -169,6 +153,6 @@ module SelectiveAttributeProxy
 
   module ClassMethods
   end
-end
+end unless defined? SelectiveAttributeProxy
 
 #:startdoc:

data/lib/aliyun/ess/response.rb

@@ -77,6 +77,14 @@ module Aliyun
         end
       end
     end
+
+    class ScalingInstance
+      class Response < Base::Response
+        def items
+          (parsed['scaling_instances'] && parsed['scaling_instances']['scaling_instance']) || []
+        end
+      end
+    end
     
 
     # Requests whose response code is between 300 and 599 and contain an <Error></Error> in their body

data/lib/aliyun/ess/scaling_group.rb

@@ -34,8 +34,20 @@ module Aliyun
         end
       end
 
+      def scaling_instances
+        @scaling_instances ||= begin
+          build_scaling_instances!
+        end
+      end
+
       private
 
+      def build_scaling_instances!
+        items = ScalingInstance.find(:scaling_group_id => id).items
+        items.each {|e| register(e) }
+        items
+      end
+
       def build_scaling_rules!
         items = ScalingRule.find(:scaling_group_id => id).items
         items.each {|e| register(e) }

data/lib/aliyun/ess/scaling_instance.rb

@@ -0,0 +1,31 @@
+# -*- encoding : utf-8 -*-
+module Aliyun
+  module ESS
+    class ScalingInstance < Base
+      class << self
+        def find(params={}, options={})
+          params = {'action' => 'DescribeScalingInstances', 'region_id' => 'cn-hangzhou', 'page_number' => 1}.merge params
+          Collection.new get('/', params, options)
+        end
+
+        def find_by(*args)
+          c = find(*args)
+          c.items.first
+        end
+      end
+
+      include SelectiveAttributeProxy
+
+      attr_accessor :scaling_group
+
+      def initialize(attributes = {})
+        super
+      end
+
+      def id
+        attributes['instance_id']
+      end
+      
+    end
+  end
+end

data/lib/aliyun/ess/scaling_rule.rb

@@ -13,7 +13,7 @@ module Aliyun
           c.items.first
         end
 
-        def execute(params={'ScalingRuleAri' => 'ari:acs:ess:cn-hangzhou:1358641544878377:scalingrule/duK8myelWehmcB5WH9cUTsu7'}, options={})
+        def execute(params={}, options={})
           params = {'Action' => 'ExecuteScalingRule'}.merge params
           get('/', params, options)
         end

data/lib/aliyun/ess/version.rb

@@ -4,7 +4,7 @@ module Aliyun
     module VERSION #:nodoc:
       MAJOR    = '0'
       MINOR    = '1'
-      TINY     = '1'
+      TINY     = '3'
       BETA     = nil
       #BETA     = Time.now.to_i.to_s
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aliyun-ess
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Joshua Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-11 00:00:00.000000000 Z
+date: 2015-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,6 +91,7 @@ files:
 - lib/aliyun/ess/parsing.rb
 - lib/aliyun/ess/response.rb
 - lib/aliyun/ess/scaling_group.rb
+- lib/aliyun/ess/scaling_instance.rb
 - lib/aliyun/ess/scaling_rule.rb
 - lib/aliyun/ess/service.rb
 - lib/aliyun/ess/version.rb