gitcontacts 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 903fd08dcfe122a1461ba4e05d0b5651ce5acfeb
-  data.tar.gz: 58d9cdeb6f50200ecad553599c9e757b52fa911b
+  metadata.gz: e670865cd65a65f5128db25e4e2ebac318ff0043
+  data.tar.gz: 2969653a59f1061f778cc0957e06593604325690
 SHA512:
-  metadata.gz: cdce2b3be1b0275b5ea4dcc16e751a3d8e9ea27e7ab26101d0f02641435a8cf6a54b7a13ed215f75bd1d477cf0c620bd86f354517a4827cc00de1da235dd0e3f
-  data.tar.gz: ef90fb5d3d632c99f376c1603f76179a0332864d2cc068113ba03fdd83dcda97b662b8cbf5f41ca3ea81976896b21a79474adab83cc6bf3297a54dbba66e3e92
+  metadata.gz: 0ac51a3ab2dc1d9ed77fa8ce960708a6d3f8f323f5b794f34a02380079a71ee48d5ea413b0eeaba18f57ed2a20297fcb86cf150c40b3c79b9a85e74f50d4b381
+  data.tar.gz: bcb9b4fa02ab51417dcd30299ee0a715e788fcf81d248f4976d83ae751bb71d9149503ba21844b293dd1884930632236037c5fc333b0cee33475b6b941c3e634

data/.gitignore

@@ -12,3 +12,4 @@
 *.o
 *.a
 mkmf.log
+*.gem

data/cookies

@@ -0,0 +1,5 @@
+# Netscape HTTP Cookie File
+# http://curl.haxx.se/docs/http-cookies.html
+# This file was generated by libcurl! Edit at your own risk.
+
+#HttpOnly_localhost	FALSE	/	FALSE	0	rack.session	3a6e5feac57db3dcecf80ab38c708995ca227632e583ca3de49b3dd930ed7fa3

data/lib/gitcontacts/Contacts.rb

@@ -10,10 +10,11 @@ module GitContacts
       # 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.users << gid
+        #obj.admins << gid
         obj.gid
       end
     end
@@ -66,39 +67,39 @@ module GitContacts
       "contacts_object:"
     end
 
-    def self::exist? id
-      true if redis.keys(key_prefix+id+':*').count > 0
+    def self::exist? gid
+      true if redis.keys(key_prefix+gid+':*').count > 0
     end
 
     def self::access id
       if exist? id
         obj = allocate
-        obj.set_id id
-        obj.set_name Redis::Value.new(key_prefix+id+':name')
-        obj.set_note Redis::Value.new(key_prefix+id+':note')
-        obj.set_users Redis::Set.new(key_prefix+id+':users')
-        obj.set_admins Redis::Set.new(key_prefix+id+':admins')
-        obj.set_requests Redis::Set.new(key_prefix+id+':requests')
-        obj.set_owner Redis::Value.new(key_prefix+id+':owner')
+        obj.set_gid id
+        obj.set_name Redis::Value.new(key_prefix+obj.id+':name')
+        obj.set_note Redis::Value.new(key_prefix+obj.id+':note')
+        obj.set_users Redis::Set.new(key_prefix+obj.id+':users')
+        obj.set_admins Redis::Set.new(key_prefix+obj.id+':admins')
+        obj.set_requests Redis::Set.new(key_prefix+obj.id+':requests')
+        obj.set_owner Redis::Value.new(key_prefix+obj.id+':owner')
         obj
       end
     end
 
 
     def initialize
-      @id = Digest::SHA1.hexdigest Time.now.to_s
+      #@id = Digest::SHA1.hexdigest Time.now.to_s
     end
 
     def id
-      @id
+      @gid
     end
 
     def gid
-      @id
+      @gid
     end
 
-    def set_id id
-      @id = id
+    def set_gid gid
+      @gid = gid
     end
 
     def set_name name

data/lib/gitcontacts/Invitation.rb

@@ -67,9 +67,9 @@ module GitContacts
       if exist? id
         obj = allocate
         obj.set_id id
-        obj.set_uid Redis::Value.new(key_prefix+id+':uid')
-        obj.set_gid Redis::Value.new(key_prefix+id+':gid')
-        obj.set_inviter_id Redis::Value.new(key_prefix+id+':inviter_id')
+        obj.set_uid Redis::Value.new(key_prefix+obj.id+':uid')
+        obj.set_gid Redis::Value.new(key_prefix+obj.id+':gid')
+        obj.set_inviter_id Redis::Value.new(key_prefix+obj.id+':inviter_id')
         obj
       end
     end

data/lib/gitcontacts/Request.rb

@@ -9,15 +9,14 @@ module GitContacts
 
       def create hash
         # all keys are required
-        if hash.keys == GitContacts::request_keys
-          obj = RequestObject.new
-          obj.uid = hash[:uid]
-          obj.gid = hash[:gid]
-          obj.card_id = hash[:card_id]
-          obj.action = hash[:action]
-          obj.content = hash[:content]
-          obj.request_id
-        end
+        obj = RequestObject.new
+        obj.uid = hash[:uid]
+        obj.gid = hash[:gid]
+        obj.time = Time.now.to_i
+        obj.card_id = hash[:card_id] if hash.member? :card_id
+        obj.action = hash[:action]
+        obj.content = hash[:content] if hash.member? :content
+        obj.request_id
       end
 
       def delete request_id
@@ -26,56 +25,58 @@ module GitContacts
 
     end
 
-    def initiazlie request_id
+    def initialize request_id
       @obj =  RequestObject::access request_id
     end
 
     def getuid
-      @obj.uid if @obj
+      @obj.uid.value if @obj
     end
 
     def getgid
-      @obj.gid if @obj
+      @obj.gid.value if @obj
     end
 
     def getaction
-      @obj.action if @obj
+      @obj.action.value if @obj
     end
 
     def getcard_id
-      @obj.card_id if @obj
+      @obj.card_id.value if @obj
     end
 
     def get_req_time
-      @obj.time if @obj
+      @obj.time.value if @obj
     end
 
     def getcontent
-      @obj.content if @obj
+      @obj.content.value if @obj
     end
 
+    # code review: @AustinChou
     def auto_merge? uid
-      false
+      true
     end
 
     def allow operator
       author = User.new getuid
-      contacts = Gitdb::Contacts.new(uid).access getgid
+      operator = User.new operator
+      contacts = Gitdb::Contacts.new(getuid).access getgid
       card = Gitdb::Card.new contacts.repo
       
       case getaction
       when 'create'
-        card.create uid 
+        card.create getuid 
       when 'setmeta'
-        card.access(getcard_id).setmeta getcontent
+        card.access(getcard_id).setmeta JSON.parse(getcontent, { symbolize_names: true })
       when 'setdata'
-        card.access(getcard_id).setdata getcontent
+        card.access(getcard_id).setdata JSON.parse(getcontent, { symbolize_names: true })
       when 'delete'
         card.access(getcard_id).delete
       end
       
       commit_obj = {
-        :author => { :name => author.getuid, :email => author.getemail, :time => get_req_time },
+        :author => { :name => author.getuid, :email => author.getemail, :time => Time.at(get_req_time.to_i) },
         :committer => { :name => operator.getuid, :email => operator.getemail, :time => Time.now }
       }
 
@@ -98,7 +99,7 @@ module GitContacts
     value :time
     value :card_id
     value :action
-    hash_key :content
+    value :content
 
     def self::key_prefix
       "request_object:"
@@ -116,12 +117,12 @@ module GitContacts
       if exist? id
         obj = allocate
         obj.set_id id
-        obj.set_uid Redis::Value.new(key_prefix+id+':uid')
-        obj.set_gid Redis::Value.new(key_prefix+id+':gid')
-        obj.set_card_id Redis::Value.new(key_prefix+id+':card_id')
-        obj.set_action Redis::Value.new(key_prefix+id+':action')
-        obj.set_time Redis::Value.new "#{key_prefix}#{id}:time"
-        obj.set_content Redis::HashKey.new(key_prefix+id+':content')
+        obj.set_uid Redis::Value.new(key_prefix+obj.id+':uid')
+        obj.set_gid Redis::Value.new(key_prefix+obj.id+':gid')
+        obj.set_card_id Redis::Value.new(key_prefix+obj.id+':card_id')
+        obj.set_action Redis::Value.new(key_prefix+obj.id+':action')
+        obj.set_time Redis::Value.new "#{key_prefix}#{obj.id}:time"
+        obj.set_content Redis::Value.new(key_prefix+obj.id+':content')
         obj
       end
     end

data/lib/gitcontacts/User.rb

@@ -10,34 +10,35 @@ module GitContacts
       # some keys are optional
       if hash.keys.include?(:email) && hash.keys.include?(:password) && !User::exist?(hash[:email])
         obj = UserObject.new
-        obj.email = hash[:email]
-        obj.password = hash[:password]
-        obj.uid
+        obj.set_email hash[:email]
+        obj.password = Digest::MD5.hexdigest(hash[:password])
       end
     end
 
     def initialize email
+      @email = email
       @obj = UserObject::access email
     end
 
     def getuid
-      @obj.uid if @obj
+      getemail
     end
 
-    def getname
-      @obj.name if @obj
-    end
+    # def getname
+    #   @obj.name.value if @obj
+    # end
 
     def getemail
-      @obj.email if @obj
+      #@obj.email if @obj
+      @email
     end
 
     def getpassword
-      @obj.password if @obj
+      @obj.password.value if @obj
     end
 
     def getcontacts
-      @obj.contacts if @obj
+      @obj.contacts.members if @obj
     end
 
     def getrequests
@@ -73,8 +74,8 @@ module GitContacts
   class UserObject
     include Redis::Objects
 
-    value :uid
-    value :email
+    #value :uid
+    # value :email
     value :password
     set :contacts
     set :requests
@@ -90,24 +91,24 @@ module GitContacts
     def self::access email
       obj = allocate
       obj.set_email email
-      obj.set_uid Redis::Value.new(key_prefix+id+':uid')
-      obj.set_password Redis::Value.new(key_prefix+id+':password')
-      obj.set_contacts Redis::Set.new(key_prefix+id+':contacts')
-      obj.set_requests Redis::Set.new(key_prefix+id+':requests')
+      #obj.set_uid Redis::Value.new(key_prefix+obj.id+':uid')
+      obj.set_password Redis::Value.new(key_prefix+obj.id+':password')
+      obj.set_contacts Redis::Set.new(key_prefix+obj.id+':contacts')
+      obj.set_requests Redis::Set.new(key_prefix+obj.id+':requests')
       obj
     end
 
     def initialize
-      @uid = Digest::SHA1.hexdigest(Time.now.to_s + rand(10000))
+      #@uid = Digest::SHA1.hexdigest(Time.now.to_s + rand(10000).to_s)
     end
 
     def id
       @email
     end
 
-    def set_uid uid
-      @uid = uid
-    end
+    #def set_uid uid
+    #  @uid = uid
+    #end
 
     def set_email email
       @email = email

data/lib/gitcontacts/util.rb

@@ -19,7 +19,7 @@ module GitContacts
     end
 
     def request_keys
-      [:uid, :gid, :card_id, :action, :content]
+      [:uid, :gid, :action, :content]
     end
   end
 end

data/lib/gitcontacts/version.rb

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

data/lib/gitcontacts.rb

@@ -7,7 +7,7 @@ require 'gitcontacts/Request'
 require 'gitcontacts/Contacts'
 require 'gitcontacts/Invitation'
 require "gitcontacts/version"
-require 'digest/sha1'
+require 'digest'
 require "gitdb"
 
 module GitContacts
@@ -16,128 +16,84 @@ module GitContacts
     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::SHA1.hexdigest password
+        user if user.password_correct? Digest::MD5.hexdigest(password)
       end
     end
-
+    # code review: @AustinChou
     def relation_valid? operator, gid
-      #if User::exist?(operator) && Contacts::exist?(gid)
+      if User::exist?(operator) && Contacts::exist?(gid)
         user = User.new operator
-        contacts = GitContacts.new gid
-        [user, contacts] #if user.getcontacts.include?(gid) && contacts.getusers.include?(operator)
-      #end
+        contacts = Contacts.new gid
+        [user, contacts] if user.getcontacts.include?(gid) && contacts.getusers.include?(operator)
+      end
     end
-
+    # code review: @abbshr
     # meta => :owner, :gid, :count, :name
     def get_all_contacts operator
       contacts_arr = []
       user = User.new operator
-      contacts = Gitdb::Contacts.new uid
+      contacts = Gitdb::Contacts.new operator
       user.getcontacts.each do |gid|
-        return unless GitContacts::relation_valid? operator 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 &condition
+    def get_contacts_if uid, &condition
       GitContacts::get_all_contacts(uid).select &condition
     end
-
+    # code review: @abbshr
     def add_contacts operator, name
       #return unless GitContacts::relation_valid? operator gid
-      contacts = Gitdb::Contacts.new operator
-      contacts.create name
-      contacts.getmeta[:gid]
+      git_contacts = Gitdb::Contacts.new operator 
+      git_contacts.create name
+      gid = git_contacts.getmeta[:gid]
+      Contacts.create gid, { :name => name }
+      contacts = Contacts.new gid
+      contacts.add_user operator
+      contacts.add_admin operator
+      user = User.new operator
+      user.add_contacts gid
+      gid
     end
-
+    # code review: @abbshr
     def edit_contacts_meta operator, gid, new_meta
-      return unless GitContacts::relation_valid? operator gid
+      return unless GitContacts::relation_valid? operator, gid
+      puts operator, gid, new_meta
       contacts = Gitdb::Contacts.new operator
       contacts.access gid
       contacts.setmeta new_meta
+      true
     end
-
+    # code review: @abbshr
     def get_contacts_card operator, gid, card_id
-      return unless GitContacts::relation_valid? operator gid
+      return unless GitContacts::relation_valid? operator, gid
       contacts = Gitdb::Contacts.new operator
       contacts.access gid
-      contacts.get_card_by_id card_id
-    end
-=begin
-    def get_contacts_cards_by_owner operator, owner
-      return unless GitContacts::relation_valid? operator gid
-      contacts = Gitdb::Contacts.new operator
-      contacts.access gid
-      contacts.get_cards do |card|
-        card.getdata if card.getmeta[:owner].include? owner
-      end
-    end
-
-    def get_contacts_cards_by_name operator, name 
-      return unless GitContacts::relation_valid? operator gid
-      contacts = Gitdb::Contacts.new operator
-      contacts.access gid
-      contacts.get_cards do |card|
-        card.getdata if card.getdata[:firstname].include? name || card.getdata[:firstname].include? name
-      end
-    end
-
-    def get_contacts_cards_by_number operator, number
-      return unless GitContacts::relation_valid? operator gid
-      contacts = Gitdb::Contacts.new operator
-      contacts.access gid
-      contacts.get_cards do |card|
-        info = card.getdata
-        cond = info[:mobile].include? number || info[:phone].include? number || info[:im].include? number
-        info if cond
-      end
+      contacts.get_card_by_id(card_id).getdata
     end
-
-    def get_contacts_cards_by_birthday date
-      contacts = Gitdb::Contacts.new uid
-      contacts.access gid
-      contacts.get_cards do |card|
-        card.getdata if card.getdata[:birthday].include? date
-      end
-    end
-
-    def get_contacts_cards_by_email email
-      contacts = Gitdb::Contacts.new uid
-      contacts.access gid
-      contacts.get_cards do |card|
-        card.getdata if card.getdata[:email].include? email
-      end
-    end
-
-    def get_contacts_cards_by_etc info
-      contacts = Gitdb::Contacts.new uid
-      contacts.access gid
-      contacts.get_cards do |card|
-        card.getdata if card.getdata[:address].include? info || card.getdata[:note].include? info
-      end
-    end
-=end
+    # code review: @abbshr
     def get_contacts_cards_by_related operator, gid, keyword
-      return unless GitContacts::relation_valid? operator gid
+      return unless GitContacts::relation_valid? operator, gid
       contacts = Gitdb::Contacts.new operator
       contacts.access gid
       contacts.get_cards do |card|
         info = card.getdata
-        info if card.getmeta[:owner].include? keyword || info.find { |k| true if info[k].include? keyword }
+        info if (card.getmeta[:owner].include? keyword) || info.find { |k,v| true if v.include? keyword }
       end
     end
-    
+    # code review: @abbshr
     def get_contacts_history operator, gid
       contacts = Gitdb::Contacts.new operator
       contacts.access gid
@@ -151,8 +107,9 @@ module GitContacts
         commit_obj
       end
     end
-
-    def revert_to operator, gid
+    # code review: @abbshr
+    def revert_to operator, gid, oid
+      puts operator, gid, oid
       contacts = Gitdb::Contacts.new operator
       contacts.access gid
       operator = {
@@ -162,49 +119,50 @@ module GitContacts
       }
       contacts.revert_to oid, { :author => operator, :committer => operator, :message => "revert to revision #{oid}" }
     end
-
+    # code review: @abbshr
     def add_contacts_card operator, gid, payload
-      return unless GitContacts::relation_valid? operator gid
+      return unless GitContacts::relation_valid? operator, gid
       # request id
-      qid = Request::create :uid => operator, :gid => gid, :action => "create", :time => Time.now, :content => payload
+      qid = Request::create :uid => operator, :gid => gid, :action => "create"
       # create a rqeuest
       req = Request.new qid
       if req.auto_merge? operator
-        Request::delete qid
         # here should return card_id if success
-        return req.allow operator
+        cid = req.allow operator
+        Request::delete qid
+        return cid
       end
       true
     end
-
+    # code review: @abbshr
     def edit_contacts_card operator, gid, card_id, payload
-      return unless GitContacts::relation_valid? operator gid
-      qid = GCRequest::create :uid => operator, :gid => gid, :action => "setdata", :time => Time.now, :card_id => card_id, :content => payload
-      req = GCRequest.new qid
+      return unless GitContacts::relation_valid? operator, gid
+      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
       end
       true
     end
-
+    # code review: @abbshr
     def delete_contacts_card operator, gid, card_id
-      return unless GitContacts::relation_valid? operator gid
-      qid = GCRequest::create :uid => operator, :gid => gid, :action => "delete", :time => Time.now, :card_id => card_id
-      req = GCRequest.new qid
+      return unless GitContacts::relation_valid? operator, gid
+      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
       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
     end
-
+    # code review: @abbshr
     def add_contacts_user operator, gid, uid
       return unless result = GitContacts::relation_valid?(operator, gid)
       user = result.first
@@ -215,6 +173,7 @@ module GitContacts
       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
@@ -230,7 +189,7 @@ module GitContacts
         end
       end
     end
-
+=begin
     def invite_contacts_user operator, gid, payload
       return unless result = GitContacts::relation_valid?(operator, gid)
       user = result.first
@@ -252,10 +211,13 @@ module GitContacts
         true
       end
     end
-
+=end
+    
+    # code review: @AustinChou
     def get_all_requests operator
     end
 
+    # code review: @AustinChou
     def edit_request_status operator
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitcontacts
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - AustinChou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -93,6 +93,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- cookies
 - gitcontacts.gemspec
 - lib/gitcontacts.rb
 - lib/gitcontacts/Contacts.rb