cadun 0.5.4 → 0.5.5

data/lib/cadun/config.rb

@@ -1,19 +1,9 @@
 module Cadun
-  class Config
-    include Singleton
-    
-    attr_accessor :config
-    
-    def initialize
-      @config = {}
-    end
-    
+  class Config    
     def self.load_file(path)
-      instance.config = YAML::load_file(path)
-    end
-    
-    def self.method_missing(method, *args)
-      instance.config['cadun'][method.to_s]
+      (class << self; self; end).instance_eval do
+        YAML::load_file(path)['cadun'].each { |key, value| define_method(key) { value } }
+      end
     end
   end
 end

data/lib/cadun/gateway.rb

@@ -0,0 +1,39 @@
+module Cadun
+  class Gateway
+    attr_reader :opts
+  
+    def self.provision(user_id, service_id)
+      RestClient.put("#{Config.restclient_url}/service/provisionamento", "{\"usuarioId\": \"#{user_id}\", \"servicoId\": \"#{service_id}\"}", :content_type => "text/javascript").code == 200
+    end
+  
+    def initialize(opts = {})        
+      @opts = opts
+    end
+    
+    def content
+      @content ||= Hash.from_xml(content_resource)["pessoa"]
+    end
+  
+    def content_resource
+      subject = if opts[:email]; "email/#{opts[:email]}"
+        elsif opts[:cadun_id]; opts[:cadun_id]
+        else
+          raise RestClient::Unauthorized unless authorization["status"] == "AUTORIZADO"
+          authorization["usuarioID"]
+        end
+    
+      RestClient.get("#{Config.auth_url}/cadunii/ws/resources/pessoa/#{subject}", :content_type => "text/xml")
+    end
+    
+    def authorization
+      @authorization ||= Hash.from_xml(authorization_resource)["usuarioAutorizado"]
+    end
+  
+    def authorization_resource
+      %w(glb_id ip service_id).each { |i| raise ArgumentError.new("#{i} is missing") unless opts[i.to_sym] }
+      authorization_data = { "glbId" => opts[:glb_id], "ip" => opts[:ip], "servicoID" => opts[:service_id] }.to_xml(:root => "usuarioAutorizado", :indent => 0)
+    
+      RestClient.put("#{Config.auth_url}/ws/rest/autorizacao", authorization_data, :content_type => "text/xml")
+    end
+  end
+end

data/lib/cadun/user.rb

@@ -1,17 +1,13 @@
 module Cadun
-  class User
-    attr_reader :authorization_gateway, :provisioning_gateway
-    
-    { "id"                       => "cadun_id", 
-      "nome"                     => "name", 
-      "emailPrincipal"           => "email",
-      "tipoUsuario"              => "user_type", 
-      "sexo"                     => "gender",
-      "bairro"                   => "neighborhood", 
-      "cep"                      => "zipcode",
-      "complemento"              => "complement" }.each do |path, method|
-      define_method(method) { authorization_gateway.content[path] }
-    end
+  class User    
+    { "id"             => "cadun_id", 
+      "nome"           => "name", 
+      "emailPrincipal" => "email",
+      "tipoUsuario"    => "user_type", 
+      "sexo"           => "gender",
+      "bairro"         => "neighborhood", 
+      "cep"            => "zipcode",
+      "complemento"    => "complement" }.each { |path, method| define_method(method) { gateway.content[path] } }
     
     alias :id :cadun_id
     
@@ -25,8 +21,7 @@ module Cadun
     end
     
     def initialize(options = {})
-      @authorization_gateway = Gateway::Authorization.new(options)
-      @provisioning_gateway = Gateway::Provisioning.new(options)
+      @options = options
     end
     
     def address
@@ -58,15 +53,19 @@ module Cadun
     end
     
     def to_hash      
-      %w(cadun_id name email user_type gender neighborhood city state country address birthday phone mobile login cpf zipcode status complement).inject(Hash.new(0)) { |hash, method| hash[method.to_sym] = send(method); hash }
+      %w(address birthday cadun_id city complement country cpf email gender login mobile name neighborhood phone state status user_type zipcode).inject(Hash.new(0)) { |hash, method| hash[method.to_sym] = send(method); hash }
     end
     
     def provision_to_service(service_id)
