arena 0.0.2 → 0.0.4

data/lib/arena.rb

@@ -17,6 +17,13 @@ module Arena
         @client = Arena::Client.new(options)
       end
     end
+
+  private
+
+    def method_missing(method, *args, &block)
+      self.client.send(method, *args, &block)
+    end
+
   end
 end
 

data/lib/arena/api.rb

@@ -0,0 +1,80 @@
+require 'arena/user'
+require 'arena/block'
+require 'arena/channel'
+require 'arena/results'
+require 'arena/search_results'
+
+module Arena
+  module API
+    # Returns paginated global list of Channels
+    def channels(options={})
+      object_from_response(Arena::ChannelResults, :get, "/channels", options)
+    end
+
+    # Returns a full Channel representation
+    def channel(id, options={})
+      object_from_response(Arena::Channel, :get, "/channels/#{id}", options)
+    end
+
+    # Posts a block to a channel
+    def channel_add_block(id, options={})
+      object_from_response(Arena::Block, :post, "/channels/#{id}/blocks", options)
+    end
+
+    # Remove a block from channel (destroy connection)
+    def channel_remove_block(channel_id, id, options={})
+      send(:delete, "/channels/#{channel_id}/blocks/#{id}", options)
+    end
+
+    # Select a block within the context of a channel
+    def channel_toggle_block_selection(id, options={})
+      send(:put, "/connections/#{id}/selection", options)
+    end
+
+    # Returns thumbnail representation (first 9 Blocks) for the given Channel
+    def channel_thumb(id, options={})
+      object_from_response(Arena::Channel, :get, "/channels/#{id}/thumb", options)
+    end
+
+    # Returns a paginated list of all Channels connected to the given Channel
+    def channel_channels(id, options={})
+      object_from_response(Arena::ChannelResults, :get, "/channels/#{id}/channels", options)
+    end
+
+    # Returns a full Block representation
+    def block(id, options={})
+      object_from_response(Arena::Block, :get, "/blocks/#{id}", options)
+    end
+
+    # Returns a User representation
+    def user(id, options={})
+      object_from_response(Arena::User, :get, "/users/#{id}", options)
+    end
+
+    # Returns a paginated list of all Channels a User has access to
+    def user_channels(id, options={})
+      object_from_response(Arena::ChannelResults, :get, "/users/#{id}/channels", options)
+    end
+
+    # Returns a Search object with an Array for Channels, Blocks and Users
+    def search(query, option={})
+      object_from_response(Arena::SearchResults, :get, "/search?q=#{query}", options)
+    end
+
+  private
+
+    def object_from_response(klass, request_method, url, options={})
+      response = send(request_method.to_sym, url, options)
+      klass.new(response)
+    end
+
+    def collection_from_array(klass, array)
+      array.collect { |element| klass.new(element) }
+    end
+
+    def collection_from_response(klass, request_method, url, options={}, selector)
+      collection_from_array(klass, send(request_method.to_sym, url, options)[selector])
+    end
+
+  end
+end

data/lib/arena/base.rb

@@ -0,0 +1,52 @@
+module Arena
+  class Base
+    attr_reader :attrs
+    alias to_hash attrs
+
+    # Define methods that retrieve the value from an initialized instance variable Hash, using the attribute as a key
+    #
+    # @param attrs [Array, Set, Symbol]
+    def self.attr_reader(*attrs)
+      attrs.each do |attribute|
+        class_eval do
+          define_method attribute do
+            @attrs[attribute.to_s]
+          end
+        end
+      end
+    end
+
+    # Initializes a new object
+    #
+    # @param attrs [Hash]
+    # @return [Arena::Base]
+    def initialize(attrs={})
+      @attrs = attrs
+    end
+
+    # Update the attributes of an object
+    #
+    # @param attrs [Hash]
+    # @return [Arena::Base]
+    # def update(attrs)
+    #   @attrs.update(attrs)
+    #   self
+    # end
+
+  protected
+
+    # @param attr [Symbol]
+    # @param other [Arena::Base]
+    # @return [Boolean]
+    def attr_equal(attr, other)
+      self.class == other.class && !other.send(attr).nil? && send(attr) == other.send(attr)
+    end
+
+    # @param other [Arena::Base]
+    # @return [Boolean]
+    def attrs_equal(other)
+      self.class == other.class && !other.attrs.empty? && attrs == other.attrs
+    end
+
+  end
+end

data/lib/arena/block.rb

@@ -0,0 +1,51 @@
+require 'arena/base'
+require 'arena/entity'
+require 'arena/entities/source'
+require 'arena/entities/image'
+require 'arena/entities/attachment'
+require 'arena/creatable'
+
+module Arena
+  class Block < Arena::Base
+    include Arena::Creatable
+
+    attr_reader :id, :title, :generated_title, :state, :comment_count, :content,
+      :content_html, :description, :description_html, :position, :selected,
+      :connection_id, :connected_at, :connected_by_user_id, :connected_by_username
+
+    def user
+      @user ||= Arena::User.new(@attrs.dup['user'])
+    end
+
+    def _class
+      @_class ||= @attrs.dup['class']
+    end
+
+    def _base_class
+      @_base_class ||= @attrs.dup['base_class']
+    end
+
+    def source
+      @source ||= Arena::Entity::Source.new(@attrs.dup['source'])
+    end
+
+    def image
+      @image ||= Arena::Entity::Image.new(@attrs.dup['image'])
+    end
+    
+    def attachment
+      @attachment ||= Arena::Entity::Attachment.new(@attrs.dup['attachment'])
+    end
+
+    def connections
+      @connections ||= @attrs['connections'].collect { |channel| Arena::Channel.new(channel) }
+    end
+
+  end
+
+  class Text < Block; end
+  class Image < Block; end
+  class Link < Block; end
+  class Media < Block; end
+  class Attachment < Block; end
+end

data/lib/arena/channel.rb

@@ -0,0 +1,35 @@
+require 'arena/base'
+require 'arena/creatable'
+require 'arena/user'
+require 'arena/block'
+
+module Arena
+  class Channel < Arena::Base
+    include Arena::Creatable
+
+    attr_reader :id, :title, :published, :open, :collaboration,
+      :slug, :length, :kind, :status, :user_id, :total_pages,
+      :current_page, :per, :follower_count
+
+    def user
+      @user ||= Arena::User.new(@attrs['user'])
+    end
+
+    def _class
+      @attrs['class']
+    end
+
+    def _base_class
+      @attrs['base_class']
+    end
+
+    def contents
+      @contents ||= @attrs['contents'].collect { |object| "Arena::#{object['class']}".constantize.new(object) }
+    end
+
+    def collaborators
+      @collaborators ||= @attrs['collaborators'].collect { |user| Arena::User.new(user) }
+    end
+    
+  end
+end

data/lib/arena/client.rb

@@ -1,4 +1,6 @@
 require 'arena/configurable'
+require 'arena/error'
+require 'arena/api'
 require 'httparty'
 require 'json'
 
@@ -7,6 +9,7 @@ module Arena
   class Client
     include HTTParty
     include Arena::Configurable
+    include Arena::API
 
     def initialize(options={})
       Arena::Configurable.keys.each do |key|
@@ -14,30 +17,31 @@ module Arena
       end
     end
 
-    # Wrapper for v1
-    def channel(identifier, options={})
-      get_json "/channels/#{identifier}", options
+    # Performs HTTP GET POST PUT and DELETE requests
+    %w(get post put delete).each do |method|
+      define_method method do |path, options={}|
+        options = { query: options,
+                    headers: { 'Authorization' => "Bearer #{@access_token}" } }
+                    
+        request(__method__, path, options)
+      end
     end
 
-    def users_channels(id, options={})
-      get_json "/channels?user=#{id}", options
-    end
+  private
 
-    def block(id, options={})
-      get_json "/blocks/#{id}", options
-    end
+    def request(method, path, options)
+      JSON.parse self.class.send(method, "http://#{@base_domain}/#{@api_version}#{path}", options).body
 
