thingiverse 0.0.6 → 0.0.7

data/lib/thingiverse.rb

@@ -2,10 +2,10 @@ require 'rubygems'
 require 'json'
 require 'httparty'
 require 'curb'
-require 'active_model'
 require 'cgi'
 require 'uri'
 
+require 'thingiverse/dynamic_attributes'
 require 'thingiverse/connection'
 require 'thingiverse/pagination'
 require 'thingiverse/things'
@@ -16,5 +16,5 @@ require 'thingiverse/categories'
 require 'thingiverse/tags'
 
 module Thingiverse
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

data/lib/thingiverse/categories.rb

@@ -1,22 +1,6 @@
 module Thingiverse
   class Categories
-    include ActiveModel::Validations
-    validates_presence_of :name
+    include Thingiverse::DynamicAttributes
 
-    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,
-        :things_url => things_url
-      }
-    end
   end
 end

data/lib/thingiverse/dynamic_attributes.rb

@@ -0,0 +1,33 @@
+module Thingiverse
+  module DynamicAttributes
+    def eigenclass
+      class << self; self; end
+    end
+    
+    attr_reader :attributes
+
+    def initialize(attributes={})
+      @attributes = attributes
+      @attributes.each do |k,v|
+        add_attribute(k, v)
+      end
+    end
+
+    def method_missing(method_sym, *arguments, &block)
+      method = (method_sym.instance_of? Symbol) ? method_sym.to_s : method_sym.clone
+      
+      if method.end_with? "="
+        method.chomp! "="
+        @attributes[method] = arguments[0]
+        add_attribute(method, arguments[0])
+      else
+        super(method_sym, *arguments, &block)
+      end
+    end
+
+    def add_attribute(name, value)
+      eigenclass.class_eval{ attr_reader name.to_sym }
+      instance_variable_set("@#{name}", value)
+    end
+  end
+end

data/lib/thingiverse/files.rb

@@ -1,25 +1,6 @@
 module Thingiverse
   class Files
-    include ActiveModel::Validations
-    validates_presence_of :name
+    include Thingiverse::DynamicAttributes
 
-    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,
-        :download_url => download_url
-      }
-    end
   end
 end

data/lib/thingiverse/images.rb

@@ -1,22 +1,6 @@
 module Thingiverse
   class Images
-    include ActiveModel::Validations
-    validates_presence_of :name
+    include Thingiverse::DynamicAttributes
 
-    attr_accessor :id, :name, :url, :sizes
-    def initialize(attributes={})
-      attributes.each do |name, value|
-        send("#{name}=", value)
-      end
-    end
-
-    def attributes
-      {
-        :id => id,
-        :name => name,
-        :url => url,
-        :sizes => sizes
-      }
-    end
   end
 end

data/lib/thingiverse/tags.rb

@@ -1,24 +1,7 @@
 module Thingiverse
   class Tags
-    include ActiveModel::Validations
-    validates_presence_of :name
+    include Thingiverse::DynamicAttributes
 
-    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,
-        :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?

data/lib/thingiverse/things.rb

@@ -1,48 +1,6 @@
 module Thingiverse
   class Things
-    include ActiveModel::Validations
-    validates_presence_of :name
-
-    attr_accessor :id, :name, :thumbnail, :url, :public_url, :creator, :added, :modified, :is_published, :is_wip
-    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,
-        :modified => modified.to_s,
-        :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,
-        :likes_url => likes_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 || [],
-        :tags => tags || []
-      }
-    end
+    include Thingiverse::DynamicAttributes
 
     def user
       response = Thingiverse::Connection.get("/users/#{creator['name']}")
@@ -62,12 +20,11 @@ module Thingiverse
       Thingiverse::Pagination.new(Thingiverse::Connection.get(@categories_url, :query => query), Thingiverse::Categories)
     end
 
