active_forms 0.3.1 → 0.3.2

data/active_forms.gemspec

@@ -1,4 +1,5 @@
-# -*- encoding: utf-8 -*-
+# encoding: UTF-8
+
 require File.expand_path('../lib/active_forms/version', __FILE__)
 
 Gem::Specification.new do |gem|

data/lib/active_forms/configuration.rb

@@ -2,7 +2,7 @@
 
 module ActiveForms
   class Configuration
-    attr_accessor :api_url, :url, :base_url, :api_key, :secret_key, :logger
+    attr_accessor :api_url, :url, :base_url, :api_key, :secret_key, :logger, :basic_auth
 
     def initialize
       @api_url = { :protocol => "https", :host => 'api.activeforms.com' }

data/lib/active_forms/request.rb

@@ -6,7 +6,7 @@ require 'httparty'
 
 module ActiveForms
   class Request
-    attr_reader :http_method, :path, :params, :api_params, :uri
+    attr_reader :http_method, :path, :params, :api_params, :uri, :options
 
     class << self
       def get(path, all_params = {})
@@ -44,15 +44,16 @@ module ActiveForms
       @api_params["apiSig"]       = api_sig
 
       @uri = build_uri
+      @options = build_options
     end
 
     def perform
       ActiveForms.log("[ActiveForms] Request: #{http_method.upcase} #{uri}")
       begin
-        response = HTTParty.send(http_method.downcase, uri)
+        response = HTTParty.send(http_method.downcase, uri, options)
         verify_response(response)
       rescue
-        response = HTTParty.send(http_method.downcase, uri)
+        response = HTTParty.send(http_method.downcase, uri, options)
         verify_response(response)
       end
       response
@@ -73,6 +74,10 @@ module ActiveForms
       url_with_path + "?" + [params, api_params].flatten.join("&")
     end
 
+    def build_options
+      ActiveForms.configuration.basic_auth ? { :basic_auth => ActiveForms.configuration.basic_auth } : {}
+    end
+
     def url_with_path
       url = ActiveForms.configuration.api_url[:protocol] + "://" + ActiveForms.configuration.api_url[:host]
       [url, ActiveForms.configuration.base_url, path].join('/')

data/lib/active_forms/version.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 module ActiveForms
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/test/active_forms/request_test.rb

@@ -58,6 +58,11 @@ class ActiveForms::RequestTest < Test::Unit::TestCase
           end
         end
       end
+
+      should "have empty options" do
+        expected = {}
+        assert_equal expected, @request.options
+      end
     end
 
     context "POST request" do
@@ -138,4 +143,21 @@ class ActiveForms::RequestTest < Test::Unit::TestCase
       end
     end
   end
+
+  context "configured with basic_auth" do
+    setup do
+      configure(:basic_auth => { :username => "user", :password => "pass" })
+    end
+
+    context "request" do
+      setup do
+        @request = ActiveForms::Request.new(:get, "entries")
+      end
+
+      should "have correct options" do
+        expected = { :basic_auth => { :username => "user", :password => "pass" } }
+        assert_equal expected, @request.options
+      end
+    end
+  end
 end

data/test/test_helper.rb

@@ -15,13 +15,16 @@ class Test::Unit::TestCase
     FakeWeb.clean_registry
   end
 
-  def configure
+  def configure(opts = {})
     ActiveForms.configure do |c|
       c.api_url    = { :protocol => "https", :host => "api.example.com" }
       c.url        = { :protocol => "https", :host => "www.example.com" }
       c.base_url   = "client"
       c.api_key    = "123456"
       c.secret_key = "abcdef"
+      opts.each do |k, v|
+        c.send("#{k}=", v)
+      end
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_forms
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - "Micha\xC5\x82 Szajbe"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-27 00:00:00 Z
+date: 2012-06-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport