girlscout 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7757794a46770a9c9dc9a2069da1a142915b81ad
-  data.tar.gz: f0ac94f3c3bce9cfd3e617f09eff0927c9fd4bce
+  metadata.gz: 9ccc0c560938afb43d3438904fa99f116cb366d0
+  data.tar.gz: 0a60b0d92d6ffe2b91e5a28b1ac0a55068d8fbf3
 SHA512:
-  metadata.gz: 57866d8cdc3c564aa52fa688d583495e462452283d3575c1a3e57b7f5a8deca58aba4f5819b17198c12daa4521e10f18a0cdf9e0ce29ad7008c0eefd4010fab6
-  data.tar.gz: 9d80473c624041b0280cfc8074c322cbdf6cd0f3b1508ba0c7a7a512a3e2d3be692c749d45d27e983b754a5544485b651cd3e897cda048e955199ae593ee5c84
+  metadata.gz: eb33333214ed4f1ba9732220d444d48242be7931019237ca2d3d62d74780e27bc1d2f2417b6456376bad4f55ca764a3632fca46e870578c090859dd8a1d264ec
+  data.tar.gz: d1d0a9c6af2aef765e0152938941f9d533a42a67681b4b1a063dcae9ee4516e6071a38ecabe7c1aba8743dd8a457384122ea5e8924fe7e242cfee6b63887deab

data/lib/girlscout.rb

@@ -6,6 +6,7 @@ require 'girlscout/config'
 require 'girlscout/concerns/has_attributes'
 require 'girlscout/concerns/has_resource'
 require 'girlscout/object'
+require 'girlscout/error'
 
 require 'girlscout/list'
 require 'girlscout/folder'

data/lib/girlscout/concerns/has_attributes.rb

@@ -34,6 +34,16 @@ module GirlScout
 
       protected
 
+      def normalize_attributes(attr)
+        attr = attr || @attributes
+        attr = attr.attributes if attr.respond_to?(:attributes)
+
+        attr.inject({}) do |hash,(k,v)|
+          hash[attr_key(k)] = v
+          hash
+        end
+      end
+
       def attr_key(sym)
         parts = sym.to_s.split('_') # camelize w/o active support
         parts[0] + parts[1..-1].map(&:capitalize).join('')

data/lib/girlscout/error.rb

@@ -0,0 +1,10 @@
+module GirlScout
+  class Error < ::StandardError
+    include GirlScout::Concerns::HasAttributes
+
+    def initialize(attr={})
+      @attributes = normalize_attributes(attr)
+      super @attributes["error"]
+    end
+  end
+end

data/lib/girlscout/object.rb

@@ -4,13 +4,7 @@ module GirlScout
     include GirlScout::Concerns::HasResource
 
     def initialize(attr={}, options={})
-      attr = attr.attributes if attr.is_a?(Object)
-      attr = attr.inject({}) do |hash,(k,v)|
-        hash[attr_key(k)] = v
-        hash
-      end
-
-      @attributes = attr
+      @attributes = normalize_attributes(attr)
       @resource   = options[:resource] if options[:resource]
     end
   end

data/lib/girlscout/resource.rb

@@ -34,22 +34,13 @@ module GirlScout
 
     def request(options={})
       auth = { user: Config.api_key, password: 'X' }
-      JSON.parse(Excon.new(url, auth).request(options).body)
-    end
-
-    # def get(query=nil)
-    #   opts = { }
-    #   opts[:headers] = { params: query } if query
-
-    #   parse(rest_resource.get(opts))
-    # end
+      response = Excon.new(url, auth).request(options)
+      if response.status != 200
+        raise GirlScout::Error.new(JSON.parse(response.body))
+      end
 
-    # [:put, :post, :patch, :delete].each do |method|
-    #   define_method(method.to_s) do |payload=nil|
-    #     payload = serialize(payload) if payload
-    #     parse(rest_resource.send(method, payload, content_type: :json))
-    #   end
-    # end
+      JSON.parse(response.body)
+    end
 
     private
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: girlscout
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Chakrit Wichian
@@ -163,6 +163,7 @@ files:
 - lib/girlscout/config.rb
 - lib/girlscout/conversation.rb
 - lib/girlscout/customer.rb
+- lib/girlscout/error.rb
 - lib/girlscout/folder.rb
 - lib/girlscout/list.rb
 - lib/girlscout/mailbox.rb