sailplay 0.1.3 → 0.2.0

data/lib/sailplay.rb

@@ -67,11 +67,11 @@ module Sailplay
     # @option options [true|false] :auth — authenticate user
     #
     # @return [Sailplay::User]
-    def find_user(phone, options = {})
-      self.client.find_user(phone, options)
+    def find_user(user_id, options = {})
+      self.client.find_user(user_id, options)
     end
 
-    # @param [String|Integer] phone_or_user_id
+    # @param [String          user_id
     # @param [BigDecimal]     price
     # @param [Hash]           options
     #
@@ -84,8 +84,12 @@ module Sailplay
     #                                                 необходимо подтверждать, а про остальные известно что они уже подтверждены.
     #
     # @return [Sailplay::Purchase]
-    def create_purchase(phone_or_user_id, price, options = {})
-      self.client.create_purchase(phone_or_user_id, price, options)
+    def create_purchase(user_id, price, options = {})
+      self.client.create_purchase(user_id, price, options)
+    end
+    
+    def add_points(user_id, points, comment)
+      self.client.add_points(user_id, points, comment)
     end
 
     # @param [Integer] order_id

data/lib/sailplay/client.rb

@@ -43,7 +43,7 @@ module Sailplay
       params = {:user_phone => phone}
       params[:extra_fields] = 'auth_hash' if options[:auth]
 
-      response = request(:get, '/users/reg', :user_phone => phone)
+      response = request(:get, '/v1/users/reg', :user_phone => phone)
       if response.success?
         User.parse(response.data)
       else
@@ -51,17 +51,18 @@ module Sailplay
       end
     end
 
-    # @param [String] phone
+    # @param [String] user_id
     # @param [Hash]   options
     #
     # @option options [true|false] :auth — authenticate user
     #
     # @return [Sailplay::User]
-    def find_user(phone, options = {})
-      params = {:user_phone => phone}
+    def find_user(user_id, options = {})
+      params = {:origin_user_id => user_id}
+      params[:user_phone] = options[:phone] if options[:phone]
       params[:extra_fields] = 'auth_hash' if options[:auth]
 
-      response = Sailplay.request(:get, '/users/points-info', params)
+      response = request(:get, '/v1/users/points-info', params)
       if response.success?
         User.parse(response.data)
       else
@@ -88,7 +89,7 @@ module Sailplay
 
       params[:fields] = [:public_key, options[:order_id] && :order_num].compact.join(',')
 
-      response = Sailplay.request(:get, '/purchases/new', params)
+      response = request(:get, '/v1/purchases/new', params)
 
       if response.success?
         Purchase.parse(response.data)
@@ -105,7 +106,7 @@ module Sailplay
       params = {:order_num => order_id}
       params[:new_price] = options[:price] if options[:price]
 
-      response = request(:get, '/purchases/confirm', params)
+      response = request(:get, '/v1/purchases/confirm', params)
 
       if response.success?
         Purchase.parse(response.data)
@@ -117,13 +118,27 @@ module Sailplay
     # @param [String] gift_public_key
     def confirm_gift(gift_public_key)
       params = {:gift_public_key => gift_public_key}
-      response = request(:get, '/ecommerce/gifts/commit-transaction', params)
+      response = request(:get, '/v1/ecommerce/gifts/commit-transaction', params)
 
       if response.success?
       else
         raise APIError, "Cannot confirm a gift: #{response.error_message}"
       end
     end
+    
+    # @param [String]  user_id    origin user id
+    # @param [Integer] points     amount of points to deposit to the user's account
+    # @param [String]  comment    
+    def add_points(user_id, points, comment = nil)
+      params = {:origin_user_id => user_id, :points => points, :comment => comment}
+      response = request(:get, '/v2/points/add', params)
+      
+      if response.success?
+        response.data[:public_key]
+      else
+        raise APIError, "Cannot add points: #{response.error_message}"
+      end
+    end
 
     def request(method, url, params = {})
       execute_request(method, url, auth_params.merge(params))
@@ -152,7 +167,7 @@ module Sailplay
           'please check that store_id, store_key and pin_code are ' +
           'configured' unless credentials?
 
-      response = execute_request(:get, 'login', credentials)
+      response = execute_request(:get, '/v1/login', credentials)
 
       if response.success?
         response.data[:token]

data/lib/sailplay/configuration.rb

@@ -12,7 +12,7 @@ module Sailplay
     # connections, 80 for insecure connections).
     attr_accessor :port
 
-    # Url prefix for API (defaults to /api/v1)
+    # Url prefix for API (defaults to /api)
     attr_accessor :endpoint
 
     # +true+ for https connections, +false+ for http connections.
@@ -51,7 +51,7 @@ module Sailplay
     def initialize
       @host =     'sailplay.ru'
       @secure =   true
-      @endpoint = '/api/v1'
+      @endpoint = '/api'
 
       @js_api_path = 'static/js/sailplay.js'
       @js_position = :top_right

data/lib/sailplay/rails/client.rb

@@ -52,6 +52,13 @@ module Sailplay
       rescue Sailplay::Error => e
         logger.error "Error reporting purchase to Sailplay: #{e.message}"
       end
+      
+      def add_sailplay_points(user_id, points, comment)
+        key = Sailplay.add_points(user_id, points, comment)
+        sailplay_options :public_key => key
+      rescue Sailplay::Error => e
+        logger.error "Error adding points: #{e.message}"
+      end
 
 
       def sailplay_options(options = {})

data/lib/sailplay/version.rb

@@ -1,3 +1,3 @@
 module Sailplay
-  VERSION = '0.1.3'
+  VERSION = '0.2.0'
 end

data/spec/sailplay/client_spec.rb

@@ -8,7 +8,7 @@ describe Sailplay::Client do
       Sailplay.client.host.should eq('sailplay.ru')
       Sailplay.client.port.should eq(443)
       Sailplay.client.secure.should be_true
-      Sailplay.client.endpoint.should eq('/api/v1')
+      Sailplay.client.endpoint.should eq('/api')
     end
 
     it 'should set the options' do

data/spec/sailplay/configuration_spec.rb

@@ -18,8 +18,8 @@ describe Sailplay::Configuration do
       subject.secure.should be_true
     end
 
-    it 'should set the endpoint to /api/v1' do
-      subject.endpoint.should eq('/api/v1')
+    it 'should set the endpoint to /api' do
+      subject.endpoint.should eq('/api')
     end
 
     it 'shouldn\'t set store_id' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sailplay
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 3
-  version: 0.1.3
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Sergey Nebolsin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-08-23 00:00:00 Z
+date: 2013-09-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: multi_json