zanox 0.2.4 → 0.2.5

data/lib/zanox.rb

@@ -9,22 +9,36 @@ module Zanox
     
     class AuthError < ArgumentError; end
     
-    attr_accessor :connect_id
+    attr_accessor :public_key
     attr_accessor :secret_key
     attr_accessor :wsdl
+    attr_accessor :driver
     
     def self.request(method, options)
-      puts method + " " + options.inspect if $DEBUG
+      begin
+        puts method + " " + options.inspect if $DEBUG
       
-      options.merge!(:connectId=>Zanox::API.connect_id)
+        options.merge!(:connectId=>Zanox::API::Session.connect_id)
       
-      raise AuthError, "Missing connect id. Try calling Zanox::API.authenticate('your connect id', 'your secret key') before your requests", caller[caller.length - 1] if !!options[:connect_id]
+        #raise AuthError, "Missing connect id. Try calling Zanox::API.authenticate('your connect id', 'your secret key') before your requests", caller[caller.length - 1] if !!options[:connect_id]
       
-      @wsdl = 'http://api.zanox.com/wsdl/2009-07-01/' unless !!@wsdl
-      $driver = SOAP::WSDLDriverFactory.new(@wsdl).create_rpc_driver unless !!$driver
-      $driver.wiredump_dev = STDOUT if $DEBUG
-      $driver.options['protocol.http.ssl_config.verify_mode'] = OpenSSL::SSL::VERIFY_NONE if $DEBUG
-      $driver.method(method.to_sym).call(options)
+        unless Zanox::API::Session.secret_key.nil?
+          timestamp = Zanox::API.get_timestamp
+          nonce = Zanox::API.generate_nonce
+          signature = Zanox::API.create_signature(Zanox::API::Session.secret_key, "publisherservice"+method.downcase + timestamp + nonce)
+          options.merge!(:timestamp=>timestamp, :nonce=>nonce, :signature=>signature)
+        end
+      
+        @wsdl = 'http://api.zanox.com/wsdl/2009-07-01/' unless !!@wsdl
+        @driver = SOAP::WSDLDriverFactory.new(@wsdl).create_rpc_driver unless !!@driver
+        @driver.wiredump_dev = STDOUT if $DEBUG
+        @driver.options['protocol.http.ssl_config.verify_mode'] = OpenSSL::SSL::VERIFY_NONE if $DEBUG
+        @driver.method(method.to_sym).call(options)
+      rescue Exception => e
+        puts
+        puts "ERROR"
+        puts e.message
+      end
     end
     
     def self.generate_nonce
@@ -41,6 +55,12 @@ module Zanox
       signature = Base64.encode64(HMAC::SHA1.new(secret_key).update(string2sign).digest)[0..-2]
     end
     
+    def self.authorize(public_key, secret_key)
+      @public_key = public_key
+      @secret_key = secret_key
+      true
+    end
+    
     def self.authenticate(connect_id, secret_key=nil)
       #todo: real session request with connect flow
       @connect_id = connect_id
@@ -48,6 +68,76 @@ module Zanox
       true
     end
     
+    module Session
+      attr_accessor :connect_id
+      attr_accessor :secret_key
+      attr_accessor :offline_token
+      
+      def self.new(auth_token)
+        response = Zanox::Connect.request("getSession", {:authToken=>auth_token})
+        self.map(response)
+      end
+      
+      def self.offline(offline_token)
+        response = Zanox::Connect.request("getOfflineSession", {:offlineToken=>offline_token})
+        self.map(response)
+        if(response.respond_to?(:session))
+          response.session
+        else
+          {:error=>"error!!! offline session"}
+        end
+      end
+      
+      def map(response)
+        if(response.respond_to?(:session))
+          @connect_id = response.session.connectId
+          @secret_key = response.session.secretKey
+          @offline_token = response.session.offlineToken
+          true
+        else
+          false
+        end
+      end
+      
+      self.instance_methods.each do |method|
+         module_function method.to_sym
+      end
+      
+    end
+    
+    self.instance_methods.each do |method|
+       module_function method.to_sym
+    end
+    
+  end
+  
+  module Connect
+    attr_accessor :wsdl
+    attr_accessor :driver
+    
+    def self.request(method, options)
+      begin
+        options.merge!(:publicKey=>Zanox::API.public_key)
+      
+        unless Zanox::API.secret_key.nil?
+          timestamp = Zanox::API.get_timestamp
+          nonce = Zanox::API.generate_nonce
+          signature = Zanox::API.create_signature(Zanox::API.secret_key, "connectservice"+method.downcase + timestamp + nonce)
+          options.merge!(:timestamp=>timestamp, :nonce=>nonce, :signature=>signature)
+        end
+      
+        @wsdl = 'https://auth.zanox-affiliate.de/wsdl/2010-02-01' unless !!@wsdl
+        @driver = SOAP::WSDLDriverFactory.new(@wsdl).create_rpc_driver unless !!@driver
+        @driver.wiredump_dev = STDOUT if $DEBUG
+        @driver.options['protocol.http.ssl_config.verify_mode'] = OpenSSL::SSL::VERIFY_NONE if $DEBUG
+        @driver.method(method.to_sym).call(options)
+      rescue Exception => e
+        puts
+        puts "ERROR"
+        puts e.message
+      end
+    end
+    
     self.instance_methods.each do |method|
        module_function method.to_sym
     end
