kojn 0.2.7 → 0.3.0

data/Gemfile

@@ -5,7 +5,8 @@ source 'https://rubygems.org'
 gem "activemodel", ">= 3.0"
 gem "activesupport", ">= 3.0"
 
-gem 'curb', '> 0.8.1'
+#gem 'curb', '> 0.8.1'
+gem 'faraday'
 
 group :development do
   gem "bundler", "~> 1.3.5"

data/VERSION

@@ -1 +1 @@
-0.2.7
+0.3.0

data/kojn.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "kojn"
-  s.version = "0.2.7"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeffrey Wilcke", "Maran Hidskes"]
@@ -52,7 +52,7 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activemodel>, [">= 3.0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 3.0"])
-      s.add_runtime_dependency(%q<curb>, ["> 0.8.1"])
+      s.add_runtime_dependency(%q<faraday>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.3.5"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
@@ -60,7 +60,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<activemodel>, [">= 3.0"])
       s.add_dependency(%q<activesupport>, [">= 3.0"])
-      s.add_dependency(%q<curb>, ["> 0.8.1"])
+      s.add_dependency(%q<faraday>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.3.5"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
       s.add_dependency(%q<rspec>, [">= 0"])
@@ -69,7 +69,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<activemodel>, [">= 3.0"])
     s.add_dependency(%q<activesupport>, [">= 3.0"])
-    s.add_dependency(%q<curb>, ["> 0.8.1"])
+    s.add_dependency(%q<faraday>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.3.5"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
     s.add_dependency(%q<rspec>, [">= 0"])

data/lib/kojn.rb

@@ -1,7 +1,7 @@
 require 'active_support/core_ext'
 require 'active_support/inflector'
 require 'active_model'
-require 'curb'
+require 'faraday'
 
 String.send(:include, ActiveSupport::Inflector)
 

data/lib/kojn/collection.rb

@@ -12,19 +12,19 @@ module Kojn
     end
 
     def all(options = {})
-      parse_objects! Kojn::Net::get(self.path).body_str, self.model
+      parse_objects! Kojn::Net::get(self.path).body, self.model
     end
 
     def create(options = {})
-      parse_object! Kojn::Net::post(self.path, {invoice: options}).body_str, self.model
+      parse_object! Kojn::Net::post(self.path, {invoice: options}).body, self.model
     end
 
     def find(id, options = {})
-      parse_object! Kojn::Net::get("#{self.path}/#{id}").body_str, self.model
+      parse_object! Kojn::Net::get("#{self.path}/#{id}").body, self.model
     end
 
     def update(id, options = {})
-      parse_object! Kojn::Net::patch("#{self.path}/#{id}", options).body_str, self.model
+      parse_object! Kojn::Net::patch("#{self.path}/#{id}", options).body, self.model
     end
 
     protected

data/lib/kojn/net.rb

@@ -1,52 +1,42 @@
 module Kojn
   module Net
-    def self.to_uri(path)
-      return "http#{Kojn.ssl ? "s" : ""}://#{Kojn.host}:#{Kojn.port}#{path}"
+    def self.base_host
+      return "http#{Kojn.ssl ? "s" : ""}://#{Kojn.host}:#{Kojn.port}"
     end
 
-    def self.curl(verb, path, options={})
-      verb = verb.upcase.to_sym
-
-      c = Curl::Easy.new(self.to_uri(path))
-
-      c.verbose = Kojn.verbose
-      c.ssl_verify_peer = Kojn.verify_peer_and_host
-      c.ssl_verify_host = Kojn.verify_peer_and_host
-
-      if verb != :GET
-        c.post_body = options.to_json
+    def self.request(verb, path, options={})
+      conn = Faraday.new(:url => self.base_host) do |faraday|
+        faraday.request  :url_encoded             # form-encode POST params
+        faraday.response :logger                  # log requests to STDOUT
+        faraday.adapter  Faraday.default_adapter  # make requests with Net::HTTP
       end
+      conn.basic_auth(Kojn.api_key, '')
 
-      c.headers['Content-Type'] = 'application/json'
-      c.http_auth_types = :basic
-      c.username = Kojn.api_key
-      c.password = ''
-
-      c.http(verb)
+      response = conn.send(verb.to_s.downcase, path, options)
 
-      return c
+      return response
     end
 
     def self.get(path, options={})
-      request = self.curl(:GET, path, options)
+      request = self.request(:GET, path, options)
 
       return request
     end
 
     def self.post(path, options={})
-      request = self.curl(:POST, path, options)
+      request = self.request(:POST, path, options)
 
       return request
     end
 
     def self.patch(path, options={})
-      request = self.curl(:PATCH, path, options)
+      request = self.request(:PATCH, path, options)
 
       return request
     end
 
     def self.delete(path, options={})
-      request = self.curl(:DELETE, path, options)
+      request = self.request(:DELETE, path, options)
 
       return request
     end

data/lib/kojn/transaction.rb

@@ -20,19 +20,19 @@ module Kojn
     end
 
     def all(options = {})
-      Kojn.parse_objects! Kojn::Net::get('/api/transactions').read_body, Kojn::Tx
+      Kojn.parse_objects! Kojn::Net::get('/api/transactions').body, Kojn::Tx
     end
 
     def create(options = {})
-      Kojn.parse_object! Kojn::Net::post('/api/transactions', {transaction: options}).read_body, Kojn::Tx
+      Kojn.parse_object! Kojn::Net::post('/api/transactions', {transaction: options}).body, Kojn::Tx
     end
 
     def find(id, options = {})
-      Kojn.parse_object! Kojn::Net::get("/api/transactions/#{id}").read_body, Kojn::Tx
+      Kojn.parse_object! Kojn::Net::get("/api/transactions/#{id}").body, Kojn::Tx
     end
 
     def update(id, options = {})
-      Kojn.parse_object! Kojn::Net::patch("/api/transactions/#{id}", options).read_body, Kojn::Tx
+      Kojn.parse_object! Kojn::Net::patch("/api/transactions/#{id}", options).body, Kojn::Tx
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kojn
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -45,21 +45,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: curb
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>'
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>'
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -172,7 +172,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -169175154166651822
+      hash: -4292198967056187689
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: