gprov 0.0.5 → 0.0.7

data/README.markdown

@@ -1,13 +1,19 @@
 Ruby-GProv
 ==========
 
+Synopsis
+--------
+
+This is a ruby implementation of the Ruby implementation of the [Google Provisioning API][api].
+
 Description
 -----------
 
-This is a ruby implementation of the Ruby implementation of the [Google
-Provisioning API][api]. It's designed to provide an object oriented approach to
-the API instead of the weird procedural approach that's the straight
-implementation. By and large it's modelled in the manner of CRUD.
+The specification of the Google Provisioning API is primarily procedural in
+nature, despite that all the languages that Google provides bindings for are
+object oriented. This implementation attempts to provide a more natural
+interface to that API. Where applicable, objects present a CRUD-like set of
+methods to perform operations on the underlying system.
 
 [api]: http://code.google.com/googleapps/domain/gdata_provisioning_api_v2.0_reference.html "Google Provisioning API v2.0"
 

data/lib/gprov/connection.rb

@@ -1,4 +1,4 @@
-# = gprov/connection.rb: common interface for the google apps API
+# = GProv::Connection: common interface for the google apps API
 #
 # == Overview
 #
@@ -52,8 +52,15 @@ module GProv
         if path.nil?
           raise "#{self.class}##{verb} requires a non-nil path"
         end
-        options = *args
-        options ||= {}
+
+        # If extra headers were passed in, explode the containing array. Else,
+        # create a new empty hash. When that's done, merge the Google API
+        # headers.
+        case args.length
+        when 0 then options = {}
+        when 1 then options = args.pop
+        else options = *args
+        end
         options.merge! default_headers
 
         # Interpolate the :domain substring into a url to allow for the domain
@@ -61,8 +68,8 @@ module GProv
         path.gsub!(":domain", @domain)
 
         if options[:noop] or @options[:noop]
-          $stderr.puts "Would have attempted the following call"
-          $stderr.puts "#{verb} #{path} #{options.inspect}"
+          warn "Would have attempted the following call"
+          warn "#{verb} #{path} #{options.inspect}"
         else
           # Return the request to the calling class so that the caller can
           # determine the outcome of the request.

data/lib/gprov/version.rb

@@ -1,3 +1,3 @@
 module GProv
-  VERSION = "0.0.5"
+  VERSION = "0.0.7"
 end

data/spec/gprov/auth/clientlogin_spec.rb

@@ -2,10 +2,10 @@ require 'spec_helper'
 
 describe GProv::Auth::ClientLogin do
 
-  before :each do
-    @klass = GProv::Auth::ClientLogin
-    @instance = @klass.new('test', 'password', 'service')
-    @dummy_form = {:body => {
+  let(:klass) { GProv::Auth::ClientLogin }
+
+  let(:dummy_form) do
+    {:body => {
       "accountType" => "HOSTED",
       "Email"       => "test",
       "Passwd"      => "password",
@@ -13,35 +13,36 @@ describe GProv::Auth::ClientLogin do
     }}
   end
 
+  subject { GProv::Auth::ClientLogin.new('test', 'password', 'service') }
+
   it "should use the google ClientLogin uri" do
-    GProv::Auth::ClientLogin.base_uri.should == "https://www.google.com/accounts/ClientLogin"
+    klass.base_uri.should == "https://www.google.com/accounts/ClientLogin"
   end
 
-  it "should have a token method" do
-    @instance.respond_to?(:token).should == true
-  end
+  it { should respond_to :token }
 
-  it "should post valid form data to the uri specified base_uri" do
-    stub_response = stub :response
-    stub_response.stubs(:code).returns 200
-    stub_response.stubs(:body).returns "Auth=dummy\n"
-    @klass.expects(:post).with('', @dummy_form).returns stub_response
-    @instance.token
-  end
+  describe "when posting" do
+    let(:response) { stub :response }
 
-  it "should return nil if authorization failed" do
-    stub_response = stub :response
-    stub_response.stubs(:code).returns 403
-    @klass.expects(:post).with('', @dummy_form).returns stub_response
-    @instance.token.should be_nil
-  end
+    before :each do
+      klass.stubs(:post).with('', dummy_form).returns response
+    end
 
-  it "should return the token if authorization succeeded" do
-    stub_response = stub :response
-    stub_response.stubs(:code).returns 200
-    stub_response.stubs(:body).returns "Auth=dummy\n"
-    @klass.expects(:post).with('', @dummy_form).returns stub_response
-    @instance.token.should == "dummy"
-  end
+    describe "invalid credentials" do
+      before do
+        response.stubs(:code).returns 403
+      end
+
+      its(:token) { should be_nil }
+    end
 
+    describe "valid credentials" do
+      before do
+        response.stubs(:code).returns 200
+        response.stubs(:body).returns "Auth=dummy\n"
+      end
+
+      its(:token) { should == "dummy" }
+    end
+  end
 end

data/spec/gprov/connection_spec.rb

@@ -2,58 +2,57 @@ require 'spec_helper'
 
 describe GProv::Connection do
 
-  before :each do
-    @klass = GProv::Connection
-    @instance = @klass.new("domain", "token")
+  let(:klass) { GProv::Connection }
 
-    @expected_options = {:headers => {
+  subject { GProv::Connection.new("domain", "token") }
+
+  let(:expected_options) do
+    {:headers => {
       'Authorization' => "GoogleLogin auth=token",
       'Content-Type' => 'application/atom+xml',
     }}
   end
 
   it "should use to google apps API url as the base uri" do
-    @klass.base_uri.should == "https://apps-apis.google.com/a/feeds"
+    klass.base_uri.should == "https://apps-apis.google.com/a/feeds"
   end
 
-  it "should have a domain accessor" do
-    @instance.respond_to?(:domain).should == true
-  end
+  it { should respond_to :domain }
 
   it "should expose the default headers" do
-    @instance.default_headers.should == @expected_options
+    subject.default_headers.should == expected_options
   end
 
 
   describe "http instance method" do
     [:put, :get, :post, :delete].each do |verb|
-      describe %Q{"#{verb}"} do
+
+      it { should respond_to verb }
+
+      describe "##{verb}" do
         before do
-          xml = %Q{<?xml version="1.0" encoding="UTF-8"?>\n<test xml="pointy"/>}
+          xml = %Q{<?xml version="1.0" encoding="UTF-8"?>\n<test xml="pointy" />}
           @stub_request = mock
           @stub_request.stubs(:code).returns 200
           @stub_request.stubs(:success?).returns true
           @stub_request.stubs(:class).returns HTTParty::Response
         end
 
-        it "should be an instance method" do
-          @instance.respond_to?(verb).should == true
-        end
 
         it "should be forwarded to the class" do
-          @klass.expects(verb).returns @stub_request
-          @instance.send(verb, '')
+          klass.expects(verb).returns @stub_request
+          subject.send(verb, '')
         end
 
         it "should return the http response" do
-          @klass.expects(verb).returns @stub_request
-          output = @instance.send(verb, "/url")
+          klass.expects(verb).returns @stub_request
+          output = subject.send(verb, "/url")
           output.class.should == HTTParty::Response
         end
 
         it "should interpolate the :domain substring" do
-          @klass.expects(verb).with("/domain", @expected_options).returns @stub_request
-          @instance.send(verb, "/:domain")
+          klass.expects(verb).with("/domain", expected_options).returns @stub_request
+          subject.send(verb, "/:domain")
         end
       end
     end

data/spec/gprov/provision/entrybase/classmethods_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+require 'fakeentry'
+
+describe GProv::Provision::EntryBase::ClassMethods do
+
+  subject { FakeEntry }
+
+  [:xmlattr, :xml_to_hash, :attributes].each do |method|
+    it { should respond_to method }
+  end
+
+end

data/spec/gprov/provision/entrybase_spec.rb

@@ -1,39 +1,11 @@
 require 'spec_helper'
+require 'fakeentry'
 
-class FakeEntry < GProv::Provision::EntryBase
-
-  xml_attr_accessor :test, :xpath => "/foo/bar/text()"
-  xml_attr_accessor :test_transform, :xpath => "/foo/bar/text()", :transform => lambda {|x| x.upcase}
-end
+# Tests are against the fakeentry fixture
 
 describe GProv::Provision::EntryBase do
 
-  before do
-    @klass = GProv::Provision::EntryBase
-    @test_klass = FakeEntry
-    @instance = @test_klass.new
-  end
-
-  describe GProv::Provision::EntryBase::ClassMethods do
-
-    [:xml_attr_accessor, :xml_to_hash, :attributes].each do |method|
-      it "method #{method} should be a class method" do
-        FakeEntry.respond_to?(method).should be_true
-      end
-    end
-
-    it "xml_attr_accessor should receive a symbol and hash of attributes" do
-      @test_klass.attributes[:test].should == {:xpath => "/foo/bar/text()"}
-    end
-
-    describe "xml_to_hash" do
-    end
-  end
-
-
   [:status, :connection].each do |method|
-    it "method #{method} should be an instance method" do
-      @instance.respond_to?(method).should be_true
-    end
+    it { should respond_to method }
   end
 end

data/spec/gprov/provision/group.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe GProv::Provision::User do
+
+  [:create!, :update!, :delete].each do |method|
+    it { should respond_to method }
+  end
+end
+

data/spec/gprov/provision/orgunit.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe GProv::Provision::User do
+
+  [:create!, :update!, :delete].each do |method|
+    it { should respond_to method }
+  end
+end
+

data/spec/gprov/provision/user.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+
+describe GProv::Provision::User do
+
+  [:create!, :update!, :delete].each do |method|
+    it { should respond_to method }
+  end
+end

data/spec/lib/fakeentry.rb

@@ -0,0 +1,6 @@
+require 'gprov'
+
+class FakeEntry < GProv::Provision::EntryBase
+
+  xmlattr :test, :xpath => "/foo/bar/text()"
+end

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby -S rspec
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "lib"))
 
 require 'mocha'
 require 'gprov'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gprov
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Adrien Thebo
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-11 00:00:00 Z
+date: 2012-05-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: httparty
@@ -104,7 +104,12 @@ files:
 - lib/gprov.rb
 - spec/gprov/auth/clientlogin_spec.rb
 - spec/gprov/connection_spec.rb
+- spec/gprov/provision/entrybase/classmethods_spec.rb
 - spec/gprov/provision/entrybase_spec.rb
+- spec/gprov/provision/group.rb
+- spec/gprov/provision/orgunit.rb
+- spec/gprov/provision/user.rb
+- spec/lib/fakeentry.rb
 - spec/spec_helper.rb
 - LICENSE
 - Rakefile