-    def parents(query = {})
+    def ancestors(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
-    def tag_records
+    def tags
       response = Thingiverse::Connection.get(tags_url)
       raise "#{response.code}: #{JSON.parse(response.body)['error']}" unless response.success?
       response.parsed_response.collect do |attrs|
@@ -76,12 +33,10 @@ module Thingiverse
     end
 
     def save
-      if id.to_s == ""
-        thing = Thingiverse::Things.create(attributes)
+      if @id.to_s == ""
+        thing = Thingiverse::Things.create(@attributes)
       else
-        raise "Invalid Parameters" unless self.valid?
-
-        response = Thingiverse::Connection.patch("/things/#{id}", :body => attributes.to_json)
+        response = Thingiverse::Connection.patch("/things/#{id}", :body => @attributes.to_json)
         raise "#{response.code}: #{JSON.parse(response.body)['error']}" unless response.success?
 
         thing = Thingiverse::Things.new(response.parsed_response)
@@ -91,15 +46,28 @@ module Thingiverse
         send("#{name}=", value)
       end
     end
-
-    def upload(file)
-      response = Thingiverse::Connection.post("/things/#{id}/files", :body => {:filename => File.basename(file.path)}.to_json)
+    
+    # file_or_string can be a File or a String.
+    # thingiverse_filename is optional if using a File (the File filename will be used by default) but is required if using a String
+    def upload(file_or_string, thingiverse_filename=nil)
+      # to support different File type objects (like Tempfile) lets look for .path
+      if file_or_string.respond_to?("path")
+        thingiverse_filename = File.basename(file_or_string.path) if thingiverse_filename.to_s == ""
+        file_data = File.read(file_or_string.path)
+      elsif file_or_string.is_a?(String)
+        file_data = file_or_string
+      else
+        raise ArgumentError, "file_or_string not of accepted type. Expected File or String. Actual: #{file_or_string.class}"
+      end
+      
+      raise ArgumentError, "Unable to determine filename" if thingiverse_filename.to_s == ""
+      
+      response = Thingiverse::Connection.post("/things/#{id}/files", :body => {:filename => thingiverse_filename}.to_json)
       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"]
       query = parsed_response["fields"]
-      query["file"] = file
 
       # stupid S3 requires params to be in a certain order... so can't use HTTParty :(
       # prepare post data
@@ -114,7 +82,7 @@ module Thingiverse
       post_data << Curl::PostField.content('Content-Type',            query['Content-Type'])
       post_data << Curl::PostField.content('Content-Disposition',     query['Content-Disposition'])
 
-      post_data << Curl::PostField.file('file', file.path)
+      post_data << Curl::PostField.file('file', thingiverse_filename) { file_data }
 
       # post
       c = Curl::Easy.new(action) do |curl|
@@ -136,7 +104,7 @@ module Thingiverse
     end
 
     def publish
-      if id.to_s == ""
+      if @id.to_s == ""
         raise "Cannot publish until thing is saved"
       else
         response = Thingiverse::Connection.post("/things/#{id}/publish")
@@ -162,7 +130,6 @@ module Thingiverse
 
     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

@@ -1,41 +1,7 @@
 module Thingiverse
   class Users
-    include ActiveModel::Validations
-    validates_presence_of :name
-
-    attr_accessor :id, :name, :full_name, :thumbnail, :url, :public_url, :bio, :location, :registered, :last_active
-    attr_accessor :email, :default_license, :is_following
-    attr_accessor :things_url, :copies_url, :likes_url, :downloads_url, :collections_url
-
-    def initialize(attributes={})
-      attributes.each do |name, value|
-        send("#{name}=", value)
-      end
-    end
-
-    def attributes
-      {
-        :id => id,
-        :name => name,
-        :full_name => full_name,
-        :thumbnail => thumbnail,
-        :url => url,
-        :public_url => public_url,
-        :bio => bio,
-        :location => location,
-        :registered => registered,
-        :last_active => last_active,
-        :things_url => things_url,
-        :copies_url => copies_url,
-        :likes_url => likes_url,
-        :email => email,
-        :default_license => default_license,
-        :downloads_url => downloads_url,
-        :collections_url => collections_url,
-        :is_following => is_following
-      }
-    end
-
+    include Thingiverse::DynamicAttributes
+    
     def self.find(user_name)
       response = Thingiverse::Connection.get("/users/#{user_name}")
       raise "#{response.code}: #{JSON.parse(response.body)['error']}" unless response.success?

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: thingiverse
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Tony Buser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-15 00:00:00 Z
+date: 2013-05-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -59,20 +59,6 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: activemodel
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id004
 description: Thingiverse API
 email: tony@makerbot.com
 executables: []
@@ -84,6 +70,7 @@ extra_rdoc_files: []
 files: 
 - lib/thingiverse/categories.rb
 - lib/thingiverse/connection.rb
+- lib/thingiverse/dynamic_attributes.rb
 - lib/thingiverse/files.rb
 - lib/thingiverse/images.rb
 - lib/thingiverse/pagination.rb