@@ -65,18 +155,13 @@ module Zanox
     def find_every(options)
       items = []
       class_name = self.name.split('::').last
-      api_method = 'get'+self.pluralize
       
-      if(class_name=='Program' && options.has_key?(:adspaceId))
-        api_method = "getProgramApplications"
+      if(self.respond_to?(:pluralize))
+        api_method = 'get'+self.pluralize
       end
       
-      unless Zanox::API.secret_key.nil?
-        timestamp = Zanox::API.get_timestamp
-        nonce = Zanox::API.generate_nonce
-      
-        signature = Zanox::API.create_signature(Zanox::API.secret_key, "publisherservice"+api_method.downcase + timestamp + nonce)
-        options.merge!(:timestamp=>timestamp, :nonce=>nonce, :signature=>signature)
+      if(class_name=='Program' && options.has_key?(:adspaceId))
+        api_method = "getProgramsByAdspace"
       end
       
       response = Zanox::API.request(api_method, options)
@@ -122,21 +207,35 @@ module Zanox
       class_name = self.name.split('::').last
       api_method = ''
 
-      if(ids.size>0)
+      if(ids.size==0 && queries.size==0)
         api_method = 'get'+class_name
         unless Zanox::API.secret_key.nil?
-          timestamp = Zanox::API.get_timestamp
-          nonce = Zanox::API.generate_nonce
-          signature = Zanox::API.create_signature(Zanox::API.secret_key, "publisherservice"+api_method.downcase + timestamp + nonce)
-          options.merge!(:timestamp=>timestamp, :nonce=>nonce, :signature=>signature)
+          response = Zanox::API.request(api_method, options)
+          class_name.sub!(/\b\w/) { $&.downcase }
+          item_method = (class_name+'Item').to_sym
+          if(response.respond_to?(item_method))
+            item = self.new(response.method(item_method).call)
+            items.push item
+          end
         end
         
+      end
+
+      if(ids.size>0)
+        
+        api_method = 'get'+class_name
+        
         ids.each do |id|
           options.merge!(self.key_symbol=>id)
           response = Zanox::API.request(api_method, options)
+          
           class_name.sub!(/\b\w/) { $&.downcase }
-          item = self.new(response.method((class_name+'Item').to_sym).call)
-          items.push item
+          item_method = (class_name+'Item').to_sym
+          
+          if(response.respond_to?(item_method))
+            item = self.new(response.method(item_method).call)
+            items.push item
+          end
         end
       end
 
@@ -170,21 +269,30 @@ module Zanox
     end
     
     def find(*args)
-      
+      item_name = self.name.split('::').last
       options = args.last.is_a?(Hash) ? args.pop : {}
       
       puts "Arguments: " + args.inspect if $DEBUG
       puts "Options: " + options.inspect if $DEBUG
       
-      case args.first
-        when :all then find_every(options)
-        when nil  then find_every(options)
-        else           find_other(args, options)
+      if(item_name=="Profile")
+        find_other(args, options)
+      else
+        case args.first
+          when :all then find_every(options)
+          when nil  then find_every(options)
+          else           find_other(args, options)
+        end
       end
       
     end
   end
   
