mastodon-api 0.0.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc0c9787cd86d495ceab2625291f4aceb8cdc6d6
-  data.tar.gz: 4f93ab9cd2a539f1db0b5d894be11673784a1322
+  metadata.gz: accd7a899ecb47c6c3422e33a0b73616ce4e136b
+  data.tar.gz: 3391e4cfdcf7954653114bb48504fe8af5160f2d
 SHA512:
-  metadata.gz: 8f10d250823c02c2ad8292dcbc524bb22907509e94b3c8586ae98a5027278aa02329aab1644fc0634ad12c850c9759ab31e3412ad193cd96fdd19030df45b6f8
-  data.tar.gz: e9f4fcd13cc8cd60152d174e8cad4a8716c97514c89dfb62081b53477708973ece9f7273830311ca6d5930d2af72d7b91a6d73b4a2a44fcbf9364c9f7f318c47
+  metadata.gz: 80cd9c0868459f585815ea381d163d1df3f9fca050db242acbbab50982463f38a2b6be9770de59f7ad4b1adf9a393195c4665cbee657b26a9a863e942eb9f0da
+  data.tar.gz: 57085547060814204777c1153be45118b250a0cf3e26479046ba2d172fa291dec3a39d6027d4c56ba843ed0a968cc1e3282eebf7098590effb9217d0f7a45cea

data/lib/mastodon/base.rb

@@ -22,6 +22,12 @@ module Mastodon
         end
       end
 
+      def collection_attr_reader(attribute, klass)
+        define_method(attribute) do
+          Mastodon::Collection.new(@attributes[attribute.to_s], klass)
+        end
+      end
+
       def predicate_attr_reader(*attributes)
         attributes.each do |attribute|
           define_predicate_method(attribute)

data/lib/mastodon/collection.rb

@@ -15,5 +15,13 @@ module Mastodon
 
       self
     end
+
+    def size
+      @collection.size
+    end
+
+    def last
+      @collection.last
+    end
   end
 end

data/lib/mastodon/entities/media.rb

@@ -0,0 +1,14 @@
+module Mastodon
+  module Entities
+    class Media < Mastodon::Base
+      # @!attribute [r] url
+      #   @return [String]
+      # @!attribute [r] preview_url
+      #   @return [String]
+      # @!attribute [r] type
+      #   @return [String]
+
+      normal_attr_reader :url, :preview_url, :type
+    end
+  end
+end

data/lib/mastodon/entities/mention.rb

@@ -0,0 +1,14 @@
+module Mastodon
+  module Entities
+    class Mention < Mastodon::Base
+      # @!attribute [r] id
+      #   @return [Integer] Account ID
+      # @!attribute [r] acct
+      #   @return [String]
+      # @!attribute [r] url
+      #   @return [String]
+
+      normal_attr_reader :id, :acct, :url
+    end
+  end
+end

data/lib/mastodon/media.rb

@@ -0,0 +1,20 @@
+module Mastodon
+  class Media < Mastodon::Base
+    # @!attribute [r] id
+    #   @return [Integer]
+    # @!attribute [r] type
+    #   @return [String] Image or video
+    # @!attribute [r] url
+    #   @return [String] Full file URL
+    # @!attribute [r] preview_url
+    #   @return [String] URL to preview image
+    # @!attribute [r] text_url
+    #   @return [String] URL that can be put into status body and will redirect to the status/media
+
+    normal_attr_reader :id, :type, :url, :preview_url, :text_url
+
+    def initialize(attributes = {})
+      attributes.fetch('id')
+    end
+  end
+end

data/lib/mastodon/relationship.rb

@@ -1,5 +1,14 @@
 module Mastodon
   class Relationship < Mastodon::Base
+    # @!attribute [r] id
+      #   @return [Integer] Account ID
+      # @!attribute [r] following?
+      #   @return [Boolean]
+      # @!attribute [r] followed_by?
+      #   @return [Boolean]
+      # @!attribute [r] blocking?
+      #   @return [Boolean]
+
     normal_attr_reader :id
     predicate_attr_reader :following, :followed_by, :blocking
 

