openpayu 0.0.2 → 0.1.2

data/doc/top-level-namespace.html

@@ -6,7 +6,7 @@
 <title>
   Top Level Namespace
   
-    &mdash; Documentation by YARD 0.8.7.2
+    &mdash; Documentation by YARD 0.8.7.4
   
 </title>
 
@@ -17,7 +17,7 @@
 <script type="text/javascript" charset="utf-8">
   hasFrames = window.top.frames.main ? true : false;
   relpath = '';
-  framesUrl = "frames.html#!" + escape(window.location.href);
+  framesUrl = "frames.html#!top-level-namespace.html";
 </script>
 
 
@@ -105,9 +105,9 @@
 </div>
 
     <div id="footer">
-  Generated on Tue Dec 17 15:20:58 2013 by
+  Generated on Thu May 29 15:13:57 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.8.7.2 (ruby-1.9.3).
+  0.8.7.4 (ruby-1.9.3).
 </div>
 
   </body>

data/lib/openpayu.rb

@@ -1,5 +1,4 @@
 # -*- encoding : utf-8 -*-
-require_relative 'openpayu/xml_builder'
 require_relative 'openpayu/version'
 require_relative 'openpayu/configuration'
 require_relative 'openpayu/connection'

data/lib/openpayu/configuration.rb

@@ -34,6 +34,7 @@ module OpenPayU
         @env    = 'sandbox'
         @country = 'pl'
         @algorithm = 'MD5'
+        @data_format = 'json'
       end
 
       def required_parameters

data/lib/openpayu/connection.rb

@@ -7,55 +7,64 @@ module OpenPayU
 
   class Connection
 
-    def self.post(url, data, headers)
-      uri = URI.parse(url)
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true if OpenPayU::Configuration.use_ssl?
+    def self.post(endpoint, data)
+      http, uri = build_url(endpoint)
       request = Net::HTTP::Post.new(uri.path)
+      request = authenticate(request)
       request.body = data
       request['Content-Type'] =
         "application/#{OpenPayU::Configuration.data_format}"
-      request['OpenPayu-Signature'] = headers['OpenPayu-Signature']
       response = http.request(request)
       { response: response, request: request }
     end
 
-    def self.put(url, data, headers)
-      uri = URI.parse(url)
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true if OpenPayU::Configuration.use_ssl?
+    def self.put(endpoint, data)
+      http, uri = build_url(endpoint)
       request = Net::HTTP::Put.new(uri.path)
+      request = authenticate(request)
       request.body = data
       request['Content-Type'] =
         "application/#{OpenPayU::Configuration.data_format}"
-      request['OpenPayu-Signature'] = headers['OpenPayu-Signature']
       response = http.request(request)
       { response: response, request: request }
     end
 
-    def self.get(url, data, headers)
-      common_connection(url, data, headers, 'GET')
+    def self.get(endpoint, data)
+      common_connection(endpoint, data, 'GET')
     end
 
-    def self.delete(url, data, headers)
-      common_connection(url, data, headers, 'DELETE')
+    def self.delete(endpoint, data)
+      common_connection(endpoint, data, 'DELETE')
     end
 
     private
 
-    def self.common_connection(url, data, headers, method)
-      uri = URI.parse(url)
+    def self.authenticate(request)
+      request.basic_auth(
+        OpenPayU::Configuration.merchant_pos_id,
+        OpenPayU::Configuration.signature_key
+      )
+      request
+    end
+
+    def self.build_url(endpoint)
+      uri = URI.parse(Configuration.get_base_url + endpoint)
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = true if OpenPayU::Configuration.use_ssl?
+      [http, uri]
+    end
+
+    def self.common_connection(endpoint, data, method)
+      http, uri = build_url(endpoint)
       request =
         if method == 'DELETE'
-          Net::HTTP::Delete.new(uri.request_uri, headers)
+          Net::HTTP::Delete.new(uri.request_uri)
         else
-          Net::HTTP::Get.new(uri.request_uri, headers)
+          Net::HTTP::Get.new(uri.request_uri)
         end
+      request = authenticate(request)
       request['Content-Type'] =
         "application/#{OpenPayU::Configuration.data_format}"
-      request['OpenPayu-Signature'] = headers['OpenPayu-Signature']
       response = http.request(request)
       { response: response, request: request }
     end

data/lib/openpayu/document.rb

@@ -37,9 +37,8 @@ module OpenPayU
         raise EmptyResponseError,
               "Got empty response from request: #{@request.try(:body)}"
       end
-      if (@message_name == 'OrderNotifyRequest' ||
-          %w(200 201 422 302).include?(response.code)) &&
-          verify_signature(@body)
+      if ( response.is_a?(OpenPayU::Documents::Request) ||
+            %w(200 201 422 302).include?(response.code)) 
         true
       else
         raise HttpStatusException,
@@ -48,41 +47,6 @@ module OpenPayU
       end
     end
 
-    def verify_signature(message)
-      signature = parse_signature
-      generated_signature = generate_signature(
-        message,
-        signature['algorithm'],
-        OpenPayU::Configuration.signature_key
-      )
-      if generated_signature == signature['signature']
-        true
-      else
-        raise WrongSignatureException,
-              "Invalid signature: Got message signed with:
-              #{signature["signature"]}. Generated signature:
-              #{generated_signature}"
-      end
-
-    end
-
-    def parse_signature
-      parameters = {}
-      get_signature.split(';').each do |parameter|
-        k, v = parameter.split('=')
-        parameters[k] = v
-      end
-      parameters
-    end
-
-    def get_signature
-      @response['X-OpenPayU-Signature'] ||
-      @response['x-openpayu-signature'] ||
-      @response['openpayu-signature'] ||
-      @response.headers['x-openpayu-signature'] ||
-      @response.headers['openpayu-signature']
-    end
-
     def underscore_keys(hash)
       deep_transform_keys(hash) { |key| key.underscore }
     end

data/lib/openpayu/documents/response.rb

@@ -2,12 +2,11 @@
 module OpenPayU
   module Documents
     class Response < Document
-      attr_accessor :parsed_data, :response, :request, :message_name, :body
+      attr_accessor :parsed_data, :response, :request, :body
 
-      def initialize(data, message_name)
+      def initialize(data)
         @response = data[:response]
         @request = data[:request]
-        @message_name = message_name
         @body = @response.body.is_a?(StringIO) ? @response.body.string :
           @response.body
         parse_data if verify_response
@@ -18,25 +17,15 @@ module OpenPayU
       end
 
       def parse_data
-        if OpenPayU::Configuration.data_format == 'xml'
-          @parsed_data = Hash.from_xml(@body)
-        else
-          @parsed_data = JSON.parse(@body)
-        end
-        if @parsed_data['OpenPayU'] && @parsed_data['OpenPayU'][@message_name]
-          @parsed_data = underscore_keys @parsed_data['OpenPayU'][@message_name]
-        elsif @parsed_data['OpenPayU']
-          @parsed_data = underscore_keys @parsed_data['OpenPayU']
-        end
-        @parsed_data
+        @parsed_data = underscore_keys JSON.parse(@body)
       end
 
-      def order_status
-        if @message_name == 'OrderRetrieveResponse'
-          @parsed_data['orders']['order']['status']
-        else
-          @parsed_data['order'] ? @parsed_data['order']['status'] : ''
-        end
+      def status
+        @parsed_data['status']
+      end
+
+       def order_status
+        @parsed_data['orders']['orders'][1]['status']
       end
 
       Models::Order::STATUSES.each do |method|

data/lib/openpayu/models/model.rb

@@ -7,7 +7,6 @@ module OpenPayU
 
       include ActiveModel::Validations
       include ActiveModel::Serializers::JSON
-      include ActiveModel::Serializers::Xml
 
       attr_accessor :all_errors
 
