woopy 0.2.0 → 0.2.1

data/lib/woopy/account.rb

@@ -12,12 +12,10 @@ module Woopy
       Ownership.create(account_id: self.id, user_id: user.id, role: role)
     end
 
-    def employments
-      Employment.find(:all, params: { account_id: self.id })
-    end
-
     def find_employment(user)
-      Employment.find(:first, params: { account_id: self.id, user_id: user.id})
+      employment_json = Account.get("#{self.id}/users/#{user.id}/employment")
+
+      Employment.new(employment_json, true)
     end
   end
-end
+end

data/lib/woopy/version.rb

@@ -1,3 +1,3 @@
 module Woopy
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/spec_helper.rb

@@ -28,23 +28,6 @@ def account_attributes
   { name: "Account", subdomain: "subdomain1", packages: ["package1", "package2"] }
 end
 
-def user_account_employment_response
-  {
-    employments: [
-      { employment: employment_attributes.merge(id: 1) }
-    ]
-  }.to_json
-end
-
-def account_employments_response
-  {
-    employments: [
-      { employment: employment_attributes.merge(id: 1) },
-      { employment: employment_attributes.merge(id: 2, user_id: 2,) }
-    ]
-  }.to_json
-end
-
 def user_response
   { user: user_attributes.merge(id: 1) }.to_json
 end

data/spec/woopy/account_spec.rb

@@ -10,8 +10,7 @@ describe Woopy::Account do
       mock.post( '/services/v1/users.json', request_headers(@token), user_response )
       mock.post( '/services/v1/ownerships.json', request_headers(@token), ownership_response )
 
-      mock.get(    '/services/v1/accounts/1/employments.json', accept_request_headers(@token), account_employments_response )
-      mock.get(    '/services/v1/accounts/1/employments.json?user_id=1', accept_request_headers(@token), user_account_employment_response )
+      mock.get(    '/services/v1/accounts/1/users/1/employment.json', accept_request_headers(@token), employment_response )
       mock.post(   '/services/v1/accounts/1/employments.json', request_headers(@token), employment_response )
       mock.delete( '/services/v1/accounts/1/employments/1.json', accept_request_headers(@token), employment_response )
     end
@@ -58,16 +57,11 @@ describe Woopy::Account do
       it { should be_persisted }
     end
 
-    describe "#employments" do
-      subject { @account.employments }
-
-      its(:count) { should == 2 }
-    end
-
     describe "#find_employment" do
       subject { @account.find_employment(@user) }
 
       it { should be_kind_of Woopy::Employment }
+      it { should be_persisted }
       its(:user_id) { should == @user.id }
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: woopy
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-16 00:00:00.000000000 Z
+date: 2012-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70137251115060 !ruby/object:Gem::Requirement
+  requirement: &70327883433640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70137251115060
+  version_requirements: *70327883433640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70137251114540 !ruby/object:Gem::Requirement
+  requirement: &70327883432480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70137251114540
+  version_requirements: *70327883432480
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70137251114120 !ruby/object:Gem::Requirement
+  requirement: &70327883431080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70137251114120
+  version_requirements: *70327883431080
 - !ruby/object:Gem::Dependency
   name: gem-release
-  requirement: &70137251113660 !ruby/object:Gem::Requirement
+  requirement: &70327883280420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70137251113660
+  version_requirements: *70327883280420
 - !ruby/object:Gem::Dependency
   name: activeresource
-  requirement: &70137251113160 !ruby/object:Gem::Requirement
+  requirement: &70327883278720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70137251113160
+  version_requirements: *70327883278720
 description: Wraps the Woople API as ActiveResources
 email:
 - developers@bigbangtechnology.com
@@ -104,15 +104,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1435565781307241770
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1435565781307241770
 requirements: []
 rubyforge_project: woopy
-rubygems_version: 1.8.15
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Woople API Wrapper