iesde 1.1.1 → 2.0.0

data/lib/iesde/api/alterar_status_matricula.rb

@@ -0,0 +1,9 @@
+module Iesde
+  module Api
+    class AlterarStatusMatricula < ::Iesde::API
+      def initialize(format, opts)
+        super(:alterar_matricula, format, opts)
+      end
+    end
+  end
+end

data/lib/iesde/api/criar_matricula.rb

@@ -0,0 +1,13 @@
+module Iesde
+  module Api
+    class CriarMatricula < ::Iesde::API
+      def initialize(format, opts)
+        super(:cadastro_matricula, format, opts)
+      end
+
+      def matricula_id_do_retorno
+        as_json["MatriculaID"]
+      end
+    end
+  end
+end

data/lib/iesde/api/obter_aula.rb

@@ -0,0 +1,12 @@
+module Iesde
+  module Api
+    class ObterAula < ::Iesde::API
+      include Underscorable
+
+      def initialize(format, opts)
+        super(:aulas, format, opts)
+        @response = "[]" if as_json.is_a?(Hash) && tem_chave?("status") && ( status == false )
+      end
+    end
+  end
+end

data/lib/iesde/api/obter_dados_pdf.rb

@@ -0,0 +1,9 @@
+module Iesde
+  module Api
+    class ObterDadosPdf < ::Iesde::API
+      def initialize(format, opts)
+        super(:pdf, format, opts)
+      end
+    end
+  end
+end

data/lib/iesde/api/obter_disciplina.rb

@@ -0,0 +1,11 @@
+module Iesde
+  module Api
+    class ObterDisciplina < ::Iesde::API
+      include Underscorable
+
+      def initialize(format, opts)
+        super(:disciplinas, format, opts)
+      end
+    end
+  end
+end

data/lib/iesde/api/obter_link_pdf.rb

@@ -0,0 +1,10 @@
+module Iesde
+  module Api
+    class ObterLinkPdf < ::Iesde::API
+      include Linkable
+      def initialize(format, opts)
+        super(:get_pdf, format, opts)
+      end
+    end
+  end
+end

data/lib/iesde/api/obter_matricula.rb

@@ -0,0 +1,11 @@
+module Iesde
+  module Api
+    class ObterMatricula < ::Iesde::API
+      include Underscorable
+
+      def initialize(format, config = {})
+        super(:matriculas, format, config)
+      end
+    end
+  end
+end

data/lib/iesde/api/obter_video.rb

@@ -0,0 +1,11 @@
+module Iesde
+  module Api
+    class ObterVideo < ::Iesde::API
+      include Linkable
+
+      def initialize(format, opts)
+        super(:video_aula, format, opts)
+      end
+    end
+  end
+end

data/lib/iesde/config.rb

@@ -1,5 +1,5 @@
 module Iesde
   class Config
-    attr_accessor :default_username, :default_password
+    attr_accessor :user, :password, :ead_api_key
   end
-end
+end

data/lib/iesde/model/aula.rb

@@ -1,34 +1,25 @@
 module Iesde
   module Model
     class Aula
-      attr_accessor :curso_id, :nome_curso, :categoria, :subcategoria, :id, :ordem, :tema, :autores, :duracao, :login_aluno, :cpf, :disciplina_id, :disciplina, :login, :senha, :curso
+      include Stringable
 
-      def initialize(*args)
-        @curso_id, @nome_curso, @categoria, @subcategoria, @id, @ordem, @tema, @autores, @duracao, @login_aluno, @cpf, @disciplina_id, @disciplina = args
-      end
-
-      def self.buscar params
-        client_obtem_aulas = WSDLClient.create :obtem_aulas
-        aulas = client_obtem_aulas.run params
-        aulas.each do |aula|
-          aula.login = params[:login]
-          aula.senha = params[:senha]
-        end
-      end
+      attr_accessor :matricula_id, :curso_id, :grade_id, :disciplina_id, :aula_id, :tema
 
-      def curso
-        @curso ||= Curso.find id: @curso_id, login: @login, senha: @senha
+      def initialize(*args)
+        @matricula_id, @curso_id, @grade_id, @disciplina_id, @aula_id, @tema = args
       end
 
-      def link_pdf email_aluno, cpf_aluno
-        client_buscar_arquivo = WSDLClient.create :buscararquivo
-        client_buscar_arquivo.run usuario: email_aluno, senha: cpf_aluno, curso: @curso_id, aula: @id, tipo: curso.tipo
+      def self.buscar(opts)
+        aulas = Iesde::Api::ObterAula.new(:json, opts)
+        aulas.underscorize_fields(Aula)
       end
 
-      def pdf_para aluno
-        link_pdf aluno.login_aluno, aluno.cpf
+      def link_video(opts = {})
+        Iesde::Api::ObterVideo.new(:json, {
+          'MatriculaID' => matricula_id,
+          'AulaID'      => aula_id
+        }.merge(opts)).link
       end
