grape-client 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ceaceb46fa4a688ef855c6fb4f93edbdce4eb91
-  data.tar.gz: fd74c6a7c64947991f1c18c9f008300af3cd74bf
+  metadata.gz: 341b46f253dfcb759fe23752366c38f6ae202f8b
+  data.tar.gz: fff3c514bc2727305905d86b6f866c9671eaef03
 SHA512:
-  metadata.gz: d2af71e884d0235bcf3ca41c22147b1e13445ce843ec1bb37280709918a83956c3446ab8bd826c71f1fd85deb352fd4fca18187d41f78e1a6e621f79095622bd
-  data.tar.gz: f36fcae56089adfe5402349dc60a3a4e5f20f574ed7fc625421d9ef0161c3a3e6b6621184e1fc034cb8d506320d202d9f30013f4a5a92706de0bd17e75806e21
+  metadata.gz: 82f1698dc7ec49188fa943a0a11edd14ccefaccd5022fd0af67c891bdb8a53b44eb7798ec4a184540f7ecdf5ca648a0d5c5046d79e84b13def2fa07ae495be97
+  data.tar.gz: 0a111811d89accbd8104ca14b8a2dd128af5ff032cf18fe7e89d7ad3f0b075813b371f834c4753a6fe17dd573b11139e3d3a31546195c3fac292b7de5f4ad1e6

data/README.md

@@ -1,4 +1,6 @@
 # GrapeClient
+[![GitHub version](https://badge.fury.io/gh/desofto%2Fgrape-client.svg)](https://badge.fury.io/gh/desofto%2Fgrape-client)
+[![Gem Version](https://badge.fury.io/rb/grape-client.svg)](https://badge.fury.io/rb/grape-client)
 [![Build Status](https://travis-ci.org/desofto/grape-client.svg?branch=master)](https://travis-ci.org/desofto/grape-client)
 [![Code Climate](https://codeclimate.com/github/desofto/grape-client/badges/gpa.svg)](https://codeclimate.com/github/desofto/grape-client)
 [![Test Coverage](https://codeclimate.com/github/desofto/grape-client/badges/coverage.svg)](https://codeclimate.com/github/desofto/grape-client/coverage)

data/lib/grape_client/base.rb

@@ -9,15 +9,15 @@ module GrapeClient
       include BelongsTo
       include HasMany
 
-      attr_accessor :attributes
+      attr_reader :attributes
       attr_accessor :site, :user, :password, :prefix
 
       def inherited(child)
-        child.attributes = attributes.try(:dup) || []
-        child.site       = GrapeClient.configuration.site
-        child.user       = GrapeClient.configuration.user
-        child.password   = GrapeClient.configuration.password
-        child.prefix     = GrapeClient.configuration.prefix
+        child.instance_variable_set('@attributes', attributes.try(:dup) || [])
+        child.instance_variable_set('@site',       GrapeClient.configuration.site)
+        child.instance_variable_set('@user',       GrapeClient.configuration.user)
+        child.instance_variable_set('@password',   GrapeClient.configuration.password)
+        child.instance_variable_set('@prefix',     GrapeClient.configuration.prefix)
       end
 
       def attr_accessor(*names)
@@ -79,15 +79,18 @@ module GrapeClient
     end
 
     def respond_to?(method_name, *args, &block)
-      name = method_name.to_s
-      name = name[0..-2] if name.last == '='
-      self.class.attributes.include?(name.to_sym) || super
+      super ||
+        begin
+          name = method_name.to_s
+          name = name[0..-2] if name.last == '='
+          self.class.attributes.include?(name.to_sym)
+        end
     end
 
     def to_post
-      entity_name = self.class.entity_name
       list = self.class.attributes
       filtered_attributes = attributes.select { |key, _value| list.include? key }
+      entity_name = self.class.entity_name
       filtered_attributes.transform_keys { |key| "#{entity_name}[#{key}]" }
     end
 

data/lib/grape_client/collection.rb

@@ -38,6 +38,14 @@ module GrapeClient
       result
     end
 
+    def empty?
+      @is_first_page && @elements.empty?
+    end
+
+    def any?
+      !empty?
+    end
+
     private
 
     def per_page

data/lib/grape_client/connection.rb

@@ -50,8 +50,8 @@ module GrapeClient
     def validate_response(res)
       case res
       when Net::HTTPUnauthorized        then raise Unauthorized
-      when Net::HTTPSuccess             then res.body
       when Net::HTTPUnprocessableEntity then raise InvalidEntity
+      when Net::HTTPSuccess             then res.body
       else raise UnknownError, res.body
       end
     end

data/lib/grape_client/has_many.rb

@@ -5,7 +5,7 @@ module GrapeClient
         clazz = class_from_name(options[:class_name] || property.to_s.singularize)
         case @attributes[property]
         when Collection then @attributes[property]
-        when nil?
+        when nil
           @attributes[property] = clazz.where("#{self.class.entity_name}_id" => id)
         else
           @attributes[property].map! do |element|

data/lib/grape_client/rest_methods_collection.rb

@@ -49,6 +49,7 @@ module GrapeClient
 
     def request(method, url, params = {}, &_block)
       url = [endpoint, url].compact.join('/')
+      method = method.compact.join('/') if method.is_a? Array
       response = connection.request method, url, params
       if block_given?
         yield response

data/lib/grape_client/rest_methods_member.rb

@@ -13,7 +13,7 @@ module GrapeClient
 
     def save
       save!
-    rescue Connection::InvalidEntity
+    rescue Connection::InvalidEntity, Connection::UnknownError
       false
     end
 
@@ -32,19 +32,20 @@ module GrapeClient
 
     protected
 
+    def method_with_id(method)
+      [id, method].compact.join('/')
+    end
+
     def get(method, params = {}, &block)
-      method = [id, method].compact.join('/')
-      self.class.send(:get, method, params, &block)
+      self.class.send(:get, method_with_id(method), params, &block)
     end
 
     def put(method, params = {}, &block)
-      method = [id, method].compact.join('/')
-      self.class.send(:put, method, params, &block)
+      self.class.send(:put, method_with_id(method), params, &block)
     end
 
     def post(method, params = {}, &block)
-      method = [id, method].compact.join('/')
-      self.class.send(:post, method, params, &block)
+      self.class.send(:post, method_with_id(method), params, &block)
     end
 
     def delete(params = {}, &block)

data/lib/grape_client/version.rb

@@ -1,3 +1,3 @@
 module GrapeClient
-  VERSION = '0.3.2'.freeze
+  VERSION = '0.3.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grape-client
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Dmitry Silchenko