paysio 1.0.3 → 1.0.4

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    paysio (1.0.2)
+    paysio (1.0.3)
+      activemodel
       activesupport
       oj (> 2)
       rest-client (~> 1.4)
@@ -9,20 +10,38 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    activemodel (3.2.12)
+      activesupport (= 3.2.12)
+      builder (~> 3.0.0)
     activesupport (3.2.12)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    i18n (0.6.1)
+    builder (3.0.4)
+    diff-lcs (1.2.1)
+    i18n (0.6.4)
+    metaclass (0.0.1)
     mime-types (1.21)
-    multi_json (1.6.0)
-    oj (2.0.4)
+    mocha (0.10.5)
+      metaclass (~> 0.0.1)
+    multi_json (1.6.1)
+    oj (2.0.10)
     rake (10.0.3)
     rest-client (1.6.7)
       mime-types (>= 1.16)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  mocha
   paysio!
   rake
+  rspec

data/README.rdoc

@@ -17,18 +17,21 @@
   Paysio::Customer.all  # get list of customers
 
 == Actions: update
-  customer = Paysio::Customer.find("cs_1111111")
-  customer.update(description: "test user")
+  customer = Paysio::Customer.retrieve("cs_1111111")
+  customer.description = "test user"
+  customer.save
 
 == Actions: destroy
-  customer = Paysio::Customer.find("cs_1111111")
+  customer = Paysio::Customer.retrieve("cs_1111111")
   customer.destroy
 
 == Actions: refund charge
-  charge = Paysio::Charge.find("ch_1111111")
+  charge = Paysio::Charge.retrieve("ch_1111111")
   charge.refund
 
 
 == Actions: redirect to charge after create (e.g. in Ruby on Rails)
-  charge = Paysio::Charge.create(amount: 100, payment_system_id: 'test', description: 'test charge')
-  redirect_to charge.redirect_url
+  def create
+    charge = Paysio::Charge.create(amount: 100, payment_system_id: 't_123', description: 'test charge')
+    redirect_to charge.redirect
+  end

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.4

data/lib/paysio/actions/create.rb

@@ -3,9 +3,8 @@ module Paysio
     module Create
       module ClassMethods
         def create(attrs = {})
-          validate!(attrs)
           response = Paysio::Client.request(:post, path, attrs)
-          Resource.build_from(response)
+          response["error"].blank? ? Resource.build_from(response) : response
         end
       end
 

data/lib/paysio/actions/find.rb

@@ -6,6 +6,7 @@ module Paysio
           response = Paysio::Client.request(:get, "#{path}/#{id}")
           Resource.build_from(response)
         end
+        alias_method :retrieve, :find
       end
 
       def self.included(base)

data/lib/paysio/actions/update.rb

@@ -2,9 +2,14 @@ module Paysio
   module Actions
     module Update
       def update(attrs = {})
-        validate!(to_hash.merge(attrs))
         response = Paysio::Client.request(:put, path, attrs)
-        refresh_from(response.to_hash)
+        response["error"].blank? ? refresh_from(response.to_hash) : response
+      end
+
+      def save
+        @previously_changed = changes
+        @changed_attributes.clear
+        update(changed_attributes)
       end
     end
   end

data/lib/paysio/client.rb

@@ -3,17 +3,17 @@ module Paysio
     class << self
       def request(method, path, params = {}, headers = {})
         unless Paysio.api_key
-          raise Paysio::Errors::NotAuthorized, "Please specify Paysio.api_key"
+          raise Paysio::Exceptions::NotAuthorized, "Please specify Paysio.api_key"
         end
         headers = {
-          user_agent: "Pays.io RubyClient/#{Paysio::VERSION}",
-          content_type: 'application/x-www-form-urlencoded'
+          :user_agent => "Pays.io RubyClient/#{Paysio::VERSION}",
+          :content_type => 'application/x-www-form-urlencoded'
         }.merge(headers)
         opts = {
-          url: Paysio.api_url(path),
-          method: method,
-          timeout: 80,
-          headers: headers
+          :url => Paysio.api_url(path),
+          :method => method,
+          :timeout => 80,
+          :headers => headers
         }
 
         # build params
@@ -28,7 +28,7 @@ module Paysio
         begin
           resp = Paysio::JSON.decode(body)
         rescue Oj::ParseError
-          # raise APIError.new("Invalid response object from API: #{body.inspect} (#{code})", code, body)
+          raise Paysio::Exceptions::APIError.new("Invalid response object from API: #{body.inspect} (#{code})", code, body)
         end
         Paysio::Resource.build_from(resp, response.headers[:location])
       end

data/lib/paysio/exceptions.rb

@@ -0,0 +1,6 @@
+module Paysio
+  module Exceptions
+    class NotAuthorized < Exception; end;
+    class APIError < Exception; end;
+  end
+end

data/lib/paysio/json.rb

@@ -6,7 +6,7 @@ module Paysio
       end
 
       def encode(json)
-        Oj.dump(json)
+        Oj.dump(json, mode: :compat)
       end
     end
   end

data/lib/paysio/resource.rb

@@ -1,6 +1,9 @@
+require 'active_model/dirty'
 module Paysio
   class Resource
-    attr_accessor :redirect_url
+    include ActiveModel::Dirty
+
+    attr_accessor :redirect
 
     def initialize(id = nil)
       @values = {}
@@ -23,7 +26,13 @@ module Paysio
     end
 
     def method_missing(name, *opts)
-      @values[name.to_s] if @values.has_key?(name.to_s)
+      if name[-1] == '='
+        name = name.to_s.gsub(/\=$/, '')
+        send(:"#{name}_will_change!")
+        @values[name.to_s] = opts.first if @values.has_key?(name.to_s)
+      else
+        @values[name.to_s] if @values.has_key?(name.to_s)
+      end
     end
 
     def to_json(*opts)
@@ -38,6 +47,14 @@ module Paysio
       @values
     end
 
+    def attributes
+      to_hash.reject{ |k, v| v.is_a? (Paysio::Resource)}
+    end
+
+    def attribute(key)
+      to_hash[key]
+    end
+
     def each(&blk)
       @values.each(&blk)
     end
@@ -56,25 +73,6 @@ module Paysio
         @@registered_resources << resource_name.to_s
       end
 
-      def validates_presence_of(field)
-        @validate_presence_of ||= []
-        @validate_presence_of << field.to_s
-      end
-
-      def valid?(attrs)
-        @validate_presence_of ||= []
-        @validate_presence_of.all? do |field|
-          attrs.symbolize_keys.has_key?(field.to_sym)
-        end
-      end
-
-      def validate!(attrs)
-        unless valid?(attrs)
-          raise Paysio::Errors::ResourceNotValid,
-                "#{self.name} should have following attributes: #{@validate_presence_of.inspect}"
-        end
-      end
-
       def path
         "/#{self.name.demodulize.tableize}"
       end
@@ -91,7 +89,8 @@ module Paysio
           end
           resource = klass.new(resp['id'])
           resource.refresh_from(resp)
-          resource.redirect_url = redirect_url
+          resource.class.define_attribute_methods(resource.attributes.keys)
+          resource.redirect = redirect_url
           resource
         else
           resp

data/lib/paysio/resources/charge.rb

@@ -6,10 +6,6 @@ module Paysio
     include Paysio::Actions::Find
     resource :charge
 
-    validates_presence_of :amount
-    validates_presence_of :payment_system_id
-    validates_presence_of :description
-
     def refund(attrs = {})
       response = Paysio::Client.request(:post, action_path(:refund), attrs)
       refresh_from(response.to_hash)

data/lib/paysio/resources/coupon.rb

@@ -6,8 +6,5 @@ module Paysio
     include Paysio::Actions::Destroy
     include Paysio::Actions::Find
     resource :coupon
-
-    validates_presence_of :code
-    validates_presence_of :percent_off
   end
 end

data/lib/paysio/resources/customer.rb

@@ -6,8 +6,5 @@ module Paysio
     include Paysio::Actions::Destroy
     include Paysio::Actions::Find
     resource :customer
-
-    validates_presence_of :email
-    validates_presence_of :description
   end
 end

data/lib/paysio/resources/payout.rb

@@ -0,0 +1,8 @@
+module Paysio
+  class Payout < Paysio::Resource
+    include Paysio::Actions::List
+    include Paysio::Actions::Create
+    include Paysio::Actions::Find
+    resource :payout
+  end
+end

data/lib/paysio/resources/reward.rb

@@ -6,8 +6,5 @@ module Paysio
     include Paysio::Actions::Destroy
     include Paysio::Actions::Find
     resource :reward
-
-    validates_presence_of :percent_off
-    validates_presence_of :title
   end
 end

data/lib/paysio/resources/wallet.rb

@@ -6,8 +6,5 @@ module Paysio
     include Paysio::Actions::Destroy
     include Paysio::Actions::Find
     resource :wallet
-
-    validates_presence_of :type
-    validates_presence_of :account
   end
 end

data/lib/paysio/version.rb

@@ -1,3 +1,3 @@
 module Paysio
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

data/lib/paysio.rb

@@ -17,9 +17,8 @@ require 'paysio/actions/update'
 require 'paysio/actions/destroy'
 require 'paysio/actions/find'
 
-# errors
-require 'paysio/errors/not_authorized'
-require 'paysio/errors/resource_not_valid'
+# exceptions
+require 'paysio/exceptions'
 
 # resources
 require 'paysio/resources/list'
@@ -29,6 +28,7 @@ require 'paysio/resources/customer'
 require 'paysio/resources/reward'
 require 'paysio/resources/coupon'
 require 'paysio/resources/event'
+require 'paysio/resources/payout'
 require 'paysio/resources/log'
 
 module Paysio

data/paysio.gemspec

@@ -15,9 +15,12 @@ spec = Gem::Specification.new do |s|
 
   s.add_dependency('rest-client', '~> 1.4')
   s.add_dependency('activesupport')
+  s.add_dependency('activemodel')
   s.add_dependency('oj', '> 2')
 
   s.add_development_dependency('rake')