-
     end
   end
 end

data/lib/iesde/model/disciplina.rb

@@ -0,0 +1,45 @@
+module Iesde
+  module Model
+    class Disciplina
+      include Stringable
+
+      attr_accessor :disciplina_id, :grade_id, :curso_id, :computed, :sigla, :situacao, :carga_horaria, :ementa, :plano_aula
+
+      def initialize(*args)
+        @disciplina_id, @grade_id, @curso_id, @computed, @sigla, @situacao, @carga_horaria, @ementa, @plano_aula = args
+      end
+
+      def self.buscar(opts = {})
+        disciplinas = Iesde::Api::ObterDisciplina.new(:json, opts)
+
+        disciplinas.underscorize_fields(Disciplina)
+      end
+
+      def aulas(matricula_id, opts = {})
+        Iesde::Model::Aula.buscar({
+          'MatriculaID'  => matricula_id,
+          'DisciplinaID' => disciplina_id
+        }.merge(opts))
+      end
+
+      def dados_pdf(matricula_id, opts = {})
+        Iesde::Api::ObterDadosPdf.new(:json, {
+          'MatriculaID'  => matricula_id,
+          'DisciplinaID' => disciplina_id
+        }.merge(opts)).as_json
+      end
+
+      def link_pdf(matricula_id, livro_disciplina_id, opts = {})
+        Iesde::Api::ObterLinkPdf.new(:json, {
+          'MatriculaID'       => matricula_id,
+          'LivroDisciplinaID' => livro_disciplina_id
+        }.merge(opts)).link
+      end
+
+      def pdf(matricula_id, opts = {})
+        livro_disciplina_id = dados_pdf(matricula_id, opts).first["LivroDisciplinaID"]
+        link_pdf(matricula_id, livro_disciplina_id, opts)
+      end
+    end
+  end
+end

data/lib/iesde/model/matricula.rb

@@ -1,46 +1,66 @@
 module Iesde
   module Model
     class Matricula
-      attr_accessor :curso_id, :nome_curso, :data_inclusao, :duracao, :email_aluno, :cpf_aluno, :id, :login, :senha, :curso
+      include Stringable
+
+      attr_accessor :matricula_id, :login_id, :situacao, :dt_cadastro, :curso_id, :polo_id, :curso, :aluno, :cpf, :email, :situacao_descricao, :sexo
 
       def initialize(*args)
-        @curso_id, @nome_curso, @data_inclusao, @duracao, @email_aluno, @cpf_aluno, @id = args
+        @matricula_id, @login_id, @situacao, @dt_cadastro, @curso_id, @polo_id, @curso, @aluno, @cpf, @email, @situacao_descricao, @sexo = args
       end
 
-      def self.buscar params
-        client_obtem_matriculas = WSDLClient.create :obtem_matriculas
-        matriculas = client_obtem_matriculas.run params
-        matriculas.each do |matricula|
-          matricula.login = params[:login]
-          matricula.senha = params[:senha]
-        end
+      def self.buscar(config = {})
+        matriculas_obtidas = Iesde::Api::ObterMatricula.new(:json, config)
+
+        matriculas_obtidas.underscorize_fields(Matricula)
       end
 
       def self.criar params
-        client_cadastro = WSDLClient.create :cadastro
-        if client_cadastro.run(params)
-          matriculas = buscar params.except(:loginAluno, :cpf, :duracao, :valor)
-          matriculas.select { |matricula| matricula.email_aluno == params[:loginAluno] }.first
+        matricula = Iesde::Api::CriarMatricula.new(:json, params)
+
+        if matricula.salvo_com_sucesso?
+          Iesde::Model::Matricula.buscar.select do |mat|
+            mat.matricula_id.to_s == matricula.matricula_id_do_retorno.to_s
+          end.first
+        else
+          raise Iesde::Error::WSError.new(matricula.msg)
         end
       end
 
-      def self.inativar params
-        client_inativa_acesso = WSDLClient.create :inativa_acesso
-        client_inativa_acesso.run params
+      def self.criar_com_campos_obrigatorios(curso_id, nome, cpf, email, cep, numero)
+        self.criar(
+          'CursoID' => curso_id,
+          'Nome'    => nome,
+          'CPF'     => cpf,
+          'Email'   => email,
+          'CEP'     => cep,
+          'Numero'  => numero
+        )
       end
 
-      def inativar
-        Matricula.inativar login: @login, senha: @senha, :"LoginID" => @id
-      end
+      def self.alterar_status(params)
+        api = Iesde::Api::AlterarStatusMatricula.new(:json, params)
 
-      def curso
-        @curso ||= Curso.find id: @curso_id, login: @login, senha: @senha
+        if api.salvo_com_sucesso?
+          api.msg
+        else
+          raise Iesde::Error::WSError.new(api.msg)
+        end
       end
 
