cybercoach 0.3.0 → 0.4.0

data/spec/lib/cybercoach/subscription_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe 'Subscription' do
   before(:context) do
-    @proposer = UserHelper.make(6)
-    @proposed = UserHelper.make(7)
+    @proposer = UserHelper.make(8)
+    @proposed = UserHelper.make(9)
     ResourceHelper.safe_delete(@proposer)
     ResourceHelper.safe_delete(@proposed)
     @proposer.create
@@ -12,18 +12,18 @@ describe 'Subscription' do
     @partnership.proposer = @proposer
     @partnership.proposed = @proposed
     @partnership.privacy_level = CyberCoach::PrivacyLevel::REGISTERED_USER
-    ResourceHelper.safe_delete(@partnership, UserHelper.options(@proposer))
-    ResourceHelper.safe_delete(@partnership, UserHelper.options(@proposed))
-    @partnership.create(UserHelper.options(@proposer))
-    @partnership.update(UserHelper.options(@proposed))
+    ResourceHelper.safe_delete(@partnership, @proposer.authentication)
+    ResourceHelper.safe_delete(@partnership, @proposed.authentication)
+    @partnership.create(@proposer.authentication)
+    @partnership.update(@proposed.authentication)
     @sport = CyberCoach::Sport.new
     @sport.name = 'Running'
     @sport.read
   end
 
   after(:context) do
-    ResourceHelper.safe_delete(@partnership, UserHelper.options(@proposer))
-    ResourceHelper.safe_delete(@partnership, UserHelper.options(@proposed))
+    ResourceHelper.safe_delete(@partnership, @proposer.authentication)
+    ResourceHelper.safe_delete(@partnership, @proposed.authentication)
     ResourceHelper.safe_delete(@proposer)
     ResourceHelper.safe_delete(@proposed)
   end
@@ -35,17 +35,40 @@ describe 'Subscription' do
     @subscription.privacy_level = CyberCoach::PrivacyLevel::REGISTERED_USER
   end
 
+  it 'should instantiate itself with preset attributes' do
+    uri = '/pants/'
+    id = 1
+    subscriber = CyberCoach::User.new
+    sport = CyberCoach::Sport.new
+    privacy_level = CyberCoach::PrivacyLevel::OWNER
+    pants = 'yes'
+    @subscription = CyberCoach::Subscription.new(
+      uri: uri,
+      id: id,
+      subscriber: subscriber,
+      sport: sport,
+      privacy_level: privacy_level,
+      pants: pants
+    )
+    expect(@subscription.uri).to be(uri)
+    expect(@subscription.id).to be(id)
+    expect(@subscription.subscriber).to be(subscriber)
+    expect(@subscription.sport).to be(sport)
+    expect(@subscription.privacy_level).to be(privacy_level)
+    expect { @subscription.pants }.to raise_error(NoMethodError)
+  end
+
   it 'should raise an error if it does not exist' do
-    expect { @subscription.read(UserHelper.options(@proposer)) }.to raise_error(CyberCoach::HttpError)
+    expect { @subscription.read(@proposer.authentication) }.to raise_error(CyberCoach::HttpError)
   end
 
   describe 'crud' do
     before(:example) do
-      ResourceHelper.safe_delete(@subscription, UserHelper.options(@proposer))
+      ResourceHelper.safe_delete(@subscription, @proposer.authentication)
     end
 
     after(:example) do
-      ResourceHelper.safe_delete(@subscription, UserHelper.options(@proposer))
+      ResourceHelper.safe_delete(@subscription, @proposer.authentication)
     end
 
     describe 'with partnership subscriber' do
@@ -54,13 +77,13 @@ describe 'Subscription' do
       end
 
       it 'should create itself' do
-        @subscription.create(UserHelper.options(@proposer))
+        @subscription.create(@proposer.authentication)
         expect(@subscription.id).not_to be_nil
       end
 
       it 'should read itself' do
-        @subscription.create(UserHelper.options(@proposer))
-        @subscription.read(UserHelper.options(@proposer))
+        @subscription.create(@proposer.authentication)
+        @subscription.read(@proposer.authentication)
         expect(@subscription.id).not_to be_nil
         expect(@subscription.uri).not_to be_nil
         expect(@subscription.subscriber.uri).to eq(@partnership.uri)
@@ -71,19 +94,19 @@ describe 'Subscription' do
       end
 
       it 'should update itself' do