+  s.add_development_dependency('rspec')
+  s.add_development_dependency('mocha')
 
   s.files = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- test/*`.split("\n")

data/spec/requests/base_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+describe "API Bindings" do
+
+  before :all do
+    @client = authorized_paysio_client
+  end
+
+  it "should not fetch from network while creating a new Resource" do
+    @client.expects(:get).never
+    Paysio::Charge.new("someid")
+  end
+
+  it "should add redirect url to resource from location" do
+    @client.expects(:get).once.returns(test_response(test_charge, 200, 'http://example.com'))
+    Paysio::Charge.retrieve("someid").redirect == 'http://example.com'
+  end
+end

data/spec/resources/charge_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+describe Paysio::Charge do
+  it { should be_listable_resource }
+  it { should be_updatable_resource }
+
+  it "should return charge on create" do
+    client = authorized_paysio_client
+
+    client.expects(:post).once.returns(test_response(test_charge))
+    c = Paysio::Charge.create
+    c.should be_a_kind_of(Paysio::Charge)
+  end
+end

data/spec/resources/coupon_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+describe Paysio::Coupon do
+  it { should be_listable_resource }
+  it { should be_updatable_resource }
+
+  it "should return coupon on create" do
+    client = authorized_paysio_client
+
+    client.expects(:post).once.returns(test_response(test_coupon))
+    c = Paysio::Coupon.create
+    c.should be_a_kind_of(Paysio::Coupon)
+  end
+end

data/spec/resources/customer_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+describe Paysio::Customer do
+  it { should be_listable_resource }
+  it { should be_updatable_resource }
+
+  it "should return charge on create" do
+    client = authorized_paysio_client
+
+    client.expects(:post).once.returns(test_response(test_customer))
+    c = Paysio::Charge.create
+    c.should be_a_kind_of(Paysio::Customer)
+  end
+end

data/spec/resources/event_spec.rb

@@ -0,0 +1,4 @@
+require 'spec_helper'
+describe Paysio::Event do
+  it { should be_listable_resource }
+end

data/spec/resources/log_spec.rb

@@ -0,0 +1,4 @@
+require 'spec_helper'
+describe Paysio::Log do
+  it { should be_listable_resource }
+end

data/spec/resources/payout_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+describe Paysio::Payout do
+  it { should be_listable_resource }
+
+  it "should return payout on create" do
+    client = authorized_paysio_client
+
+    client.expects(:post).once.returns(test_response(test_payout))
+    c = Paysio::Payout.create
+    c.should be_a_kind_of(Paysio::Payout)
+  end
+
+  it "should have wallet" do
+    client = authorized_paysio_client
+
+    client.expects(:get).once.returns(test_response(test_payout))
+    c = Paysio::Payout.retrieve('someid')
+    c.wallet.should be_a_kind_of(Paysio::Wallet)
+  end
+end

data/spec/resources/reward_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+describe Paysio::Reward do
+  it { should be_listable_resource }
+  it { should be_updatable_resource }
+
+  it "should return reward on create" do
+    client = authorized_paysio_client
+
+    client.expects(:post).once.returns(test_response(test_reward))
+    c = Paysio::Reward.create
+    c.should be_a_kind_of(Paysio::Reward)
+  end
+end

data/spec/resources/wallet_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+describe Paysio::Wallet do
+  it { should be_listable_resource }
+  it { should be_updatable_resource }
+
+  it "should return wallet on create" do
+    client = authorized_paysio_client
+
+    client.expects(:post).once.returns(test_response(test_wallet))
+    c = Paysio::Wallet.create
+    c.should be_a_kind_of(Paysio::Wallet)
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,8 @@
+require 'paysio'
+require 'support/paysio'
+require 'support/paysio_responses'
+require 'support/test_matchers'
+RSpec.configure do |config|
+  include Paysio::TestResponses
+  config.mock_with :mocha
+end

data/spec/support/paysio.rb

@@ -0,0 +1,24 @@
+module Paysio
+  class Client
+    @mock_rest_client = nil
+
+    def self.mock_rest_client(mock_client)
+      @mock_rest_client = mock_client
+    end
+
+    def self.execute(opts)
+      get_params = (opts[:headers] || {})[:params]
+      post_params = opts[:payload]
+      case opts[:method]
+      when :get then @mock_rest_client.get opts[:url], get_params, post_params
+      when :post then @mock_rest_client.post opts[:url], get_params, post_params
+      when :put then @mock_rest_client.put opts[:url], get_params, post_params
+      when :delete then @mock_rest_client.delete opts[:url], get_params, post_params
+      end
+    end
+  end
+end
+def authorized_paysio_client
+  Paysio.api_key = 'paysio'
+  Paysio::Client.mock_rest_client(mock)
+end

data/spec/support/paysio_responses.rb

@@ -0,0 +1,156 @@
+ module Paysio::TestResponses
+  def test_response(body, code = 200, location = 'test')
+    body = Paysio::JSON.encode(body) if !(body.kind_of? String)
+    m = mock
+    m.instance_variable_set('@data', { body: body, code: code , location: location})
+    def m.body; @data[:body]; end
+    def m.code; @data[:code]; end
+    def m.headers; {location: @data[:location]} end
+    m
+  end
+
+  def test_customer(params={})
+    {
+      :object => 'customer',
+      :merchant_id => 'm_12345',
+      :email => 'user@example.com',
+      :phone_number => '+71234567',
+      :name => 'Bruce Lee',
+      :description => 'Foo bar',
+      :created => '1345537759',
+      :livemode => false
+    }.merge(params)
+  end
+
+  def test_customer_array
+    {
+      :data => [test_customer, test_customer, test_customer],
+      :object => 'list'
+    }
+  end
+
+  def test_charge(params={})
+    {
+      :object => 'charge',
+      :merchant_id => 'm_12345',
+      :amount => 100,
+      :fee => 10,
+      :status => 'pending',
+      :order_id => 'o_1234234',
+      :return_url => 'http://example.com',
+      :livemode => false
+    }.merge(params)
+  end
+
+  def test_charge_array
+    {
+      :data => [test_charge, test_charge, test_charge],
+      :object => 'list'
+    }
+  end
+
+  def test_coupon(params={})
+    {
+      :object => 'coupon',
+      :merchant_id => 'm_12345',
+      :percent_off => 30,
+      :currency_id => 'usd',
+      :code => 'foo',
+      :livemode => false
+    }.merge(params)
+  end
+
+  def test_coupon_array
+    {
+      :data => [test_coupon, test_coupon, test_coupon],
+      :object => 'list'
+    }
+  end
+
+  def test_event(params={})
+    {
+      :object => 'event',
+      :merchant_id => 'm_12345',
+      :type => 'charge.create',
+      :livemode => false
+    }.merge(params)
+  end
+
+  def test_event_array
+    {
+      :data => [test_event, test_event, test_event],
+      :object => 'list'
+    }
+  end
+
+  def test_log(params={})
+    {
+      :object => 'log',
+      :request_url => 'http://example.com',
+      :request_ip => '127.0.0.1',
+      :livemode => false
+    }.merge(params)
+  end
+
+  def test_log_array
+    {
+      :data => [test_log, test_log, test_log],
+      :object => 'list'
+    }
+  end
+
+  def test_wallet(params={})
+    {
+      :object => 'wallet',
+      :merchant_id => 'm_12345',
+      :type => 'test',
+      :account => 'foo',
+      :account_number => '12345',
+      :account_id => 'ac_12345',
+      :livemode => false
+    }.merge(params)
+  end
+
+  def test_wallet_array
+    {
+      :data => [test_wallet, test_wallet, test_wallet],
+      :object => 'list'
+    }
+  end
+
+  def test_payout(params={})
+    {
+      :object => 'payout',
+      :merchant_id => 'm_12345',
+      :amount => 50,
+      :status => 'success',
+      :wallet => test_wallet,
+      :livemode => false
+    }.merge(params)
+  end
+
+  def test_payout_array
+    {
+      :data => [test_payout, test_payout, test_payout],
+      :object => 'list'
+    }
+  end
+
+  def test_reward(params={})
+    {
+      :object => 'reward',
+      :merchant_id => 'm_12345',
+      :title => 'Foo Bar',
+      :percent_off => 50,
+      :max_amount => 100,
+      :livemode => false
+    }.merge(params)
+  end
+
+  def test_reward_array
+    {
+      :data => [test_reward, test_reward, test_reward],
+      :object => 'list'
+    }
+  end
+end

data/spec/support/test_matchers.rb

@@ -0,0 +1,27 @@
+RSpec::Matchers.define :be_listable_resource do |expected|
+  match do |actual|
+    client = authorized_paysio_client
+    subject = actual.class
+    test_response_hash = send(:"test_#{subject.name.demodulize.underscore}_array")
+
+    client.expects(:get).once.returns(test_response(test_response_hash))
+    c = subject.all.data
+
+    c.should be_a_kind_of(Array)
+    c[0].should be_a_kind_of(subject)
+  end
+end
+RSpec::Matchers.define :be_updatable_resource do |expected|
+  match do |actual|
+    client = authorized_paysio_client
+    subject = actual.class
+
+    client.expects(:get).once.returns(test_response(test_customer({name: "foo"})))
+    client.expects(:put).once.returns(test_response(test_customer({name: "bar"})))
+    c = subject.retrieve("resource_id")
+    c.name.should == "foo"
+    c.name = "bar"
+    c.save
+    c.name.should == "bar"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paysio
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-19 00:00:00.000000000 Z
+date: 2013-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
@@ -75,6 +91,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: See https://paysio.com for details.
 email:
 - gvalmon@gmail.com
@@ -101,8 +149,7 @@ files:
 - lib/paysio/actions/list.rb
 - lib/paysio/actions/update.rb
 - lib/paysio/client.rb
-- lib/paysio/errors/not_authorized.rb
-- lib/paysio/errors/resource_not_valid.rb
+- lib/paysio/exceptions.rb
 - lib/paysio/json.rb
 - lib/paysio/resource.rb
 - lib/paysio/resources/charge.rb
@@ -111,10 +158,24 @@ files:
 - lib/paysio/resources/event.rb
 - lib/paysio/resources/list.rb
 - lib/paysio/resources/log.rb
+- lib/paysio/resources/payout.rb
 - lib/paysio/resources/reward.rb
 - lib/paysio/resources/wallet.rb
 - lib/paysio/version.rb
 - paysio.gemspec
+- spec/requests/base_spec.rb
+- spec/resources/charge_spec.rb
+- spec/resources/coupon_spec.rb
+- spec/resources/customer_spec.rb
+- spec/resources/event_spec.rb
+- spec/resources/log_spec.rb
+- spec/resources/payout_spec.rb
+- spec/resources/reward_spec.rb
+- spec/resources/wallet_spec.rb
+- spec/spec_helper.rb
+- spec/support/paysio.rb
+- spec/support/paysio_responses.rb
+- spec/support/test_matchers.rb
 homepage: https://paysio.com
 licenses: []
 post_install_message: 

data/lib/paysio/errors/not_authorized.rb

@@ -1,7 +0,0 @@
-module Paysio
-  module Errors
-    class NotAuthorized < Exception
-
-    end
-  end
-end

data/lib/paysio/errors/resource_not_valid.rb

@@ -1,7 +0,0 @@
-module Paysio
-  module Errors
-    class ResourceNotValid < Exception
-
-    end
-  end
-end