fuelsdk 0.0.2 → 0.0.3

data/README.md

@@ -9,17 +9,12 @@ The Fuel SDK for Ruby provides easy access to ExactTarget's Fuel API Family serv
 ## Requirements ##
 Ruby Version 1.9.3
 
-Gems:
-
-- [savon (2.x)](http://rubygems.org/gems/savon)
-- [json (1.7.x)](http://rubygems.org/gems/json)
-- [jwt (0.1.6)](https://rubygems.org/gems/jwt)
-
-
 ## Getting Started ##
-After downloading the project, rename the config.yaml.template file to config.yaml.
+Add this line to your application's Gemfile:
 
-Edit config.yaml so you can input the ClientID and Client Secret values provided when you registered your application. If you are building a HubExchange application for the Interactive Marketing Hub then, you must also provide the Application Signature (appsignature).  Only change the value for the defaultwsdl configuration item if instructed by ExactTarget.
+```ruby
+gem 'fuelsdk'
+```
 
 If you have not registered your application or you need to lookup your Application Key or Application Signature values, please go to App Center at [Code@: ExactTarget's Developer Community](http://code.exacttarget.com/appcenter "Code@ App Center").
 
@@ -68,8 +63,8 @@ Print out the results for viewing
 			:"@xsi:type"=>"List"}
 		],
 	@code=200,
-	@status=true,
-	@moreResults=false,
+	@success?=true,
+	@more?=false,
 	@request_id="41f0f293-954f-4ac7-8e7a-0a5756022218"
 >
 </pre>

data/lib/fuelsdk.rb

@@ -14,327 +14,6 @@ module FuelSDK
 end
 
 =begin
-  class ET_Constructor
-    attr_accessor :status, :code, :message, :results, :request_id, :moreResults
-
-    def initialize(response = nil, rest = false)
-      @results = []
-      #if !response.nil? && !rest then
-      #  @@body = response.body
-
-      #  if ((!response.soap_fault?) or (!response.http_error?)) then
-      #    @code = response.http.code
-      #    @status = true
-      #  elsif (response.soap_fault?) then
-      #    @code = response.http.code
-      #    @message = @@body[:fault][:faultstring]
-      #    @status = false
-      #  elsif (response.http_error?) then
-      #    @code = response.http.code
-      #    @status = false
-      #  end
-      #elsif
-        @code = response.code
-        @status = true
-        if @code != "200" then
-          @status = false
-        end
-
-        begin
-          @results = JSON.parse(response.body)
-        rescue
-          @message = response.body
-        end
-
-      end
-    end
-  end
-
-  class ET_BaseObject
-    attr_accessor :authStub, :props
-    attr_reader :obj, :lastRequestID, :endpoint
-
-    def initialize
-      @authStub = nil
-      @props = nil
-      @filter = nil
-      @lastRequestID = nil
-      @endpoint = nil
-    end
-  end
-
-  class ET_GetSupportRest < ET_BaseObject
-    attr_reader :urlProps, :urlPropsRequired, :lastPageNumber
-
-    def get(props = nil)
-      if props and props.is_a? Hash then
-        @props = props
-      end
-
-      completeURL = @endpoint
-      additionalQS = {}
-
-      if @props and @props.is_a? Hash then
-        @props.each do |k,v|
-          if @urlProps.include?(k) then
-            completeURL.sub!("{#{k}}", v)
-          else
-            additionalQS[k] = v
-          end
-        end
-      end
-
-      @urlPropsRequired.each do |value|
-        if !@props || !@props.has_key?(value) then
-          raise "Unable to process request due to missing required prop: #{value}"
-        end
-      end
-
-      @urlProps.each do |value|
-        completeURL.sub!("/{#{value}}", "")
-      end
-
-      obj = ET_GetRest.new(@authStub, completeURL,additionalQS)
-
-      if obj.results.has_key?('page') then
-        @lastPageNumber = obj.results['page']
-        pageSize = obj.results['pageSize']
-        if obj.results.has_key?('count') then
-          count = obj.results['count']
-        elsif obj.results.has_key?('totalCount') then
-          count = obj.results['totalCount']
-        end
-
-        if !count.nil? && count > (@lastPageNumber * pageSize)  then
-          obj.moreResults = true
-        end
-      end
-      return obj
-    end
-
-    def getMoreResults()
-      if props and props.is_a? Hash then
-        @props = props
-      end
-
-      originalPageValue = "1"
-      removePageFromProps = false
-
-      if !@props.nil? && @props.has_key?('$page') then
-        originalPageValue = @props['page']
-      else
-        removePageFromProps = true
-      end
-
-      if @props.nil?
-        @props = {}
-      end
-
-      @props['$page'] = @lastPageNumber + 1
-
-      obj = self.get
-
-      if removePageFromProps then
-        @props.delete('$page')
-      else
-        @props['$page'] = originalPageValue
-      end
-
-      return obj
-    end
-  end
-
-  class ET_CUDSupportRest < ET_GetSupportRest
-
-    def post()
-      completeURL = @endpoint
-
-      if @props and @props.is_a? Hash then
-        @props.each do |k,v|
-          if @urlProps.include?(k) then
-            completeURL.sub!("{#{k}}", v)
-          end
-        end
-      end
-
-      @urlPropsRequired.each do |value|
-        if !@props || !@props.has_key?(value) then
-          raise "Unable to process request due to missing required prop: #{value}"
-        end
-      end
-
-      # Clean Optional Parameters from Endpoint URL first
-      @urlProps.each do |value|
-        completeURL.sub!("/{#{value}}", "")
-      end
-
-      ET_PostRest.new(@authStub, completeURL, @props)
-    end
-
-    def patch()
-      completeURL = @endpoint
-      # All URL Props are required when doing Patch
-      @urlProps.each do |value|
-        if !@props || !@props.has_key?(value) then
-          raise "Unable to process request due to missing required prop: #{value}"
-        end
-      end
-
-      if @props and @props.is_a? Hash then
-        @props.each do |k,v|
-          if @urlProps.include?(k) then
-            completeURL.sub!("{#{k}}", v)
-          end
-        end
-      end
-
-      obj = ET_PatchRest.new(@authStub, completeURL, @props)
-    end
-
-    def delete()
-      completeURL = @endpoint
-      # All URL Props are required when doing Patch
-      @urlProps.each do |value|
-        if !@props || !@props.has_key?(value) then
-          raise "Unable to process request due to missing required prop: #{value}"
-        end
-      end
-
-      if @props and @props.is_a? Hash then
-        @props.each do |k,v|
-          if @urlProps.include?(k) then
-            completeURL.sub!("{#{k}}", v)
-          end
-        end
-      end
-
-      ET_DeleteRest.new(@authStub, completeURL)
-    end
-
-  end
-
-
-  class ET_GetRest < ET_Constructor
-    def initialize(authStub, endpoint, qs = nil)
-      authStub.refreshToken
-
-      if qs then
-        qs['access_token'] = authStub.authToken
-      else
-        qs = {"access_token" => authStub.authToken}
-      end
-
-      uri = URI.parse(endpoint)
-      uri.query = URI.encode_www_form(qs)
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true
-      request = Net::HTTP::Get.new(uri.request_uri)
-      requestResponse = http.request(request)
-
-      @moreResults = false
-
-      obj = super(requestResponse, true)
-      return obj
-    end
-  end
-
-
-  class ET_ContinueRest < ET_Constructor
-    def initialize(authStub, endpoint, qs = nil)
-      authStub.refreshToken
-
-      if qs then
-        qs['access_token'] = authStub.authToken
-      else
-        qs = {"access_token" => authStub.authToken}
-      end
-
-      uri = URI.parse(endpoint)
-      uri.query = URI.encode_www_form(qs)
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true
-      request = Net::HTTP::Get.new(uri.request_uri)
-      requestResponse = http.request(request)
-
-      @moreResults = false
-
-      super(requestResponse, true)
-    end
-  end
-
-
-  class ET_PostRest < ET_Constructor
-    def initialize(authStub, endpoint, payload)
-      authStub.refreshToken
-
-      qs = {"access_token" => authStub.authToken}
-      uri = URI.parse(endpoint)
-      uri.query = URI.encode_www_form(qs)
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true
-      request = Net::HTTP::Post.new(uri.request_uri)
-      request.body =  payload.to_json
-      request.add_field "Content-Type", "application/json"
-      requestResponse = http.request(request)
-
-      super(requestResponse, true)
-
-    end
-  end
-
-  class ET_PatchRest < ET_Constructor
-    def initialize(authStub, endpoint, payload)
-      authStub.refreshToken
-
-      qs = {"access_token" => authStub.authToken}
-      uri = URI.parse(endpoint)
-      uri.query = URI.encode_www_form(qs)
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true
-      request = Net::HTTP::Patch.new(uri.request_uri)
-      request.body =  payload.to_json
-      request.add_field "Content-Type", "application/json"
-      requestResponse = http.request(request)
-      super(requestResponse, true)
-
-    end
-  end
-
-  class ET_DeleteRest < ET_Constructor
-    def initialize(authStub, endpoint)
-      authStub.refreshToken
-
-      qs = {"access_token" => authStub.authToken}
-
-      uri = URI.parse(endpoint)
-      uri.query = URI.encode_www_form(qs)
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true
-      request = Net::HTTP::Delete.new(uri.request_uri)
-      requestResponse = http.request(request)
-      super(requestResponse, true)
-
-    end
-  end
-
-  class ET_Campaign < ET_CUDSupportRest
-    def initialize
-      super
-      @endpoint = 'https://www.exacttargetapis.com/hub/v1/campaigns/{id}'
-      @urlProps = ["id"]
-      @urlPropsRequired = []
-    end
-
-    class Asset < ET_CUDSupportRest
-      def initialize
-        super
-        @endpoint = 'https://www.exacttargetapis.com/hub/v1/campaigns/{id}/assets/{assetId}'
-        @urlProps = ["id", "assetId"]
-        @urlPropsRequired = ["id"]
-      end
-    end
-  end
-
   class ET_DataExtension < ET_CUDSupport
     attr_accessor :columns
 
@@ -556,17 +235,4 @@ end
       end
     end
   end
-
-  class ET_TriggeredSend < ET_CUDSupport
-    attr_accessor :subscribers
-    def initialize
-      super
-      @obj = 'TriggeredSendDefinition'
-    end
-
-    def send
-      @tscall = {"TriggeredSendDefinition" => @props, "Subscribers" => @subscribers}
-      ET_Post.new(@authStub, "TriggeredSend", @tscall)
-    end
-  end
 =end

data/lib/fuelsdk/http_request.rb

@@ -14,6 +14,7 @@ module FuelSDK
     def continue
       rsp = nil
       if more?
+       @request['options']['page'] = @results['page'].to_i + 1
        rsp = unpack @client.rest_get(@request['url'], @request['options'])
       else
         puts 'No more data'

data/lib/fuelsdk/version.rb

@@ -1,3 +1,3 @@
 module FuelSDK
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fuelsdk
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors: