givey_ruby 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    givey_ruby (0.0.1.alpha)
+    givey_ruby (0.0.3)
       httparty
       oauth2
 
@@ -29,20 +29,20 @@ GEM
     erubis (2.7.0)
     factory_girl (3.4.0)
       activesupport (>= 3.0.0)
-    faraday (0.8.1)
+    faraday (0.8.5)
       multipart-post (~> 1.1)
     hike (1.2.1)
-    httparty (0.8.3)
+    httparty (0.10.2)
       multi_json (~> 1.0)
-      multi_xml
-    httpauth (0.1)
+      multi_xml (>= 0.5.2)
+    httpauth (0.2.0)
     i18n (0.6.0)
     journey (1.0.4)
     jwt (0.1.5)
       multi_json (>= 1.0)
     log_buddy (0.7.0)
     multi_json (1.3.6)
-    multi_xml (0.5.1)
+    multi_xml (0.5.2)
     multipart-post (1.1.5)
     oauth2 (0.8.0)
       faraday (~> 0.8)

data/lib/givey_ruby/configuration.rb

@@ -5,9 +5,10 @@ module GiveyRuby
     def client(client_options = {})
       @client ||= begin
         # TODO: ensure consumer key and secret
-        @api_site   = client_options.include?(:api_site) ? client_options[:api_site] : "http://api.givey.com"
-        opts        = {:site => @api_site, :authorize_url => "/#{api_version}/oauth/authorize", :token_url => "/#{api_version}/oauth/token", :raise_errors => false}
-        @token_file = client_options.include?(:token_file) ? client_options[:token_file] : "../tmp/givey_token_file"
+        @api_site    = client_options.include?(:api_site) ? client_options[:api_site] : "http://api.givey.com"
+        @api_version = client_options.include?(:api_version) ? client_options[:api_version] : "v2"
+        opts         = {:site => @api_site, :authorize_url => "/#{api_version}/oauth/authorize", :token_url => "/#{api_version}/oauth/token", :raise_errors => false}
+        @token_file  = client_options.include?(:token_file) ? client_options[:token_file] : "../tmp/givey_token_file"
         OAuth2::Client.new(client_options[:consumer_key], client_options[:consumer_secret], opts) do |builder|
           # POST/PUT params encoders:
           builder.request :multipart
@@ -17,8 +18,8 @@ module GiveyRuby
       end
     end
 
-    def api_version(version = "v1")
-      @api_version  ||= version
+    def api_version
+      @api_version
     end
 
     def api_site

data/lib/givey_ruby/version.rb

@@ -1,3 +1,3 @@
 module GiveyRuby
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/givey_ruby/configuration_spec.rb

@@ -2,30 +2,41 @@ require 'spec_helper'
 
 describe GiveyRuby::Configuration do
 
-  describe "Client options" do
-
-    it "GiveyRuby configure should set OAuth2 client correctly" do
+  context "api_site" do
+    before(:each) do
       GiveyRuby.configure do |config|
         config.client({api_site: "http://example.com"})
       end
+    end
 
-      GiveyRuby.configuration.client.should be_kind_of(OAuth2::Client)
-      GiveyRuby.configuration.client.site.should == "http://example.com"
+    describe "Client options" do
+      it "GiveyRuby configure should set OAuth2 client correctly" do
+        GiveyRuby.configuration.client.should be_kind_of(OAuth2::Client)
+        GiveyRuby.configuration.client.site.should == "http://example.com"
+      end
     end
 
+    describe "Session options" do
+      it "GiveyRuby configure should set OAuth2 client correctly" do
+        puts GiveyRuby.configuration.inspect
+        GiveyRuby.configuration.client.should be_kind_of(OAuth2::Client)
+        GiveyRuby.configuration.client.site.should == "http://example.com"
+      end
+    end
   end
 
-  describe "Session options" do
+  describe "#api_version" do
+    let(:config) { GiveyRuby::Configuration.new }
+    let(:subject) { config.api_version }
 
-    it "GiveyRuby configure should set OAuth2 client correctly" do
-      GiveyRuby.configure do |config|
-        config.client({api_site: "http://example.com"})
-      end
-
-      GiveyRuby.configuration.client.should be_kind_of(OAuth2::Client)
-      GiveyRuby.configuration.client.site.should == "http://example.com"
+    context "default" do
+      before { config.client }
+      it { should == "v2" }
     end
 
+    context "specified" do
+      before { config.client({ api_version: "v1" }) }
+      it { should == "v1" }
+    end
   end
-
 end

data/spec/givey_ruby/controller_spec.rb

@@ -3,12 +3,14 @@ require 'action_controller'
 
 describe GiveyRuby::Controller do
 
-  class CharityController
-    include GiveyRuby::Controller
-  end
+  before(:all) do
+    class CharityController
+      include GiveyRuby::Controller
+    end
 
-  GiveyRuby.configure do |config|
-    config.client({token_file: "#{SPEC_ROOT}/tmp/givey_token_file"})
+    GiveyRuby.configure do |config|
+      config.client({token_file: "#{SPEC_ROOT}/tmp/givey_token_file"})
+    end
   end
 
   let(:charity_controller) { CharityController.new }
@@ -21,6 +23,7 @@ describe GiveyRuby::Controller do
     it "should get new token and update session if it doesn't exist" do
       charity_controller.stub(:session).and_return({})
       charity_controller.stub_chain(:api_client, :client_credentials, :get_token).and_return(api_token)
+      charity_controller.stub(:token_to_file) # Because token_to_file cannot find the file/folder in a full test run
       charity_controller.access_token.should == api_token
       charity_controller.session[:access_token].should == 'udhs7gf7ssg'
     end

data/spec/givey_ruby/model_spec.rb

@@ -2,12 +2,14 @@ require 'spec_helper'
 
 describe GiveyRuby::Model do
 
-  class Charity
-    include GiveyRuby::Model
-  end
+  before(:all) do
+    class Charity
+      include GiveyRuby::Model
+    end
 
-  GiveyRuby.configure do |config|
-    config.client({token_file: "#{SPEC_ROOT}/tmp/givey_token_file"})
+    GiveyRuby.configure do |config|
+      config.client({token_file: "#{SPEC_ROOT}/tmp/givey_token_file"})
+    end
   end
 
   let(:charity) { Charity.new }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: givey_ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-18 00:00:00.000000000 Z
+date: 2013-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -173,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: givey_ruby
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Ruby API for accessing Givey API