kiik 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6f8af83f78371428d1419ef682c9de5e09f0eab
-  data.tar.gz: ec55948e8487624751521e9e0b69f8abed80d9f0
+  metadata.gz: a8998be7b8baba07f66b96c691d57d3f3e0da93b
+  data.tar.gz: f9943d6dd97f205948ab7bf3ad2d9cceda0f9c2b
 SHA512:
-  metadata.gz: d4064160a604e4320e24aedad51f5206ab8b6cbf605d5f0267f25537cde7e33a623c3e41d07e9c311c086dd4b9d1762e3d64be3c13ab9e846f1f54f7c55a1239
-  data.tar.gz: e9a79edbfece2d884e2d3a44743de81ed14df5efe11d66c7d6109efec0dec7c32193e4399e94ec0624e58f72e722f33c7e6f7d18e700969be4961f9768e0a0f4
+  metadata.gz: 735f3b9f243e7221eb809b3821d3f3189e9043404c1f8afdcc3844fd7838225a94c7b55b7608b326bc5c21e3b6e6b7b8d41a9c84fbf8f76c371d8dd12997258b
+  data.tar.gz: 2f1bddd6b7a03e08c6b94af29d5181fb6b851d19798a8c3f89490c9de6563354e0941e58d53b31ae554b7a56de8b462762ae6355c294d12842bf69c8b6bfbd5d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kiik (0.1.4)
+    kiik (0.1.6)
 
 GEM
   remote: https://rubygems.org/
@@ -53,7 +53,7 @@ DEPENDENCIES
   rake (~> 10.4)
   shoulda (~> 3.5)
   test-unit (~> 3.1)
-  webmock (~> 1.21.0)
+  webmock (~> 1.21)
 
 BUNDLED WITH
    1.10.6

data/config/kiik.yml

@@ -1,12 +1,12 @@
 development:
   api_key:  payos_test
   host:     http://localhost:8800
-  version:  0.3
+  version:  '0.3'
 staging:
   api_key:  B31DCE74-E768-43ED-86DA-85501612548F
   host:     https://demo.kiik.com
-  version:  0.3
+  version:  '0.3'
 production:
   api_key:  B31DCE74-E768-43ED-86DA-85501612548F
   host:     https://api.kiik.com
-  version:  0.3
+  version:  '0.3'

data/kiik.gemspec

@@ -1,8 +1,8 @@
 $:.unshift(File.join(File.dirname(__FILE__), 'lib'))
 
-spec = Gem::Specification.new do |s|
+Gem::Specification.new do |s|
   s.name = 'kiik'
-  s.version = '0.1.5'
+  s.version = '0.1.6'
   s.summary = 'Integrate Kiik with your Ruby app'
   s.description = "KiiK's official gem that helps you to integrate with our services. See https://docs.kiik.com.br for details."
   s.authors = ['Julien Lucca', 'Esdras Eduardo']
@@ -14,7 +14,7 @@ spec = Gem::Specification.new do |s|
   s.add_development_dependency('shoulda', '~> 3.5')
   s.add_development_dependency('test-unit', '~> 3.1')
   s.add_development_dependency('rake', '~> 10.4')
-  s.add_development_dependency('webmock', '~> 1.21.0')
+  s.add_development_dependency('webmock', '~> 1.21')
 
   s.files = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- test/*`.split("\n")

data/lib/kiik/resource.rb

@@ -5,6 +5,7 @@ module Kiik
     attr_accessor :id, :created, :errors
 
     class << self
+
       def class_name
         self.name.split('::')[-1]
       end
@@ -28,6 +29,34 @@ module Kiik
         instance.errors = error.errors unless error.nil?
         instance
       end
+
+      def request(path=nil, params={}, method=:GET)
+        options = opts.merge!(body: JSON.generate(params))
+        url_abs = path.nil? ? url : "#{url}/#{path}"
+
+        response = case method
+                   when :GET
+                     get(url_abs, options)
+                   when :POST
+                     post(url_abs, options)
+                   when :PUT
+                     put(url_abs, options)
+                   else
+                     raise StandardError.new("Method #{method} not implemented")
+                   end
+
+        case response.code
+        when 200
+          build(JSON.parse(response.body))
+        when 422, 404
+          result = JSON.parse(response.body)
+          result["error"]["param"] = "id" unless result["error"]["param"]
+          KiikError.new(result)
+        else
+          raise StandardError.new(response.message)
+        end
+      end
+
     end
 
     def initialize(attributes = {})

data/lib/kiik/rest/create.rb

@@ -2,12 +2,28 @@ module Kiik
   module Rest
     module Create
       class << self
+
         def included(base)
           base.extend(ClassMethods)
         end
+
+      end
+
+      def create
+        result = self.class.create(self.to_json)
+        raise result if result.instance_of? StandardError
+
+        if result.instance_of? KiikError
+          self.errors = result.errors
+          return false
+        end
+
+        initialize(result.to_json)
+        true
       end
 
       module ClassMethods
+
         def create!(params={})
           begin
             create(params)
@@ -19,43 +35,12 @@ module Kiik
         end
 
         def create(params={})
-          result = request_create(params)
-          raise result if result.instance_of? StandardError
+          result = request(nil, params, :POST)
+          raise result if result.kind_of? StandardError
           result
         end
-
-        def request_create(params)
-          options = opts.merge!(body: JSON.generate(params))
-          response = post(url, options)
-          case response.code
-          when 200
-            build(JSON.parse(response.body))
-          when 402
-            result = KiikError.new
-            result.errors << ({attr: 'status', message: 'recused'})
-            build(JSON.parse(response.body), result)
-          when 422
-            KiikError.new(JSON.parse(response.body))
-          else
-            StandardError.new(response.message)
-          end
-        end
-
       end
 
-      def create
-        created = false
-        result = self.class.request_create(self.to_json)
-        if result.instance_of? KiikError
-          self.errors = result.errors
-        elsif result.instance_of? StandardError
-          raise result
-        else
-          initialize(result.to_json)
-          created = true
-        end
-        created
-      end
     end
   end
 end

data/lib/kiik/rest/update.rb

@@ -2,55 +2,45 @@ module Kiik
   module Rest
     module Update
       class << self
+
         def included(base)
           base.extend(ClassMethods)
         end
+
+      end
+
+      def update
+        result = self.class.update(self.to_json)
+        raise result if result.instance_of? StandardError
+
+        if result.instance_of? KiikError
+          self.errors = result.errors
+          return false
+        end
+
+        initialize(result.to_json)
+        true
       end
 
       module ClassMethods
-        def update!(params={})
+
+        def update!(params={id: 0})
           begin
             update(params)
           rescue KiikError => e
             build(params, e)
           rescue StandardError => e
-            e
+            raise e
           end
         end
 
-        def update(params={})
-          result = request_update(params)
-          raise result if result.instance_of? StandardError or result.instance_of? KiikError
+        def update(params={id: 0})
+          result = request(params[:id], params, :PUT)
+          raise result if result.kind_of? StandardError
           result
         end
-
-        def request_update(params)
-          options = opts.merge!(body: JSON.generate(params))
-          response = put(url + "/" + params['id'], options)
-          case response.code
-          when 200
-            build(JSON.parse(response.body))
-          when 422
-            KiikError.new(JSON.parse(response.body))
-          else
-            StandardError.new(response.message)
-          end
-        end
       end
 
-      def updated
-        updated = false
-        result = self.class.request_update(self.to_json)
-        if result.instance_of? KiikError
-          self.errors = result.errors
-        elsif result.instance_of? StandardError
-          raise result
-        else
-          initialize(result.to_json)
-          updated = true
-        end
-        updated
-      end
     end
   end
 end

data/test/kiik/customer_test.rb

@@ -4,24 +4,24 @@ module Kiik
   class CustomerTest < Test::Unit::TestCase
 
     should "raise exception for create empty customer" do
-      error = {type:"invalid_request_error", param:"name", message:"Param name is required"}
-      make_customer({}, error)
+      respond = {error: {type:"invalid_request_error", param:"name", message:"Param name is required"}}
+      post({}, respond, 422)
       assert_raise KiikError do
         Kiik::Customer.create
       end
     end
 
     should "return invalid customer for create! empty customer" do
-      error = {type:"invalid_request_error", param:"name", message:"Param name is required"}
-      make_customer({}, error)
+      respond = {error: {type:"invalid_request_error", param:"name", message:"Param name is required"}}
+      post({}, respond, 422)
       customer = Kiik::Customer.create!
       assert !customer.valid?
     end
 
     should "return a new customer for create" do
-      data = {name:"Customer test", email:"customer@email.com", phone: "11223344", document:"11122233345"}
-      make_customer data
-      customer = Kiik::Customer.create data
+      customer_data = {name:"Customer test", email:"customer@email.com", phone: "11223344", document:"11122233345"}
+      post(customer_data, customer_data)
+      customer = Kiik::Customer.create customer_data
       assert customer.valid?
       assert customer.cards.empty?
     end
@@ -29,18 +29,45 @@ module Kiik
     should "return a new customer with card for create with card" do
       card_data = {name:"Card Name", number:"1234567890", month:12, year:17}
       customer_data = {name:"Customer test", email:"customer@email.com", phone: "11223344", document:"11122233345", card:card_data}
-      make_customer customer_data
+      respond = {name:"Customer test", email:"customer@email.com", phone: "11223344", document:"11122233345", cards:[card_data]}
+      post(customer_data, respond)
       customer = Kiik::Customer.create customer_data
       assert customer.valid?
-      assert customer.cards[0].name == card_data[:name]
+      assert customer.cards.first.name == card_data[:name]
     end
 
     should "return customer for create using instance" do
-      data = {name:"Customer test", email:"customer@email.com", phone: "11223344", document:"11122233345"}
-      make_customer data
-      customer = Kiik::Customer.new data
+      customer_data = {name:"Customer test", email:"customer@email.com", phone: "11223344", document:"11122233345"}
+      post(customer_data)
+      customer = Kiik::Customer.new customer_data
       customer.create
       assert customer.valid?
     end
+
+    should "raise exception for update with customer doesn't exists, code 404" do
+      error = {error: {type:"invalid_request_error", message:"Customer doesn't exists"}}
+      put(0, {}, error, 422)
+      assert_raise KiikError do
+        Kiik::Customer.update
+      end
+    end
+
+    should "return invalid customer for update! empty customer" do
+      error = {error: {type:"invalid_request_error", message:"Customer doesn't exists"}}
+      put(0, {}, error, 422)
+      customer = Kiik::Customer.update!
+      assert !customer.valid?
+      assert_equal customer.errors.first[:attr], "id"
+      assert_equal customer.errors.first[:message], "Customer doesn't exists"
+    end
+
+    should "return customer updated" do
+      customer_data = {id: 1, name:"New name", email:"customer@email.com", phone: "11223344", document:"11122233345"}
+      customer_send = {id: 1, name:"New name"}
+      put(customer_data[:id], customer_send, customer_data)
+      customer = Kiik::Customer.update! customer_send
+      assert_equal customer.name, customer_data[:name]
+      assert_equal customer.email, customer_data[:email]
+    end
   end
 end

data/test/test_mock.rb

@@ -3,18 +3,22 @@ module Kiik
 
     def request(url, params = {}, method = :any)
       host = Kiik.host.gsub(/^https:\/\//, "").gsub(/^http:\/\//, "")
-      headers = {:accept_version => Kiik.version, :content_type => 'application/json'}
+      headers = {accept_version: Kiik.version, content_type: 'application/json'}
       stub_request(method, "#{Kiik.api_key}:@#{host}/#{url}").
-        with(:headers => headers).
-        with(:body => params)
+        with(headers: headers).
+        with(body: params)
     end
 
-    def make_customer(params = {}, error = nil)
-      code = error.nil? ? 200 : 422
-      respond = error.nil? ? params.clone : {error: error}
-      respond[:cards] = [params[:card]] unless params[:card].nil?
-      request("customers", params, :post).
-        to_return(:status => code, :body => JSON.generate(respond), :headers => {})
+    def post(request = {}, respond = nil, code = 200)
+      respond = request.clone if respond.nil?
+      request("customers", request, :post).
+        to_return(status: code, body: JSON.generate(respond), headers: {})
+    end
+
+    def put(id = 0, request = {}, respond = nil, code = 200)
+      respond = request.clone if respond.nil?
+      request("customers/#{id}", request, :put).
+        to_return(status: code, body: JSON.generate(respond), headers: {})
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kiik
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Julien Lucca
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-16 00:00:00.000000000 Z
+date: 2015-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
@@ -73,14 +73,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.21.0
+        version: '1.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.21.0
+        version: '1.21'
 description: KiiK's official gem that helps you to integrate with our services. See
   https://docs.kiik.com.br for details.
 email:
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Integrate Kiik with your Ruby app