@@ -29,26 +28,8 @@ module OpenPayU
         prepare_keys.to_json
       end
 
-      def prepare_data(request_type)
-        if OpenPayU::Configuration.data_format == 'xml'
-          generate_xml(request_type)
-        else
-          {
-            'OpenPayU' => {
-              request_type => prepare_keys(instance_values)
-            }
-          }.to_json
-        end
-      end
-
-      def generate_xml(request_type)
-        '<?xml version="1.0" encoding="UTF-8"?>
-        <OpenPayU xmlns="http://www.openpayu.com/20/openpayu.xsd">' +
-          prepare_keys(instance_values).to_xml(
-            builder: OpenPayU::XmlBuilder.new(request_type, indent: 2),
-            root: request_type,
-            skip_types: true,
-            skip_instruct: true) + '</OpenPayU>'
+      def prepare_data
+        prepare_keys.to_json
       end
 
       def get_instance_values
@@ -59,11 +40,9 @@ module OpenPayU
 
       def prepare_keys(attrs = {}, hash = get_instance_values)
         hash.each_pair do |k, v|
-          attrs[k.camelize] =
+          attrs[k.camelize(:lower)] =
             if v.is_a? Array
-              v.map do |element|
-                { element.class.name.demodulize =>  element.prepare_keys }
-              end
+              { k.camelize(:lower) =>  v.map(&:prepare_keys) }
             elsif v.class.name =~ /OpenPayU::Models/
               v.prepare_keys
             else

data/lib/openpayu/models/order.rb

@@ -13,7 +13,6 @@ module OpenPayU
         :currency_code, :total_amount, presence: true
       has_one_object :buyer # not required
       has_one_object :fee # not required
-      has_many_objects :pay_methods, :pay_method # not required
       has_many_objects :products, :product # not required
       has_many_objects :shipping_methods, :shipping_method # not required
 

data/lib/openpayu/models/refund.rb

@@ -7,33 +7,11 @@ module OpenPayU
           :description, :bank_description, :source_account_number
       validates :description, :order_id, presence: true
 
-      def prepare_data(request_type)
-        if OpenPayU::Configuration.data_format == 'xml'
-          generate_xml(request_type)
-        else
-          {
-            'OpenPayU' => {
-              request_type => {
-                'OrderId' => @order_id,
-                'Refund' => prepare_keys(instance_values)
-              }
-            }
-          }.to_json
-        end
-      end
-
-      def generate_xml(request_type)
-        '<?xml version="1.0" encoding="UTF-8"?>
-        <OpenPayU xmlns="http://www.openpayu.com/20/openpayu.xsd">' +
-          prepare_keys({
-                'OrderId' => @order_id,
-                'Refund' => prepare_keys(instance_values)
-              }).to_xml(
-                builder: OpenPayU::XmlBuilder.new(request_type, indent: 2),
-                root: request_type,
-                skip_types: true,
-                skip_instruct: true
-              ) + '</OpenPayU>'
+      def prepare_data
+        {
+          'orderId' => @order_id,
+          'refund' => prepare_keys({} , instance_values.except('order_id'))
+        }.to_json
       end
 
     end

data/lib/openpayu/models/shipping_method.rb

@@ -2,8 +2,8 @@
 module OpenPayU
   module Models
     class ShippingMethod < Model
-      attr_accessor :country, :price, :nazwa
-      validates :country, :price, :nazwa, presence: true
+      attr_accessor :country, :price, :name
+      validates :country, :price, :name, presence: true
     end
   end
 end

data/lib/openpayu/order.rb

@@ -12,12 +12,8 @@ module OpenPayU
     # @return [Documents::Response] Response class object order
     #   with OrderRetrieveResponse
     def self.retrieve(order_id)
-      url = Configuration.get_base_url + "order/#{order_id}." +
-      Configuration.data_format
-      request = Documents::Request.new(url)
       Documents::Response.new(
-        Connection.get(url, request.body, request.headers),
-        'OrderRetrieveResponse'
+        Connection.get("orders/#{order_id}", nil)
       )
     end
 
