arena 0.0.6 → 0.0.7

data/README.md

@@ -16,4 +16,11 @@ Or install it yourself as:
 
 ## Usage
 
-TODO
+Register an application at http://dev.are.na
+
+### Configure for personal use
+```ruby
+Arena.configure do |config|
+    config.access_token = 'XXXXXXXXXXXXX'
+end
+```

data/lib/arena/api.rb

@@ -51,11 +51,16 @@ module Arena
       object_from_response(Arena::User, :get, "/users/#{id}", options)
     end
 
-    # Returns a paginated list of all Channels a User has access to
+    # Returns a paginated list of all public Channels a User has access to
     def user_channels(id, options={})
       object_from_response(Arena::ChannelResults, :get, "/users/#{id}/channels", options)
     end
 
+    # All of the authenticated user's Channels
+    def account_channels(options={})
+      object_from_response(Arena::ChannelResults, :get, "/accounts/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)

data/lib/arena/base.rb

@@ -1,9 +1,11 @@
 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
+    # 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)

data/lib/arena/block.rb

@@ -5,14 +5,15 @@ require 'arena/entities/image'
 require 'arena/entities/attachment'
 require 'arena/entities/embed'
 require 'arena/creatable'
+require 'arena/connectable'
 
 module Arena
   class Block < Arena::Base
     include Arena::Creatable
+    include Arena::Connectable
 
     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
+      :content_html, :description, :description_html, :position, :selected
 
     def user
       @user ||= Arena::User.new(@attrs['user'])

data/lib/arena/channel.rb

@@ -1,11 +1,13 @@
 require 'arena/base'
 require 'arena/creatable'
+require 'arena/connectable'
 require 'arena/user'
 require 'arena/block'
 
 module Arena
   class Channel < Arena::Base
     include Arena::Creatable
+    include Arena::Connectable
 
     attr_reader :id, :title, :published, :open, :collaboration,
       :slug, :length, :kind, :status, :user_id, :total_pages,

data/lib/arena/client.rb

@@ -20,8 +20,7 @@ module Arena
     # 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}" } }
+        options = { query: options, headers: set_headers }
                     
         request(__method__, path, options)
       end
@@ -29,17 +28,33 @@ module Arena
 
   private
 
+    def set_headers
+      if !@access_token.nil?
+        { 'Authorization' => "Bearer #{@access_token}" }
+      elsif !@auth_token.nil?
+        { 'X-AUTH-TOKEN' => @auth_token }
+      else
+        { }
+      end
+    end
+
+    def error?(response)
+      !response['status']['code'].nil?
+    end
+
+    def error_message(response)
+      "#{response['status']['code']}: #{response['status']['message']} - #{response['status']['description']}"
+    end
+
     def request(method, path, options)
-      JSON.parse self.class.send(method, "http://#{@base_domain}/#{@api_version}#{path}", options).body
+      response = JSON.parse self.class.send(method, "http://#{@base_domain}/#{@api_version}#{path}", options).body
+      
+      raise Arena::Error.new(error_message(response)) if error?(response)
+      
+      return response
 
     rescue JSON::ParserError, TypeError
       nil
-
-    rescue Exception => exception
-      puts exception.inspect
-      puts exception.backtrace
-
-      raise Arena::Error
     end
 
   end

data/lib/arena/configurable.rb

@@ -1,7 +1,12 @@
 module Arena
   module Configurable
-    attr_writer :application_id, :application_secret, :access_token
-    attr_accessor :base_domain, :api_version
+    attr_accessor :base_domain,
+                  :api_version
+
+    attr_writer :application_id,
+                :application_secret,
+                :access_token,
+                :auth_token
 
     class << self
       def keys
@@ -10,7 +15,8 @@ module Arena
           :api_version,
           :application_id,
           :application_secret,
-          :access_token
+          :access_token,
+          :auth_token
         ]
       end
     end

data/lib/arena/connectable.rb

@@ -0,0 +1,30 @@
+require 'time'
+
+module Arena
+  module Connectable
+    attr_reader :connection_id
+
+    def connected_at
+      @connected_at ||= Time.parse(@attrs['connected_at']) if connected?
+    end
+
+    def connected_by_different_user?
+      user.id != connected_by.id
+    end
+
+    def connected_by
+      @connected_by ||= Arena::User.new({
+          'id' => @attrs['connected_by_user_id'],
+          'username' => @attrs['connected_by_username'],
+          'full_name' => @attrs['connected_by_username']
+        })
+    end
+
+  private
+
+    def connected?
+      !@attrs['connected_at'].nil?
+    end
+
+  end
+end

data/lib/arena/default.rb

@@ -28,6 +28,10 @@ module Arena
       def access_token
         ENV['APPLICATION_SECRET']
       end
+
+      def auth_token
+        ENV['AUTH_TOKEN']
+      end
     end
   end
 end

data/lib/arena/version.rb

@@ -1,5 +1,5 @@
 module Arena
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arena
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-12 00:00:00.000000000 Z
+date: 2012-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -79,6 +79,7 @@ files:
 - lib/arena/channel.rb
 - lib/arena/client.rb
 - lib/arena/configurable.rb
+- lib/arena/connectable.rb
 - lib/arena/core_ext/string.rb
 - lib/arena/creatable.rb
 - lib/arena/default.rb