data/lib/mastodon/rest/apps.rb

@@ -11,7 +11,7 @@ module Mastodon
       # @param redirect_uri [String]
       # @return [Mastodon::App]
       def create_app(name, redirect_uri)
-        perform_request_with_object(:post, '/api/v1/apps', { name: name, redirect_uris: redirect_uri }, Mastodon::App)
+        perform_request_with_object(:post, '/api/v1/apps', { client_name: name, redirect_uris: redirect_uri }, Mastodon::App)
       end
     end
   end

data/lib/mastodon/rest/media.rb

@@ -1,12 +1,16 @@
 require 'mastodon/rest/utils'
+require 'mastodon/media'
 
 module Mastodon
   module REST
     module Media
       include Mastodon::REST::Utils
 
+      # Upload a media file
+      # @param file [HTTP::FormData::File]
+      # @return [Mastodon::Media]
       def upload_media(file)
-        raise NotImplementedError
+        perform_request_with_object(:post, '/api/v1/media', { file: file }, Mastodon::Media)
       end
     end
   end

data/lib/mastodon/rest/relationships.rb

@@ -10,7 +10,7 @@ module Mastodon
       # @param ids [Integer]
       # @return [Mastodon::Collection<Mastodon::Relationship>]
       def relationships(*ids)
-        perform_request_with_collection(:get, '/api/v1/accounts/relationships', { id: ids }, Mastodon::Relationship)
+        perform_request_with_collection(:get, '/api/v1/accounts/relationships', array_param(:id, ids), Mastodon::Relationship)
       end
 
       # Follow a user

data/lib/mastodon/rest/utils.rb

@@ -27,6 +27,14 @@ module Mastodon
         response = perform_request(request_method, path, options)
         Mastodon::Collection.new(response, klass)
       end
+
+      # Format an array of values into a query param hash
+      # @param key [Symbol]
+      # @param values [Enumerable]
+      # @return [Hash]
+      def array_param(key, values)
+        values.map.with_index { |value, i| ["#{key}[#{i}]", value] }.to_h
+      end
     end
   end
 end

data/lib/mastodon/status.rb

@@ -1,4 +1,6 @@
 require 'mastodon/account'
+require 'mastodon/entities/media'
+require 'mastodon/entities/mention'
 
 module Mastodon
   class Status < Mastodon::Base
@@ -26,6 +28,10 @@ module Mastodon
     #   @return [Boolean]
     # @!attribute [r] reblogged?
     #   @return [Boolean]
+    # @!attribute [r] media_attachments
+    #   @return [Mastodon::Collection<Mastodon::Entities::Media>]
+    # @!attribute [r] mentions
+    #   @return [Mastodon::Collection<Mastodon::Entities::Mention>]
 
     normal_attr_reader :id, :content, :in_reply_to_id, :url, :uri, :created_at, :reblogs_count, :favourites_count
 
@@ -34,6 +40,9 @@ module Mastodon
     object_attr_reader :account, Mastodon::Account
     object_attr_reader :reblog, Mastodon::Status
 
+    collection_attr_reader :media_attachments, Mastodon::Entities::Media
+    collection_attr_reader :mentions, Mastodon::Entities::Mention
+
     def initialize(attributes = {})
       attributes.fetch('id')
       super

data/lib/mastodon/version.rb

@@ -7,11 +7,11 @@ module Mastodon
     end
 
     def minor
-      0
+      9
     end
 
     def patch
-      1
+      0
     end
 
     def pre

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mastodon-api
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Eugen Rochko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-20 00:00:00.000000000 Z
+date: 2016-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -64,8 +64,11 @@ files:
 - lib/mastodon/base.rb
 - lib/mastodon/client.rb
 - lib/mastodon/collection.rb
+- lib/mastodon/entities/media.rb
+- lib/mastodon/entities/mention.rb
 - lib/mastodon/error.rb
 - lib/mastodon/headers.rb
+- lib/mastodon/media.rb
 - lib/mastodon/relationship.rb
 - lib/mastodon/rest/accounts.rb
 - lib/mastodon/rest/api.rb