layer-api 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68514306a1bf3af9a052d78f8b05a0320187b8e8
-  data.tar.gz: bf7c980017a973f4161d4506a028c9946b1d9493
+  metadata.gz: f6ab8370a2e62e08d609cec42258773e8513f9d8
+  data.tar.gz: 84cb431cb17c4a4f7056c960c07e194e3b3b87b1
 SHA512:
-  metadata.gz: 2ceea987ca922d113bb8fb8d96e696f8d8487a731915c68b28d78e4b1a6982e9ec8ad739d4324324ab51060ca3b0f2302f923bc6f6674efc85f5a1deffbebe87
-  data.tar.gz: d1b427e746217ed81afc5ed239113cffa7226ecb8b545a59416336841c0939a976987c24e538f934de20e95e5ae527595ea3b9f665f769271166e581d68f7b52
+  metadata.gz: d423646475953f4ef3d8c420abe8d7b663223c3a0e33fd5d1702648761efd4e10cb89b3d7d3e242020ea2cdc252f78af3dfe9ee0ef5a7e3010a2a7d4970debbf
+  data.tar.gz: 266871324eb01f3bde7faa784f07d0b7a2995d70c9cf27b01fa49732a49722851e083b279bbab41a9f94880725f06074c6cc6a1464e62cee7243aa1c3c470b7d

data/MIGRATING.md

@@ -28,7 +28,7 @@ In `0.3.x`, each function returned a Hash containing a parsed JSON representatio
 
 `0.4` introduced `Resource` - A base class used to encapsulate each JSON response.
 
-`Resource` can allow attributes to be accessed with dot notation. Alternatively, you can return a Hashed version of the resource using `Resource.attributes`. For example:
+`Resource` can allow attributes to be accessed by calling the attribute name on the instance. Alternatively, you can return a Hashed version of the resource using `Resource.attributes`. For example:
 
 ```ruby
 

data/README.md

@@ -28,7 +28,7 @@ Or install it yourself as:
 ## Usage
 
 ### Resources
-All client methods return  `Resource` objects or a collection of `Resource` objects. Every attribute from a resource can be accessed calling attribute methods:
+All client methods return  `Resource` objects or a collection of `Resource` objects. Every attribute from a resource can be accessed by calling attribute methods:
 
 ```ruby
 conversation = platform.conversations.find("fb2f3a48-523d-4449-a57f-c6651fc6612c")

data/lib/layer/platform/client.rb

@@ -4,13 +4,13 @@ module Layer
       attr_accessor :api_token, :app_id
 
       def initialize(options = {})
+        id = options[:app_id] || ENV['LAYER_APP_ID']
         @api_token = options[:api_token] || ENV['LAYER_API_TOKEN']
-        @app_id = options[:app_id] || ENV['LAYER_APP_ID']
-        strip_layer_prefix(@app_id)
+        @app_id = strip_layer_prefix(id)
       end
 
       def client
-        @http_client ||= Layer::HttpClient.new(app_id, api_token)
+        @http_client ||= Layer::HttpClient.new(@app_id, @api_token)
       end
 
       def get(url, *args)
@@ -38,20 +38,26 @@ module Layer
       end
 
       def announcements
-        Layer::ResourceProxy.new(nil, Layer::Resources::Announcement)
+        Layer::ResourceProxy.new(client, nil, Layer::Resources::Announcement)
       end
 
       def conversations
-        Layer::ResourceProxy.new(nil, Layer::Resources::Conversation)
+        Layer::ResourceProxy.new(client, nil, Layer::Resources::Conversation)
       end
 
       def users
-        Layer::ResourceProxy.new(nil, Layer::Resources::User)
+        Layer::ResourceProxy.new(client, nil, Layer::Resources::User)
       end
 
       def generate_identity_token(options = {})
         Layer::IdentityToken.new(options)
       end
+
+      def inspect
+        "#<#{self.class} api_token=\"#{@api_token}\" app_id=\"#{@app_id}\">"
+      end
+
+      alias_method :to_s, :inspect
     end
   end
 end

data/lib/layer/resource.rb

@@ -2,8 +2,9 @@ module Layer
   class Resource
     attr_reader :attributes, :client
 
-    def initialize(attributes)
+    def initialize(attributes, client)
       @attributes = attributes
+      @client = client
     end
 
     def update(params)
@@ -18,10 +19,6 @@ module Layer
       client.delete(url)
     end
 
-    def client
-      self.class.client
-    end
-
     def method_missing(method, *args, &block)
       method_key = method.to_s
       attributes.has_key?(method_key) ? attributes[method_key] : super
@@ -36,6 +33,12 @@ module Layer
       attributes["id"].split("/").last if attributes["id"]
     end
 
+    def inspect
+      "#<#{self.class} attributes=#{@attributes}>"
+    end
+
+    alias_method :to_s, :inspect
+
     class << self
       def class_name
         name.split("::").last
@@ -49,28 +52,21 @@ module Layer
         pluralized_name.downcase
       end
 
-      def client
-        Layer::HttpClient.new(
-          ENV['LAYER_APP_ID'],
-          ENV['LAYER_API_TOKEN']
-        )
-      end
-
-      def create(url, params = {})
+      def create(client, url, params = {})
         response = client.post(url, body: params.to_json)
-        new(response)
+        new(response, client)
       end
 
-      def find(url, id)
+      def find(client, url, id)
         response = client.get("#{url}/#{id}")
-        new(response)
+        new(response, client)
       end
 
-      def list(url, params = {})
+      def list(client, url, params = {})
         collection = client.get(url, body: params.to_json)
 
         if collection.any?
-          collection.map{ |resource| new(resource) }
+          collection.map{ |resource| new(resource, client) }
         else
           []
         end

data/lib/layer/resource_proxy.rb

@@ -1,6 +1,7 @@
 module Layer
   class ResourceProxy
-    def initialize(base, resource)
+    def initialize(client, base, resource)
+      @client = client
       @base = base
       @resource = resource
     end
@@ -10,7 +11,7 @@ module Layer
     end
 
     def method_missing(method, *args, &block)
-      @resource.public_send(method, *([url] + args), &block)
+      @resource.public_send(method, *([@client, url] + args), &block)
     end
 
     def respond_to_missing?(method, include_private = false)

data/lib/layer/resources/block.rb

@@ -1,30 +1,32 @@
 module Layer
   module Resources
     class Block < Layer::Resource
-      def self.find(url, user)
+      def self.find(client, url, user)
         user_id = user.instance_of?(User) ? user.id : user
-        new_abstract_instance(url, user_id)
+        new_abstract_instance(url, user_id, client)
       end
 
-      def self.list(url, params = {})
+      def self.list(client, url, params = {})
         collection = client.get(url, body: params.to_json)
 
         if collection.any?
-          collection.map{ |resource| new_abstract_instance(url, resource['user_id']) }
+          collection.map do |resource|
+            new_abstract_instance(url, resource['user_id'], client)
+          end
         else
           []
         end
       end
 
-      def self.create(url, params = {})
+      def self.create(client, url, params = {})
         user_params = params.instance_of?(User) ? {user_id: params.id} : params
 
         client.post(url, body: user_params.to_json)
-        new_abstract_instance(url, user_params[:user_id])
+        new_abstract_instance(url, user_params[:user_id], client)
       end
 
-      def self.new_abstract_instance(url, id)
-        new({"id" => id, "url" => "#{url}/#{id}"})
+      def self.new_abstract_instance(url, id, client)
+        new({"id" => id, "url" => "#{url}/#{id}"}, client)
       end
     end
   end

data/lib/layer/resources/conversation.rb

@@ -2,7 +2,7 @@ module Layer
   module Resources
     class Conversation < Layer::Resource
       def messages
-        Layer::ResourceProxy.new(self, Message)
+        Layer::ResourceProxy.new(client, self, Message)
       end
     end
   end

data/lib/layer/resources/user.rb

@@ -1,20 +1,20 @@
 module Layer
   module Resources
     class User < Layer::Resource
-      def self.find(url, id)
-        new({"id" => id, "url" => "users/#{id}"})
+      def self.find(client, url, id)
+        new({"id" => id, "url" => "users/#{id}"}, client)
       end
 
       def blocks
-        Layer::ResourceProxy.new(self, Layer::Resources::Block)
+        Layer::ResourceProxy.new(client, self, Layer::Resources::Block)
       end
 
       def conversations
-        Layer::ResourceProxy.new(self, Layer::Resources::Conversation)
+        Layer::ResourceProxy.new(client, self, Layer::Resources::Conversation)
       end
 
       def messages
-        Layer::ResourceProxy.new(self, Layer::Resources::Message)
+        Layer::ResourceProxy.new(client, self, Layer::Resources::Message)
       end
     end
   end

data/lib/layer/version.rb

@@ -1,5 +1,5 @@
 module Layer
   module Api
-    VERSION = "0.4.0"
+    VERSION = "0.4.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: layer-api
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Jake Kelly
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-03 00:00:00.000000000 Z
+date: 2016-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -191,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A ruby toolkit for Layer's Web API's (https://developer.layer.com/docs)