arena 0.0.1 → 0.0.2

data/lib/arena.rb

@@ -1,11 +1,23 @@
 require "arena/version"
 require_relative "./arena/client"
+require_relative "./arena/default"
 require_relative "./arena/configurable"
 
 module Arena
   class << self
+    include Arena::Configurable
+
+    # Delegate to a Arena::Client
+    #
+    # @return [Arena::Client]
     def client
-      Arena::Client
+      if @client
+        @client
+      else
+        @client = Arena::Client.new(options)
+      end
     end
   end
 end
+
+Arena.setup

data/lib/arena/client.rb

@@ -7,35 +7,37 @@ module Arena
   class Client
     include HTTParty
     include Arena::Configurable
-    
-    class << self
 
-      def channel(identifier, options={})
-        get_json "/channels/#{identifier}", options
-      end
-
-      def users_channels(id, options={})
-        get_json "/channels?user=#{id}", options
+    def initialize(options={})
+      Arena::Configurable.keys.each do |key|
+        instance_variable_set(:"@#{key}", options[key] || Arena.instance_variable_get(:"@#{key}"))
       end
+    end
 
-      def block(id, options={})
-        get_json "/blocks/#{id}", options
-      end
+    # Wrapper for v1
+    def channel(identifier, options={})
+      get_json "/channels/#{identifier}", options
+    end
 
-      def blocks(identifier, options={})
-        get_json "/blocks?channel=#{identifier}", options
-      end
+    def users_channels(id, options={})
+      get_json "/channels?user=#{id}", options
+    end
 
-      private
+    def block(id, options={})
+      get_json "/blocks/#{id}", options
+    end
 
-      # Perform HTTP GET request and parse the response body
-      def get_json(path, options)
-        JSON.parse(
-            (get "#{Arena::Configurable::BASE_URL}#{path}", options).body
-          )
-      end
+    def blocks(identifier, options={})
+      get_json "/blocks?channel=#{identifier}", options
     end
 
+    private
+
+    def get_json(path, options)
+      JSON.parse(
+          (self.class.get "http://#{@base_domain}/api/#{@api_version}#{path}", options).body
+        )
+    end
   end
 
 end

data/lib/arena/configurable.rb

@@ -1,8 +1,41 @@
 module Arena
-
   module Configurable
-    API_VERSION = "v1"
-    BASE_URL = "http://are.na/api/#{API_VERSION}"
-  end
 
+    CONFIG_KEYS = [
+      :base_domain,
+      :api_version,
+    ] unless defined? CONFIG_KEYS
+
+    attr_accessor *CONFIG_KEYS
+
+    class << self
+      def keys
+        @keys ||= CONFIG_KEYS
+      end
+    end
+
+    # Allows configuration options
+    # to be set in a block
+    def configure
+      yield self
+      self
+    end
+
+    def reset!
+      Arena::Configurable.keys.each do |key|
+        instance_variable_set(:"@#{key}", Arena::Default.options[key])
+      end
+      self
+    end
+
+    alias setup reset!
+
+  private
+
+    # @return [Hash]
+    def options
+      Hash[Arena::Configurable.keys.map{|key| [key, instance_variable_get(:"@#{key}")]}]
+    end
+
+  end
 end

data/lib/arena/default.rb

@@ -0,0 +1,21 @@
+module Arena
+  module Default
+    BASE_DOMAIN = "are.na" unless defined? BASE_DOMAIN
+    API_VERSION = "v1" unless defined? API_VERSION
+
+    class << self
+      # @return [Hash]
+      def options
+        Hash[Arena::Configurable.keys.map{|key| [key, send(key)]}]
+      end
+
+      def api_version
+        API_VERSION
+      end
+
+      def base_domain
+        BASE_DOMAIN
+      end
+    end
+  end
+end

data/lib/arena/version.rb

@@ -1,3 +1,3 @@
 module Arena
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arena
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-09 00:00:00.000000000 Z
+date: 2012-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -75,6 +75,7 @@ files:
 - lib/arena.rb
 - lib/arena/client.rb
 - lib/arena/configurable.rb
+- lib/arena/default.rb
 - lib/arena/version.rb
 - test/lib/arena/version_test.rb
 - test/test_helper.rb