appoxy_sessions 0.0.16 → 0.0.17

data/lib/sessions/application_controller.rb

@@ -54,9 +54,11 @@ module Appoxy
                     session[:return_to] = request.request_uri # return to after logging in
                     puts "ac=" + params[:ac].inspect
                     if params[:user_id] && params[:ac]
+                        # todo: should we store ac in cookie?  Make it easier to pass around
+                        cookies[:ac] = params[:ac]
                         # then from an invite
                         user = ::User.find(params[:user_id])
-                        if user && user.password.blank? # this the best way to decide of user has not logged in? Could also check status.
+                        if user && user.password.blank? # is this the best way to decide of user has not logged in? Could also check status.
                             redirect_to :controller=>"users", :action=>"new", :email=>user.email, :ac=>params[:ac]
                             return
                         end

data/lib/sessions/shareable.rb

@@ -2,6 +2,18 @@ module Appoxy
     module Sessions
         module Shareable
 
+            # Call this method on your Sharable object to share it with the person.
+            # returns: a hash with :user (the user that the item was shared with), :ac (activation code that should be sent to the user)
+            #          or false if couldn't be shared.
+            # You can check for errors by looking at the errors array of the object.
+            # Eg:
+            #   if my_ob.share_with(x)
+            #      # all good
+            #      Mail the user a link that contains user_id and ac, this gem will take care of the rest.
+            #   else
+            #      # not all good, check errors
+            #      errors = my_ob.errors
+            #   end
 
             def share_with(email, access_rights={}, options={})
 
@@ -9,13 +21,8 @@ module Appoxy
 
                 @email = email.strip
 
-                # See if user exists in the system already
-#        if @email == current_user.email current_user not available from here
-#            flash[:error] = "Now why do you want to invite yourself??"
-#            return false
-#        end
                 if @email == self.user.email
-                    self.errors.add_to_base("That user already owns this project.")
+                    self.errors.add_to_base("User already owns this item.")
                     return false
                 end
 
@@ -23,7 +30,7 @@ module Appoxy
                 if user.nil?
                     # lets create the user and send them an invite.
                     user = ::User.new(:email=>@email, :status=>"invited")
-                    user.set_activation_code
+                    user.set_activation_code # todo: this shouldn't be on user anymore
                     if user.save
 
                     else
@@ -31,6 +38,7 @@ module Appoxy
                         return false
                     end
                 end
+                activation_code = user.activation_code
 
                 # check if exists
                 share_domain = self.share_domain
@@ -38,14 +46,13 @@ module Appoxy
 #                puts 'share_domain = ' + share_domain.inspect
                 @sdb = SimpleRecord::Base.connection
 #        @shared_with = share_class.find(:first, :conditions=>["user_id = ? and item_id = ?", user.id, @item.id])
-                @project_user = get_results(:first, ["select * from #{share_domain} where user_id=? and #{item_id_name} = ?", user.id, self.id])
-                puts '@project_user=' + @project_user.inspect
+                @project_user = Shareable.get_results(:first, ["select * from #{share_domain} where user_id=? and #{item_id_name} = ?", user.id, self.id])
+                puts 'sharing user=' + @project_user.inspect
                 unless @project_user.nil?
-                    self.errors.add_to_base("This project is already shared with this user.")
+                    self.errors.add_to_base("This item is already shared with #{email}.")
                     return false
                 end
 
-#        id = self.class.generate_id
                 now = Time.now
                 id = share_id(user)
                 @sdb.put_attributes(share_domain, id, {:new_share=>true,
@@ -53,9 +60,15 @@ module Appoxy
                                                        :created=>SimpleRecord::Translations.pad_and_offset(now),
                                                        :updated=>SimpleRecord::Translations.pad_and_offset(now),
                                                        :user_id => user.id,
-                                                       item_id_name => self.id }.merge(access_rights), true)
+                                                       :activation_code=>activation_code,
+                                                       :status=>"invited",
+                                                       item_id_name => self.id}.merge(access_rights), true)
 
