dribbble 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eebd1d875d2a246c82abe992c30399b86bc926fa
-  data.tar.gz: 7702399ef09cb5399581a8311503d6a50909027f
+  metadata.gz: 6eff1aac4c30a7dec57c39acd452c29a3bdb9c49
+  data.tar.gz: 29797d5b150718aaa47e541d9704770d5150c9f7
 SHA512:
-  metadata.gz: d53fa391316e9d29ccfb7c18c9cca8c9dc4cfccc7652c6e8e9c9daa6d64b17f812970dcd8403d38945b2b2838dff873b463aa7173db5f7f3f07d0648060bd1d8
-  data.tar.gz: a678ba5dc4bb8e43e702602179c7abc7534d493295ac6536f9d31830b5bdf04c5a5b96468c037dbd2b5c5efe9badce3ad33feb475ac0d4eeed4c7ef21dae3088
+  metadata.gz: a7f958d7451b211dc2898b1b8e682941d35811a72f6f9b681c4d22942271eb9463a2fb9dbc5279f26c8012a8251135ecf6b3f9dbf2f68f31ddaeb5e437a8ee19
+  data.tar.gz: 74a7d86be3ad9b76bcf3b9a4f79f14311f8dd00c74dd7d1bed5e3b3ae6dd4ff93f7bf6dc3e75ab0d92ced017d9b8c96d7d3d1435a6237367272236f05f4fa0a9

data/lib/dribbble/client.rb

@@ -1,8 +1,8 @@
 require 'dribbble/base'
+require 'dribbble/shot'
 require 'dribbble/user'
 require 'dribbble/bucket'
 require 'dribbble/project'
-require 'dribbble/shot'
 require 'dribbble/team'
 require 'dribbble/errors'
 

data/lib/dribbble/user.rb

@@ -4,17 +4,10 @@ module Dribbble
   class User < Dribbble::Base
     include Dribbble::Utils::Findable
 
-    def buckets(attrs = {})
-      Dribbble::Bucket.batch_new token, html_get("/users/#{id}/buckets", attrs)
-    end
-
-    def followers(attrs = {})
-      Dribbble::User.batch_new token, html_get("/users/#{id}/followers", attrs)
-    end
-
-    def following(attrs = {})
-      Dribbble::User.batch_new token, html_get("/users/#{id}/following", attrs), 'followee'
-    end
+    has_many :buckets, :projects, :shots, :teams
+    has_many :likes, as: Dribbble::Shot, key: 'shot'
+    has_many :followers, as: Dribbble::User, key: 'follower'
+    has_many :following, as: Dribbble::User, key: 'followee'
 
     def following?(other_user_id = nil)
       if other_user_id
@@ -36,21 +29,5 @@ module Dribbble
       res = html_delete "/users/#{id}/follow"
       res.code == 204 ? true : false
     end
-
-    def likes(attrs = {})
-      Dribbble::Shot.batch_new token, html_get("/users/#{id}/likes", attrs), 'shot'
-    end
-
-    def projects(attrs = {})
-      Dribbble::Project.batch_new token, html_get("/users/#{id}/projects", attrs)
-    end
-
-    def shots(attrs = {})
-      Dribbble::Shot.batch_new token, html_get("/users/#{id}/shots", attrs)
-    end
-
-    def teams(attrs = {})
-      Dribbble::Team.batch_new token, html_get("/users/#{id}/teams", attrs)
-    end
   end
 end

data/lib/dribbble/utils/has_children.rb

@@ -4,7 +4,7 @@ module Dribbble
       module ClassMethods
         def has_many(*fields)
           if fields[1].is_a? Hash
-            generate_methods fields[0], fields[1][:as]
+            generate_methods fields[0], fields[1][:as], fields[1][:key]
           else
             fields.each do |field|
               generate_methods field
@@ -12,13 +12,13 @@ module Dribbble
           end
         end
 
-        def generate_methods(field, klass = nil)
+        def generate_methods(field, klass = nil, key = nil)
           singularized_field = field[0...-1]
 
           define_method field do |attrs = {}|
             klass ||= Object.const_get "Dribbble::#{__method__[0...-1].capitalize}"
             url = "/#{pluralized_class_name}/#{id}/#{field}"
-            klass.batch_new token, html_get(url, attrs), nil, url
+            klass.batch_new token, html_get(url, attrs), key, url
           end
 
           define_method "find_#{singularized_field}" do |child_id|

data/lib/dribbble/version.rb

@@ -1,4 +1,4 @@
 # Dribbble Version
 module Dribbble
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/spec/lib/dribbble/user_spec.rb

@@ -37,6 +37,7 @@ describe Dribbble::User do
       it 'responds with users' do
         expect(subject.size).to eq 1
         expect(subject.first).to be_a Dribbble::User
+        expect(subject.first.location).to eq 'Salem, MA'
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dribbble
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Calyhre