-      def aluno
-        @aluno ||= Aluno.new @email_aluno, @cpf_aluno, @login, @senha
+      def ativar!(opts = {})
+        Iesde::Model::Matricula.alterar_status({
+          'MatriculaID' => self.matricula_id,
+          'Situacao'    => 'A'
+        }.merge(opts))
       end
 
+      def inativar!(opts = {})
+        Iesde::Model::Matricula.alterar_status({
+          'MatriculaID' => self.matricula_id,
+          'Situacao'    => 'I'
+        }.merge(opts))
+      end
     end
   end
 end

data/lib/iesde/request.rb

@@ -0,0 +1,70 @@
+module Iesde
+  class Request
+    def initialize(ask_for, format, api)
+      @api     = api[:config]
+      @uri     = build_uri(ask_for, format)
+      @format  = format
+      @retorno = []
+    end
+
+    def execute(opts = {})
+      res = do_the_post(opts)
+
+      case res.code
+      when '200'
+        @retorno = res.body
+      when '400'
+        @retorno = res.body
+      else
+        raise "Ocorreu um erro"
+      end
+    end
+
+  private
+
+    def build_uri(ask_for, format)
+      url           = Iesde::API.build_url(ask_for, format)
+      _uri          = URI.parse(url)
+      _uri.user     = @api[:user]
+      _uri.password = @api[:password]
+
+      _uri
+    end
+
+    def do_the_post(opts = {})
+      h    = config_host
+      auth = pega_autorizacao(h)
+
+      req = Net::HTTP::Post.new(@uri.request_uri)
+      req.add_field 'Authorization', auth
+      req.add_field 'ead-api-key', @api[:ead_api_key]
+      req.set_form_data(opts)
+
+      res = h.request(req)
+
+      res
+    end
+
+    def pega_autorizacao(h)
+      res         = pega_autenticacao(h)
+      digest_auth = Net::HTTP::DigestAuth.new
+      auth        = digest_auth.auth_header @uri, res['www-authenticate'], 'POST'
+
+      auth
+    end
+
+    def pega_autenticacao(h)
+      req = Net::HTTP::Head.new(@uri.request_uri)
+      res = h.request(req)
+
+      res
+    end
+
+    def config_host
+      http = Net::HTTP.new(@uri.host, @uri.port)
+      http.set_debug_output $stderr if ENV['DEBUG']
+
+      http
+    end
+  end
+end

data/lib/iesde/version.rb

@@ -1,3 +1,3 @@
 module Iesde
-  VERSION = "1.1.1"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,119 +1,260 @@
 --- !ruby/object:Gem::Specification
 name: iesde
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Pedro Benevides
+- Heron Medeiros
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-07 00:00:00.000000000 Z
+date: 2017-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: savon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.10'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: actionview
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-http-digest_auth
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Esta não é uma versão oficial
 email:
 - pedroaugusto@gmail.com
+- heron.medeiros@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE
+- README-OLD-API.md
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
+- examples/aulas/buscar.rb
+- examples/aulas/link_video.rb
+- examples/disciplinas/aulas.rb
+- examples/disciplinas/buscar.rb
+- examples/disciplinas/link_pdf.rb
+- examples/matriculas/ativar.rb
+- examples/matriculas/buscar.rb
+- examples/matriculas/criar.rb
+- examples/matriculas/criar_com_campos_obrigatorios.rb
 - iesde.gemspec
+- lib/concerns/linkable.rb
+- lib/concerns/stringable.rb
+- lib/concerns/underscorable.rb
 - lib/iesde.rb
-- lib/iesde/clients/buscararquivo.rb
-- lib/iesde/clients/cadastro.rb
-- lib/iesde/clients/inativa_acesso.rb
-- lib/iesde/clients/lista_curso.rb
-- lib/iesde/clients/logout.rb
-- lib/iesde/clients/obtem_aulas.rb
-- lib/iesde/clients/obtem_matriculas.rb
+- lib/iesde/api.rb
+- lib/iesde/api/alterar_status_matricula.rb
+- lib/iesde/api/criar_matricula.rb
+- lib/iesde/api/obter_aula.rb
+- lib/iesde/api/obter_dados_pdf.rb
+- lib/iesde/api/obter_disciplina.rb
+- lib/iesde/api/obter_link_pdf.rb
+- lib/iesde/api/obter_matricula.rb
+- lib/iesde/api/obter_video.rb
 - lib/iesde/config.rb
-- lib/iesde/error/validation_error.rb
 - lib/iesde/error/ws_error.rb
-- lib/iesde/model/aluno.rb
 - lib/iesde/model/aula.rb
-- lib/iesde/model/curso.rb
+- lib/iesde/model/disciplina.rb
 - lib/iesde/model/matricula.rb
+- lib/iesde/request.rb
 - lib/iesde/version.rb
-- lib/iesde/wsdl_client.rb
 homepage: https://github.com/fortesinformatica/iesde
 licenses:
 - MIT
@@ -124,18 +265,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: Client do WebService SOAP do IESDE
+summary: Client do WebService REST do IESDE
 test_files: []