@@ -32,12 +28,8 @@ module OpenPayU
     def self.create(order)
       @order = Models::Order.new(order)
       if @order.all_objects_valid?
-        url = Configuration.get_base_url + 'order.' + Configuration.data_format
-        request =
-          Documents::Request.new(@order.prepare_data('OrderCreateRequest'))
         Documents::Response.new(
-          Connection.post(url, request.body, request.headers),
-          'OrderCreateResponse'
+          Connection.post('orders', @order.prepare_data)
         )
       else
         raise WrongOrderParameters.new(@order)
@@ -54,13 +46,8 @@ module OpenPayU
     # @raise [NotImplementedException] This feature is not yet implemented
     def self.status_update(status_update)
       @update = OpenPayU::Models::StatusUpdate.new status_update
-      url = Configuration.get_base_url + "order/#{@update.order_id}/status." +
-        Configuration.data_format
-      request =
-        Documents::Request.new(@update.prepare_data('OrderStatusUpdateRequest'))
       Documents::Response.new(
-        Connection.put(url, request.body, request.headers),
-        'OrderStatusUpdateResponse'
+        Connection.put("orders/#{@update.order_id}/status", @update.prepare_data)
       )
     end
 
@@ -71,12 +58,8 @@ module OpenPayU
     # @return [Documents::Response] Response class object order
     #   with OrderCancelResponse
     def self.cancel(order_id)
-      url = Configuration.get_base_url + "order/#{order_id}." +
-        Configuration.data_format
-      request = Documents::Request.new(url)
       Documents::Response.new(
-        Connection.delete(url, request.body, request.headers),
-        'OrderCancelResponse'
+        Connection.delete("orders/#{order_id}", nil)
       )
     end
 
@@ -89,8 +72,7 @@ module OpenPayU
     # @raise [WrongNotifyRequest] when generated response is empty
     def self.consume_notification(request)
       response = Documents::Response.new(
-        { response: request, request: nil },
-        'OrderNotifyRequest'
+        { response: request, request: nil }
       )
       if !response.nil?
         response
@@ -109,9 +91,9 @@ module OpenPayU
     def self.build_notify_response(request_id)
       response = Models::NotifyResponse.new({
         res_id: request_id,
-        status: { 'StatusCode' => 'SUCCESS' }
+        status: { 'statusCode' => 'SUCCESS' }
       })
-      response.prepare_data('OrderNotifyResponse')
+      response.prepare_data
     end
 
   end

data/lib/openpayu/refund.rb

@@ -12,14 +12,8 @@ module OpenPayU
     #   with RefundCreateResponse
     def self.create(data)
       refund = Models::Refund.new(data)
-      url = Configuration.get_base_url + "order/#{refund.order_id}/refund." +
-        OpenPayU::Configuration.data_format
-      request = Documents::Request.new(
-        refund.prepare_data('RefundCreateRequest')
-      )
       @response = Documents::Response.new(
-        Connection.post(url, request.body, request.headers),
-        'RefundCreateResponse'
+        Connection.post("orders/#{refund.order_id}/refund",  refund.prepare_data)
       )
     end
   end

data/lib/openpayu/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module OpenPayU
-  VERSION = '0.0.2'
+  VERSION = '0.1.2'
 end

data/openpayu_ruby.gemspec

@@ -22,13 +22,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   if RUBY_VERSION < "1.9.3"
-    spec.add_development_dependency "activemodel", '~> 3.2'
-    spec.add_development_dependency "activesupport", '~> 3.2'
     spec.add_runtime_dependency "activemodel", '~> 3.2'
     spec.add_runtime_dependency "activesupport", '~> 3.2'
   else
-    spec.add_development_dependency "activemodel"
-    spec.add_development_dependency "activesupport"
     spec.add_runtime_dependency "activemodel"
     spec.add_runtime_dependency "activesupport"
   end