billogram 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 413126d96eb6392012e781f51b6e55ee2aa96caa
-  data.tar.gz: 4b6ade05a3d41a5f93d3e6fb117b1e6bf02b1a3e
+  metadata.gz: 7ea9d6bb4bcbf0fc5d3b772fdaa8711ffc71c53c
+  data.tar.gz: 3e08419d6355f7d66b6e96d90ae2864d085cc764
 SHA512:
-  metadata.gz: cd39f9925577645dce7f92eadb6e6fdc37cd30b07df889fb9f1fd4b777d6372954ab0a9f9d9c33a430c3bb2347ea12ff9f119b6556d1c63ff3bd21f87938e0d8
-  data.tar.gz: ca621f3971aa723a343c3188576bbdbdabffbc126d2dd0d01e987c60990acd0711373c616089de46d4eddf93777c798aa3a0a4bba875b90655bbaa1cb72bbe10
+  metadata.gz: 0d1f0e740c9a15aa09f086831848ec1ef8bdce74662182461506acff9b76af757e4118e34a4ab6c49349336e14cb996fc46048979194407923d6a6cee168e388
+  data.tar.gz: 46176d7024013032388fd55f9fb98b61d354aca18ce16ea9560de4f65560eb48a0569c14daa0fa547b1e17b41a2d15ce8dc1506fa977755b37ddb87fbb6bc11d

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+*.gem

data/billogram.gemspec

@@ -20,6 +20,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec"
-  spec.add_dependency "httparty"
+  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_dependency "httparty", "~> 0.13"
 end

data/lib/billogram.rb

@@ -1,5 +1,6 @@
 require "httparty"
 require "billogram/client"
+require "billogram/error"
 require "billogram/relation_builder"
 require "billogram/resource"
 require 'billogram/resources/address'

data/lib/billogram/error.rb

@@ -0,0 +1,27 @@
+module Billogram
+  class Error < StandardError
+
+    class BadRequest < Error; end
+    class Unauthorized < Error; end
+    class Forbidden < Error; end
+    class NotFound < Error; end
+    class InternalServerError < Error; end
+
+    def self.from_response(response)
+      status  = response.response.code.to_i
+      body    = response.body.to_s
+      headers = response.headers
+
+      if klass =  case status
+                  when 400      then Billogram::BadRequest
+                  when 401      then Billogram::Unauthorized
+                  when 403      then Billogram::Forbidden
+                  when 404      then Billogram::NotFound
+                  when 500      then Billogram::InternalServerError
+                  else               Billogram::Error
+                  end
+        klass.new(response)
+      end
+    end
+  end
+end

data/lib/billogram/relation_builder.rb

@@ -29,27 +29,16 @@ module Billogram
 
     def build_relation(type, relation_names)
       relation_names.each do |name|
-        if type == :one
-          build_one_relation(name)
-        elsif type == :many
-          build_many_relation(name)
+        if attrs = relation_attributes(name)
+          if type == :one
+            value = relation_class(name).new(attrs)
+          elsif type == :many
+            value = attrs.map{|item| relation_class(name[0..-2]).new(item) }
+          end
+
+          resource.public_send("#{name}=", value)
         end
       end
     end
-
-    def build_one_relation(name)
-      if attrs = relation_attributes(name)
-        value = relation_class(name).new attrs
-        resource.instance_variable_set("@#{name}", value)
-      end
-    end
-
-    def build_many_relation(name)
-      if attrs = relation_attributes(name)
-        singular = name[0..name.length-2]
-        value = attrs.map{|item| relation_class(singular).new(item) }
-        resource.instance_variable_set("@#{name}", value)
-      end
-    end
   end
 end

data/lib/billogram/resource.rb

@@ -1,8 +1,6 @@
 module Billogram
   class Resource
-    attr_reader :data
-
-    DEFAULT_OPTIONS = { page: 1, page_size: 2 }
+    DEFAULT_OPTIONS = { page: 1, page_size: 50 }
 
     class << self
       def relations
@@ -11,39 +9,45 @@ module Billogram
 
       def endpoint(value = nil)
         @endpoint = value if value
-        @endpoint || name.demodulize.underscore.pluralize
+        @endpoint || "#{name.sub('Billogram::', '').downcase}s"
       end
 
       def search(options = {})
         query = DEFAULT_OPTIONS.merge(options)
         response = Billogram.client.get("#{endpoint}", {query: query})
-        parse_response(response.parsed_response["data"])
+        parse_response(response)
       end
 
       def fetch(id)
         response = Billogram.client.get("#{endpoint}/#{id}")
-        parse_response(response.parsed_response["data"])
+        parse_response(response)
+      end
+
+      def parse_response(response)
+        response.code == 200 ? build_objects(response.parsed_response['data']) : process_error(response)
       end
 
-      def parse_response(data)
-        # TODO: refactor, error handling
+      def relation(relation_name, relation_type = :one)
+        relations[relation_type] << relation_name
+        attr_accessor relation_name
+      end
+
+      def build_objects(data)
         case data
         when Hash then new(data)
-        when Array then data.map{|item| parse_response(item) }
-        when nil
+        when Array then data.map{|item| build_objects(item) }
         else data
         end
       end
 
-      def relation(relation_name, relation_type = :one)
-        relations[relation_type] << relation_name
-        attr_reader relation_name
+      def process_error(response)
+        raise Billogram::Error.from_response(response)
       end
     end
 
     def initialize(attributes = {})
       Hash(attributes).each do |key, value|
-        instance_variable_set("@#{key}", value) if respond_to?(key)
+        public_send("#{key}=", value) if respond_to?(key)
       end
 
       RelationBuilder.new(self, attributes).call

data/lib/billogram/version.rb

@@ -1,3 +1,3 @@
 module Billogram
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: billogram
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Mark Birman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-16 00:00:00.000000000 Z
+date: 2015-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,30 +42,30 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.13'
 description: 
 email:
 - birmanmark@gmail.com
@@ -85,6 +85,7 @@ files:
 - bin/setup
 - lib/billogram.rb
 - lib/billogram/client.rb
+- lib/billogram/error.rb
 - lib/billogram/relation_builder.rb
 - lib/billogram/resource.rb
 - lib/billogram/resources/address.rb