gitcontacts 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32f8aa6d72a71df70529373d58120aaae71975a3
-  data.tar.gz: 76a57917abbc81ef9698eea46b94192ed3c32b50
+  metadata.gz: 70a7b11e301760f9ef08d0f91888d14029eef928
+  data.tar.gz: 7d791fa4c6acfc337eeb1a7671471ee32fd94838
 SHA512:
-  metadata.gz: b7f901de92143f961de9c289aad8b199ea3cbbc26ac9a4decd4d756f68d899624abb8b60923c7c33334678530c278a8984de77596e70b68115bec861cc2bfe56
-  data.tar.gz: 8c168ee166b5ade5a9263640fcc55050d3ba77680da91ad1fb07b9b678415d14cd0ec8fb953642b0f574405b18799c74bb481eda48b937f085947bfea60b7dce
+  metadata.gz: c6572d28e0a798198777b7bb10819c16ed652da55b48989b17d5a844edf893d756a2c792c997563cad19ff25ab247304262e3885d0258a18bdc122a33954ee1d
+  data.tar.gz: 5d951e20902a33584144294c870f27696b82ee07eef4510fb287ad07c2df9c7f942fad33c8ab2ae0ce4d1bf1a305b561f85c351ed548392ca307d490545fb049

data/lib/gitcontacts.rb

@@ -12,288 +12,307 @@ require "gitdb"
 
 module GitContacts
 
+  @@errno = :ok
+
   class << self
+
+    def errsym
+      @@errno
+    end
+    
     def user_exist? uid
       User::exist? uid
     end
     
-    def create_user hash
-      User::create hash
-    end
     # code review: @abbshr
     def password_valid? email, password
-      if user = User.new(email)
-        user if user.password_correct? Digest::MD5.hexdigest(password)
-      end
+      User.new(email).password_correct? Digest::MD5.hexdigest(password)
     end
-    # code review: @AustinChou
+    
+    # code review: @AustinChou, @abbshr
+    # if operator belongs to contacts gid
     def relation_valid? operator, gid
-      if User::exist?(operator) && Contacts::exist?(gid)
-        user = User.new operator
-        contacts = Contacts.new gid
-        [user, contacts] if user.getcontacts.include?(gid) && contacts.getusers.include?(operator)
-      end
+      Contacts::exist?(gid) && 
+      Contacts.new(gid).getusers.include?(operator) && 
+      User.new(operator).getcontacts.include?(gid)
+    end
+
+    def create_user hash
+      return @@errno = :miss_args unless hash.include?(:email) && hash.include?(:password)
+      return @@errno = :exist if user_exist?(hash[:email])
+      User::create hash
+      @@errno = :ok
     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
+      return @@errno = :non_exist unless user_exist? uid
+      @@errno = :ok
+      User.new(uid).getinfo
+    end
+
+    # => [ uid ]
+    def get_users operator
+      @errno = :ok
+      User::all
     end
 
     # code review: @abbshr
+    # e.g.: 获取联系人数量大于200的uid群组
     # meta => :owner, :gid, :count, :name
-    def get_all_contacts operator
-      contacts_arr = []
+    # get_contacts_if operator { |contacts| contacts.count > 200 }
+    def get_contacts_if operator, &condition
+      @@errno = :ok
       user = User.new operator
       contacts = Gitdb::Contacts.new operator
-      user.getcontacts.each do |gid|
-        break unless GitContacts::relation_valid? operator, gid
-        contacts.access gid
-        contacts_arr << contacts.getmeta
-      end
-      contacts_arr
-    end
-    # code review: @abbshr
-    # e.g.: 获取联系人数量大于200的uid群组
-    # get_contacts_if { |contacts| contacts.count > 200 }
-    def get_contacts_if uid, &condition
-      GitContacts::get_all_contacts(uid).select &condition
+      user.getcontacts.map { |gid| contacts.access(gid).getmeta }.select &condition
     end
+
     # code review: @abbshr
     def add_contacts operator, name
-      #return unless GitContacts::relation_valid? operator gid
-      git_contacts = Gitdb::Contacts.new operator 
-      git_contacts.create name
-      gid = git_contacts.getmeta[:gid]
-      Contacts.create gid, { :name => name }
+      return @@errno = :miss_args unless name
+      @@errno = :ok
+      gid = Contacts.create operator, :name => name
       contacts = Contacts.new gid
-      contacts.add_user operator
-      contacts.add_admin operator
-      user = User.new operator
-      user.add_contacts gid
+      User.new(operator).add_contacts gid
       gid
     end
+
     # code review: @abbshr
-    def edit_contacts_meta operator, gid, new_meta
-      return unless GitContacts::relation_valid? operator, gid
-      puts operator, gid, new_meta
+    def edit_contacts_meta operator, gid, meta
+      return @@errno = :forbidden unless relation_valid? operator, gid
+      return @@errno = :miss_args unless meta
+      @@errno = :ok
       contacts = Gitdb::Contacts.new operator
-      contacts.access gid
-      contacts.setmeta new_meta
-      true
+      contacts.access(gid).setmeta meta
+      # TODO: check meta
     end
+
     # code review: @abbshr
-    def get_contacts_card operator, gid, card_id
-      return unless GitContacts::relation_valid? operator, gid
-      contacts = Gitdb::Contacts.new operator
-      contacts.access gid
-      contacts.get_card_by_id(card_id).getdata.merge! card.getmeta
+    def get_contacts_card operator, gid, cid
+      return @@errno = :forbidden unless relation_valid? operator, gid
+      contacts = Gitdb::Contacts.new(operator).access(gid)
+      card = contacts.get_card_by_id cid
+      return @@errno = :non_exist unless card
+      @@errno = :ok
+      card.getdata.merge! card.getmeta
     end
+
     # code review: @abbshr
     def get_contacts_cards_by_related operator, gid, keyword
-      return unless GitContacts::relation_valid? operator, gid
+      return @@errno = :forbidden unless relation_valid? operator, gid
+      @@errno = :ok
       contacts = Gitdb::Contacts.new operator
-      contacts.access gid
-      contacts.get_cards do |card|
-        info = card.getdata
-        info.merge! card.getmeta if (card.getmeta[:owner].include? keyword) || info.find { |k,v| true if v.include? keyword }
+      contacts.access(gid).get_cards do |card|
+        if card.getmeta[:owner].include?(keyword) || card.getdata.find { |k,v| v.include? keyword }
+          card.getdata.merge! card.getmeta 
+        end
       end
     end
+
     # code review: @abbshr
     def get_contacts_history operator, gid
+      return @@errno = :forbidden unless relation_valid? operator, gid
+      @@errno = :ok
       contacts = Gitdb::Contacts.new operator
-      contacts.access gid
-      contacts.read_change_history do |commit|
-        commit_obj = {}
-        commit_obj[:author] = commit.author
-        commit_obj[:operator] = commit.committer
-        commit_obj[:modified_time] = commit.time
-        commit_obj[:oid] = commit.oid
-        commit_obj[:message] = commit.message
-        commit_obj
+      contacts.access(gid).read_change_history do |commit|
+        {
+          :author => commit.author,
+          :operator => commit.committer,
+          :mtime => commit.time,
+          :oid => commit.oid,
+          :message => commit.message
+        }
       end
     end
+
     # code review: @abbshr
     def revert_to operator, gid, oid
-      puts operator, gid, oid
-      contacts = Gitdb::Contacts.new operator
-      contacts.access gid
+      return @@errno = :forbidden unless relation_valid? operator, gid
+      return @@errno = :miss_args unless oid
+      contacts = Gitdb::Contacts.new(operator).access gid
+      return @@errno = :non_exist unless contacts.read_change_history { |commit| commit.oid }.include?(oid)
+      @@errno = :ok
       operator = {
         :name => operator,
         :email => User.new(operator).getemail,
         :time => Time.now
       }
-      contacts.revert_to oid, { :author => operator, :committer => operator, :message => "revert to revision #{oid}" }
+      commit = { 
+        :author => operator, 
+        :committer => operator, 
+        :message => "revert to revision #{oid}" 
+      }
+      contacts.revert_to oid, commit
     end
+
     # code review: @abbshr
     def add_contacts_card operator, gid, payload
-      return unless result = GitContacts::relation_valid?(operator, gid)
-      user = result.first
+      return @@errno = :forbidden unless relation_valid? operator, gid
       # request id
       qid = Request::create :uid => operator, :gid => gid, :action => "create"
-      # 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
+        @@errno = :ok
         return cid
       else
-        user.add_request qid
+        @@errno = :pend
+        User.new(operator).add_request qid
+        Contacts.new(gid).add_request qid
       end
-      true
     end
+
     # code review: @abbshr
-    def edit_contacts_card operator, gid, card_id, payload
-      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)
+    def edit_contacts_card operator, gid, cid, payload
+      return @@errno = :forbidden unless relation_valid? operator, gid
+      return @@errno = :non_exist unless Gitdb::Contacts.new(operator).access(gid).get_card_by_id cid
+      hash = {
+        :uid => operator, 
+        :gid => gid, 
+        :action => "setdata", 
+        :card_id => cid, 
+        :content => JSON.generate(payload)
+      }
+      qid = Request::create hash
       req = Request.new qid
       if req.auto_merge? operator
         req.allow operator
         Request::delete qid
+        @@errno = :ok
       else
-        user.add_request qid
+        @@errno = :pend
+        User.new(operator).add_request qid
+        Contacts.new(gid).add_request qid
       end
-      true
     end
+
     # code review: @abbshr
-    def delete_contacts_card operator, gid, card_id
-      return unless result = GitContacts::relation_valid?(operator, gid)
-      user = result.first
-      qid = Request::create :uid => operator, :gid => gid, :action => "delete", :card_id => card_id
+    def delete_contacts_card operator, gid, cid
+      return @@errno = :forbidden unless relation_valid? operator, gid
+      return @@errno = :non_exist unless Gitdb::Contacts.new(operator).access(gid).get_card_by_id cid
+      hash = {
+        :uid => operator, 
+        :gid => gid, 
+        :action => "delete", 
+        :card_id => cid
+      }
+      qid = Request::create hash
       req = Request.new qid
       if req.auto_merge? operator
         req.allow operator
         Request::delete qid
+        @@errno = :ok
       else
-        user.add_request qid
+        @errno = :pend
+        User.new(operator).add_request qid
+        Contacts.new(gid).add_request qid
       end
-      true
     end
+
     # code review: @abbshr
     def get_contacts_users operator, gid
-      return unless result = GitContacts::relation_valid?(operator, gid)
-      contacts = result.last
-      contacts.getusers
+      return @@errno = :forbidden unless relation_valid? operator, gid
+      @@errno = :ok
+      Contacts.new(gid).getusers
     end
+
     def get_contacts_user operator, gid, uid
-      return unless GitContacts::relation_valid?(operator, gid)
-      User.new uid if User.exist? uid
+      return @@errno = :forbidden unless relation_valid? operator, gid
+      return @@errno = :non_exist unless user_exist? operator
+      @@errno = :ok
+      User.new(uid).getinfo
     end
+
     # code review: @abbshr
     def add_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.add_user uid
-        true
+      return @@errno = :forbidden unless relation_valid? operator, gid
+      return @@errno = :non_exist unless user_exist? uid
+      contacts = Contacts.new(gid)
+      if contacts.getadmins.include?(operator)
+        @@errno = :ok
+        contacts.add_user uid unless contacts.getusers.include? uid
+        User.new(uid).add_contacts gid
+      else
+        @@errno = :forbidden
       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)
+      return @@errno = :forbidden unless relation_valid? operator, gid
+      contacts = Contacts.new(gid)
+      admins = contacts.getadmins
+      @@errno = :ok
+      if admins.include?(operator)
+        return @@errno = :forbidden if admins.length < 2 && operator == uid
+        contacts.remove_admin uid
         contacts.remove_user uid
-        true
+      elsif operator == uid
+        contacts.remove_user uid
+      else
+        @@errno = :forbidden
       end
     end
 
     def get_contacts_user_privileges operator, gid, uid
-      return unless GitContacts::relation_valid?(operator, gid)
-      privilege = 'user' if contacts.getusers.include? uid 
-      privilege = 'admin' if contacts.getadmins.include? uid
+      return @@errno = :forbidden unless relation_valid? operator, gid
+      @@errno = :ok
+      Contacts.new(gid).getadmins.include?(uid) ? 'admin' : 'user'
     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) && contacts.getusers.include?(uid)
-        case payload
+    def edit_contacts_user_privileges operator, gid, uid, role
+      return @@errno = :forbidden unless relation_valid? operator, gid
+      contacts = Contacts.new gid
+      admins = contacts.getadmins
+      @@errno = :ok
+      if admins.include?(operator)
+        return @@errno = :forbidden if admins.length < 2 && operator == uid
+        case role
         when "admin"
-          contacts.add_admin uid
-          true
-        when "users"
+          contacts.add_admin uid unless contacts.getadmins.include? uid
+        when "user"
           contacts.remove_admin uid
-          true
+        else
+          @@errno = :bad_args
         end
+      else
+        @@errno = :forbidden
       end
     end
-=begin
-    def invite_contacts_user operator, gid, payload
-      return unless result = GitContacts::relation_valid?(operator, gid)
-      user = result.first
-      contacts = result.last
-      if contacts.getadmins.include?(user.getuid)
-        Inviation::create :uid => User::email_to_uid(payload[:email]), :contacts => gid
-      end
-    end
-
-    def edit_invitation_status operator, payload
-      invitation = Inviation.new payload[:invite_id]
-      if invitation.accept? operator
-        user = User.new operator
-        gid = invitation.getcontacts
-        user.add_contacts gid
-        contacts = GCContacts.new gid
-        contacts.adduser user.getuid
-        Inviation::delete payload[:invite_id]
-        true
-      end
-    end
-=end
     
     # 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
+      @@errno = :ok
+      Contacts.new(gid).getrequests.map { |qid| Request.new qid }
     end
 
     def get_a_request operator, qid
-      if user = User.new(operator)
-        Request.new qid if Request.exist? qid
-      end
+      @@errno = :ok
+      Request.exist?(qid) ? Request.new(qid) : @@errno = :non_exist
     end
 
     # code review: @AustinChou
-    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
+    def edit_request_status operator, gid, qid, action
+      return @@errno = :non_exist unless Request.exist? qid
+      return @@errno = :forbidden unless relation_valid?(operator, gid)
+      return @@errno = :forbidden unless Contacts.new(gid).getadmins.include? operator
+      @@errno = :ok
+      req = Request.new(qid)
+      case action
+      when "permit"
+        req.allow operator
+        Request::delete qid
+        User.new(req.getuid).remove_request qid
+        Contacts.new(gid).remove_request qid
+      when "reject"
+        Request::delete qid
+        User.new(req.getuid).remove_request qid
+        Contacts.new(gid).remove_request qid
+      else
+        @@errno = :bad_args
       end
     end
-
   end
 end

data/lib/gitcontacts/Contacts.rb

@@ -6,17 +6,16 @@ module GitContacts
       true if ContactsObject::exist?(gid)
     end
 
-    def self::create gid, hash
-      # some keys are optional
-      if hash.keys.include?(:name)
-        obj = ContactsObject.new
-        obj.set_gid gid
-        obj.name = hash[:name]
-        obj.note = hash[:note] if hash.has_key?(:note)
-        #obj.users << gid
-        #obj.admins << gid
-        obj.gid
-      end
+    def self::create uid, hash
+      # some keys are optional  
+      gid = Gitdb::Contacts.new(uid).create(hash[:name]).getmeta[:gid]
+      obj = ContactsObject.new
+      obj.set_gid gid
+      obj.name = hash[:name]
+      obj.note = hash[:note] if hash.has_key?(:note)
+      obj.users << uid
+      obj.admins << uid
+      gid
     end
 
     def initialize gid
@@ -35,6 +34,10 @@ module GitContacts
       @obj.admins if @obj
     end
 
+    def getrequests
+      @obj.requests if @obj
+    end
+
     def add_user uid
       @obj.users << uid if @obj
     end
@@ -43,6 +46,10 @@ module GitContacts
       @obj.admins << uid if @obj
     end
 
+    def add_request request_id
+      @obj.requests << request_id if @obj
+    end
+
     def remove_user uid
       @obj.users.delete(uid) if @obj
     end
@@ -50,6 +57,10 @@ module GitContacts
     def remove_admin uid
       @obj.admins.delete(uid) if @obj
     end
+
+    def remove_request request_id
+      @obj.requests.delete request_id if @obj
+    end
     
   end
 

data/lib/gitcontacts/Request.rb

@@ -95,7 +95,9 @@ module GitContacts
 
     def deny
       # deny merge here
-      GitContacts::Request::delete @obj.request_id
+      author = User.new getuid
+      author.remove_request @obj.request_id
+      Request::delete @obj.request_id
     end
   end
 

data/lib/gitcontacts/User.rb

@@ -3,16 +3,18 @@ module GitContacts
   class User
 
     def self::exist? email
-      true if UserObject::exist?(email)
+      UserObject::exist?(email)
     end
 
     def self::create hash
       # some keys are optional
-      if hash.keys.include?(:email) && hash.keys.include?(:password) && !User::exist?(hash[:email])
-        obj = UserObject.new
-        obj.set_email hash[:email]
-        obj.password = Digest::MD5.hexdigest(hash[:password])
-      end
+      obj = UserObject.new
+      obj.set_email hash[:email]
+      obj.password = Digest::MD5.hexdigest(hash[:password])
+    end
+
+    def self::all
+      UserObject::all
     end
 
     def initialize email
@@ -45,6 +47,15 @@ module GitContacts
       @obj.requests.members if @obj
     end
 
+    def getinfo
+      {
+        :uid => getuid,
+        :email => getemail,
+        :contacts => getcontacts,
+        :request => getrequests
+      }
+    end
+
     def password_correct? sha
       sha == getpassword && sha != nil && sha != ""
     end
@@ -88,6 +99,11 @@ module GitContacts
       true if redis.keys(key_prefix+email+':*').count > 0
     end
 
+    def self::all
+      keys = redis.keys %(#{key_prefix}*:password)
+      keys.map { |key| key.split(":")[1] }
+    end
+
     def self::access email
       obj = allocate
       obj.set_email email

data/lib/gitcontacts/version.rb

@@ -1,3 +1,3 @@
 module GitContacts
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

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