fraternity 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b43ac4cafa20bd1b818343d4dc265644772c6f2
-  data.tar.gz: c02cd18e455a11856ca83ca2482ce36e7b96165c
+  metadata.gz: 217b8b45d967f02b6babaecf7fd500986e60438a
+  data.tar.gz: eb12679aaa201814133d26105e21199f3e9d6684
 SHA512:
-  metadata.gz: 5a3e6db18805b1b92294dde90a434de664698aff1faa1c045f6ff29b1b0e2c965ed1eff53449cefb8be75a1677bf96a87cb637e028348ae55ea7df81ffa94b68
-  data.tar.gz: ce9b61f747675965e4008507a09c218092a6bc6bf53f3833f6483c0ba9720533d19cafdba73b894adbb6722ca4662d498276a1c57fd5a443c20f3029cbab5d96
+  metadata.gz: 0a53d4edae2600388c547dd9bbd06fc138f1ab5f7a2963bb00d2346280fc5fa2aa698fc4876b3d3c6faf63565c242ff1059a70e5785fdeaeb56246bb5b77f150
+  data.tar.gz: 73e4ab6646e0d83854f23d9e9bb7e542c534a1eb33a910adaca2d01a560d08d3128e8680204c5c038502e8bda31d039e9bdefb4be82d37cf8e024c88cbc6cf78

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fraternity (0.0.2)
+    fraternity (0.0.3)
       lotus-model
       lotus-validations (~> 0.2.3)
       rake

data/README.md

@@ -127,7 +127,7 @@ Fraternity::Pledge.find(token).crossed?
 Convert the pledge into a full member (accept the invitation).
 
 ```
-Fraternity::Pledge.cross! token
+Fraternity::Pledge.find(token).cross! token
 ```
 
 ## CONTRIBUTING

data/lib/fraternity/pledge.rb

@@ -11,7 +11,6 @@ module Fraternity
     validates :initiation_number, presence: true
 
     def initialize(attributes={})
-
       @id, @email, @first_name, @last_name, @token, @initiation_number, @invited_at, @accepted_at =
         attributes.values_at :id, :email, :first_name, :last_name, :token, :initiation_number, :invited_at, :accepted_at
     end
@@ -32,6 +31,7 @@ module Fraternity
       raise Fraternity::PerpError if !invited?
       raise Fraternity::TokenMismatchError.new(self.token, token) if token != self.token
       self.accepted_at = DateTime.now
+      Repositories::PledgeRepository.persist self
     end
 
     def crossed?
@@ -41,5 +41,12 @@ module Fraternity
     def ready?
       self.invited? && !self.crossed?
     end
+
+    def merge(attributes={})
+      attributes.each_pair do |attribute, value|
+        method = "#{attribute}="
+        self.public_send method, value if self.respond_to? method
+      end
+    end
   end
 end

data/lib/fraternity/repositories/pledge_repository.rb

@@ -11,6 +11,12 @@ module Fraternity
         end.first
       end
 
+      def self.find_by_email(email)
+        query do
+          where(email: email)
+        end.first
+      end
+
       def self.find_by_token(token)
         query do
           where(token: token)

data/lib/fraternity/version.rb

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

data/lib/fraternity.rb

@@ -18,13 +18,19 @@ module Fraternity
   end
 
   def self.rush(params={})
-    params[:token] ||= TemporaryToken.generate_random_token
-    params[:initiation_number] ||= Time.now.to_i
-    Fraternity::Pledge.new params
+    pledge = Repositories::PledgeRepository.find_by_email params[:email]
+    if pledge
+      pledge.merge params
+      pledge
+    else
+      params[:token] ||= TemporaryToken.generate_random_token
+      params[:initiation_number] ||= Time.now.to_i
+      Fraternity::Pledge.new params
+    end
   end
 
   def self.rush!(params)
-    Repositories::PledgeRepository.create self.rush(params)
+    Repositories::PledgeRepository.persist self.rush(params)
   end
 
   def self.bid!(quota)

data/spec/fraternity/pledge_spec.rb

@@ -102,4 +102,24 @@ describe Fraternity::Pledge do
       expect(pledge).to_not be_ready
     end
   end
+
+  describe "#merge" do
+    it "updates attributes that were not set" do
+      pledge = Fraternity::Pledge.new token: "1234"
+      pledge.merge email: "jimmy@example.com"
+      expect(pledge.email).to eq "jimmy@example.com"
+    end
+
+    it "updates attributes that were already set" do
+      pledge = Fraternity::Pledge.new token: "1234"
+      pledge.merge token: "5678"
+      expect(pledge.token).to eq "5678"
+    end
+
+    it "does not delete attributes that were not set" do
+      pledge = Fraternity::Pledge.new token: "1234", first_name: "Jimmy"
+      pledge.merge email: "jimmy@example.com"
+      expect(pledge.first_name).to eq "Jimmy"
+    end
+  end
 end

data/spec/fraternity/repositories/pledge_repository_spec.rb

@@ -32,6 +32,21 @@ describe Fraternity::Repositories::PledgeRepository do
     end
   end
 
+  describe ".find_by_email" do
+    let(:pledge) { Fraternity::Repositories::PledgeRepository.create(Fraternity::Pledge.new(email: "jimmy@example.com", token: "12345", initiation_number: Time.now.to_i)) }
+
+    it "returns the first pledge with the email" do
+      pledge
+      actual = Fraternity::Repositories::PledgeRepository.find_by_email pledge.email
+      expect(actual.id).to eq pledge.id
+    end
+
+    it "returns nil if the pledge does not exist" do
+      actual = Fraternity::Repositories::PledgeRepository.find_by_email "blah@blah.com"
+      expect(actual).to be_nil
+    end
+  end
+
   describe ".oldest_univited_by_initiation_number" do
     let(:four_days_ago) { Time.now.to_i - 24 * 60 * 60 * 4 }
     let(:six_days_ago) { Time.now.to_i - 24 * 60 * 60 * 6 }

data/spec/fraternity_spec.rb

@@ -81,6 +81,23 @@ describe Fraternity do
       pledge = Fraternity.rush initiation_number: 12345
       expect(pledge.initiation_number).to eq 12345
     end
+
+    context "with an existing pledge" do
+      let(:email) { "jimmy@example.com" }
+      let(:pledge) { Fraternity::Pledge.new id: 123, token: "12345", email: email }
+
+      before { allow(Fraternity::Repositories::PledgeRepository).to receive(:find_by_email).and_return pledge }
+
+      it "returns an existing pledge based on their email" do
+        actual = Fraternity.rush email: email
+        expect(actual.id).to eq pledge.id
+      end
+
+      it "merges the parameters for updating the pledge" do
+        actual = Fraternity.rush email: email, first_name: "Robert"
+        expect(actual.first_name).to eq "Robert"
+      end
+    end
   end
 
   describe ".rush!" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fraternity
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Jamie Wright
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-19 00:00:00.000000000 Z
+date: 2015-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake