centrum_faktur 0.2.2 → 0.3.0

data/.travis.yml

@@ -1,5 +1,4 @@
 notifications:
   disabled: true
 rvm:
-  - 1.8.7
   - 1.9.3

data/Gemfile

@@ -2,5 +2,6 @@ source "https://rubygems.org"
 
 gemspec
 
+ruby "1.9.3"
+
 gem "rake"
-gem "minitest", :platform => :ruby_18

data/README.md

@@ -7,33 +7,25 @@ Ruby client for [Centrum Faktur API](http://centrumfaktur.pl/api/)
 ```
 gem install centrum_faktur
 ```
+## Usage
 
-## Configuration
+Request returns Array or Hash, where keys are strings.
+When other format than `json` (default) or `yaml` is specified, response is not parsed.
+So for `xml` and `pickle` requests, string is returned.
 
-``` ruby
+```ruby
 require "centrum_faktur"
-
-CentrumFaktur.configure do |config|
-  config.login     = "your_login"
-  config.subdomain = "your-subdomain"
-  config.password  = "your-password"
-end
+client = CentrumFaktur::Client.new(login: "your_login", password: "your-password", subdomain: "your-subodomain")
 ```
 
-## Usage
-
-Requests return Array or Hash, where keys are strings.
-When other format than json (default) or yaml is specified, response is not parsed.
-So for xml and pickle requests string is returned.
-
 ``` ruby
-CentrumFaktur::Invoice.show("/api/1.0/invoices/1/", :format => :xml)
+client.invoice.show("/api/1.0/invoices/1/", format: :xml)
 ```
 
 Writing invoice to pdf can be done as follows:
 
 ``` ruby
-File.open("my-invoice.pdf", "w") { |file| file.write(CentrumFaktur::Invoice.show("/api/1.0/invoices/1/", :format => :pdf)) }
+File.open("my-invoice.pdf", "w") { |file| file.write(client.invoice.show("/api/1.0/invoices/1/", format: :pdf)) }
 ```
 
 All params that respond to `strftime` (i.e. Date, Time) will be normalized to format
@@ -44,7 +36,7 @@ required by API, that is: `"YYYY-MM-DD"`
 Only listing accounts is supported via API
 
 ``` ruby
-CentrumFaktur::Account.list
+client.account.list
 ```
 
 ### Comment
@@ -52,13 +44,13 @@ CentrumFaktur::Account.list
 Listing all comments:
 
 ``` ruby
-CentrumFaktur::Comment.list
+client.comment.list
 ```
 
 Or listing comments for given resource:
 
 ``` ruby
-CentrumFaktur::Comment.list("/api/1.0/estimates/1/comments/")
+client.comment.list("/api/1.0/estimates/1/comments/")
 ```
 
 Creating comment:
@@ -66,7 +58,7 @@ Creating comment:
 You must pass path to resource comment and required attributes:
 
 ``` ruby
-CentrumFaktur::Comment.create("/api/1.0/estimates/1/comments/", {:body => "cool", :is_public => false})
+client.comment.create("/api/1.0/estimates/1/comments/", {body: "cool", is_public: false})
 ```
 
 ### Estimate
@@ -74,31 +66,31 @@ CentrumFaktur::Comment.create("/api/1.0/estimates/1/comments/", {:body => "cool"
 Listing all estimates:
 
 ``` ruby
-CentrumFaktur::Estimate.list
+client.estimate.list
 ```
 
 Monitoring estimate changes (with optional filter param):
 
 ``` ruby
-CentrumFaktur::Estimate.list_updates(:updated_since => "2012-01-12")
+client.estimate.list_updates(updated_since: "2012-01-12")
 ```
 
 Creating estimate (check required attributes in API description):
 
 ``` ruby
-CentrumFaktur::Estimate.create({})
+client.estimate.create({})
 ```
 
 Updating estimate:
 
 ``` ruby
-CentrumFaktur::Estimate.update("/api/1.0/estimates/1/", {})
+client.estimate.update("/api/1.0/estimates/1/", {})
 ```
 
 Removing estimate:
 
 ``` ruby
-CentrumFaktur::Estimate.destroy("/api/1.0/estimates/1/")
+client.estimate.destroy("/api/1.0/estimates/1/")
 ```
 
 ### Invoice
@@ -106,37 +98,37 @@ CentrumFaktur::Estimate.destroy("/api/1.0/estimates/1/")
 Listing all invoices:
 
 ``` ruby
-CentrumFaktur::Invoice.list
+client.invoice.list
 ```
 
 Monitoring invoice changes:
 
 ``` ruby
-CentrumFaktur::Invoice.list_updates
+client.invoice.list_updates
 ```
 
 Displaying invoice:
 
 ``` ruby
-CentrumFaktur::Invoice.show("/api/1.0/invoices/1/")
+client.invoice.show("/api/1.0/invoices/1/")
 ```
 
 Creating invoice (check required attributes in API description):
 
 ``` ruby
-CentrumFaktur::Invoice.create({})
+client.invoice.create({})
 ```
 
 Updating invoice:
 
 ``` ruby
-CentrumFaktur::Invoice.update("/api/1.0/invoices/1/", {})
+client.invoice.update("/api/1.0/invoices/1/", {})
 ```
 
 Removing invoice:
 
 ``` ruby
-CentrumFaktur::Invoice.destroy("/api/1.0/invoices/1/")
+client.invoice.destroy("/api/1.0/invoices/1/")
 ```
 
 ### User ###
@@ -144,7 +136,7 @@ CentrumFaktur::Invoice.destroy("/api/1.0/invoices/1/")
 Only listing users is supported via API
 
 ``` ruby
-CentrumFaktur::User.list
+client.user.list
 ```
 
 ## Continuous Integration

data/Rakefile

@@ -8,4 +8,4 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-task :default => :test
+task default: :test

data/centrum_faktur.gemspec

@@ -17,15 +17,4 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "multi_json", "~> 1.3.2"
   gem.add_development_dependency "fakeweb"
-
-  gem.post_install_message = %{
-    *************************************************************************
-
-    Interface of version 0.3 of this gem will change with backward incompatibilities.
-
-    If you don't want to update your code, please specify in your Gemfile:
-    gem "centrum_faktur", "~> 0.2.0"
-
-    *************************************************************************
-  }
 end

data/lib/centrum_faktur/api/account.rb

@@ -0,0 +1,10 @@
+require "centrum_faktur/api/base"
+
+module CentrumFaktur::API
+  class Account < Base
+    def list(options = {})
+      request = connection.get("/api/1.0/accounts/", options)
+      request.handle_response
+    end
+  end
+end

data/lib/centrum_faktur/api/base.rb

@@ -0,0 +1,17 @@
+require "centrum_faktur/api/base"
+
+module CentrumFaktur::API
+  class Base
+    attr_reader :client
+
+    def initialize(client)
+      @client = client
+    end
+
+    private
+
+    def connection
+      CentrumFaktur::Connection.new(client)
+    end
+  end
+end

data/lib/centrum_faktur/api/comment.rb

@@ -0,0 +1,15 @@
+require "centrum_faktur/api/base"
+
+module CentrumFaktur::API
+  class Comment < Base
+    def list(comment_uri = "/api/1.0/comments/", options = {})
+      request = connection.get(comment_uri, options)
+      request.handle_response
+    end
+
+    def create(comment_uri, params)
+      request = connection.post(comment_uri, params)
+      request.handle_response
+    end
+  end
+end

data/lib/centrum_faktur/api/customer.rb

@@ -0,0 +1,30 @@
+require "centrum_faktur/api/base"
+
+module CentrumFaktur::API
+  class Customer < Base
+    def list(options = {})
+      request = connection.get("/api/1.0/customers/", options)
+      request.handle_response
+    end
+
+    def show(customer_uri, options = {})
+      request = connection.get(customer_uri, options)
+      request.handle_response
+    end
+
+    def create(params)
+      request = connection.post("/api/1.0/customers/", params)
+      request.handle_response
+    end
+
+    def update(customer_uri, params)
+      request = connection.put(customer_uri, params)
+      request.handle_response
+    end
+
+    def destroy(customer_uri)
+      request = connection.delete(customer_uri)
+      request.handle_response
+    end
+  end
+end

data/lib/centrum_faktur/api/estimate.rb

@@ -0,0 +1,35 @@
+require "centrum_faktur/api/base"
+
+module CentrumFaktur::API
+  class Estimate < Base
+    def list(options = {})
+      request = connection.get("/api/1.0/estimates/", options)
+      request.handle_response
+    end
+
+    def list_updates(options = {})
+      request = connection.get("/api/1.0/estimates/updates/", options)
+      request.handle_response
+    end
+
+    def show(estimate_uri, options = {})
+      request = connection.get(estimate_uri, options)
+      request.handle_response
+    end
+
+    def create(params)
+      request = connection.post("/api/1.0/estimates/", params)
+      request.handle_response
+    end
+
+    def update(estimate_uri, params)
+      request = connection.put(estimate_uri, params)
+      request.handle_response
+    end
+
+    def destroy(estimate_uri)
+      request = connection.delete(estimate_uri)
+      request.handle_response
+    end
+  end
+end

data/lib/centrum_faktur/api/invoice.rb

@@ -0,0 +1,35 @@
+require "centrum_faktur/api/base"
+
+module CentrumFaktur::API
+  class Invoice < Base
+    def list(options = {})
+      request = connection.get("/api/1.0/invoices/", options)
+      request.handle_response
+    end
+
+    def list_updates(options = {})
+      request = connection.get("/api/1.0/invoices/updates/", options)
+      request.handle_response
+    end
+
+    def show(invoice_uri, options = {})
+      request = connection.get(invoice_uri, options)
+      request.handle_response
+    end
+
+    def create(params)
+      request = connection.post("/api/1.0/invoices/", params)
+      request.handle_response
+    end
+
+    def update(invoice_uri, params)
+      request = connection.put(invoice_uri, params)
+      request.handle_response
+    end
+
+    def destroy(invoice_uri)
+      request = connection.delete(invoice_uri)
+      request.handle_response
+    end
+  end
+end

data/lib/centrum_faktur/api/payment.rb

@@ -0,0 +1,15 @@
+require "centrum_faktur/api/base"
+
+module CentrumFaktur::API
+  class Payment < Base
+    def list(comment_uri = "/api/1.0/payments/", options = {})
+      request = connection.get(comment_uri, options)
+      request.handle_response
+    end
+
+    def create(payment_uri, params)
+      request = connection.post(payment_uri, params)
+      request.handle_response
+    end
+  end
+end

data/lib/centrum_faktur/api/user.rb

@@ -0,0 +1,10 @@
+require "centrum_faktur/api/base"
+
+module CentrumFaktur::API
+  class User < Base
+    def list(options = {})
+      request = connection.get("/api/1.0/users/", options)
+      request.handle_response
+    end
+  end
+end

data/lib/centrum_faktur/client.rb

@@ -0,0 +1,39 @@
+module CentrumFaktur
+  class Client
+    attr_reader :login, :password, :subdomain
+
+    def initialize(configuration = {})
+      @login     = configuration[:login]     || raise(ArgumentError.new("You must specify login"))
+      @password  = configuration[:password]  || raise(ArgumentError.new("You must specify password"))
+      @subdomain = configuration[:subdomain] || raise(ArgumentError.new("You must specify subdomain"))
+    end
+
+    def account
+      API::Account.new(self)
+    end
+
+    def comment
+      API::Comment.new(self)
+    end
+
+    def customer
+      API::Customer.new(self)
+    end
+
+    def estimate
+      API::Estimate.new(self)
+    end
+
+    def invoice
+      API::Invoice.new(self)
+    end
+
+    def payment
+      API::Payment.new(self)
+    end
+
+    def user
+      API::User.new(self)
+    end
+  end
+end

data/lib/centrum_faktur/connection.rb

@@ -4,92 +4,90 @@ require "uri"
 require "yaml"
 require "multi_json"
 
-class CentrumFaktur::Connection
-  attr_reader :response, :path
-  attr_accessor :login, :password, :subdomain
+module CentrumFaktur
+  class Connection
+    attr_reader :client, :response, :path
 
-  def initialize(options = {})
-    self.login = options.fetch(:login, CentrumFaktur.login) || raise(ArgumentError.new("You must specify login"))
-    self.password = options.fetch(:password, CentrumFaktur.password) || raise(ArgumentError.new("You must specify password"))
-    self.subdomain = options.fetch(:subdomain, CentrumFaktur.subdomain) || raise(ArgumentError.new("You must specify subdomain"))
-  end
+    def initialize(client)
+      @client = client
+    end
 
-  def http
-    http = Net::HTTP.new(uri.host, uri.port)
-    http.use_ssl = true
-    http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    http
-  end
+    def http
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
+      http
+    end
 
-  def uri
-    @uri ||= URI.parse("https://#{subdomain}.centrumfaktur.pl")
-  end
+    def uri
+      @uri ||= URI.parse("https://#{client.subdomain}.centrumfaktur.pl")
+    end
 
-  def format
-    @format ||= :json
-  end
+    def format
+      @format ||= :json
+    end
 
-  # TODO: unify
-  def get(to, params = {})
-    @format = params.fetch(:format, :json)
-    @path = CentrumFaktur::Utils.path_with_params(to, params)
-    request = Net::HTTP::Get.new(@path, headers)
-    request.basic_auth(login, password)
-    @response = http.request(request)
-    self
-  end
+    # TODO: unify
+    def get(to, params = {})
+      @format = params.fetch(:format, :json)
+      @path = CentrumFaktur::Utils.path_with_params(to, params)
+      request = Net::HTTP::Get.new(@path, headers)
+      request.basic_auth(client.login, client.password)
+      @response = http.request(request)
+      self
+    end
 
-  def post(to, params = {})
-    @path = URI.parse(to).to_s
-    request = Net::HTTP::Post.new(@path, headers)
-    request.basic_auth(login, password)
-    request.body = MultiJson.dump(CentrumFaktur::Utils.normalize_params(params))
-    @response = http.request(request)
-    self
-  end
+    def post(to, params = {})
+      @path = URI.parse(to).to_s
+      request = Net::HTTP::Post.new(@path, headers)
+      request.basic_auth(client.login, client.password)
+      request.body = MultiJson.dump(CentrumFaktur::Utils.normalize_params(params))
+      @response = http.request(request)
+      self
+    end
 
-  def put(to, params = {})
-    @path = URI.parse(to).to_s
-    request = Net::HTTP::Put.new(@path, headers)
-    request.basic_auth(login, password)
-    request.body = MultiJson.encode(CentrumFaktur::Utils.normalize_params(params))
-    @response = http.request(request)
-    self
-  end
+    def put(to, params = {})
+      @path = URI.parse(to).to_s
+      request = Net::HTTP::Put.new(@path, headers)
+      request.basic_auth(client.login, client.password)
+      request.body = MultiJson.encode(CentrumFaktur::Utils.normalize_params(params))
+      @response = http.request(request)
+      self
+    end
 
-  def delete(to)
-    @path = URI.parse(to).to_s
-    request = Net::HTTP::Delete.new(@path, headers)
-    request.basic_auth(login, password)
-    @response = http.request(request)
-    self
-  end
+    def delete(to)
+      @path = URI.parse(to).to_s
+      request = Net::HTTP::Delete.new(@path, headers)
+      request.basic_auth(client.login, client.password)
+      @response = http.request(request)
+      self
+    end
 
-  def parse_response
-    case format.to_sym
-    when :json
-      response.body ? MultiJson.load(response.body) : nil
-    when :yaml
-      response.body ? YAML.load(response.body) : nil
-    when :xml, :pickle, :pdf
-      response.body
-    else
-      raise StandardError.new("Unknown format: #{@format}")
+    def parse_response
+      case format.to_sym
+      when :json
+        response.body ? MultiJson.load(response.body) : nil
+      when :yaml
+        response.body ? YAML.load(response.body) : nil
+      when :xml, :pickle, :pdf
+        response.body
+      else
+        raise StandardError.new("Unknown format: #{@format}")
+      end
     end
-  end
 
-  def handle_response
-    case response.code.to_i
-    when 200...300
-      parse_response
-    when 300...600
-      raise CentrumFaktur::ResponseError.new(response)
-    else
-      raise StandardError.new("Unknown response code")
+    def handle_response
+      case response.code.to_i
+      when 200...300
+        parse_response
+      when 300...600
+        raise CentrumFaktur::ResponseError.new(response)
+      else
+        raise StandardError.new("Unknown response code")
+      end
     end
-  end
 
-  def headers
-    {"Content-Type" => "application/json", "User-Agent" => "ruby-gem-v#{CentrumFaktur::VERSION}"}
+    def headers
+      {"Content-Type" => "application/json", "User-Agent" => "ruby-gem-v#{CentrumFaktur::VERSION}"}
+    end
   end
 end

data/lib/centrum_faktur/utils.rb

@@ -1,3 +1,5 @@
+require "uri"
+
 module CentrumFaktur::Utils
   def inline_params(params)
     params.map { |k, v| "#{k}=#{v}" }.join("&")

data/lib/centrum_faktur/version.rb

@@ -1,3 +1,3 @@
 module CentrumFaktur
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/lib/centrum_faktur.rb

@@ -2,22 +2,16 @@ require "centrum_faktur/version"
 require "centrum_faktur/utils"
 require "centrum_faktur/exceptions"
 require "centrum_faktur/connection"
-require "centrum_faktur/account"
-require "centrum_faktur/comment"
-require "centrum_faktur/customer"
-require "centrum_faktur/estimate"
-require "centrum_faktur/invoice"
-require "centrum_faktur/user"
-require "centrum_faktur/payment"
+require "centrum_faktur/client"
+
+require "centrum_faktur/api/account"
+require "centrum_faktur/api/comment"
+require "centrum_faktur/api/customer"
+require "centrum_faktur/api/estimate"
+require "centrum_faktur/api/invoice"
+require "centrum_faktur/api/user"
+require "centrum_faktur/api/payment"
 
 module CentrumFaktur
   API_VERSION = "1.0"
-
-  class << self
-    attr_accessor :login, :password, :subdomain
-
-    def configure
-      yield self
-    end
-  end
 end

data/test/{comment_test.rb → api/comment_test.rb}

@@ -1,18 +1,14 @@
 # -*- encoding: utf-8 -*-
 require "helper"
 
-describe CentrumFaktur::Comment do
+describe CentrumFaktur::API::Comment do
   before do
-    CentrumFaktur.configure do |config|
-      config.login     = "john"
-      config.password  = "secret"
-      config.subdomain = "john"
-    end
+    @client = CentrumFaktur::Client.new(login: "john", password: "secret", subdomain: "john")
   end
 
   it "returns estimate comments list limited to one" do
     FakeWeb.register_uri(:get, "https://john:secret@john.centrumfaktur.pl/api/1.0/estimates/14587/comments/?limit=1", :response => fixture("comments.txt"))
-    response = CentrumFaktur::Comment.list("/api/1.0/estimates/14587/comments/", :limit => 1)
+    response = CentrumFaktur::API::Comment.new(@client).list("/api/1.0/estimates/14587/comments/", :limit => 1)
     expected = [{"body"=>"cool", "user_uri"=>"/api/1.0/users/749/", "comment_type"=>"user", "created"=>"2011-06-14 20:06:36", "commented_object_type"=>"estimate", "commented_object_uri"=>"/api/1.0/estimates/20527/", "is_public"=>false}]
 
     assert_equal expected, response
@@ -20,7 +16,7 @@ describe CentrumFaktur::Comment do
 
   it "creates comment" do
     FakeWeb.register_uri(:post, "https://john:secret@john.centrumfaktur.pl/api/1.0/estimates/14587/comments/", :response => fixture("new_comment.txt"))
-    response = CentrumFaktur::Comment.create("/api/1.0/estimates/14587/comments/", {:body => "cool", :is_public => false})
+    response = CentrumFaktur::API::Comment.new(@client).create("/api/1.0/estimates/14587/comments/", {:body => "cool", :is_public => false})
     expected = {"body"=>"thanks", "user_uri"=>"/api/1.0/users/749/", "comment_type"=>"user", "created"=>"2011-06-16 21:55:03", "commented_object_type"=>"estimate", "commented_object_uri"=>"/api/1.0/estimates/20627/", "is_public"=>false}
 
     assert_equal expected, response

data/test/{customer_test.rb → api/customer_test.rb}

@@ -1,18 +1,14 @@
 # -*- encoding: utf-8 -*-
 require "helper"
 
-describe CentrumFaktur::Customer do
+describe CentrumFaktur::API::Customer do
   before do
-    CentrumFaktur.configure do |config|
-      config.login     = "john"
-      config.password  = "secret"
-      config.subdomain = "john"
-    end
+    @client = CentrumFaktur::Client.new(login: "john", password: "secret", subdomain: "john")
   end
 
   it "returns customers list" do
-    FakeWeb.register_uri(:get, "https://john:secret@john.centrumfaktur.pl/api/1.0/customers/", :response => fixture("customers.txt"))
-    response = CentrumFaktur::Customer.list
+    FakeWeb.register_uri(:get, "https://john:secret@john.centrumfaktur.pl/api/1.0/customers/", response: fixture("customers.txt"))
+    response = CentrumFaktur::API::Customer.new(@client).list
     expected = [{"name"=>"Stefan Stefański", "contact"=>"", "address"=>"Stefanowo\r\nul. Stefańska 1", "resource_uri"=>"/api/1.0/customers/3138/", "email"=>"w.wnetrzak+stefan@gmail.com", "tax_id"=>""}]
 
     assert_equal expected, response

data/test/api/invoice_test.rb

@@ -0,0 +1,23 @@
+# -*- encoding: utf-8 -*-
+require "helper"
+
+describe CentrumFaktur::API::Invoice do
+  before do
+    @client = CentrumFaktur::Client.new(login: "john", password: "secret", subdomain: "john")
+  end
+
+  it "detroys invoice" do
+    FakeWeb.register_uri(:delete, "https://john:secret@john.centrumfaktur.pl/api/1.0/invoices/666/", response: fixture("destroy_invoice.txt"))
+    response = CentrumFaktur::API::Invoice.new(@client).destroy("/api/1.0/invoices/666/")
+
+    assert_equal nil, response
+  end
+
+  it "raises error when invoice does not exist" do
+    FakeWeb.register_uri(:delete, "https://john:secret@john.centrumfaktur.pl/api/1.0/invoices/666/", response: fixture("destroy_invoice_404.txt"))
+
+    assert_raises CentrumFaktur::ResponseError do
+      CentrumFaktur::API::Invoice.new(@client).destroy("/api/1.0/invoices/666/")
+    end
+  end
+end

data/test/{payments_test.rb → api/payments_test.rb}

@@ -1,12 +1,8 @@
 require "helper"
 
-describe CentrumFaktur::Payment do
+describe CentrumFaktur::API::Payment do
   before do
-    CentrumFaktur.configure do |config|
-      config.login     = "john"
-      config.password  = "secret"
-      config.subdomain = "john"
-    end
+    @client = CentrumFaktur::Client.new(login: "john", password: "secret", subdomain: "john")
   end
 
   it "gets payment" do
@@ -14,7 +10,7 @@ describe CentrumFaktur::Payment do
       "https://john:secret@john.centrumfaktur.pl/api/1.0/invoices/22933/payments",
       :response => fixture("payments.txt")
     )
-    response = CentrumFaktur::Payment.list("/api/1.0/invoices/22933/payments")
+    response = CentrumFaktur::API::Payment.new(@client).list("/api/1.0/invoices/22933/payments")
     expected = [{
       "date" => "2007-01-01", "amount" => 10.0, "resource_uri" => "/api/1.0/users/749/",
       "created" => "2011-06-14 20:06:36"
@@ -25,7 +21,7 @@ describe CentrumFaktur::Payment do
 
   it "creates payment" do
     FakeWeb.register_uri(:post, "https://john:secret@john.centrumfaktur.pl/api/1.0/invoices/22933/payments", :response => fixture("new_payment.txt"))
-    response = CentrumFaktur::Payment.create("/api/1.0/invoices/22933/payments",
+    response = CentrumFaktur::API::Payment.new(@client).create("/api/1.0/invoices/22933/payments",
       {:date => "2011-06-10", :amount => 99.00}
     )
 

data/test/{user_test.rb → api/user_test.rb}

@@ -1,18 +1,14 @@
 # -*- encoding: utf-8 -*-
 require "helper"
 
-describe CentrumFaktur::User do
+describe CentrumFaktur::API::User do
   before do
-    CentrumFaktur.configure do |config|
-      config.login     = "john"
-      config.password  = "secret"
-      config.subdomain = "john"
-    end
+    @client = CentrumFaktur::Client.new(login: "john", password: "secret", subdomain: "john")
   end
 
   it "returns users list" do
-    FakeWeb.register_uri(:get, "https://john:secret@john.centrumfaktur.pl/api/1.0/users/", :response => fixture("users.txt"))
-    response = CentrumFaktur::User.list
+    FakeWeb.register_uri(:get, "https://john:secret@john.centrumfaktur.pl/api/1.0/users/", response: fixture("users.txt"))
+    response = CentrumFaktur::API::User.new(@client).list
     expected = [{
       "login"        => "morgoth",
       "first_name"   => "Wojciech",

data/test/client_test.rb

@@ -0,0 +1,21 @@
+require "helper"
+
+describe CentrumFaktur::Client do
+  it "raises Argument Error when login not present" do
+    assert_raises ArgumentError, /login/ do
+      CentrumFaktur::Client.new(password: "secret", subdomain: "john")
+    end
+  end
+
+  it "raises Argument Error when password not present" do
+    assert_raises ArgumentError, /password/ do
+      CentrumFaktur::Client.new(login: "john", subdomain: "john")
+    end
+  end
+
+  it "raises Argument Error when subdomain not present" do
+    assert_raises ArgumentError, /subdomain/ do
+      CentrumFaktur::Client.new(login: "john", password: "secret")
+    end
+  end
+end

data/test/connection_test.rb

@@ -2,14 +2,10 @@ require "helper"
 
 describe CentrumFaktur::Connection do
   before do
-    CentrumFaktur.configure do |config|
-      config.login     = "fake"
-      config.password  = "fake"
-      config.subdomain = "fake"
-    end
+    @client = CentrumFaktur::Client.new(login: "john", password: "secret", subdomain: "john")
   end
 
   it "returns url to custom profile" do
-    assert_equal "https://fake.centrumfaktur.pl", CentrumFaktur::Connection.new.uri.to_s
+    assert_equal "https://john.centrumfaktur.pl", CentrumFaktur::Connection.new(@client).uri.to_s
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: centrum_faktur
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-30 00:00:00.000000000 Z
+date: 2012-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -58,21 +58,26 @@ files:
 - Rakefile
 - centrum_faktur.gemspec
 - lib/centrum_faktur.rb
-- lib/centrum_faktur/account.rb
-- lib/centrum_faktur/comment.rb
+- lib/centrum_faktur/api/account.rb
+- lib/centrum_faktur/api/base.rb
+- lib/centrum_faktur/api/comment.rb
+- lib/centrum_faktur/api/customer.rb
+- lib/centrum_faktur/api/estimate.rb
+- lib/centrum_faktur/api/invoice.rb
+- lib/centrum_faktur/api/payment.rb
+- lib/centrum_faktur/api/user.rb
+- lib/centrum_faktur/client.rb
 - lib/centrum_faktur/connection.rb
-- lib/centrum_faktur/customer.rb
-- lib/centrum_faktur/estimate.rb
 - lib/centrum_faktur/exceptions.rb
-- lib/centrum_faktur/invoice.rb
-- lib/centrum_faktur/payment.rb
-- lib/centrum_faktur/user.rb
 - lib/centrum_faktur/utils.rb
 - lib/centrum_faktur/version.rb
-- test/comment_test.rb
-- test/configuration_test.rb
+- test/api/comment_test.rb
+- test/api/customer_test.rb
+- test/api/invoice_test.rb
+- test/api/payments_test.rb
+- test/api/user_test.rb
+- test/client_test.rb
 - test/connection_test.rb
-- test/customer_test.rb
 - test/fixtures/comments.txt
 - test/fixtures/customers.txt
 - test/fixtures/destroy_invoice.txt
@@ -82,17 +87,10 @@ files:
 - test/fixtures/payments.txt
 - test/fixtures/users.txt
 - test/helper.rb
-- test/invoice_test.rb
-- test/payments_test.rb
-- test/user_test.rb
 - test/utils_test.rb
 homepage: https://github.com/morgoth/centrum_faktur
 licenses: []
-post_install_message: ! "\n    *************************************************************************\n\n
-  \   Interface of version 0.3 of this gem will change with backward incompatibilities.\n\n
-  \   If you don't want to update your code, please specify in your Gemfile:\n    gem
-  \"centrum_faktur\", \"~> 0.2.0\"\n\n    *************************************************************************\n
-  \ "
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib

data/lib/centrum_faktur/account.rb

@@ -1,8 +0,0 @@
-class CentrumFaktur::Account
-  class << self
-    def list(options = {})
-      request = CentrumFaktur::Connection.new.get("/api/1.0/accounts/", options)
-      request.handle_response
-    end
-  end
-end

data/lib/centrum_faktur/comment.rb

@@ -1,13 +0,0 @@
-class CentrumFaktur::Comment
-  class << self
-    def list(comment_uri = "/api/1.0/comments/", options = {})
-      request = CentrumFaktur::Connection.new.get(comment_uri, options)
-      request.handle_response
-    end
-
-    def create(comment_uri, params)
-      request = CentrumFaktur::Connection.new.post(comment_uri, params)
-      request.handle_response
-    end
-  end
-end

data/lib/centrum_faktur/customer.rb

@@ -1,28 +0,0 @@
-class CentrumFaktur::Customer
-  class << self
-    def list(options = {})
-      request = CentrumFaktur::Connection.new.get("/api/1.0/customers/", options)
-      request.handle_response
-    end
-
-    def show(customer_uri, options = {})
-      request = CentrumFaktur::Connection.new.get(customer_uri, options)
-      request.handle_response
-    end
-
-    def create(params)
-      request = CentrumFaktur::Connection.new.post("/api/1.0/customers/", params)
-      request.handle_response
-    end
-
-    def update(customer_uri, params)
-      request = CentrumFaktur::Connection.new.put(customer_uri, params)
-      request.handle_response
-    end
-
-    def destroy(customer_uri)
-      request = CentrumFaktur::Connection.new.delete(customer_uri)
-      request.handle_response
-    end
-  end
-end

data/lib/centrum_faktur/estimate.rb

@@ -1,33 +0,0 @@
-class CentrumFaktur::Estimate
-  class << self
-    def list(options = {})
-      request = CentrumFaktur::Connection.new.get("/api/1.0/estimates/", options)
-      request.handle_response
-    end
-
-    def list_updates(options = {})
-      request = CentrumFaktur::Connection.new.get("/api/1.0/estimates/updates/", options)
-      request.handle_response
-    end
-
-    def show(estimate_uri, options = {})
-      request = CentrumFaktur::Connection.new.get(estimate_uri, options)
-      request.handle_response
-    end
-
-    def create(params)
-      request = CentrumFaktur::Connection.new.post("/api/1.0/estimates/", params)
-      request.handle_response
-    end
-
-    def update(estimate_uri, params)
-      request = CentrumFaktur::Connection.new.put(estimate_uri, params)
-      request.handle_response
-    end
-
-    def destroy(estimate_uri)
-      request = CentrumFaktur::Connection.new.delete(estimate_uri)
-      request.handle_response
-    end
-  end
-end

data/lib/centrum_faktur/invoice.rb

@@ -1,33 +0,0 @@
-class CentrumFaktur::Invoice
-  class << self
-    def list(options = {})
-      request = CentrumFaktur::Connection.new.get("/api/1.0/invoices/", options)
-      request.handle_response
-    end
-
-    def list_updates(options = {})
-      request = CentrumFaktur::Connection.new.get("/api/1.0/invoices/updates/", options)
-      request.handle_response
-    end
-
-    def show(invoice_uri, options = {})
-      request = CentrumFaktur::Connection.new.get(invoice_uri, options)
-      request.handle_response
-    end
-
-    def create(params)
-      request = CentrumFaktur::Connection.new.post("/api/1.0/invoices/", params)
-      request.handle_response
-    end
-
-    def update(invoice_uri, params)
-      request = CentrumFaktur::Connection.new.put(invoice_uri, params)
-      request.handle_response
-    end
-
-    def destroy(invoice_uri)
-      request = CentrumFaktur::Connection.new.delete(invoice_uri)
-      request.handle_response
-    end
-  end
-end

data/lib/centrum_faktur/payment.rb

@@ -1,13 +0,0 @@
-class CentrumFaktur::Payment
-  class << self
-    def list(comment_uri = "/api/1.0/payments/", options = {})
-      request = CentrumFaktur::Connection.new.get(comment_uri, options)
-      request.handle_response
-    end
-
-    def create(payment_uri, params)
-      request = CentrumFaktur::Connection.new.post(payment_uri, params)
-      request.handle_response
-    end
-  end
-end

data/lib/centrum_faktur/user.rb

@@ -1,8 +0,0 @@
-class CentrumFaktur::User
-  class << self
-    def list(options = {})
-      request = CentrumFaktur::Connection.new.get("/api/1.0/users/", options)
-      request.handle_response
-    end
-  end
-end

data/test/configuration_test.rb

@@ -1,15 +0,0 @@
-require "helper"
-
-describe "Configuration" do
-  it "allows to set custom settings" do
-    CentrumFaktur.configure do |config|
-      config.login     = "john"
-      config.password  = "secret"
-      config.subdomain = "john-doe"
-    end
-
-    assert_equal "john", CentrumFaktur.login
-    assert_equal "secret", CentrumFaktur.password
-    assert_equal "john-doe", CentrumFaktur.subdomain
-  end
-end

data/test/invoice_test.rb

@@ -1,27 +0,0 @@
-# -*- encoding: utf-8 -*-
-require "helper"
-
-describe CentrumFaktur::Invoice do
-  before do
-    CentrumFaktur.configure do |config|
-      config.login     = "john"
-      config.password  = "secret"
-      config.subdomain = "john"
-    end
-  end
-
-  it "detroys invoice" do
-    FakeWeb.register_uri(:delete, "https://john:secret@john.centrumfaktur.pl/api/1.0/invoices/666/", :response => fixture("destroy_invoice.txt"))
-    response = CentrumFaktur::Invoice.destroy("/api/1.0/invoices/666/")
-
-    assert_equal nil, response
-  end
-
-  it "raises error when invoice does not exist" do
-    FakeWeb.register_uri(:delete, "https://john:secret@john.centrumfaktur.pl/api/1.0/invoices/666/", :response => fixture("destroy_invoice_404.txt"))
-
-    assert_raises CentrumFaktur::ResponseError do
-      CentrumFaktur::Invoice.destroy("/api/1.0/invoices/666/")
-    end
-  end
-end