rajaongkir 0.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1edc89559278295f1eb908ac040bf7bae02c9444
-  data.tar.gz: 912bb6d7bff7738a6f8720f6d7a596183d8a677d
+  metadata.gz: 9fa0f49e0a04dcc80ad2d80284142e327e5e1d30
+  data.tar.gz: 7867b3824d873a8c1eba1b9476bc8032a9f4626a
 SHA512:
-  metadata.gz: a0ff4b57c6886163602f94763ff793a6dbb1891c59a60dfbea7da211222162574181fefea1bb4e07dbe75fd090c2354c0cc6b7d1cb5e53547d06529b938852aa
-  data.tar.gz: bc3e117de5d7d45e21c28259fc2f1876b6153c08555162f851d172a7ee5be0976a33ca373bf9f1babe78aaf25b641cdde083c36fc3c73d8eb2f3ee5f8a883df4
+  metadata.gz: 68e7a0da58af1e2ab190e92886f61dfbe6df99f6be2f09c049b9db13d01f1b66c7dac1d348ea407e8bf138cb43d1dea5f631fe18587556f56ac828a3ee40024a
+  data.tar.gz: 8cc810b02ee3e004064d6e1fb0e9e3b896ab3567b1d6d3a0b46fbbff96a6723b756dad38ed991d739cb280a6017b64935d60dbed12245496edcd03ba0df79e3e

data/lib/rajaongkir.rb

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 require 'unirest'
 require File.join(File.dirname(__FILE__), "response.rb")
+require File.join(File.dirname(__FILE__), "validator.rb")
 
 # simple class ruby untuk API Rajaongkir
 # http://rajaongkir.com/dokumentasi
@@ -45,30 +46,31 @@ class Rajaongkir
     # weight Berat kiriman dalam gram
     # courier Kode kurir (jne, pos, tiki)
 	def cost(origin = '', destination = '', weight = 0, courier = 'pos')
-		error_message = Hash.new
+		error_message ||= {}
+
+		obj = OpenStruct.new(
+			:origin => origin,
+			:destination => destination,
+			:weight => weight
+			);
+		validation = Validator.new(obj)
+		validation.rule(:origin, :not_empty)
+		validation.rule(:destination, :not_empty)
+		validation.rule(:weight, :not_null)
+
+		if validation.valid?
+			params = {:origin => origin, :destination => destination, :weight => weight, :courier => courier}
 
-		if origin == ''
-			error = 1
-			error_message['origin'] = 'origin tidak boleh kosong'
-		end
-		if destination == ''
-			error = 1
-			error_message['destination'] = 'destination tidak boleh kosong'
-		end
-		if weight == 0
-			error = 1
-			error_message['weight'] = 'weight harus lebih besar dari 0'
-		end
-		
-		if error == 1
+			request "cost", params, 'post'
+		else
+			validation.errors.each_pair do |key, value|
+				error_message[key.to_s] = value
+			end
+			
 			params = set_params 500, error_message
 			data_return = Response.new params
 
 			return data_return
-		else		
-			params = {:origin => origin, :destination => destination, :weight => weight, :courier => courier}
-
-			request "cost", params, 'post'
 		end
 	end
 

data/lib/validator.rb

@@ -0,0 +1,45 @@
+class Validator
+	attr_accessor :errors, :rules
+
+	def initialize(obj)
+		@rules ||= {}
+		@errors ||= {}
+		@obj = obj
+
+		# message error
+		@message = {
+			:not_empty => "tidak boleh kosong",
+			:not_null => "harus lebih besar dari 0"
+			}
+	end
+
+	# menambahkan aturan validasi
+	def rule(field, rule)
+		if ! rule.nil?
+			@rules[field] = rule
+		end
+	end
+
+	# cek apakah object valid atau tidak
+	def valid?
+		valid = true
+		@rules.each_pair do |f,r|
+			if ! send(r.to_sym, @obj.send(f))
+				valid = false
+				@errors[f] = @message[r]
+			end
+		end
+
+		@valid = valid
+	end
+
+	# tidak boleh kosong
+	def not_empty(value)
+	 	! (value.nil? || value == "")	
+	end
+
+	# tidak boleh 0
+	def not_null(value)
+		! (value == 0)
+	end
+end

data/rajaongkir.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'rajaongkir'
-  s.version     = '0.2'
+  s.version     = '0.2.1'
   s.summary     = "Simple class untuk API rajaongkir.com"
   s.description = "Simple class ruby untuk API rajaongkir.com"
   s.authors     = ["Harry Yunanto"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rajaongkir
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.2.1
 platform: ruby
 authors:
 - Harry Yunanto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-20 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unirest
@@ -34,6 +34,7 @@ files:
 - Rakefile
 - lib/rajaongkir.rb
 - lib/response.rb
+- lib/validator.rb
 - rajaongkir.gemspec
 - test/test_rajaongkir.rb
 homepage: https://github.com/iorme/rajaongkir-rb