+  module Profile
+    include Item
+    extend  Item
+  end
+  
   module Program
     include Item
     extend  Item
@@ -198,7 +306,7 @@ module Zanox
     end
     
     def self.is_key?(id)
-      id.to_s[/^[0-9]{2,8}$/] ? true : false
+      id.to_s[/^[0-9]{1,8}$/] ? true : false
     end
   end
   

data/spec/zanox_specs.rb

@@ -2,15 +2,33 @@ require File.join(File.dirname(__FILE__),"..","lib","zanox.rb")
 
 describe Zanox::API do
   
-  # authenticate
-  TEST_CONNECT_ID = "your connect id here"
+  TEST_PUBLIC_KEY = "your public key here"
   TEST_SECRET_KEY = "your secret key here"
   
   before(:all) do
   end
   
-  it "should authenticate a developer" do
-    Zanox::API.authenticate(TEST_CONNECT_ID, TEST_SECRET_KEY).should == true
+  it "should authorize a developer's application" do
+    Zanox::API.authorize(TEST_PUBLIC_KEY, TEST_SECRET_KEY).should == true
+  end
+end
+
+describe Zanox::API::Session do
+  it "should get a new session" do
+    TEST_AUTH_TOKEN = "your auth token here"
+    Zanox::API::Session.new(TEST_AUTH_TOKEN).should == true
+  end
+  it "should get a new offline session" do
+    TEST_OFFLINE_TOKEN = "your offline token here"
+    TEST_CONNECT_ID = "publisher connect id here"
+    Zanox::API::Session.offline(TEST_OFFLINE_TOKEN)
+    Zanox::API::Session.connect_id.should == TEST_CONNECT_ID
+  end
+end
+
+describe Zanox::Profile do
+  it "should find the users profile" do
+    Zanox::Profile.find.size.should == 1
   end
 end
 
@@ -42,15 +60,14 @@ describe Zanox::Program do
     Zanox::Program.find(TEST_PROGRAM_ID).size.should == 1
   end
 
-  # TODO: fix it  
-  # it "should find programs by an adspace" do
-  #   Zanox::Program.find(:adspaceId=>TEST_ADSPACE_ID).size.should >= 1
-  # end
+  it "should find programs by an adspace" do
+    Zanox::Program.find(:adspaceId=>TEST_ADSPACE_ID).size.should >= 1
+  end
 end
 
 describe Zanox::Adspace do
   # Adspace.find
-  TEST_ADSPACE_ID = "1289612"
+  TEST_ADSPACE_ID = "99501"
   
   it "should find all user's Adspaces" do
     Zanox::Adspace.find(:all).size.should >=1

data/zanox.gemspec

@@ -8,13 +8,13 @@ require 'rake'
 spec = Gem::Specification.new do |s|
     s.platform  =   Gem::Platform::RUBY
     s.name      =   %q{zanox}
-    s.version   =   "0.2.4"
+    s.version   =   "0.2.5"
     s.authors   =   ["Krispin Schulz"]
     s.homepage  =   %q{http://github.com/kr1sp1n/zanox}
     s.date      =   Time.now.strftime("%Y-%m-%d")
     s.email     =   %q{krispinone@googlemail.com}
-    s.summary   =   %q{One gem to rule the zanox web services.}
-    s.description =   %q{The easy way to the zanox web services.}
+    s.summary   =   %q{One gem to rule the zanox API.}
+    s.description =   %q{The easy way to the zanox API.}
     s.files     =   FileList['Rakefile', 'zanox.gemspec', 'README.textile', 'lib/**/*', 'test/*', 'spec/*'].to_a
     s.require_paths  =   ["lib"]
     s.rubygems_version = %q{1.3.5}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zanox
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
+  hash: 29
+  prerelease: 
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - Krispin Schulz
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-10 00:00:00 +01:00
+date: 2011-02-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,7 +50,7 @@ dependencies:
         version: 0.4.0
   type: :runtime
   version_requirements: *id002
-description: The easy way to the zanox web services.
+description: The easy way to the zanox API.
 email: krispinone@googlemail.com
 executables: []
 
@@ -96,9 +96,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
-summary: One gem to rule the zanox web services.
+summary: One gem to rule the zanox API.
 test_files: 
 - test/zanox_tests.rb