softlayer 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: beb400af02666f554f5a060246e92fb1ba3df387
-  data.tar.gz: d7c85d3b78eea84b2bf185ffbba6aba383115798
+  metadata.gz: 5a16ca70dcbda31e591758d296bbaf4f7d21a0cb
+  data.tar.gz: 2aa960fbd9fb2794cfed46fadac95dc2ef52a509
 SHA512:
-  metadata.gz: 33ab36f13f61b4714ded223b1fe2745ddf068b6742da298e2a70d55f9aba396bea6fb884b5399d7cc1e82b360a1e857277950bc0c44ba607ea064ccf3c4fae38
-  data.tar.gz: f2c4527286a9c9c8c126eca28c84975efbe5bad18148d093d6721e3eb3458de688fab4baa2ab0d578d3d0dae384e1456e62a610b3ab964e4b8973dce26ed20d3
+  metadata.gz: f8db194bb0b5c0478f7f92b37e28a04e3dbab6fce200817b1b43d9a8b117c7433d3edae495592dac724c95fac9d942386dba7bebcd6e66f10ab640d9b5ce6c64
+  data.tar.gz: 0d6b13032ba198aa15010c4e95c62d77602f25056e37986e3716c0a05b47a4538b1ecd0f2ea76c5b8833f240b6d2ca11897364650c18940220d7ce17c4f37d66

data/README.md

@@ -41,11 +41,11 @@ Softlayer::Account.get_virtual_guests
 
 ## README Driven Development
 
-* Add support for Object Masks
-* Add support for Object Filters
+* Improve support for masks and filters (parse a better format instead of using ruby hash)
 
 ## Known Issues
 
+* Mask and Filter not working correctly with `SoftLayer_Account` calls
 * Using Savon master until a version is released containing the commit to support rpc/encoded XML
 * Actually arrays are being wrongly mapped, so when we pass an argument containing **one** array, we need to pass inside another array, like this:
 

data/lib/softlayer/client.rb

@@ -1,15 +1,6 @@
 module Softlayer
   class Client < Savon::Client
-    class << self
-      def call(method, message = {})
-        safe do
-          resp = super method, message: message
-          resp.to_hash["#{method}_response".to_sym]["#{method}_return".to_sym]
-        end
-      end
-    end
 
-    # Create a new client.
     def initialize(service)
       @service = service
       super client_params
@@ -48,7 +39,9 @@ module Softlayer
     end
 
     def client_params
-      { wsdl: "https://api.softlayer.com/soap/v3.1/#{@service}?wsdl" }.tap do |params|
+      # Use the already downloaded wsdl files, this speeds up A LOT!
+      wsdl_file = File.join(File.dirname(Softlayer.root), 'data', @service.sub('SoftLayer_', '') + '.wsdl')
+      { wsdl: wsdl_file }.tap do |params|
         params[:open_timeout] = Softlayer.configuration.open_timeout if Softlayer.configuration.open_timeout
         params[:read_timeout] = Softlayer.configuration.read_timeout if Softlayer.configuration.read_timeout
         params[:soap_header] = auth_params

data/lib/softlayer/model/filter.rb

@@ -0,0 +1,16 @@
+module Softlayer
+  class Model
+    class Filter
+      def initialize(service_name, filter)
+        @service_name = service_name
+        @filter = filter
+      end
+
+      def to_header
+        {
+          "#{@service_name}ObjectFilter" => @filter
+        }
+      end
+    end
+  end
+end

data/lib/softlayer/model/limit.rb

@@ -0,0 +1,19 @@
+module Softlayer
+  class Model
+    class Limit
+      def initialize(limit, offset = 0)
+        @limit = limit
+        @offset = offset
+      end
+
+      def to_header
+        {
+          'resultLimit' => {
+            'limit' => @limit,
+            'offset' => @offset
+          }
+        }
+      end
+    end
+  end
+end

data/lib/softlayer/model/mask.rb

@@ -0,0 +1,18 @@
+module Softlayer
+  class Model
+    class Mask
+      def initialize(service_name, mask)
+        @service_name = service_name
+        @mask = mask
+      end
+
+      def to_header
+        {
+          "#{@service_name}ObjectMask" => {
+            'mask' => @mask
+          }
+        }
+      end
+    end
+  end
+end

data/lib/softlayer/model/operations.rb

@@ -0,0 +1,44 @@
+module Softlayer
+  class Model
+    module Operations
+      def self.included(base)
+        base.send(:attr_accessor, :headers)
+      end
+
+      def self.extended(klass)
+        klass.define_singleton_method("headers=") { |headers| @headers = headers }
+        klass.define_singleton_method("headers") { @headers }
+      end
+
+      def filter(filter)
+        @filter = Filter.new(service_name, filter) if filter.is_a? Hash
+        @filter = filter if filter.is_a? Filter
+        self
+      end
+
+      def limit(limit, offset = 0)
+        @limit = Limit.new(limit, offset)
+        self
+      end
+
+      def mask(mask)
+        @mask = Mask.new(service_name, mask) if mask.is_a? Hash
+        @mask = mask if mask.is_a? Mask
+        self
+      end
+
+      def request_headers
+        headers = {}
+        headers.merge!(@headers) if @headers
+        @headers = nil
+        %w(filter limit mask).each do |header|
+          if instance_variable_get("@#{header}")
+            headers.merge!(instance_variable_get("@#{header}").to_header)
+            instance_variable_set("@#{header}", nil)
+          end
+        end
+        headers
+      end
+    end
+  end
+end

data/lib/softlayer/model.rb

@@ -2,7 +2,14 @@ require 'softlayer/generator/converter'
 
 module Softlayer #:nodoc:
   class Model
-    autoload :Response,'softlayer/model/response'
+    autoload :Filter, 'softlayer/model/filter'
+    autoload :Limit, 'softlayer/model/limit'
+    autoload :Mask, 'softlayer/model/mask'
+    autoload :Operations, 'softlayer/model/operations'
+    autoload :Response, 'softlayer/model/response'
+
+    include Operations
+    extend Operations
 
     class << self
       # user friendly methods
@@ -10,6 +17,7 @@ module Softlayer #:nodoc:
         object = self.new.tap do |obj|
           obj.id = id.to_s
         end
+        object.headers = request_headers
         object.get_object
       end
 
@@ -20,20 +28,27 @@ module Softlayer #:nodoc:
       def all
         request = all_request_for(self)
         return nil if request.nil?
+        Softlayer::Account.headers = request_headers
         Softlayer::Account.send(request)
       end
 
-      def request(method, return_object, message = {})
-        service_name = Generator::Converter.to_softlayer_name(self.to_s)
-        service_name = self.class::SERVICE if defined?(self.class::SERVICE)
-        return Softlayer::Mock.request(service_name, method, return_object, message) if Softlayer.mock?
-        parse(Softlayer::Client.new(service_name).call(method, message), return_object, method)
+      def request(method, return_object, message = {}, headers = {})
+        headers.merge! request_headers
+
+        return Softlayer::Mock.request(service_name, method, return_object, message, headers) if Softlayer.mock?
+        parse(Softlayer::Client.new(service_name).call(method, message, headers), return_object, method)
       end
 
       def parse(hash, return_object, method)
         Response.new(hash).process(return_object)
       end
 
+      def service_name
+        name = Generator::Converter.to_softlayer_name(self.to_s)
+        name = self::SERVICE if defined?(self::SERVICE)
+        name
+      end
+
       def all_request_for(klass)
         klass = klass.to_s
         requests = {
@@ -105,19 +120,22 @@ module Softlayer #:nodoc:
     end
 
     def request(method, return_object, message = {})
-      service_name = Generator::Converter.to_softlayer_name(self.class.to_s)
-      service_name = self.class::SERVICE if defined?(self.class::SERVICE)
-      init_headers = {
-        "#{service_name}InitParameters" => {
-          "id" => self.id.to_i
-        }
-      }
-      return Softlayer::Mock.request(service_name, method, return_object, message, init_headers) if Softlayer.mock?
-      self.class.parse(Softlayer::Client.new(service_name).call(method, message, init_headers), return_object, method)
+      headers = request_headers.merge(init_headers)
+
+      self.class.request(method, return_object, message, headers)
     end
 
     def to_hash
       (self.class.to_s+"::Representer").constantize.new(self).to_hash
     end
+
+    def init_headers
+      raise Exception.new('You need to set the ID on object') if id.nil?
+      {
+        "#{self.class.service_name}InitParameters" => {
+          "id" => self.id.to_i
+        }
+      }
+    end
   end
 end

data/lib/softlayer/network/bandwidth/version1.rb

@@ -1,5 +1,5 @@
 module Softlayer
-  module Network
+  class Network
     module Bandwidth
       module Version1
         autoload :Allocation, 'softlayer/network/bandwidth/version1/allocation'

data/lib/softlayer/network/bandwidth.rb

@@ -1,5 +1,5 @@
 module Softlayer
-  module Network
+  class Network
     module Bandwidth
       autoload :Usage, 'softlayer/network/bandwidth/usage'
       autoload :Version1, 'softlayer/network/bandwidth/version1'

data/lib/softlayer/version.rb

@@ -1,3 +1,3 @@
 module Softlayer
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/softlayer.rb

@@ -72,6 +72,10 @@ module Softlayer
     # Softlayer gem configuration.
     attr_accessor :configuration
 
+    def root
+      File.dirname(__FILE__)
+    end
+
     # Returns true if the gem has been configured.
     def configured?
       configuration.present?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: softlayer
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Celso Fernandes
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-28 00:00:00.000000000 Z
+date: 2016-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -1434,6 +1434,10 @@ files:
 - lib/softlayer/mock/ticket.rb
 - lib/softlayer/mock/virtual/guest.rb
 - lib/softlayer/model.rb
+- lib/softlayer/model/filter.rb
+- lib/softlayer/model/limit.rb
+- lib/softlayer/model/mask.rb
+- lib/softlayer/model/operations.rb
 - lib/softlayer/model/response.rb
 - lib/softlayer/monitoring.rb
 - lib/softlayer/monitoring/agent.rb