agree2 0.1.1 → 0.2.0

data/.gitignore

@@ -0,0 +1,4 @@
+doc
+pkg
+*.log
+.DS_Store

data/Rakefile

@@ -40,50 +40,23 @@ namespace :spec do |ns|
   end
 end
 
-namespace :gem do |gem|
-  File.open( 'agree2.gemspec') do |f|
-    @gem=eval(f.read)
-    @version=@gem.version.to_s
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gemspec|
+    gemspec.name = "agree2"
+    gemspec.summary = "Ruby client library for Agree2"
+    gemspec.description = "Ruby library for creating and managing agreements on Agree2"
+    gemspec.email = "support@agree2.com"
+    gemspec.homepage = "http://agree2.com"
+    gemspec.authors = ["Pelle Braendgaard"]
+    gemspec.add_dependency('oauth', '>= 0.3.5')
+    gemspec.add_dependency("json", [">= 1.1.3"])
+    gemspec.add_dependency("activesupport", [">= 2.0.2"])
+    
+    gemspec.rubyforge_project = 'agree2'
   end
-  
-  Rake::GemPackageTask.new @gem do |pkg|
-    pkg.need_tar = true
-    pkg.need_zip = true
-  end
-
-  desc 'Install the package as a gem.'
-  task :install => [:clean, :package] do
-    gem = Dir['pkg/*.gem'].first
-    sh "sudo gem install --local #{gem}"
-  end
-
-  
-  desc 'Package and upload the release to rubyforge.'
-  task :release => [:clean, :package] do |t|
-    pkg = "pkg/#{name}-#{@version}"
-
-    if $DEBUG then
-      puts "release_id = rf.add_release #{rubyforge_name.inspect}, #{name.inspect}, #{@version.inspect}, \"#{pkg}.tgz\""
-      puts "rf.add_file #{rubyforge_name.inspect}, #{name.inspect}, release_id, \"#{pkg}.gem\""
-    end
-
-    rf = RubyForge.new.configure
-    puts "Logging in"
-    rf.login
-
-#    c = rf.userconfig
-#    c["release_notes"] = description if description
-#    c["release_changes"] = changes if changes
-#    c["preformatted"] = true
-
-    files = ["#{pkg}.tgz",
-             "#{pkg}.zip",
-             "#{pkg}.gem"].compact
-
-    puts "Releasing #{name} v. #{@version}"
-    rf.add_release rubyforge_name, name, @version, *files
-  end
-  
+rescue LoadError
+  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
 end
 
 desc "Clean up all dirt"
@@ -94,4 +67,4 @@ task :clean => [ "rdoc:clobber_doc", "gem:clobber_package" ] do
   end
 end
 
-task :default=>[:spec]
+task :default=>["spec:spec"]

data/VERSION

@@ -0,0 +1 @@
+0.2.0

data/agree2.gemspec

@@ -0,0 +1,76 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{agree2}
+  s.version = "0.2.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Pelle Braendgaard"]
+  s.date = %q{2009-07-31}
+  s.description = %q{Ruby library for creating and managing agreements on Agree2}
+  s.email = %q{support@agree2.com}
+  s.extra_rdoc_files = [
+    "README.rdoc"
+  ]
+  s.files = [
+    ".gitignore",
+     "History.txt",
+     "License.txt",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "agree2.gemspec",
+     "certs/sf_bundle.crt",
+     "lib/agree2.rb",
+     "lib/agree2/agreement.rb",
+     "lib/agree2/base.rb",
+     "lib/agree2/client.rb",
+     "lib/agree2/party.rb",
+     "lib/agree2/proxy_collection.rb",
+     "lib/agree2/template.rb",
+     "lib/agree2/user.rb",
+     "spec/agreement_spec.rb",
+     "spec/client_spec.rb",
+     "spec/fixtures/agreement.json",
+     "spec/fixtures/party.json",
+     "spec/party_spec.rb",
+     "spec/proxy_collection_spec.rb",
+     "spec/spec_helper.rb",
+     "spec/template_spec.rb",
+     "spec/user_spec.rb"
+  ]
+  s.homepage = %q{http://agree2.com}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{agree2}
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{Ruby client library for Agree2}
+  s.test_files = [
+    "spec/agreement_spec.rb",
+     "spec/client_spec.rb",
+     "spec/party_spec.rb",
+     "spec/proxy_collection_spec.rb",
+     "spec/spec_helper.rb",
+     "spec/template_spec.rb",
+     "spec/user_spec.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<oauth>, [">= 0.3.5"])
+      s.add_runtime_dependency(%q<json>, [">= 1.1.3"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 2.0.2"])
+    else
+      s.add_dependency(%q<oauth>, [">= 0.3.5"])
+      s.add_dependency(%q<json>, [">= 1.1.3"])
+      s.add_dependency(%q<activesupport>, [">= 2.0.2"])
+    end
+  else
+    s.add_dependency(%q<oauth>, [">= 0.3.5"])
+    s.add_dependency(%q<json>, [">= 1.1.3"])
+    s.add_dependency(%q<activesupport>, [">= 2.0.2"])
+  end
+end

data/certs/sf_bundle.crt

@@ -0,0 +1,77 @@
+-----BEGIN CERTIFICATE-----
+MIIFBzCCA++gAwIBAgICAgEwDQYJKoZIhvcNAQEFBQAwaDELMAkGA1UEBhMCVVMx
+JTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xMjAwBgNVBAsT
+KVN0YXJmaWVsZCBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA2
+MTExNjAxMTU0MFoXDTI2MTExNjAxMTU0MFowgdwxCzAJBgNVBAYTAlVTMRAwDgYD
+VQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFy
+ZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTkwNwYDVQQLEzBodHRwOi8vY2VydGlm
+aWNhdGVzLnN0YXJmaWVsZHRlY2guY29tL3JlcG9zaXRvcnkxMTAvBgNVBAMTKFN0
+YXJmaWVsZCBTZWN1cmUgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxETAPBgNVBAUT
+CDEwNjg4NDM1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4qddo+1m
+72ovKzYf3Y3TBQKgyg9eGa44cs8W2lRKy0gK9KFzEWWFQ8lbFwyaK74PmFF6YCkN
+bN7i6OUVTVb/kNGnpgQ/YAdKym+lEOez+FyxvCsq3AF59R019Xoog/KTc4KJrGBt
+y8JIwh3UBkQXPKwBR6s+cIQJC7ggCEAgh6FjGso+g9I3s5iNMj83v6G3W1/eXDOS
+zz4HzrlIS+LwVVAv+HBCidGTlopj2WYN5lhuuW2QvcrchGbyOY5bplhVc8tibBvX
+IBY7LFn1y8hWMkpQJ7pV06gBy3KpdIsMrTrlFbYq32X43or174Q7+edUZQuAvUdF
+pfBE2FM7voDxLwIDAQABo4IBRDCCAUAwHQYDVR0OBBYEFElLUifRG7zyoSFqYntR
+QnqK19VWMB8GA1UdIwQYMBaAFL9ft9HO3R+G9FtVrNzXEMIOqYjnMBIGA1UdEwEB
+/wQIMAYBAf8CAQAwOQYIKwYBBQUHAQEELTArMCkGCCsGAQUFBzABhh1odHRwOi8v
+b2NzcC5zdGFyZmllbGR0ZWNoLmNvbTBMBgNVHR8ERTBDMEGgP6A9hjtodHRwOi8v
+Y2VydGlmaWNhdGVzLnN0YXJmaWVsZHRlY2guY29tL3JlcG9zaXRvcnkvc2Zyb290
+LmNybDBRBgNVHSAESjBIMEYGBFUdIAAwPjA8BggrBgEFBQcCARYwaHR0cDovL2Nl
+cnRpZmljYXRlcy5zdGFyZmllbGR0ZWNoLmNvbS9yZXBvc2l0b3J5MA4GA1UdDwEB
+/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAhlK6sx+mXmuQpmQq/EWyrp8+s2Kv
+2x9nxL3KoS/HnA0hV9D4NiHOOiU+eHaz2d283vtshF8Mow0S6xE7cV+AHvEfbQ5f
+wezUpfdlux9MlQETsmqcC+sfnbHn7RkNvIV88xe9WWOupxoFzUfjLZZiUTIKCGhL
+Indf90XcYd70yysiKUQl0p8Ld3qhJnxK1w/C0Ty6DqeVmlsFChD5VV/Bl4t0zF4o
+aRN+0AqNnQ9gVHrEjBs1D3R6cLKCzx214orbKsayUWm/EheSYBeqPVsJ+IdlHaek
+KOUiAgOCRJo0Y577KM/ozS4OUiDtSss4fJ2ubnnXlSyokfOGASGRS7VApA==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFEjCCBHugAwIBAgICAQwwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1Zh
+bGlDZXJ0IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIElu
+Yy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENsYXNzIDIgUG9saWN5IFZhbGlkYXRpb24g
+QXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAe
+BgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTA0MDYyOTE3MzkxNloX
+DTI0MDYyOTE3MzkxNlowaDELMAkGA1UEBhMCVVMxJTAjBgNVBAoTHFN0YXJmaWVs
+ZCBUZWNobm9sb2dpZXMsIEluYy4xMjAwBgNVBAsTKVN0YXJmaWVsZCBDbGFzcyAy
+IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIDANBgkqhkiG9w0BAQEFAAOCAQ0A
+MIIBCAKCAQEAtzLI/ulxpgSFrQwRZN/OTe/IAxiHP6Gr+zymn/DDodrU2G4rU5D7
+JKQ+hPCe6F/s5SdE9SimP3ve4CrwyK9TL57KBQGTHo9mHDmnTfpatnMEJWbrd3/n
+WcZKmSUUVOsmx/N/GdUwcI+vsEYq/63rKe3Xn6oEh6PU+YmlNF/bQ5GCNtlmPLG4
+uYL9nDo+EMg77wZlZnqbGRg9/3FRPDAuX749d3OyXQZswyNWmiuFJpIcpwKz5D8N
+rwh5grg2Peqc0zWzvGnK9cyd6P1kjReAM25eSl2ZyR6HtJ0awNVuEzUjXt+bXz3v
+1vd2wuo+u3gNHEJnawTY+Nbab4vyRKABqwIBA6OCAfMwggHvMB0GA1UdDgQWBBS/
+X7fRzt0fhvRbVazc1xDCDqmI5zCB0gYDVR0jBIHKMIHHoYHBpIG+MIG7MSQwIgYD
+VQQHExtWYWxpQ2VydCBWYWxpZGF0aW9uIE5ldHdvcmsxFzAVBgNVBAoTDlZhbGlD
+ZXJ0LCBJbmMuMTUwMwYDVQQLEyxWYWxpQ2VydCBDbGFzcyAyIFBvbGljeSBWYWxp
+ZGF0aW9uIEF1dGhvcml0eTEhMB8GA1UEAxMYaHR0cDovL3d3dy52YWxpY2VydC5j
+b20vMSAwHgYJKoZIhvcNAQkBFhFpbmZvQHZhbGljZXJ0LmNvbYIBATAPBgNVHRMB
+Af8EBTADAQH/MDkGCCsGAQUFBwEBBC0wKzApBggrBgEFBQcwAYYdaHR0cDovL29j
+c3Auc3RhcmZpZWxkdGVjaC5jb20wSgYDVR0fBEMwQTA/oD2gO4Y5aHR0cDovL2Nl
+cnRpZmljYXRlcy5zdGFyZmllbGR0ZWNoLmNvbS9yZXBvc2l0b3J5L3Jvb3QuY3Js
+MFEGA1UdIARKMEgwRgYEVR0gADA+MDwGCCsGAQUFBwIBFjBodHRwOi8vY2VydGlm
+aWNhdGVzLnN0YXJmaWVsZHRlY2guY29tL3JlcG9zaXRvcnkwDgYDVR0PAQH/BAQD
+AgEGMA0GCSqGSIb3DQEBBQUAA4GBAKVi8afCXSWlcD284ipxs33kDTcdVWptobCr
+mADkhWBKIMuh8D1195TaQ39oXCUIuNJ9MxB73HZn8bjhU3zhxoNbKXuNSm8uf0So
+GkVrMgfHeMpkksK0hAzc3S1fTbvdiuo43NlmouxBulVtWmQ9twPMHOKRUJ7jCUSV
+FxdzPcwl
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0
+IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz
+BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y
+aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG
+9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAwMTk1NFoXDTE5MDYy
+NjAwMTk1NFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y
+azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
+YXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw
+Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl
+cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDOOnHK5avIWZJV16vY
+dA757tn2VUdZZUcOBVXc65g2PFxTXdMwzzjsvUGJ7SVCCSRrCl6zfN1SLUzm1NZ9
+WlmpZdRJEy0kTRxQb7XBhVQ7/nHk01xC+YDgkRoKWzk2Z/M/VXwbP7RfZHM047QS
+v4dk+NoS/zcnwbNDu+97bi5p9wIDAQABMA0GCSqGSIb3DQEBBQUAA4GBADt/UG9v
+UJSZSWI4OB9L+KXIPqeCgfYrx+jFzug6EILLGACOTb2oWH+heQC1u+mNr0HZDzTu
+IYEZoDJJKPTEjlbVUjP9UNV+mWwD5MlM/Mtsq2azSiGM5bUMMj4QssxsodyamEwC
+W/POuZ6lcg5Ktz885hZo+L7tdEy8W9ViH0Pd
+-----END CERTIFICATE-----

data/lib/agree2.rb

@@ -1,6 +1,6 @@
 require 'net/https'
 require 'rubygems'
-gem 'oauth', ">= 0.2.4"
+gem 'oauth', ">= 0.3.5"
 require 'oauth'
 gem 'json'
 gem 'activesupport'
@@ -20,15 +20,22 @@ require 'agree2/party'
 require 'agree2/template'
 
 
-
-# FireEagle addition to the <code>OAuth::Consumer</code> class. Taken from Yahoo FireEagle GEM
-class OAuth::Consumer
-  alias_method :create_http_with_verify, :create_http
-  # Monkey patch to silence the SSL warnings
-  def create_http_without_verify #:nodoc:
-    http_object             = create_http_with_verify
-    http_object.verify_mode = OpenSSL::SSL::VERIFY_NONE if uri.scheme=="https"
-    http_object
+if OAuth::VERSION=='0.3.5'
+  unless OAuth::Consumer.method_defined? :create_http_with_ca_file_option
+    class OAuth::Consumer
+      alias_method :create_http_without_ca_file_option, :create_http
+      # monkey patch with ca_file option from 0.3.6 to allow us to set the agree2 certs
+      def create_http_with_ca_file_option(_url = nil)
+        http_object = create_http_without_ca_file_option(_url)
+        if http_object.use_ssl && @options[:ca_file]
+          http_object.ca_file = @options[:ca_file]
+          http_object.verify_mode = OpenSSL::SSL::VERIFY_PEER
+          http_object.verify_depth = 5
+        end
+                
+        http_object
+      end
+      alias_method :create_http, :create_http_with_ca_file_option
+    end
   end
-  alias_method :create_http, :create_http_without_verify
-end
+end

data/lib/agree2/agreement.rb

@@ -1,7 +1,10 @@
 module Agree2
   class Agreement<Base
     attr_serializable :permalink,:title,:body,:created_at,:updated_at,:smart_fields,:state,:active_version,
-                      :version,:digest,:finalized_at,:finalized_at,:terminated_at,:activated_at,:valid_to
+                      :version,:digest,:finalized_at,:terminated_at,:activated_at,:valid_to
+                      
+    attr_read_only    :permalink,:state,:created_at,:updated_at,:active_version,:version,
+                      :digest,:finalized_at,:terminated_at,:activated_at
     
     alias_method :fields,:smart_fields
     # Returns the parties to the agreement
@@ -17,6 +20,17 @@ module Agree2
       permalink
     end
     
+    # state of the agreement
+    # draft, final, active, terminated
+    def state
+      @state||=load_state
+    end
+    
+    # has agreement been signed by all parties?
+    def active?
+      state=='active'
+    end
+    
     def respond_to?(symbol, include_priv = false)  #:nodoc:
       return true if super symbol,include_priv
       return false if fields.nil?||fields.empty?
@@ -40,7 +54,7 @@ module Agree2
     
     def attributes_for_save #:nodoc:
       if new_record?
-        {self.class.singular_name=>attributes}
+        super
       else
         {"fields"=>fields}
       end
@@ -67,5 +81,6 @@ module Agree2
       end
     end
     
+    
   end
 end

data/lib/agree2/base.rb

@@ -17,6 +17,19 @@ module Agree2
       def serializable_attributes # :nodoc:
         read_inheritable_attribute("serializable_attributes")
       end
+
+      def attr_read_only(*attributes) #:nodoc:
+        attributes.map!{|a|a.to_sym}
+        write_inheritable_attribute("read_only_attributes", 
+          Set.new(attributes) + 
+          (read_only_attributes || []))
+        protected *attributes.collect{|a| "#{a.to_s}=".to_sym }
+      end
+
+      # Returns an array of all the attributes that have been made accessible to mass-assignment.
+      def read_only_attributes # :nodoc:
+        read_inheritable_attribute("read_only_attributes")
+      end
       
       def collection_path #:nodoc:
         "/#{collection_name}"
@@ -104,8 +117,17 @@ module Agree2
     
     protected
     
+    # Get the primary attributes of an object as a hash
+    def savable_attributes  #:nodoc:
+      (self.class.serializable_attributes-self.class.read_only_attributes).inject({}) do |h,field|
+        value=self.send(field)
+        h[field]=value if value
+        h
+      end
+    end
+    
     def attributes_for_save #:nodoc:
-      {self.class.singular_name=>attributes}
+      {self.class.singular_name=>savable_attributes}
     end
     
     def decode(element) #:nodoc:
@@ -128,6 +150,12 @@ module Agree2
       @from_wire=true
       load_attributes(JSON.parse(json))
     end
+    
+    # Loads the state of the object if supported. This is much quicker than downloading and parsing json
+    def load_state   #:nodoc:
+      user.get(to_url+".state",{"Accept"=>"text/plain"})
+    end
+    
 #    private
 #    
 #    def method_missing(method_symbol, *arguments) #:nodoc:

data/lib/agree2/client.rb

@@ -42,7 +42,7 @@ module Agree2
     #
     # To get these register your application at: https://agree2.com/client_applications
     def initialize(key,secret)
-      @consumer=OAuth::Consumer.new(key,secret,{:site=>AGREE2_URL})
+      @consumer=OAuth::Consumer.new(key,secret,{:site=>AGREE2_URL,:ca_file=>File.join(File.dirname(__FILE__), '..','..','certs','sf_bundle.crt')})
     end
     
     # initialize a new user object with the given token and secret. The user object is what you use to do most of the work.
@@ -63,8 +63,13 @@ module Agree2
     #     @request_token = @client.get_request_token
     #     redirect_to @request_token.authorize_url
     #
-    def get_request_token
-      consumer.get_request_token
+    # If you want to pass a callback_url you should do so here.
+    #
+    #    @request_token = @client.get_request_token :oauth_callback => "http://example.com/cb"
+    #     redirect_to @request_token.authorize_url
+    #
+    def get_request_token(request_options = {})
+      consumer.get_request_token request_options
     end
     
     # Exchange an Authorized RequestToken for a working user object
@@ -72,13 +77,16 @@ module Agree2
     # === Required Field
     # 
     # * <tt>request_token</tt> The Request token created using get_request_token and authorized on Agree2 by your user
+    # * <tt>oauth_verifier</tt> The oauth_verifier passed to your callback url
     #
     # Example:
+    #     
+    #     @request_token = ClientRequestToken.find_by_token params[:oauth_token]
+    #     @user_client = @client.user_from_request_token(@request_token,params[:oauth_verifier])
     #
-    #     @user_client = @client.user_from_request_token(@request_token)
     #
-    def user_from_request_token(request_token)
-      access_token=request_token.get_access_token
+    def user_from_request_token(request_token,oauth_verifier)
+      access_token=request_token.get_access_token(:oauth_verifier=>oauth_verifier)
       user(access_token.token,access_token.secret)
     rescue Net::HTTPServerException=>e
       if e.response.code=='401'

data/lib/agree2/party.rb

@@ -1,6 +1,8 @@
 module Agree2
   class Party<Base
-    attr_serializable :id,:role,:email,:first_name,:last_name,:created_at,:updated_at,:organization_name
+    attr_serializable :id,:role,:email,:first_name,:last_name,:created_at,:updated_at,:organization_name,:status
+    attr_read_only :id,:status,:created_at,:updated_at
+    
     alias_method :agreement,:container  
     
     # Creates a one time signed url to redirect your user to their acceptance page. This url is only valid once. Call again to
@@ -10,6 +12,13 @@ module Agree2
       AGREE2_URL+user.client.consumer.create_signed_request(:get,path,user.access_token,{:scheme=>:query_string}).path
     end
     
+    # Status of party
+    # new|invited|accepted|declined
+    def status
+      @status||=load_state
+    end
+    
+    
     def self.validate_parties_hash(parties)  #:nodoc:
       parties&&parties.each{|r,p| validate_party_hash(p)}
       true

data/lib/agree2/user.rb

@@ -15,24 +15,24 @@ module Agree2
       @templates||=Agree2::ProxyCollection.new self,'/masters','Template'
     end
     
-    def get(path)
-      handle_response @access_token.get(path,AGREE2_JSON_HEADERS)
+    def get(path,options={})
+      handle_response @access_token.get(path,{'Accept'=>'application/json'}.merge(options))
     end
 
-    def head(path)
-      handle_response @access_token.head(path,AGREE2_JSON_HEADERS)
+    def head(path,options={})
+      handle_response @access_token.head(path,options)
     end
     
-    def post(path,data=nil)
-      handle_response @access_token.post(path,(data ? data.to_json : nil),AGREE2_JSON_HEADERS)
+    def post(path,data=nil,options={})
+      handle_response @access_token.post(path,(data ? data.to_json : nil),AGREE2_JSON_HEADERS.merge(options))
     end
     
-    def put(path,data=nil)
-      handle_response @access_token.put(path,(data ? data.to_json : nil),AGREE2_JSON_HEADERS )
+    def put(path,data=nil,options={})
+      handle_response @access_token.put(path,(data ? data.to_json : nil),AGREE2_JSON_HEADERS.merge(options) )
     end
     
-    def delete(path)
-      handle_response @access_token.delete(path,AGREE2_JSON_HEADERS)
+    def delete(path,options={})
+      handle_response @access_token.delete(path,options)
     end
 
     # OAuth Stuff below here

data/spec/agreement_spec.rb

@@ -12,7 +12,7 @@ describe Agree2::Agreement do
     end
     
     it "should have attribute hash" do
-      @agreement.attributes.should=={:title=>"My Title",:body=>"My Body"}
+      @agreement.send(:savable_attributes).should=={:title=>"My Title",:body=>"My Body"}
     end
     
     it "should have a user" do

data/spec/client_spec.rb

@@ -38,8 +38,8 @@ describe Agree2::Client do
     access_token=mock("access_token")
     access_token.stub!(:token).and_return('token')
     access_token.stub!(:secret).and_return('token_secret')
-    request_token.should_receive(:get_access_token).and_return(access_token)
-    user=@client.user_from_request_token(request_token)
+    request_token.should_receive(:get_access_token).with(:oauth_verifier=>"verifier").and_return(access_token)
+    user=@client.user_from_request_token(request_token,"verifier")
     user.client.should==@client
     user.access_token.consumer.should==@client.consumer
     user.token.should=="token"

data/spec/party_spec.rb

@@ -107,7 +107,7 @@ describe Party do
     describe "Save to Server" do
       before(:each) do      
         @user.should_receive(:put).with("/agreements/hello/parties/1102",
-          {'party'=>@party.attributes}).and_return(@json)
+          {'party'=>@party.send(:savable_attributes)}).and_return(@json)
       end
       
       it "should save and return true" do

data/spec/user_spec.rb

@@ -39,9 +39,14 @@ describe Agree2::User do
       @response.stub!(:body).and_return(@json)
     end
     
-    [:get,:head,:delete].each do |m|
+    it "should perform http get" do
+      @token.should_receive(:get).with("/test",{'Accept'=>'application/json'}).and_return(@response)
+      @user.send(:get,"/test").should==@json
+    end
+
+    [:head,:delete].each do |m|
       it "should perform http #{m.to_s}" do
-        @token.should_receive(m).with("/test",{'Content-Type'=>'application/json','Accept'=>'application/json'}).and_return(@response)
+        @token.should_receive(m).with("/test",{}).and_return(@response)
         @user.send(m,"/test").should==@json
       end
     end

metadata

@@ -1,28 +1,17 @@
 --- !ruby/object:Gem::Specification 
 name: agree2
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - Pelle Braendgaard
-- Lau Taarnskov
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-08-23 00:00:00 -04:00
+date: 2009-07-31 00:00:00 -04:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: ruby-hmac
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.3.1
-    version: 
 - !ruby/object:Gem::Dependency 
   name: oauth
   type: :runtime
@@ -31,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.4
+        version: 0.3.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -53,38 +42,47 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.0.2
     version: 
-description: Agree2 Ruby client library
-email: 
-- support@agree2.com
+description: Ruby library for creating and managing agreements on Agree2
+email: support@agree2.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- License.txt
 - README.rdoc
 files: 
+- .gitignore
 - History.txt
 - License.txt
 - README.rdoc
 - Rakefile
+- VERSION
+- agree2.gemspec
+- certs/sf_bundle.crt
 - lib/agree2.rb
+- lib/agree2/agreement.rb
 - lib/agree2/base.rb
 - lib/agree2/client.rb
-- lib/agree2/user.rb
-- lib/agree2/agreement.rb
 - lib/agree2/party.rb
 - lib/agree2/proxy_collection.rb
 - lib/agree2/template.rb
+- lib/agree2/user.rb
+- spec/agreement_spec.rb
+- spec/client_spec.rb
+- spec/fixtures/agreement.json
+- spec/fixtures/party.json
+- spec/party_spec.rb
+- spec/proxy_collection_spec.rb
+- spec/spec_helper.rb
+- spec/template_spec.rb
+- spec/user_spec.rb
 has_rdoc: true
-homepage: http://agree2.rubyforge.org
+homepage: http://agree2.com
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --main
-- README.rdoc
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -102,17 +100,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: agree2
-rubygems_version: 1.3.2
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
-summary: Agree2 Ruby client library
+specification_version: 3
+summary: Ruby client library for Agree2
 test_files: 
-- spec/spec_helper.rb
 - spec/agreement_spec.rb
 - spec/client_spec.rb
 - spec/party_spec.rb
 - spec/proxy_collection_spec.rb
+- spec/spec_helper.rb
 - spec/template_spec.rb
 - spec/user_spec.rb
-- spec/fixtures/agreement.json
-- spec/fixtures/party.json