-        @subscription.create(UserHelper.options(@proposer))
+        @subscription.create(@proposer.authentication)
         old_privacy_level = @subscription.privacy_level
         new_privacy_level = CyberCoach::PrivacyLevel::EVERYBODY
         @subscription.privacy_level = new_privacy_level
-        @subscription.update(UserHelper.options(@proposer))
+        @subscription.update(@proposer.authentication)
         expect(@subscription.privacy_level).not_to eq(old_privacy_level)
         expect(@subscription.privacy_level).to eq(new_privacy_level)
       end
 
       it 'should delete itself' do
-        @subscription.create(UserHelper.options(@proposer))
-        @subscription.delete(UserHelper.options(@proposer))
-        expect { @subscription.read(UserHelper.options(@proposer)) }.to raise_error(CyberCoach::HttpError)
+        @subscription.create(@proposer.authentication)
+        @subscription.delete(@proposer.authentication)
+        expect { @subscription.read(@proposer.authentication) }.to raise_error(CyberCoach::HttpError)
       end
     end
 
@@ -93,13 +116,13 @@ describe 'Subscription' do
       end
 
       it 'should create itself' do
-        @subscription.create(UserHelper.options(@proposer))
+        @subscription.create(@proposer.authentication)
         expect(@subscription.id).not_to be_nil
       end
 
       it 'should read itself' do
-        @subscription.create(UserHelper.options(@proposer))
-        @subscription.read(UserHelper.options(@proposer))
+        @subscription.create(@proposer.authentication)
+        @subscription.read(@proposer.authentication)
         expect(@subscription.id).not_to be_nil
         expect(@subscription.uri).not_to be_nil
         expect(@subscription.subscriber.uri).to eq(@proposer.uri)
@@ -110,20 +133,66 @@ describe 'Subscription' do
       end
 
       it 'should update itself' do
-        @subscription.create(UserHelper.options(@proposer))
+        @subscription.create(@proposer.authentication)
         old_privacy_level = @subscription.privacy_level
         new_privacy_level = CyberCoach::PrivacyLevel::EVERYBODY
         @subscription.privacy_level = new_privacy_level
-        @subscription.update(UserHelper.options(@proposer))
+        @subscription.update(@proposer.authentication)
         expect(@subscription.privacy_level).not_to eq(old_privacy_level)
         expect(@subscription.privacy_level).to eq(new_privacy_level)
       end
 
       it 'should delete itself' do
-        @subscription.create(UserHelper.options(@proposer))
-        @subscription.delete(UserHelper.options(@proposer))
-        expect { @subscription.read(UserHelper.options(@proposer)) }.to raise_error(CyberCoach::HttpError)
+        @subscription.create(@proposer.authentication)
+        @subscription.delete(@proposer.authentication)
+        expect { @subscription.read(@proposer.authentication) }.to raise_error(CyberCoach::HttpError)
       end
     end
   end
-end
+
+  describe 'invalidation' do
+    before(:example) do
+      @subscription.subscriber = @proposer
+      ResourceHelper.safe_delete(@subscription, @proposer.authentication)
+    end
+
+    after(:example) do
+      ResourceHelper.safe_delete(@subscription, @proposer.authentication)
+    end
+
+    it 'should not invalidate when creating' do
+      subscriber = @subscription.subscriber
+      @subscription.subscriber = CyberCoach::User.new
+      expect(@subscription.subscriber).not_to eq(subscriber)
+      expect { @subscription.create(@proposer.authentication, false) }.not_to raise_error
+      @subscription.subscriber = subscriber
+    end
+
+    it 'should not invalidate when reading' do
+      @subscription.create(@proposer.authentication)
+      subscriber = @subscription.subscriber
+      @subscription.subscriber = CyberCoach::User.new
+      expect(@subscription.subscriber).not_to eq(subscriber)
+      expect { @subscription.read(@proposer.authentication, false) }.not_to raise_error
+      @subscription.subscriber = subscriber
+    end
+
+    it 'should not invalidate when updating' do
+      @subscription.create(@proposer.authentication)
+      subscriber = @subscription.subscriber
+      @subscription.subscriber = CyberCoach::User.new
+      expect(@subscription.subscriber).not_to eq(subscriber)
+      expect { @subscription.update(@proposer.authentication, false) }.not_to raise_error
+      @subscription.subscriber = subscriber
+    end
+
+    it 'should not invalidate when deleting' do
+      @subscription.create(@proposer.authentication)
+      subscriber = @subscription.subscriber
+      @subscription.subscriber = CyberCoach::User.new
+      expect(@subscription.subscriber).not_to eq(subscriber)
+      expect { @subscription.delete(@proposer.authentication, false) }.not_to raise_error
+      @subscription.subscriber = subscriber
+    end
+  end
+end

data/spec/lib/cybercoach/user_helper.rb

@@ -10,13 +10,4 @@ class UserHelper
     user.real_name = "New York Falcons Test #{i}"
     user
   end
-
-  def self.options(user)
-    {
-        basic_auth: {
-            username: user.username,
-            password: user.password
-        }
-    }
-  end
 end

data/spec/lib/cybercoach/user_spec.rb

@@ -5,32 +5,61 @@ describe 'User' do
     @user = CyberCoach::User.new
   end
 
+  it 'should instantiate itself with preset attributes' do
+    uri = '/pants/'
+    id = 1
+    username = 'pants'
+    email = 'fancy@pants.com'
+    password = 'fancy'
+    real_name = 'Fancy Pants'
+    privacy_level = CyberCoach::PrivacyLevel::OWNER
+    pants = 'yes'
+    @user = CyberCoach::User.new(
+      uri: uri,
+      id: id,
+      username: username,
+      email: email,
+      password: password,
+      real_name: real_name,
+      privacy_level: privacy_level,
+      pants: pants
+    )
+    expect(@user.uri).to be(uri)
+    expect(@user.id).to be(id)
+    expect(@user.username).to be(username)
+    expect(@user.email).to be(email)
+    expect(@user.password).to be(password)
+    expect(@user.real_name).to be(real_name)
+    expect(@user.privacy_level).to be(privacy_level)
+    expect { @user.pants }.to raise_error(NoMethodError)
+  end
+
   it 'should raise an error if it does not exist' do
     @user.username = 'gnirloff'
-    expect{@user.read}.to raise_error(CyberCoach::HttpError)
+    expect { @user.read }.to raise_error(CyberCoach::HttpError)
   end
 
   it 'should read all' do
     users = CyberCoach::User.read_all
     expect(users.resources.size).to eq(5)
     expect(users.next).not_to be_nil
-    expect{users.previous}.to raise_error(CyberCoach::ResourcePage::NoPreviousPageError)
+    expect { users.previous }.to raise_error(CyberCoach::ResourcePage::NoPreviousPageError)
   end
 
   it 'should get the authentication options' do
-    @user = UserHelper.make(6)
+    @user = UserHelper.make(8)
     @user.create
-    expect(@user.authentication).to eq({
-      basic_auth: {
-        username: @user.username,
-        password: @user.password
-      }
-    })
+    expect(@user.authentication).to eq(
+                                      basic_auth: {
+                                        username: @user.username,
+                                        password: @user.password
+                                      }
+                                    )
   end
 
   describe 'crud' do
     before(:example) do
-      @user = UserHelper.make(6)
+      @user = UserHelper.make(8)
       ResourceHelper.safe_delete(@user)
     end
 
@@ -76,7 +105,53 @@ describe 'User' do
     it 'should delete itself' do
       @user.create
       @user.delete
-      expect{@user.read}.to raise_error(CyberCoach::HttpError)
+      expect { @user.read }.to raise_error(CyberCoach::HttpError)
+    end
+  end
+
+  describe 'invalidation' do
+    before(:example) do
+      @user = UserHelper.make(8)
+      ResourceHelper.safe_delete(@user)
+    end
+
+    after(:example) do
+      ResourceHelper.safe_delete(@user)
+    end
+
+    it 'should not invalidate when creating' do
+      password = @user.password
+      @user.password = 'notThePassword'
+      expect(@user.password).not_to eq(password)
+      expect { @user.create({}, false) }.not_to raise_error
+      @user.password = password
+    end
+
+    it 'should not invalidate when reading' do
+      @user.create
+      password = @user.password
+      @user.password = 'notThePassword'
+      expect(@user.password).not_to eq(password)
+      expect { @user.read({}, false) }.not_to raise_error
+      @user.password = password
+    end
+
+    it 'should not invalidate when updating' do
+      @user.create
+      password = @user.password
+      @user.password = 'notThePassword'
+      expect(@user.password).not_to eq(password)
+      expect { @user.update({}, false) }.not_to raise_error
+      @user.password = password
+    end
+
+    it 'should not invalidate when deleting' do
+      @user.create
+      password = @user.password
+      @user.password = 'notThePassword'
+      expect(@user.password).not_to eq(password)
+      expect { @user.delete({}, false) }.not_to raise_error
+      @user.password = password
     end
   end
-end
+end

data/spec/lib/integration_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe 'Integration' do
   before(:context) do
-    @proposer = UserHelper.make(6)
-    @proposed = UserHelper.make(7)
+    @proposer = UserHelper.make(8)
+    @proposed = UserHelper.make(9)
     ResourceHelper.safe_delete(@proposer)
     ResourceHelper.safe_delete(@proposed)
     @proposer.create
@@ -12,10 +12,10 @@ describe 'Integration' do
     @partnership.proposer = @proposer
     @partnership.proposed = @proposed
     @partnership.privacy_level = CyberCoach::PrivacyLevel::REGISTERED_USER
-    ResourceHelper.safe_delete(@partnership, UserHelper.options(@proposer))
-    ResourceHelper.safe_delete(@partnership, UserHelper.options(@proposed))
-    @partnership.create(UserHelper.options(@proposer))
-    @partnership.update(UserHelper.options(@proposed))
+    ResourceHelper.safe_delete(@partnership, @proposer.authentication)
+    ResourceHelper.safe_delete(@partnership, @proposed.authentication)
+    @partnership.create(@proposer.authentication)
+    @partnership.update(@proposed.authentication)
     @sport = CyberCoach::Sport.new
     @sport.name = 'Running'
     @sport.read
@@ -23,34 +23,34 @@ describe 'Integration' do
     @subscription.subscriber = @partnership
     @subscription.sport = @sport
     @subscription.privacy_level = CyberCoach::PrivacyLevel::REGISTERED_USER
-    @subscription.create(UserHelper.options(@proposer))
+    @subscription.create(@proposer.authentication)
     @entry = CyberCoach::Entry.new
     @entry.subscription = @subscription
     @entry.comment = 'I like pants'
     @entry.location = 'In your pants'
     @entry.duration = 1
     @entry.privacy_level = CyberCoach::PrivacyLevel::REGISTERED_USER
-    @entry.create(UserHelper.options(@proposer))
+    @entry.create(@proposer.authentication)
   end
 
   after(:context) do
-    ResourceHelper.safe_delete(@entry, UserHelper.options(@proposer))
-    ResourceHelper.safe_delete(@subscription, UserHelper.options(@proposer))
-    ResourceHelper.safe_delete(@partnership, UserHelper.options(@proposer))
-    ResourceHelper.safe_delete(@partnership, UserHelper.options(@proposed))
+    ResourceHelper.safe_delete(@entry, @proposer.authentication)
+    ResourceHelper.safe_delete(@subscription, @proposer.authentication)
+    ResourceHelper.safe_delete(@partnership, @proposer.authentication)
+    ResourceHelper.safe_delete(@partnership, @proposed.authentication)
     ResourceHelper.safe_delete(@proposer)
     ResourceHelper.safe_delete(@proposed)
   end
 
   it 'should add the subscription to the partnership' do
-    @partnership.read(UserHelper.options(@proposer))
+    @partnership.read(@proposer.authentication)
     expect(@partnership.subscriptions).not_to be_empty
     expect(@partnership.subscriptions[0].uri).to eq(@subscription.uri)
   end
 
   it 'should add the entry to the subscription' do
-    @subscription.read(UserHelper.options(@proposer))
+    @subscription.read(@proposer.authentication)
     expect(@subscription.entries).not_to be_empty
     expect(@subscription.entries[0].uri).to eq(@entry.uri)
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cybercoach
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Manuel Leuenberger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-26 00:00:00.000000000 Z
+date: 2014-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -71,6 +71,7 @@ files:
 - lib/cybercoach/abstract_resource.rb
 - lib/cybercoach/entry.rb
 - lib/cybercoach/format_not_supported_error.rb
+- lib/cybercoach/hash_initializable.rb
 - lib/cybercoach/http_error.rb
 - lib/cybercoach/pageable.rb
 - lib/cybercoach/partnership.rb
@@ -118,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: CyberCoach proxy