omniauth-naranya_id 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4fc44aec6bf352103357b19e5c6a45bc4aad04c
-  data.tar.gz: 8e3a9bf5e82bb02c77b99341536173b05f9f6ef3
+  metadata.gz: a2282898f510b1a141d381ec7a9a13b7cb76e4b7
+  data.tar.gz: a976d4c379a3035da50030195be7f70a15145fe7
 SHA512:
-  metadata.gz: 86850421cd48c60ec7f0194f83ded1298b471f4a135af4d94e12340fb430775f14899528b9aeec477a98d19f13e05d1e3224654ea0302ada689b31b0ce205abb
-  data.tar.gz: 00b691d5859687c9783f6eb46325be64becd2af2900083869226d89df373f9c310f80deaaf2421f6b2139ff1d6375d86406f13dc6a0a586abc970824055f8854
+  metadata.gz: 5df77d967b4f20ae5d453b44a8bdf34c8a2e2b11646dd2054ea1fcb73115a32f148b759f7ff792d81e7637cf15a9843f4f1651923adedbff028e8f6d578a881a
+  data.tar.gz: 0c5563981947192f1b0f08cab79c58d2e2d5e4016d47e6719fcb268e699045007508f9c850c1a27e63e1cc84d66d60ae96b78f466189f3cd8d6021444ba7869b

data/lib/naranya_id/models/user.rb

@@ -4,49 +4,132 @@ module NaranyaId
   class User
     include ActiveModel::Model
 
-    attr_accessor :id, :first_name, :last_name, :email, :gender, :date_of_birth, :screen_name
-    
-    def attributes
-      Hash[to_yaml_properties.map { |attr| [attr.to_s[1..-1].to_sym, instance_variable_get(attr)] }]
+    attr_accessor :first_name, :last_name, :email, :gender, :date_of_birth, :screen_name
+    attr_reader   :id
+
+    def persisted?
+      @persisted === true
     end
 
-    class << self
+    def gender=(given_gender)
+      @gender = case given_gender.to_s.downcase
+      when "male", "m" then :male
+      else :female
+      end
+    end
 
-      def translate_attributes(attributes)
-        translated_attributes = {
-          id: attributes[:uuid],
-          first_name: attributes[:nombre],
-          last_name: attributes[:apellido],
-          email: attributes[:email],
-          screen_name: attributes[:screenname]
-        }
+    def update(given_attributes)
+      given_attributes.each { |attr, value| self.public_send("#{attr}=", value) } if given_attributes
+      save
+    end
 
-        translated_attributes[:date_of_birth] = attributes[:nacimiento].to_date if attributes[:nacimiento].present?
-        translated_attributes
+    def date_of_birth=(given_date_of_birth)
+      @date_of_birth = if given_date_of_birth.respond_to? :monday?
+        given_date_of_birth
+      elsif given_date_of_birth.respond_to? :downcase
+        Date.parse(given_date_of_birth)
       end
+    end
 
-      def find_one(options={})
-        options = options.with_indifferent_access
-        
-        raise "Token/Secret not provided" unless options.has_key?(:token) and options.has_key?(:secret)
+    def save
+      return false unless self.valid?
+      
+      api_token = OAuth::AccessToken.new NaranyaId.consumer, @access_token, @access_secret
+      
+      nid_hash = {}.with_indifferent_access
+      nid_hash[:name]       = @first_name unless  @first_name.nil?
+      nid_hash[:lastname]   = @last_name  unless  @last_name.nil?
+      
+      nid_hash[:gender]     = case @gender
+      when :male then 1
+      when :female then 0
+      end unless @gender.nil?
 
-        api_consumer = NaranyaId.consumer
-        
-        NaranyaId.logger.info "Consumer key: '#{api_consumer.key}', Consumer secret: '#{api_consumer.secret}'"
-        NaranyaId.logger.info "Access token key: '#{options[:token]}', Access token secret: '#{options[:secret]}'"
-        api_access_token = ::OAuth::AccessToken.new api_consumer, options[:token], options[:secret]
-        
-        user_info_response = api_access_token.get('/crmcapi/index.php/user')
-        
-        if user_info_response.code.to_i == 200
-          user_info = ActiveSupport::JSON.decode(user_info_response.body).with_indifferent_access
-          self.new translate_attributes(user_info)
+      nid_hash[:birthday]   = @date_of_birth.to_s unless  @date_of_birth.nil?
+      nid_hash[:screenname] = @screen_name unless @screen_name.nil?
+      
+      response = api_token.put "/crmcapi/user", nid_hash
+      response_data = ActiveSupport::JSON.decode(response.body).with_indifferent_access if response.body =~ /\A{.*}/i
+      
+      if Net::HTTPSuccess
+      elsif Net::HTTPClientError === response
+
+        case response_data[:message]
+        when "ERROR missing parametres"
+          self.errors.add :base, "Missing parameters"
+        when "ERROR date not valid", "ERROR invalid date format"
+          self.errors.add :date_of_birth, "is invalid"
+        when "ERROR value not valid for gender"
+          self.errors.add :gender, "is invalid"
         else