-      provisioning_gateway.provision(self.id, service_id)
+      Gateway.provision(id, service_id)
     end
     
     def method_missing(method)
-      authorization_gateway.content[method.to_s]
+      gateway.content[method.to_s]
+    end
+    
+    def gateway
+      @gateway ||= Gateway.new(@options)
     end
   end
 end

data/lib/cadun/version.rb

@@ -2,7 +2,7 @@ module Cadun
   module VERSION
     MAJOR = 0
     MINOR = 5
-    PATCH = 4
+    PATCH = 5
 
     STRING = [MAJOR, MINOR, PATCH] * '.'
   end

data/lib/cadun.rb

@@ -1,10 +1,8 @@
 require 'date'
 require 'yaml'
-require 'singleton'
 require 'rest_client'
 require 'json'
 require 'active_support/core_ext/hash'
-require "#{File.dirname(__FILE__)}/cadun/gateway/authorization"
-require "#{File.dirname(__FILE__)}/cadun/gateway/provisioning"
+require "#{File.dirname(__FILE__)}/cadun/gateway"
 require "#{File.dirname(__FILE__)}/cadun/user"
 require "#{File.dirname(__FILE__)}/cadun/config"

data/spec/cadun/gateway_spec.rb

@@ -0,0 +1,91 @@
+require 'spec_helper'
+
+describe Cadun::Gateway do  
+  before { load_config }
+  
+  describe "#provision" do  
+    context "when the service is provisioned to the user" do
+      before { FakeWeb.register_uri(:put, "http://cadun-rest.qa01.globoi.com/service/provisionamento", :status => 200) }
+    
+      subject { Cadun::Gateway.provision(123456, 2515) }
+      specify { should be_true }
+    end
+  
+    context "when the service is provisioned to the user" do
+      before { FakeWeb.register_uri(:put, "http://cadun-rest.qa01.globoi.com/service/provisionamento", :status => 304) }
+    
+      subject { Cadun::Gateway.provision(123456, 2515) }
+      it { proc { subject }.should raise_error(RestClient::NotModified) }
+    end
+    
+    context "when the service is not found" do
+      before { FakeWeb.register_uri(:put, "http://cadun-rest.qa01.globoi.com/service/provisionamento", :status => 404) }
+    
+      subject { Cadun::Gateway.provision(123456, 2515) }
+      it { proc { subject }.should raise_error(RestClient::ResourceNotFound) }
+    end
+    
+    context "when the service is not found" do
+      before { FakeWeb.register_uri(:put, "http://cadun-rest.qa01.globoi.com/service/provisionamento", :status => 503) }
+    
+      subject { Cadun::Gateway.provision(123456, 2515) }
+      it { proc { subject }.should raise_error(RestClient::ServiceUnavailable) }
+    end
+    
+  end
+  
+  describe "#content" do
+    let(:gateway) { Cadun::Gateway.new(:glb_id => "GLB_ID", :ip => "127.0.0.1", :service_id => 2626) }
+    
+    context "when status not AUTORIZADO" do
+      before do
+        FakeWeb.register_uri(:put, "http://isp-authenticator.qa01.globoi.com:8280/ws/rest/autorizacao", :body => "<?xml version='1.0' encoding='utf-8'?><usuarioAutorizado><status>NAO_AUTORIZADO</status><usuarioID>1</usuarioID></usuarioAutorizado>")
+      end
+      
+      it { proc { gateway.content }.should raise_error(RestClient::Unauthorized) }
+    end
+
+    context "when status AUTORIZADO" do
+      before do
+        FakeWeb.register_uri(:put, "http://isp-authenticator.qa01.globoi.com:8280/ws/rest/autorizacao", :body => "<?xml version='1.0' encoding='utf-8'?><usuarioAutorizado><status>AUTORIZADO</status><usuarioID>1</usuarioID></usuarioAutorizado>")
+        FakeWeb.register_uri(:get, "http://isp-authenticator.qa01.globoi.com:8280/cadunii/ws/resources/pessoa/1", :body => "<?xml version='1.0' encoding='utf-8'?><pessoa><nome>Barack Obama</nome></pessoa>")
+      end
+      
+      it { proc { gateway.content }.should_not raise_error(RestClient::Unauthorized) }
+      
+      it "should parse the resource" do
+        gateway.content['nome'].should == 'Barack Obama'
+      end
+    end
+  end
+  
+  describe "#authorization" do
+    context "when all information is given" do
+      let(:gateway) { Cadun::Gateway.new(:glb_id => "GLB_ID", :ip => "127.0.0.1", :service_id => 2626) }
+      
+      before do
+        FakeWeb.register_uri(:put, "http://isp-authenticator.qa01.globoi.com:8280/ws/rest/autorizacao", :body => "<?xml version=\"1.0\" encoding=\"UTF-8\"?><usuarioAutorizado><glbId>GLB_ID</glbId><ip>127.0.0.1</ip><servicoID type=\"integer\">2626</servicoID></usuarioAutorizado>", :body => "<?xml version='1.0' encoding='utf-8'?><usuarioAutorizado><status>AUTORIZADO</status><usuarioID>1</usuarioID></usuarioAutorizado>")
+      end
+
+      it "should parse the authorization request" do
+        gateway.authorization['usuarioID'].should == '1'
+      end
+
+    end
+    
+    context "when glb_id is not given" do
+      let(:gateway) { Cadun::Gateway.new }
+      it { proc { gateway.authorization }.should raise_error(ArgumentError, "glb_id is missing") }
+    end
+    
+    context "when ip is not given" do
+      let(:gateway) { Cadun::Gateway.new(:glb_id => "1") }
+      it { proc { gateway.authorization }.should raise_error(ArgumentError, "ip is missing") }
+    end
+    
+    context "when service_id is not given" do
+      let(:gateway) { Cadun::Gateway.new(:glb_id => "1", :ip => "1") }
+      it { proc { gateway.authorization }.should raise_error(ArgumentError, "service_id is missing") }
+    end
+  end
+end

