atech-billy 1.0.1 → 1.0.2

data/lib/billy.rb

@@ -5,12 +5,14 @@ require 'json'
 require 'basic_ssl'
 
 require 'billy/request'
+require 'billy/base_model'
 require 'billy/service'
 require 'billy/signup_token'
+require 'billy/invoice'
 
 module Billy
   
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
   
   class << self
     

data/lib/billy/base_model.rb

@@ -0,0 +1,14 @@
+module Billy
+  class BaseModel
+    attr_reader :attributes
+    
+    def initialize(attributes = {})
+      @attributes = attributes
+    end
+    
+    def method_missing(param)
+      @attributes[param.to_s] || super
+    end
+    
+  end
+end

data/lib/billy/invoice.rb

@@ -0,0 +1,33 @@
+module Billy
+  class Invoice < BaseModel
+    
+    def add_line(params)
+      attributes = Billy::Request.request('invoices/add_line', :service => @attributes['service_id'], :invoice => @attributes['number'], :line => params)
+      attributes.is_a?(Hash) ? @attributes = attributes : false
+    end
+    
+    def delete_line(id)
+      attributes = Billy::Request.request('invoices/delete_line', :service => @attributes['service_id'], :invoice => @attributes['number'], :line => id)
+      attributes.is_a?(Hash) ? @attributes = attributes : false
+    end
+    
+    def finalise!
+      attributes = Billy::Request.request('invoices/finalise', :service => @attributes['service_id'], :invoice => @attributes['number'])
+      @attributes = attributes
+      true
+    end
+    
+    def mark_as_paid(method, reference, verifier = nil)
+      options = {:service => @attributes['service_id'], :invoice => @attributes['number'], :payment_method => method, :payment_reference => reference}
+      options[:payment_verifier] = verifier if verifier
+      attributes = Billy::Request.request('invoices/mark_as_paid', options)
+      @attributes = attributes
+      true
+    end
+    
+    def delete
+      Billy::Request.request('invoices/delete', :service => @attributes['service_id'], :invoice => @attributes['number'])
+    end
+    
+  end
+end

data/lib/billy/request.rb

@@ -29,8 +29,7 @@ module Billy
       http_request.initialize_http_header({"User-Agent" => "BillyRubyClient/#{Billy::VERSION}"})
       http_request.add_field("X-Billy-Product", Billy.product)
       http_request.add_field("X-Billy-Key", Billy.product_key)
-
-      http_request.set_form_data(@data)
+      http_request.content_type = 'application/json'
     
       http = Net::HTTP.new(uri.host, uri.port)
     
@@ -39,8 +38,14 @@ module Billy
         http.verify_mode = OpenSSL::SSL::VERIFY_NONE
       end
     
-      http_result = http.request(http_request)
-      @output = JSON.parse(http_result.body)
+      http_result = http.request(http_request, @data.to_json)
+      if http_result.body == 'true'
+        @output = true
+      elsif http_result.body == 'false'
+        @output = false
+      else
+        @output = JSON.parse(http_result.body)
+      end
       @success = case http_result
       when Net::HTTPSuccess
         true
@@ -53,7 +58,7 @@ module Billy
         raise Billy::Errors::NotFound, json['error']
       when Net::HTTPClientError
         json = JSON.parse(http_result.body)
-        raise Billy::Errors::ValidationError, json['errors'].to_s
+        raise Billy::Errors::ValidationError, json.to_s
       else
         raise Billy::Errors::CommunicationError, http_result.body
       end

data/lib/billy/service.rb

@@ -1,11 +1,5 @@
 module Billy
-  class Service
-    
-    attr_reader :attributes
-    
-    def initialize(attributes)
-      @attributes = attributes
-    end
+  class Service < BaseModel
     
     ## Create a new login session and return a URL which can be used to log the user
     ## into the billing application
@@ -43,8 +37,16 @@ module Billy
       end
     end
     
-    def method_missing(param)
-      @attributes[param.to_s] || super
+    ## Create a new invoice for the service and return the new invoice object
+    def create_invoice
+      attributes = Billy::Request.request('invoices/create', :service => @attributes['id'])
+      attributes.is_a?(Hash) ? Billy::Invoice.new(attributes) : nil
+    end
+    
+    ## Return the invoice for this service
+    def invoice(number)
+      attributes = Billy::Request.request('invoices/info', :invoice => number, :service => @attributes['id'])
+      attributes.is_a?(Hash) ? Billy::Invoice.new(attributes) : nil
     end
     
     def self.find(field, data)
@@ -52,5 +54,10 @@ module Billy
       attributes.is_a?(Hash) ? self.new(attributes) : nil
     end
     
+    def self.create(atech_identity, service)
+      attributes = Billy::Request.request('services/create', :service => service, :atech_identity_key => atech_identity)
+      atech_identity.is_a?(Hash) ? self.new(attributes) : nil
+    end
+    
   end
 end

data/lib/billy/signup_token.rb

@@ -1,11 +1,5 @@
 module Billy
-  class SignupToken
-
-    attr_reader :attributes
-
-    def initialize(attributes)
-      @attributes = attributes
-    end
+  class SignupToken < BaseModel
 
     def service?
       self.attributes.include?(:service)
@@ -21,9 +15,5 @@ module Billy
       attributes.is_a?(Hash) ? self.new(attributes) : nil
     end
 
-    def method_missing(param)
-      @attributes[param.to_s] || super
-    end
-
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: atech-billy
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-31 00:00:00.000000000Z
+date: 2012-06-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: basic_ssl
-  requirement: &70223088107580 !ruby/object:Gem::Requirement
+  requirement: &70117254236000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70223088107580
+  version_requirements: *70117254236000
 description: 
 email: adam@atechmedia.com
 executables: []
@@ -29,6 +29,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/billy.rb
+- lib/billy/base_model.rb
+- lib/billy/invoice.rb
 - lib/billy/request.rb
 - lib/billy/service.rb
 - lib/billy/signup_token.rb