-          nil
+          self.errors.add :base, "Naranya ID responded with a client error (#{response_data[:message]})"
         end
         
+      elsif Net::HTTPServerError === response
+        self.errors.add :base, "An error ocurred at Naranya ID server"
+      
+      else
+        self.errors.add :base, "Naranya ID Server responded with an unexpected HTTP status code"
+      end
+
+      @persisted = self.errors.empty?
+      @persisted
+    end
+
+    # Override de #inspect para evitar mostrar el access_token y el access_secret
+    def inspect
+      inspection = "<#{self.class}:0x#{("%x" % (object_id * 2)).rjust(14,"0")}"
+      inspection += " @id=#{@id.inspect}"                       unless @id.nil?
+      inspection += " @first_name=#{@first_name.inspect}"       unless @first_name.nil?
+      inspection += " @last_name=#{@last_name.inspect}"         unless @last_name.nil?
+      inspection += " @email=#{@email.inspect}"                 unless @email.nil?
+      inspection += " @gender=#{@gender.inspect}"               unless @gender.nil?
+      inspection += " @date_of_birth=#{@date_of_birth.inspect}" unless @date_of_birth.nil?
+      inspection += " @screen_name=#{@screen_name.inspect}"     unless @screen_name.nil?
+
+      "#{inspection}>"
+    end
+
+    def attributes
+      %w(first_name last_name email gender date_of_birth screen_name).inject({}.with_indifferent_access) do |attrs, attr_name|
+        attrs[attr_name] = instance_variable_get("@#{attr_name}")
+        attrs
       end
+    end
 
+    def self.find_one(options={})
+      options = options.with_indifferent_access
+      raise "Token/Secret not provided" unless options.has_key?(:token) and options.has_key?(:secret)
+
+      NaranyaId.logger.info "Consumer key: '#{NaranyaId.consumer.key}', Consumer secret: '#{NaranyaId.consumer.secret}'"
+      NaranyaId.logger.info "Access token key: '#{options[:token]}', Access token secret: '#{options[:secret]}'"
+      
+      api_access_token = ::OAuth::AccessToken.new NaranyaId.consumer, options[:token], options[:secret]
+      
+      user_info_response = api_access_token.get('/crmcapi/index.php/user')
+      
+      if Net::HTTPSuccess === user_info_response
+        response_data = ActiveSupport::JSON.decode(user_info_response.body).with_indifferent_access
+        
+        translated_data = {}.with_indifferent_access
+        translated_data[:first_name]    = response_data[:vc_name]       unless  response_data[:vc_name].nil?
+        translated_data[:last_name]     = response_data[:vc_lastname]   unless  response_data[:vc_lastname].nil?
+        translated_data[:gender]        = response_data[:i_gender]      unless  response_data[:i_gender].nil?
+        translated_data[:date_of_birth] = response_data[:dt_birthday]   unless  response_data[:dt_birthday].nil?
+        translated_data[:email]         = response_data[:vc_email]      unless  response_data[:vc_email].nil?
+        translated_data[:screen_name]   = response_data[:vc_screenname] unless  response_data[:vc_screenname].nil?
+        
+        user = self.new translated_data
+
+        user.instance_variable_set :@id, response_data[:uuid]
+        user.instance_variable_set :@access_token,  api_access_token.token
+        user.instance_variable_set :@access_secret, api_access_token.secret
+
+        user
+      else
+        nil
+      end
+      
     end
 
   end

data/lib/omniauth-naranya_id/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module NaranyaId
-    VERSION = "0.0.10"
+    VERSION = "0.0.11"
   end
 end

metadata

@@ -1,139 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-naranya_id
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Roberto Quintanilla
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-03 00:00:00.000000000 Z
+date: 2014-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   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: 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: rack-test
   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'
 - !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'
 description: Omniauth provider for NaranyaID.
@@ -143,8 +143,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -168,17 +168,17 @@ 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.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Omniauth provider for NaranyaID.