data/spec/cadun/user_spec.rb

@@ -17,8 +17,16 @@ describe Cadun::User do
   context "when the user id is not given" do
     subject { Cadun::User.new :ip => "127.0.0.1", :service_id => 2626, :glb_id => "GLB_ID" }
     
-    it "should load the gateway" do
-      mock(Cadun::Gateway::Authorization).new(hash_including(:ip => "127.0.0.1", :service_id => 2626, :glb_id => "GLB_ID"))
+    it "should load the gateway only when it's needed" do
+      mock(Cadun::Gateway).new(hash_including(:ip => "127.0.0.1", :service_id => 2626, :glb_id => "GLB_ID")) do 
+        mock(Cadun::Gateway).content { Hash.new }
+      end
+      
+      subject.login
+    end
+    
+    it "should not load the gateway when the user is initialized" do
+      dont_allow(Cadun::Gateway).new
       subject
     end
 
@@ -84,7 +92,7 @@ describe Cadun::User do
   
   describe "#provision_to_service" do
     it "should call gateway's provision" do
-      mock(Cadun::Gateway::Provisioning).new(anything) { mock('gateway').provision(1, 6969) }
+      mock(Cadun::Gateway).provision(1, 6969)
       
       user = Cadun::User.new
       mock(user).id { 1 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cadun
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-27 00:00:00.000000000Z
+date: 2011-07-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2153540860 !ruby/object:Gem::Requirement
+  requirement: &2156848880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153540860
+  version_requirements: *2156848880
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &2153540360 !ruby/object:Gem::Requirement
+  requirement: &2156848380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *2153540360
+  version_requirements: *2156848380
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2153539980 !ruby/object:Gem::Requirement
+  requirement: &2156848000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153539980
+  version_requirements: *2156848000
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2153539520 !ruby/object:Gem::Requirement
+  requirement: &2156847540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153539520
+  version_requirements: *2156847540
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2153539100 !ruby/object:Gem::Requirement
+  requirement: &2156847120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153539100
+  version_requirements: *2156847120
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153538680 !ruby/object:Gem::Requirement
+  requirement: &2156846700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153538680
+  version_requirements: *2156846700
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153538260 !ruby/object:Gem::Requirement
+  requirement: &2156846280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153538260
+  version_requirements: *2156846280
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &2153537840 !ruby/object:Gem::Requirement
+  requirement: &2156845860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153537840
+  version_requirements: *2156845860
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &2153537420 !ruby/object:Gem::Requirement
+  requirement: &2156845440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,7 +111,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153537420
+  version_requirements: *2156845440
 description: A wrapper for the Globo.com's authentication/authorization API
 email:
 - bruno@azisaka.com.br
@@ -126,15 +126,13 @@ files:
 - cadun.gemspec
 - lib/cadun.rb
 - lib/cadun/config.rb
-- lib/cadun/gateway/authorization.rb
-- lib/cadun/gateway/provisioning.rb
+- lib/cadun/gateway.rb
 - lib/cadun/user.rb
 - lib/cadun/version.rb
 - script/console
 - script/loader.rb
 - spec/cadun/config_spec.rb
-- spec/cadun/gateway/authorization_spec.rb
-- spec/cadun/gateway/provisioning_spec.rb
+- spec/cadun/gateway_spec.rb
 - spec/cadun/user_spec.rb
 - spec/spec_helper.rb
 - spec/support/fixtures/another_config.yml

data/lib/cadun/gateway/authorization.rb

@@ -1,43 +0,0 @@
-module Cadun
-  module Gateway
-    class Authorization
-      attr_reader :options, :connection
-    
-      def initialize(options = {})        
-        @options = options
-      end
-
-      def content
-        @content ||= Hash.from_xml(content_resource)["pessoa"]
-      end
-
-      def authorization
-        @authorization ||= Hash.from_xml(authorization_resource)["usuarioAutorizado"]
-      end
-    
-      protected
-      def content_resource
-        subject = if options[:email]
-          "email/#{options[:email]}"
-        
-        elsif options[:cadun_id]
-          options[:cadun_id]
-        
-        else
-          raise RuntimeError.new "not authorized" unless authorization["status"] == "AUTORIZADO"
-          authorization["usuarioID"]
-        end
-      
-        RestClient.get("#{Config.auth_url}/cadunii/ws/resources/pessoa/#{subject}", :content_type => "text/xml")
-      end
-    
-      def authorization_resource
-        [:glb_id, :ip, :service_id].each { |arg| raise RuntimeError.new("#{arg} is missing") unless options[arg] }
-        
-        authorization_data = { "glbId" => options[:glb_id], "ip" => options[:ip], "servicoID" => options[:service_id] }.to_xml(:root => "usuarioAutorizado", :indent => 0)
-      
-        RestClient.put("#{Config.auth_url}/ws/rest/autorizacao", authorization_data, :content_type => "text/xml")
-      end
-    end
-  end
-end

data/lib/cadun/gateway/provisioning.rb

@@ -1,13 +0,0 @@
-module Cadun
-  module Gateway
-    class Provisioning < Authorization
-      def provision(user_id, service_id)
-        begin
-          RestClient.put("#{Config.restclient_url}/service/provisionamento", "{\"usuarioId\": \"#{user_id}\", \"servicoId\": \"#{service_id}\"}", :content_type => "text/javascript").code == 200
-        rescue RestClient::NotModified
-          false
-        end
-      end
-    end
-  end
-end

data/spec/cadun/gateway/authorization_spec.rb

@@ -1,64 +0,0 @@
-require 'spec_helper'
-
-describe Cadun::Gateway::Authorization do
-  let(:response) { mock }
-  
-  before do 
-    load_config
-  end
-  
-  describe "#content" do
-    let(:gateway) { Cadun::Gateway::Authorization.new(:glb_id => "GLB_ID", :ip => "127.0.0.1", :service_id => 2626) }
-    
-    context "when status not AUTORIZADO" do
-      before do
-        FakeWeb.register_uri(:put, "http://isp-authenticator.qa01.globoi.com:8280/ws/rest/autorizacao", :body => "<?xml version='1.0' encoding='utf-8'?><usuarioAutorizado><status>NAO_AUTORIZADO</status><usuarioID>1</usuarioID></usuarioAutorizado>")
-      end
-      
-      it { proc { gateway.content }.should raise_error(RuntimeError, "not authorized") }
-    end
-
-    context "when status AUTORIZADO" do
-      before do
-        FakeWeb.register_uri(:put, "http://isp-authenticator.qa01.globoi.com:8280/ws/rest/autorizacao", :body => "<?xml version='1.0' encoding='utf-8'?><usuarioAutorizado><status>AUTORIZADO</status><usuarioID>1</usuarioID></usuarioAutorizado>")
-        FakeWeb.register_uri(:get, "http://isp-authenticator.qa01.globoi.com:8280/cadunii/ws/resources/pessoa/1", :body => "<?xml version='1.0' encoding='utf-8'?><pessoa><nome>Barack Obama</nome></pessoa>")
-      end
-      
-      it { proc { gateway.content }.should_not raise_error(RuntimeError, "not authorized") }
-      
-      it "should parse the resource" do
-        gateway.content['nome'].should == 'Barack Obama'
-      end
-    end
-  end
-  
-  describe "#authorization" do
-    context "when all information is given" do
-      let(:gateway) { Cadun::Gateway::Authorization.new(:glb_id => "GLB_ID", :ip => "127.0.0.1", :service_id => 2626) }
-      
-      before do
-        FakeWeb.register_uri(:put, "http://isp-authenticator.qa01.globoi.com:8280/ws/rest/autorizacao", :body => "<?xml version=\"1.0\" encoding=\"UTF-8\"?><usuarioAutorizado><glbId>GLB_ID</glbId><ip>127.0.0.1</ip><servicoID type=\"integer\">2626</servicoID></usuarioAutorizado>", :body => "<?xml version='1.0' encoding='utf-8'?><usuarioAutorizado><status>AUTORIZADO</status><usuarioID>1</usuarioID></usuarioAutorizado>")
-      end
-
-      it "should parse the authorization request" do
-        gateway.authorization['usuarioID'].should == '1'
-      end
-
-    end
-    
-    context "when glb_id is not given" do
-      let(:gateway) { Cadun::Gateway::Authorization.new }
-      it { proc { gateway.authorization }.should raise_error(RuntimeError, "glb_id is missing") }
-    end
-    
-    context "when ip is not given" do
-      let(:gateway) { Cadun::Gateway::Authorization.new(:glb_id => "1") }
-      it { proc { gateway.authorization }.should raise_error(RuntimeError, "ip is missing") }
-    end
-    
-    context "when service_id is not given" do
-      let(:gateway) { Cadun::Gateway::Authorization.new(:glb_id => "1", :ip => "1") }
-      it { proc { gateway.authorization }.should raise_error(RuntimeError, "service_id is missing") }
-    end
-  end
-end

data/spec/cadun/gateway/provisioning_spec.rb

@@ -1,27 +0,0 @@
-require 'spec_helper'
-
-describe Cadun::Gateway::Provisioning do  
-  before { load_config }
-  
-  describe "#provision" do
-    let(:gateway) { Cadun::Gateway::Provisioning.new }
-  
-    context "when the service is provisioned to the user" do
-      before do
-        FakeWeb.register_uri(:put, "http://cadun-rest.qa01.globoi.com/service/provisionamento", :status => 200)
-      end
-    
-      subject { gateway.provision(123456, 2515) }
-      specify { should be_true }
-    end
-  
-    context "when the service is provisioned to the user" do
-      before do
-        FakeWeb.register_uri(:put, "http://cadun-rest.qa01.globoi.com/service/provisionamento", :status => 304)
-      end
-    
-      subject { gateway.provision(123456, 2515) }
-      specify { should be_false }
-    end
-  end
-end