thingiverse 0.0.2 → 0.0.5

data/lib/thingiverse.rb

@@ -4,8 +4,10 @@ require 'httparty'
 require 'curb'
 require 'active_model'
 require 'cgi'
+require 'uri'
 
 require 'thingiverse/connection'
+require 'thingiverse/pagination'
 require 'thingiverse/things'
 require 'thingiverse/files'
 require 'thingiverse/users'
@@ -14,5 +16,5 @@ require 'thingiverse/categories'
 require 'thingiverse/tags'
 
 module Thingiverse
-  VERSION = '0.0.2'
+  VERSION = '0.0.5'
 end

data/lib/thingiverse/categories.rb

@@ -9,7 +9,7 @@ module Thingiverse
         send("#{name}=", value)
       end
     end
-    
+
     def attributes
       {
         :name => name,

data/lib/thingiverse/connection.rb

@@ -3,14 +3,14 @@ module Thingiverse
     include HTTParty
     # debug_output $stderr
     attr_accessor :client_id, :client_secret, :code, :access_token, :auth_url, :base_url
-  
+
     def initialize(client_id = nil, client_secret = nil, code = nil)
       @client_id      = client_id
       @client_secret  = client_secret
       @code           = code
-    
+
       self.class.base_uri(self.base_url)
-    
+
       self.get_token if @client_id and @client_secret and @code
     end
 
@@ -33,7 +33,7 @@ module Thingiverse
     end
 
     def get_token
-      auth_response = self.class.post(@auth_url, :query => {:client_id => @client_id, :client_secret => @client_secret, :code => @code})
+      auth_response = self.class.post(auth_url, :query => {:client_id => @client_id, :client_secret => @client_secret, :code => @code})
 
       raise "#{auth_response.code}: #{auth_response.body.inspect}" unless auth_response.success?
 
@@ -45,7 +45,7 @@ module Thingiverse
 
       @access_token
     end
-    
+
     def things
       Thingiverse::Things
     end
@@ -53,5 +53,9 @@ module Thingiverse
     def users
       Thingiverse::Users
     end
+    
+    def tags
+      Thingiverse::Tags
+    end
   end
 end

data/lib/thingiverse/files.rb

@@ -3,21 +3,22 @@ module Thingiverse
     include ActiveModel::Validations
     validates_presence_of :name
 
-    attr_accessor :id, :name, :thumbnail, :url, :public_url, :threejs_url    
+    attr_accessor :id, :name, :thumbnail, :url, :public_url, :threejs_url, :download_url
     def initialize(attributes={})
       attributes.each do |name, value|
         send("#{name}=", value)
       end
     end
-    
+
     def attributes
       {
         :id => id,
         :name => name,
         :thumbnail => thumbnail,
         :url => url,
-        :public_url => public_url, 
-        :threejs_url => threejs_url
+        :public_url => public_url,
+        :threejs_url => threejs_url,
+        :download_url => download_url
       }
     end
   end

data/lib/thingiverse/images.rb

@@ -9,7 +9,7 @@ module Thingiverse
         send("#{name}=", value)
       end
     end
-    
+
     def attributes
       {
         :id => id,

data/lib/thingiverse/pagination.rb

@@ -0,0 +1,59 @@
+module Thingiverse
+  require "forwardable"
+
+  class Pagination
+    include Enumerable
+    extend Forwardable
+    
+    attr_reader :response, :object
+    attr_reader :current_page, :total_pages, :first_url, :last_url, :next_url, :prev_url
+    
+    def initialize(response, object)
+      @response = response
+      @object   = object
+
+      # TODO: provide more debug info and raise a custom exception
+      raise "#{@response.code}: #{JSON.parse(@response.body)['error']}" unless @response.success?
+      
+      @objects = @response.parsed_response.collect do |attrs|
+        @object.new attrs
+      end
+
+      if @response.headers.include?("link")
+        @response.headers["link"].split(",").each do |link|
+          url, rel = link.split(";").collect{|p| p.gsub(/\<|\>|rel\=|\"/,'').strip}
+          instance_variable_set("@#{rel}_url", url)
+          url_params = CGI.parse(URI.parse(url).query.to_s)
+
+          case rel
+          when "last"
+            @total_pages = url_params["page"][0].to_i
+          when "next"
+            @current_page = url_params["page"][0].to_i - 1
+          when "prev"
+            @current_page = url_params["page"][0].to_i + 1
+          end
+        end
+      end
+    end
+
+    def_delegators :@objects, :<<, :[], :[]=, :last, :size
+    
+    def method_missing(meth, *args, &block)
+      if meth.to_s =~ /^(.*)_page$/
+        get_url_page($1, *args, &block)
+      else
+        super
+      end
+    end
+    
+    def get_url_page(which, *args, &block)
+      url = instance_variable_get("@#{which}_url")
+      Thingiverse::Pagination.new(Thingiverse::Connection.get(url), @object) if url
+    end
+    
+    def each(&block)
+      @objects.each(&block)
+    end    
+  end
+end

data/lib/thingiverse/tags.rb

@@ -3,19 +3,30 @@ module Thingiverse
     include ActiveModel::Validations
     validates_presence_of :name
 
-    attr_accessor :name, :url, :count
+    attr_accessor :name, :url, :count, :things_url
     def initialize(attributes={})
       attributes.each do |name, value|
         send("#{name}=", value)
       end
     end
-    
+
     def attributes
       {
         :name => name,
         :url => url,
-        :count => count
+        :count => count,
+        :things_url => things_url
       }
     end
+    
+    def self.find(tag_name)
+      response = Thingiverse::Connection.get("/tags/#{tag_name}")
+      raise "#{response.code}: #{JSON.parse(response.body)['error']}" unless response.success?
+      self.new response.parsed_response
+    end
+    
+    def things(query = {})
+      Thingiverse::Pagination.new(Thingiverse::Connection.get(things_url, :query => query), Thingiverse::Things)
+    end
   end
 end

data/lib/thingiverse/things.rb

@@ -7,36 +7,36 @@ module Thingiverse
     attr_accessor :ratings_enabled, :like_count, :description, :instructions, :license
     attr_accessor :files_url, :images_url, :likes_url, :ancestors_url, :derivatives_url, :tags_url, :categories_url
     attr_accessor :category, :ancestors, :tags
-    
+
     def initialize(params={})
       params.each do |name, value|
         send("#{name}=", value)
       end
     end
-    
+
     def attributes
       {
         :id => id.to_s,
         :name => name.to_s,
         :thumbnail => thumbnail.to_s,
         :url => url.to_s,
-        :public_url => public_url.to_s, 
-        :creator => creator.to_s, 
-        :added => added.to_s, 
+        :public_url => public_url.to_s,
+        :creator => creator.to_s,
+        :added => added.to_s,
         :modified => modified.to_s,
-        :is_published => is_published != true ? false : true, 
+        :is_published => is_published != true ? false : true,
         :is_wip => is_wip != true ? false : true,
-        :ratings_enabled => ratings_enabled != true ? false : true, 
-        :like_count => like_count.to_s, 
-        :description => description.to_s, 
-        :instructions => instructions.to_s, 
-        :license => license.to_s, 
-        :files_url => files_url.to_s, 
-        :images_url => images_url.to_s, 
+        :ratings_enabled => ratings_enabled != true ? false : true,
+        :like_count => like_count.to_s,
+        :description => description.to_s,
+        :instructions => instructions.to_s,
+        :license => license.to_s,
+        :files_url => files_url.to_s,
+        :images_url => images_url.to_s,
         :likes_url => likes_url.to_s,
-        :ancestors_url => ancestors_url.to_s, 
-        :derivatives_url => derivatives_url.to_s, 
-        :tags_url => tags_url.to_s, 
+        :ancestors_url => ancestors_url.to_s,
+        :derivatives_url => derivatives_url.to_s,
+        :tags_url => tags_url.to_s,
         :categories_url => categories_url.to_s,
         :category => category.to_s,
         :ancestors => ancestors || [],
@@ -50,37 +50,20 @@ module Thingiverse
       Thingiverse::Users.new response.parsed_response
     end
 
-    def files
-      response = Thingiverse::Connection.get(files_url)
-      raise "#{response.code}: #{JSON.parse(response.body)['error']}" unless response.success?
-      response.parsed_response.collect do |attrs|
-        Thingiverse::Files.new attrs
-      end
+    def files(query = {})
+      Thingiverse::Pagination.new(Thingiverse::Connection.get(@files_url, :query => query), Thingiverse::Files)
     end
 
-    def images
-      response = Thingiverse::Connection.get(images_url)
-      raise "#{response.code}: #{JSON.parse(response.body)['error']}" unless response.success?
-      response.parsed_response.collect do |attrs|
-        Thingiverse::Images.new attrs
-      end
+    def images(query = {})
+      Thingiverse::Pagination.new(Thingiverse::Connection.get(@images_url, :query => query), Thingiverse::Images)
     end
 
-    def categories
-      response = Thingiverse::Connection.get(categories_url)
-      raise "#{response.code}: #{JSON.parse(response.body)['error']}" unless response.success?
-      response.parsed_response.collect do |attrs|
-        Thingiverse::Categories.new attrs
-      end
+    def categories(query = {})
+      Thingiverse::Pagination.new(Thingiverse::Connection.get(@categories_url, :query => query), Thingiverse::Categories)
     end
 
-    # TODO: this is a dumb name, come up with a better way to set/retrieve
-    def ancestor_things
-      response = Thingiverse::Connection.get(ancestors_url)
-      raise "#{response.code}: #{JSON.parse(response.body)['error']}" unless response.success?
-      response.parsed_response.collect do |attrs|
-        Thingiverse::Things.new attrs
-      end
+    def parents(query = {})
+      Thingiverse::Pagination.new(Thingiverse::Connection.get(@ancestors_url, :query => query), Thingiverse::Things)
     end
 
     # TODO: this is a dumb name, come up with a better way to set/retrieve
@@ -103,7 +86,7 @@ module Thingiverse
 
         thing = Thingiverse::Things.new(response.parsed_response)
       end
-      
+
       thing.attributes.each do |name, value|
         send("#{name}=", value)
       end
@@ -114,13 +97,13 @@ module Thingiverse
       raise "#{response.code}: #{JSON.parse(response.body)['error']} #{response.headers['x-error']}" unless response.success?
 
       parsed_response = JSON.parse(response.body)
-      action = parsed_response["action"]      
+      action = parsed_response["action"]
       query = parsed_response["fields"]
       query["file"] = file
 
-      # stupid S3 requires params to be in a certain order... so can't use HTTParty :(      
+      # stupid S3 requires params to be in a certain order... so can't use HTTParty :(
       # prepare post data
-      post_data = []      
+      post_data = []
       # TODO: is query['bucket'] needed here?
       post_data << Curl::PostField.content('key',                     query['key'])
       post_data << Curl::PostField.content('AWSAccessKeyId',          query['AWSAccessKeyId'])
@@ -133,7 +116,7 @@ module Thingiverse
 
       post_data << Curl::PostField.file('file', file.path)
 
-      # post                               
+      # post
       c = Curl::Easy.new(action) do |curl|
         # curl.verbose = true
         # can't follow redirect to finalize here because need to pass access_token for auth
@@ -161,30 +144,26 @@ module Thingiverse
 
         thing = Thingiverse::Things.new(response.parsed_response)
       end
-      
+
       thing.attributes.each do |name, value|
         send("#{name}=", value)
       end
     end
-    
+
     def self.find(thing_id)
       response = Thingiverse::Connection.get("/things/#{thing_id}")
       raise "#{response.code}: #{JSON.parse(response.body)['error']} #{response.headers['x-error']}" unless response.success?
       self.new response.parsed_response
     end
-    
-    def self.newest
-      response = Thingiverse::Connection.get('/newest')
-      raise "#{response.code}: #{JSON.parse(response.body)['error']}" unless response.success?
-      response.parsed_response.collect do |attrs|
-        self.new attrs
-      end
+
+    def self.newest(query = {})
+      Thingiverse::Pagination.new(Thingiverse::Connection.get('/newest', :query => query), Thingiverse::Things)
     end
 
     def self.create(params)
       thing = self.new(params)
       raise "Invalid Parameters" unless thing.valid?
-    
+
       response = Thingiverse::Connection.post('/things', :body => thing.attributes.to_json)
       raise "#{response.code}: #{JSON.parse(response.body)['error']} #{response.headers['x-error']}" unless response.success?
 

data/lib/thingiverse/users.rb

@@ -6,20 +6,20 @@ module Thingiverse
     attr_accessor :id, :name, :thumbnail, :url, :public_url, :bio, :location, :registered, :last_active
     attr_accessor :email, :default_license
     attr_accessor :things_url, :copies_url, :likes_url
-    
+
     def initialize(attributes={})
       attributes.each do |name, value|
         send("#{name}=", value)
       end
     end
-    
+
     def attributes
       {
         :id => id,
         :name => name,
         :thumbnail => thumbnail,
         :url => url,
-        :public_url => public_url, 
+        :public_url => public_url,
         :bio => bio,
         :location => location,
         :registered => registered,
@@ -31,7 +31,7 @@ module Thingiverse
         :default_license => default_license
       }
     end
-    
+
     def self.find(user_name)
       response = Thingiverse::Connection.get("/users/#{user_name}")
       raise "#{response.code}: #{JSON.parse(response.body)['error']}" unless response.success?

data/test/test_helper.rb

@@ -1 +1,9 @@
-$: << File.dirname(File.expand_path(__FILE__))+'/../lib'
+$: << File.dirname(File.expand_path(__FILE__))+'/../lib'
+
+THINGIVERSE_CLIENT_ID    = ENV.fetch('THINGIVERSE_CLIENT_ID','6806845037e641ebaf75')
+THINGIVERSE_SECRET       = ENV.fetch('THINGIVERSE_SECRET','275908d8c6fa29900fd73199b1cea3b2')
+THINGIVERSE_ACCESS_TOKEN = ENV.fetch('THINGIVERSE_ACCESS_TOKEN','d522b2638d92145e46bd6baf17555ca3')
+
+THINGIVERSE_AUTH_URL     = ENV.fetch('THINGIVERSE_AUTH_URL','http://thingiverse.dev:8888/login/oauth/access_token')
+
+THINGIVERSE_BASE_URL     = ENV.fetch('THINGIVERSE_BASE_URL','http://api.thingiverse.dev:8888')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: thingiverse
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Tony Buser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-09 00:00:00 Z
+date: 2013-02-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -86,6 +86,7 @@ files:
 - lib/thingiverse/connection.rb
 - lib/thingiverse/files.rb
 - lib/thingiverse/images.rb
+- lib/thingiverse/pagination.rb
 - lib/thingiverse/tags.rb
 - lib/thingiverse/things.rb
 - lib/thingiverse/users.rb