-    def blocks(identifier, options={})
-      get_json "/blocks?channel=#{identifier}", options
-    end
+    rescue JSON::ParserError, TypeError
+      nil
 
-    private
+    rescue Exception => exception
+      puts exception.inspect
+      puts exception.backtrace
 
-    def get_json(path, options)
-      JSON.parse(
-          (self.class.get "http://#{@base_domain}/api/#{@api_version}#{path}", options).body
-        )
+      raise Arena::Error
     end
+
   end
 
-end
+end

data/lib/arena/configurable.rb

@@ -1,16 +1,17 @@
 module Arena
   module Configurable
-
-    CONFIG_KEYS = [
-      :base_domain,
-      :api_version,
-    ] unless defined? CONFIG_KEYS
-
-    attr_accessor *CONFIG_KEYS
+    attr_writer :application_id, :application_secret, :access_token
+    attr_accessor :base_domain, :api_version
 
     class << self
       def keys
-        @keys ||= CONFIG_KEYS
+        @keys ||= [
+          :base_domain,
+          :api_version,
+          :application_id,
+          :application_secret,
+          :access_token
+        ]
       end
     end
 
@@ -38,4 +39,4 @@ module Arena
     end
 
   end
-end
+end

data/lib/arena/core_ext/string.rb

@@ -0,0 +1,7 @@
+class String
+
+  def constantize
+    self.split("::").inject(Module) {|acc, val| acc.const_get(val)}
+  end unless method_defined?(:constantize)
+
+end

data/lib/arena/creatable.rb

@@ -0,0 +1,31 @@
+require 'time'
+
+module Arena
+  module Creatable
+
+    # Time when the object was created on Arena
+    #
+    # @return [Time]
+    def created_at
+      @created_at ||= Time.parse(@attrs['created_at']) if created?
+    end
+
+    # Time when the object was last updated on Arena
+    #
+    # @return [Time]
+    def updated_at
+      @updated_at ||= Time.parse(@attrs['updated_at']) if updated?
+    end
+
+  private
+
+    def created?
+      !@attrs['created_at'].nil?
+    end
+
+    def updated?
+      !@attrs['updated_at'].nil?
+    end
+
+  end
+end

data/lib/arena/default.rb

@@ -1,7 +1,7 @@
 module Arena
   module Default
-    BASE_DOMAIN = "are.na" unless defined? BASE_DOMAIN
-    API_VERSION = "v1" unless defined? API_VERSION
+    BASE_DOMAIN = "api.are.na" unless defined? BASE_DOMAIN
+    API_VERSION = "v2" unless defined? API_VERSION
 
     class << self
       # @return [Hash]
@@ -16,6 +16,18 @@ module Arena
       def base_domain
         BASE_DOMAIN
       end
+
+      def application_id
+        ENV['APPLICATION_ID']
+      end
+
+      def application_secret
+        ENV['APPLICATION_SECRET']
+      end
+
+      def access_token
+        ENV['APPLICATION_SECRET']
+      end
     end
   end
 end

data/lib/arena/entities/attachment.rb

@@ -0,0 +1,11 @@
+require 'arena/entity'
+require 'arena/entities/version'
+
+module Arena
+  class Entity
+    class Attachment < Arena::Entity
+      attr_reader :file_name, :file_size, :file_size_display,
+        :content_type, :extension, :url
+    end
+  end
+end

data/lib/arena/entities/image.rb

@@ -0,0 +1,20 @@
+require 'arena/creatable'
+require 'arena/entity'
+require 'arena/entities/version'
+
+module Arena
+  class Entity
+    class Image < Arena::Entity
+      include Arena::Creatable
+
+      attr_reader :filename, :content_type
+
+      %w(thumb display original).each do |method|
+        define_method method do
+          instance_variable_set("@#{method}", Arena::Entity::Version.new(@attrs.dup[method])) unless instance_variable_get "@#{method}"
+          instance_variable_get "@#{method}"
+        end
+      end
+    end
+  end
+end

data/lib/arena/entities/provider.rb

@@ -0,0 +1,9 @@
+require 'arena/entity'
+
+module Arena
+  class Entity
+    class Provider < Arena::Entity
+      attr_reader :name, :url
+    end
+  end
+end

data/lib/arena/entities/source.rb

@@ -0,0 +1,14 @@
+require 'arena/entity'
+require 'arena/entities/provider'
+
+module Arena
+  class Entity
+    class Source < Arena::Entity
+      attr_reader :url
+
+      def provider
+        @provider ||= Arena::Entity::Provider.new(@attrs.dup['provider'])
+      end
+    end
+  end
+end

data/lib/arena/entities/version.rb

@@ -0,0 +1,9 @@
+require 'arena/entity'
+
+module Arena
+  class Entity
+    class Version < Arena::Entity
+      attr_reader :url, :file_size, :file_display
+    end
+  end
+end

data/lib/arena/entity.rb

@@ -0,0 +1,6 @@
+require 'arena/base'
+
+module Arena
+  class Entity < Arena::Base
+  end
+end

data/lib/arena/error.rb

@@ -0,0 +1,4 @@
+module Arena
+  class Error < StandardError
+  end
+end

data/lib/arena/results.rb

@@ -0,0 +1,14 @@
+require 'arena/base'
+require 'arena/channel'
+
+module Arena
+  class Results < Arena::Base
+    attr_reader :length, :total_pages, :current_page, :per
+  end
+
+  class ChannelResults < Results
+    def channels
+      @channels ||= @attrs.dup['channels'].collect { |channel| Arena::Channel.new(channel) }
+    end
+  end
+end

data/lib/arena/search_results.rb

@@ -0,0 +1,22 @@
+require 'arena/core_ext/string'
+require 'arena/base'
+require 'arena/channel'
+require 'arena/user'
+require 'arena/block'
+
+module Arena
+  class SearchResults < Arena::Base
+    def term
+      @attrs['term'] unless @attrs['term'].nil?
+    end
+
+    %w(user channel block).each do |method|
+      define_method "#{method}s" do
+        instance_variable_set("@#{method}s",
+            @attrs.dup["#{method}s"].collect { |element| "Arena::#{method.capitalize}".constantize.new(element) }
+          ) unless instance_variable_get "@#{method}s"
+        instance_variable_get "@#{method}s"
+      end
+    end
+  end
+end

data/lib/arena/user.rb

@@ -0,0 +1,16 @@
+require 'arena/base'
+require 'arena/creatable'
+
+module Arena
+  class User < Arena::Base
+    include Arena::Creatable
+
+    attr_reader :id, :slug, :username, :first_name, :last_name,
+    :full_name, :avatar, :email, :channel_count, :following_count,
+    :profile_id, :follower_count, :initials
+
+    def _class
+      @attrs.dup['class']
+    end
+  end
+end

data/lib/arena/version.rb

@@ -1,3 +1,7 @@
 module Arena
-  VERSION = "0.0.2"
+  VERSION = "0.0.4"
+
+  def self.version
+    VERSION
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arena
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-07 00:00:00.000000000 Z
+date: 2012-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -73,9 +73,25 @@ files:
 - Rakefile
 - arena.gemspec
 - lib/arena.rb
+- lib/arena/api.rb
+- lib/arena/base.rb
+- lib/arena/block.rb
+- lib/arena/channel.rb
 - lib/arena/client.rb
 - lib/arena/configurable.rb
+- lib/arena/core_ext/string.rb
+- lib/arena/creatable.rb
 - lib/arena/default.rb
+- lib/arena/entities/attachment.rb
+- lib/arena/entities/image.rb
+- lib/arena/entities/provider.rb
+- lib/arena/entities/source.rb
+- lib/arena/entities/version.rb
+- lib/arena/entity.rb
+- lib/arena/error.rb
+- lib/arena/results.rb
+- lib/arena/search_results.rb
+- lib/arena/user.rb
 - lib/arena/version.rb
 - test/lib/arena/version_test.rb
 - test/test_helper.rb