-                return user
+                ret = {
+                        :user=>user,
+                        :ac=>activation_code
+                }
+                return ret
 
             end
 
@@ -63,12 +76,13 @@ module Appoxy
                 return self.class.name.foreign_key
             end
 
-            def common_attribrutes
+            def common_attributes
                 ["new_share", "id", "created", "updated", "user_id", item_id_name]
             end
 
+            # Returns a list of users that this item is shared with.
             def shared_with
-                project_users = get_results(:all, ["select * from #{share_domain} where #{item_id_name} = ?", self.id])
+                project_users = Shareable.get_results(:all, ["select * from #{share_domain} where #{item_id_name} = ?", self.id])
                 user_ids = []
                 options_hash = {}
                 project_users.each do |puhash|
@@ -94,6 +108,7 @@ module Appoxy
                 ret
             end
 
+            # this unshares by the 
             def unshare_by_id(id)
 #        @project_user = ProjectUser.find(params[:pu_id])
 #        @project_user.delete
@@ -103,15 +118,25 @@ module Appoxy
 #                puts 'deleted?'
             end
 
+            # Unshare by user.
+            def unshare(user)
+                @sdb = SimpleRecord::Base.connection
+                @sdb.delete_attributes(share_domain, share_id(user))
+#                @project_user = Shareable.get_results(:first, ["select * from #{share_domain} where user_id=? and #{item_id_name} = ?", user.id, self.id])
+#                @project_user.each do |pu|
+#                    @sdb.delete_attributes(share_domain, pu["id"])
+#                end
+            end
+
             def update_sharing_options(user, options={})
                 options={} if options.nil?
 #                puts 'options=' + ({ :updated=>Time.now }.merge(options)).inspect
                 @sdb = SimpleRecord::Base.connection
-                @project_user = get_results(:first, ["select * from #{share_domain} where user_id=? and #{item_id_name} = ?", user.id, self.id])
+                @project_user = Shareable.get_results(:first, ["select * from #{share_domain} where user_id=? and #{item_id_name} = ?", user.id, self.id])
                 # compare values
                 to_delete = []
                 @project_user.each_pair do |k, v|
-                    if !common_attribrutes.include?(k) && !options.include?(k)
+                    if !common_attributes.include?(k) && !options.include?(k)
                         to_delete << k
                     end
                 end
@@ -119,7 +144,7 @@ module Appoxy
                     puts 'to_delete=' + to_delete.inspect
                     @sdb.delete_attributes(share_domain, share_id(user), to_delete)
                 end
-                @sdb.put_attributes(share_domain, share_id(user), { :updated=>Time.now }.merge(options), true)
+                @sdb.put_attributes(share_domain, share_id(user), {:updated=>Time.now}.merge(options), true)
 
             end
 
@@ -137,7 +162,7 @@ module Appoxy
             end
 
 
-            def get_results(which, q)
+            def self.get_results(which, q)
                 @sdb = SimpleRecord::Base.connection
                 next_token = nil
                 ret = []

data/lib/sessions/users_controller.rb

@@ -6,10 +6,13 @@ module Appoxy
 
             def new
                 before_new
-                puts 'NEW YO'
-                @user = User.new
-                @user.email = params[:email] if params[:email]
-                @user.activation_code = params[:ac]
+                if params[:id]
+                    @user = User.find params[:id]
+                else
+                    @user = User.new
+                    @user.email = params[:email] if params[:email]
+                end
+                @user.activation_code = params[:ac] if params[:ac]
                 after_new
             end
 
@@ -42,6 +45,10 @@ module Appoxy
                 existing_user = ::User.find_by_email(@user.email)
 
                 if existing_user
+                    if params[:ac]
+                        
+                    end
+                    # todo: remove activation_code on user
                     if @user.activation_code.present?
                         # hasn't logged in yet, probably invited, need to check access key
                         if existing_user.activation_code == @user.activation_code

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: appoxy_sessions
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: false
   segments: 
   - 0
   - 0
-  - 16
-  version: 0.0.16
+  - 17
+  version: 0.0.17
 platform: ruby
 authors: 
 - Travis Reeder