gitcontacts 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a9eb26f244b726004f0df05f786463c6d9fefe0
-  data.tar.gz: 2f98fb079c95624d5787a2b13128458e14b327ce
+  metadata.gz: 903fd08dcfe122a1461ba4e05d0b5651ce5acfeb
+  data.tar.gz: 58d9cdeb6f50200ecad553599c9e757b52fa911b
 SHA512:
-  metadata.gz: 3da4641d73fe11dca5ed32510955afb16b6de2d79e5d13a2dc2ed6fdc8e833c3350ab814e6248ebdda39f6feaa4b6ea33e99c4463198fcae6521ec85d6cb4e27
-  data.tar.gz: f3a228abbe2773a003ba6a418cea209e0b2813a2ca1b09a4f99057c8421cfff5cc4dcbb219bf17bb6aa924a8eb1449b10534703c102ec34b0b3727377a6bc8ef
+  metadata.gz: cdce2b3be1b0275b5ea4dcc16e751a3d8e9ea27e7ab26101d0f02641435a8cf6a54b7a13ed215f75bd1d477cf0c620bd86f354517a4827cc00de1da235dd0e3f
+  data.tar.gz: ef90fb5d3d632c99f376c1603f76179a0332864d2cc068113ba03fdd83dcda97b662b8cbf5f41ca3ea81976896b21a79474adab83cc6bf3297a54dbba66e3e92

data/gitcontacts.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "redis", '~> 3.2'
-  spec.add_dependency "gitdb", '~> 0.1', ">= 0.1.3"
+  spec.add_dependency "gitdb", '~> 0.1.3'
   spec.add_dependency "redis-objects", "~> 1.0"
 
   spec.add_development_dependency "bundler", "~> 1.7"

data/lib/gitcontacts/Request.rb

@@ -80,6 +80,7 @@ module GitContacts
       }
 
       contacts.make_a_commit commit_obj
+      card.getmeta[:id]
     end
 
     def deny
@@ -168,4 +169,4 @@ module GitContacts
 
   end
 
-end
+end

data/lib/gitcontacts/User.rb

@@ -2,17 +2,13 @@ module GitContacts
 
   class User
 
-    def self::exist? uid
-      true if UserObject::exist?(uid)
-    end
-
-    def self::email_to_uid email
-      
+    def self::exist? email
+      true if UserObject::exist?(email)
     end
 
     def self::create hash
       # some keys are optional
-      if hash.keys.include?(:email) && hash.keys.include?(:password)
+      if hash.keys.include?(:email) && hash.keys.include?(:password) && !User::exist?(hash[:email])
         obj = UserObject.new
         obj.email = hash[:email]
         obj.password = hash[:password]
@@ -20,8 +16,8 @@ module GitContacts
       end
     end
 
-    def initialize uid
-      @obj = UserObject::access uid
+    def initialize email
+      @obj = UserObject::access email
     end
 
     def getuid
@@ -87,28 +83,26 @@ module GitContacts
       "user_object:"
     end
 
-    def self::exist? uid
-      true if redis.keys(key_prefix+uid+':*').count > 0
+    def self::exist? email
+      true if redis.keys(key_prefix+email+':*').count > 0
     end
 
-    def self::access uid
-      if exist? uid
-        obj = allocate
-        obj.set_uid uid
-        obj.set_email Redis::Value.new(key_prefix+id+':email')
-        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
-      end
+    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
     end
 
     def initialize
-      @uid = Digest::SHA1.hexdigest Time.now.to_s
+      @uid = Digest::SHA1.hexdigest(Time.now.to_s + rand(10000))
     end
 
     def id
-      @uid
+      @email
     end
 
     def set_uid uid
@@ -133,4 +127,4 @@ module GitContacts
 
   end
 
-end
+end

data/lib/gitcontacts/version.rb

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

data/lib/gitcontacts.rb

@@ -21,9 +21,9 @@ module GitContacts
       User::create hash
     end
 
-    def password_valid uid, password
-      if user = User.new(uid)
-        user.password_correct? Digest::SHA1.hexdigest password
+    def password_valid? email, password
+      if user = User.new(email)
+        user if user.password_correct? Digest::SHA1.hexdigest password
       end
     end
 
@@ -58,6 +58,7 @@ module GitContacts
       #return unless GitContacts::relation_valid? operator gid
       contacts = Gitdb::Contacts.new operator
       contacts.create name
+      contacts.getmeta[:gid]
     end
 
     def edit_contacts_meta operator, gid, new_meta
@@ -169,10 +170,11 @@ module GitContacts
       # create a rqeuest
       req = Request.new qid
       if req.auto_merge? operator
-        req.allow operator
         Request::delete qid
         # here should return card_id if success
+        return req.allow operator
       end
+      true
     end
 
     def edit_contacts_card operator, gid, card_id, payload
@@ -183,6 +185,7 @@ module GitContacts
         req.allow operator
         Request::delete qid
       end
+      true
     end
 
     def delete_contacts_card operator, gid, card_id
@@ -193,6 +196,7 @@ module GitContacts
         req.allow operator
         Request::delete qid
       end
+      true
     end
 
     def get_contacts_users operator, gid

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitcontacts
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - AustinChou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-21 00:00:00.000000000 Z
+date: 2015-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -29,9 +29,6 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.3
   type: :runtime
@@ -39,9 +36,6 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.3
 - !ruby/object:Gem::Dependency