gitcontacts 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e670865cd65a65f5128db25e4e2ebac318ff0043
-  data.tar.gz: 2969653a59f1061f778cc0957e06593604325690
+  metadata.gz: d837531ae0cd458381ab3de9f8c7de45bf66dd4d
+  data.tar.gz: f5ac1de4f69c59e31549d5f25d4d71431d8bb378
 SHA512:
-  metadata.gz: 0ac51a3ab2dc1d9ed77fa8ce960708a6d3f8f323f5b794f34a02380079a71ee48d5ea413b0eeaba18f57ed2a20297fcb86cf150c40b3c79b9a85e74f50d4b381
-  data.tar.gz: bcb9b4fa02ab51417dcd30299ee0a715e788fcf81d248f4976d83ae751bb71d9149503ba21844b293dd1884930632236037c5fc333b0cee33475b6b941c3e634
+  metadata.gz: 86c2493fd291a5c0cc7e84648f1bb072f31fa6530f1184420839509f947d55dae13d1a3c9746f0a4fd063fb9d5b8ac04a8f2bcb6e5b557086d05fd4037af165e
+  data.tar.gz: e2aa8858d3b06a545208e85504656552342b62ef286eb89e613748ac4c9203fdc0a54f3275348a1558591782d0d2a69d60f1887c7c135765e79f38977d6b1896

data/lib/gitcontacts/Request.rb

@@ -55,7 +55,16 @@ module GitContacts
 
     # code review: @AustinChou
     def auto_merge? uid
-      true
+      if contacts = Contacts.new(getgid)
+        if contacts.getadmins.include? uid
+          return true
+        else
+          case getaction
+          when "setdata" ,"delete"
+            return true if Gitdb::Card.new(getgid).access(getcard_id).getmeta[:owner] == getuid # to-do
+          end
+        end
+      end
     end
 
     def allow operator

data/lib/gitcontacts/User.rb

@@ -42,7 +42,7 @@ module GitContacts
     end
 
     def getrequests
-      @obj.requests if @obj
+      @obj.requests.members if @obj
     end
 
     def password_correct? sha

data/lib/gitcontacts/version.rb

@@ -1,3 +1,3 @@
 module GitContacts
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

data/lib/gitcontacts.rb

@@ -34,6 +34,21 @@ module GitContacts
         [user, contacts] if user.getcontacts.include?(gid) && contacts.getusers.include?(operator)
       end
     end
+
+    def get_a_user operator, uid
+      return unless User.exist?(operator)
+      if User.exist? uid
+        user = User.new uid
+        {
+          :uid => user.getuid,
+          :email => user.getemail,
+          :password => user.getpassword,
+          :contacts => user.getcontacts,
+          :request => user.getrequests
+        }
+      end
+    end
+
     # code review: @abbshr
     # meta => :owner, :gid, :count, :name
     def get_all_contacts operator
@@ -81,7 +96,7 @@ module GitContacts
       return unless GitContacts::relation_valid? operator, gid
       contacts = Gitdb::Contacts.new operator
       contacts.access gid
-      contacts.get_card_by_id(card_id).getdata
+      contacts.get_card_by_id(card_id).getdata.merge! card.getmeta
     end
     # code review: @abbshr
     def get_contacts_cards_by_related operator, gid, keyword
@@ -90,7 +105,7 @@ module GitContacts
       contacts.access gid
       contacts.get_cards do |card|
         info = card.getdata
-        info if (card.getmeta[:owner].include? keyword) || info.find { |k,v| true if v.include? keyword }
+        info.merge! card.getmeta if (card.getmeta[:owner].include? keyword) || info.find { |k,v| true if v.include? keyword }
       end
     end
     # code review: @abbshr
@@ -121,38 +136,47 @@ module GitContacts
     end
     # code review: @abbshr
     def add_contacts_card operator, gid, payload
-      return unless GitContacts::relation_valid? operator, gid
+      return unless result = GitContacts::relation_valid?(operator, gid)
+      user = result.first
       # request id
       qid = Request::create :uid => operator, :gid => gid, :action => "create"
-      # create a rqeuest
+      # create a request
       req = Request.new qid
       if req.auto_merge? operator
         # here should return card_id if success
         cid = req.allow operator
         Request::delete qid
         return cid
+      else
+        user.add_request qid
       end
       true
     end
     # code review: @abbshr
     def edit_contacts_card operator, gid, card_id, payload
-      return unless GitContacts::relation_valid? operator, gid
+      return unless result = GitContacts::relation_valid?(operator, gid)
+      user = result.first
       qid = Request::create :uid => operator, :gid => gid, :action => "setdata", :card_id => card_id, :content => JSON.generate(payload)
       req = Request.new qid
       if req.auto_merge? operator
         req.allow operator
         Request::delete qid
+      else
+        user.add_request qid
       end
       true
     end
     # code review: @abbshr
     def delete_contacts_card operator, gid, card_id
-      return unless GitContacts::relation_valid? operator, gid
+      return unless result = GitContacts::relation_valid?(operator, gid)
+      user = result.first
       qid = Request::create :uid => operator, :gid => gid, :action => "delete", :card_id => card_id
       req = Request.new qid
       if req.auto_merge? operator
         req.allow operator
         Request::delete qid
+      else
+        user.add_request qid
       end
       true
     end
@@ -162,6 +186,10 @@ module GitContacts
       contacts = result.last
       contacts.getusers
     end
+    def get_contacts_user operator, gid, uid
+      return unless GitContacts::relation_valid?(operator, gid)
+      User.new uid if User.exist? uid
+    end
     # code review: @abbshr
     def add_contacts_user operator, gid, uid
       return unless result = GitContacts::relation_valid?(operator, gid)
@@ -172,14 +200,23 @@ module GitContacts
         true
       end
     end
+    def remove_contacts_user operator, gid, uid
+      return unless result = GitContacts::relation_valid?(operator, gid)
+      user = result.first
+      contacts = result.last
+      if contacts.getadmins.include?(user.getuid)
+        contacts.remove_user uid
+        true
+      end
+    end
     
     # code review: @AustinChou
     def edit_contacts_user_privileges operator, gid, uid, payload
       return unless result = GitContacts::relation_valid?(operator, gid)
       user = result.first
       contacts = result.last
-      if contacts.getadmins.include?(user.getuid)
-        case payload[:role]
+      if contacts.getadmins.include?(user.getuid) && contacts.getusers.include?(uid)
+        case payload
         when "admin"
           contacts.add_admin uid
           true
@@ -215,10 +252,42 @@ module GitContacts
     
     # code review: @AustinChou
     def get_all_requests operator
+      requests = []
+      if user = User.new(operator)
+        user.getrequests.each do |qid|
+          requests << Request.new(qid)
+        end
+      end
+      requests
+    end
+
+    def get_a_request operator, qid
+      if user = User.new(operator)
+        Request.new qid if Request.exist? qid
+      end
     end
 
     # code review: @AustinChou
-    def edit_request_status operator
+    def edit_request_status operator, qid, payload
+      if req = Request.new(qid)
+        if result = GitContacts::relation_valid?(operator, req.getgid)
+          user = result.first
+          contacts = result.last
+          if contacts.getadmins.include?(user.getuid)
+            case payload
+            when "permit"
+              req.allow operator
+              Request::delete qid
+            when "reject"
+              Request::delete qid
+            end
+            author = User.new req.getuid
+            author.remove_request qid
+            true
+          end
+        end
+      end
     end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitcontacts
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - AustinChou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-10 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis