appoxy_rails 0.0.30 → 0.0.31

data/lib/appoxy_rails.rb

@@ -8,16 +8,16 @@ require_relative 'appoxy_ui'
 require_relative 'appoxy_sessions'
 require_relative 'ui/time_zoner'
 
-require_relative "rails/api_controller"
-require_relative "rails/signatures"
+require_relative "server_api/api_controller"
+require_relative "server_api/signatures"
 
 
 # backwards compatible.
 # @deprecated
 module Appoxy
   module Api
-    include Appoxy::Rails
-    extend Appoxy::Rails
+    include Appoxy::ServerApi
+    extend Appoxy::ServerApi
   end
 end
 

data/lib/railtie.rb

@@ -1,7 +1,7 @@
-# see http://rails.rubyonrails.org/classes/Rails/Railtie.html
+# see http://server_api.rubyonrails.org/classes/Rails/Railtie.html
 
 # Nice write-up of hooking gems into the views/layouts/statics of Rails 3 apps: 
-# http://numbers.brighterplanet.com/2010/07/26/sharing-views-across-rails-3-apps/
+# http://numbers.brighterplanet.com/2010/07/26/sharing-views-across-server_api-3-apps/
 
 require 'rails'
 

data/lib/{rails → server_api}/api_controller.rb

@@ -1,8 +1,8 @@
 module Appoxy
 
-  module Rails
+  module ServerApi
 
-    # The rails controllers that use this should set:
+    # The server_api controllers that use this should set:
 #        protect_from_forgery :only => [] # can add methods to here, eg: :create, :update, :destroy
 
 #                rescue_from SigError, :with => :send_error
@@ -26,7 +26,7 @@ module Appoxy
         end
 
         #operation = "#{controller_name}/#{action_name}"
-        #operation = request.env["PATH_INFO"].gsub(/\/rails\//, "")# here we're getting original request url'
+        #operation = request.env["PATH_INFO"].gsub(/\/server_api\//, "")# here we're getting original request url'
 
 #                #getting clean params (without parsed via routes)
 #                params_for_signature = params2||request.query_parameters
@@ -46,7 +46,7 @@ module Appoxy
             signature = "#{controller_name}/#{action_name}"
           when "0.2"
 #            puts "new version of client"
-            operation = request.env["PATH_INFO"].gsub(/\/rails\//, "") # here we're getting original request url'
+            operation = request.env["PATH_INFO"].gsub(/\/server_api\//, "") # here we're getting original request url'
             params_for_signature = params2||request.query_parameters
             params_for_signature = params_for_signature.delete_if { |key, value| ["access_key", "sigv", "sig", "timestamp"].include? key }
             signature = operation+Appoxy::Api::Signatures.hash_to_s(params_for_signature)

data/lib/server_api/signatures.rb

@@ -0,0 +1,26 @@
+module Appoxy
+  module ServerApi
+    module Signatures
+
+
+      def self.generate_timestamp(gmtime)
+        return gmtime.strftime("%Y-%m-%dT%H:%M:%SZ")
+      end
+
+
+      def self.generate_signature(operation, timestamp, secret_key)
+        my_sha_hmac = Digest::HMAC.digest(operation + timestamp, secret_key, Digest::SHA1)
+        my_b64_hmac_digest = Base64.encode64(my_sha_hmac).strip
+        return my_b64_hmac_digest
+      end
+
+
+      def self.hash_to_s(hash)
+        str = ""
+        hash.sort.each { |a| str+= "#{a[0]}#{a[1]}" }
+        #removing all characters that could differ after parsing with server_api
+        return str.delete "\"\/:{}[]\' T"
+      end
+    end
+  end
+end

data/lib/sessions/oauth_token.rb

@@ -1,11 +1,11 @@
 class OauthToken < SimpleRecord::Base
 
-    belongs_to :user
+  belongs_to :user
 
-    has_strings :type, # request or access
-                :site,
-                :token,
-                :secret
+  has_strings :type, # request or access
+              :site,
+              :token,
+              :secret
 
 #    has_clobs :access_token
 

data/lib/sessions/sessions_controller.rb

@@ -359,9 +359,9 @@ module Appoxy
         signin = true
         callback_url = "#{base_url}/sessions/#{(signin ? "create_twitter" : "create_twitter_oauth")}"
         auth_path = signin ? "authenticate" : "authorize"
-        consumer = oauth_start(::Rails.application.config.twitter_consumer_key, Rails.application.config.twitter_consumer_secret,
+        consumer = oauth_start(::Rails.application.config.twitter_consumer_key, ::Rails.application.config.twitter_consumer_secret,
                                callback_url,
-                               "https://rails.twitter.com",
+                               "https://server_api.twitter.com",
                                "/oauth/request_token",
                                "/oauth/#{auth_path}",
                                "/oauth/access_token"

data/lib/sessions/shareable.rb

@@ -2,205 +2,205 @@ require 'aws'
 require 'simple_record'
 
 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={})
-
-                access_rights = {} if access_rights.nil?
-
-                @email = email.strip
-
-                if @email == self.user.email
-                    self.errors.add_to_base("User already owns this item.")
-                    return false
-                end
+  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={})
+
+        access_rights = {} if access_rights.nil?
+
+        @email = email.strip
+
+        if @email == self.user.email
+          self.errors.add_to_base("User already owns this item.")
+          return false
+        end
 
-                user = ::User.find_by_email(@email)
-                if user.nil?
-                    # lets create the user and send them an invite.
-                    user = ::User.new(:email=>@email, :status=>"invited")
-                    user.set_activation_code # todo: this shouldn't be on user anymore
-                    if user.save
-
-                    else
-                        self.errors = user.errors
-                        return false
-                    end
-                end
-                activation_code = user.activation_code
+        user = ::User.find_by_email(@email)
+        if user.nil?
+          # lets create the user and send them an invite.
+          user = ::User.new(:email=>@email, :status=>"invited")
+          user.set_activation_code # todo: this shouldn't be on user anymore
+          if user.save
+
+          else
+            self.errors = user.errors
+            return false
+          end
+        end
+        activation_code = user.activation_code
 
-                # check if exists
-                share_domain = self.share_domain
-                item_id_name = self.item_id_name
+        # check if exists
+        share_domain = self.share_domain
+        item_id_name = self.item_id_name
 #                puts 'share_domain = ' + share_domain.inspect
-                @sdb = SimpleRecord::Base.connection
+        @sdb = SimpleRecord::Base.connection
 #        @shared_with = share_class.find(:first, :conditions=>["user_id = ? and item_id = ?", user.id, @item.id])
-                @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 item is already shared with #{email}.")
-                    return false
-                end
+        @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 item is already shared with #{email}.")
+          return false
+        end
 
-                now = Time.now
-                id = share_id(user)
-                @sdb.put_attributes(share_domain, id, {:new_share=>true,
-                                                       :id=>id,
-                                                       :created=>SimpleRecord::Translations.pad_and_offset(now),
-                                                       :updated=>SimpleRecord::Translations.pad_and_offset(now),
-                                                       :user_id => user.id,
-                                                       :activation_code=>activation_code,
-                                                       :status=>"invited",
-                                                       item_id_name => self.id}.merge(access_rights),
-                                    true,
-                                    :create_domain=>true)
+        now = Time.now
+        id = share_id(user)
+        @sdb.put_attributes(share_domain, id, {:new_share=>true,
+                                               :id=>id,
+                                               :created=>SimpleRecord::Translations.pad_and_offset(now),
+                                               :updated=>SimpleRecord::Translations.pad_and_offset(now),
+                                               :user_id => user.id,
+                                               :activation_code=>activation_code,
+                                               :status=>"invited",
+                                               item_id_name => self.id}.merge(access_rights),
+                            true,
+                            :create_domain=>true)
 
 #                ret = {
 #                        :user=>user,
 #                        :ac=>activation_code
 #                }
 #                return ret
-                return user
-
-            end
-
-            def item_id_name
-                return self.class.name.foreign_key
-            end
-
-            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 = Shareable.get_results(:all, ["select * from #{share_domain} where #{item_id_name} = ?", self.id])
-                user_ids = []
-                options_hash = {}
-                project_users.each do |puhash|
-                    puhash.each_pair do |k, v|
-                        puhash[k] = v[0]
-                    end
-                    puts 'puhash=' + puhash.inspect
-                    user_ids << puhash["user_id"]
-                    options_hash[puhash["user_id"]] = puhash
-                end
-                ret = ::User.find(:all, :conditions=>["id in ('#{user_ids.join("','")}')"]).collect do |u|
-                    def u.share_options=(options=nil)
-                        instance_variable_set(:@share_options, options)
-                    end
+        return user
+
+      end
+
+      def item_id_name
+        return self.class.name.foreign_key
+      end
+
+      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 = Shareable.get_results(:all, ["select * from #{share_domain} where #{item_id_name} = ?", self.id])
+        user_ids = []
+        options_hash = {}
+        project_users.each do |puhash|
+          puhash.each_pair do |k, v|
+            puhash[k] = v[0]
+          end
+          puts 'puhash=' + puhash.inspect
+          user_ids << puhash["user_id"]
+          options_hash[puhash["user_id"]] = puhash
+        end
+        ret = ::User.find(:all, :conditions=>["id in ('#{user_ids.join("','")}')"]).collect do |u|
+          def u.share_options=(options=nil)
+            instance_variable_set(:@share_options, options)
+          end
 
-                    def u.share_options
-                        instance_variable_get(:@share_options)
-                    end
+          def u.share_options
+            instance_variable_get(:@share_options)
+          end
 
-                    u.share_options=options_hash[u.id]
-                    u
-                end
-                ret
-            end
+          u.share_options=options_hash[u.id]
+          u
+        end
+        ret
+      end
 
-            # this unshares by the 
-            def unshare_by_id(id)
+      # this unshares by the
+      def unshare_by_id(id)
 #        @project_user = ProjectUser.find(params[:pu_id])
 #        @project_user.delete
 #                puts 'unsharing ' + id.to_s
-                @sdb = SimpleRecord::Base.connection
-                puts "delete_attributes=" + @sdb.delete_attributes(share_domain, id.to_s).inspect
+        @sdb = SimpleRecord::Base.connection
+        puts "delete_attributes=" + @sdb.delete_attributes(share_domain, id.to_s).inspect
 #                puts 'deleted?'
-            end
+      end
 
-            # Unshare by user.
-            def unshare(user)
-                @sdb = SimpleRecord::Base.connection
-                @sdb.delete_attributes(share_domain, share_id(user))
+      # 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
+      end
 
-            def update_sharing_options(user, options={})
-                options={} if options.nil?
+      def update_sharing_options(user, options={})
+        options={} if options.nil?
 #                puts 'options=' + ({ :updated=>Time.now }.merge(options)).inspect
-                @sdb = SimpleRecord::Base.connection
-                @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_attributes.include?(k) && !options.include?(k)
-                        to_delete << k
-                    end
-                end
-                if to_delete.size > 0
-                    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 = SimpleRecord::Base.connection
+        @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_attributes.include?(k) && !options.include?(k)
+            to_delete << k
+          end
+        end
+        if to_delete.size > 0
+          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)
 
-            end
+      end
 
-            def share_id(user)
-                "#{self.id}_#{user.id}"
-            end
+      def share_id(user)
+        "#{self.id}_#{user.id}"
+      end
 
-            def share_domain
+      def share_domain
 #                puts 'instance share_domain'
-                ret = self.class.name + "User"
+        ret = self.class.name + "User"
 #                puts 'SHARE_NAME=' + ret
-                ret = ret.tableize
+        ret = ret.tableize
 #                puts 'ret=' + ret
-                ret
-            end
-
-
-            def self.get_results(which, q)
-                @sdb = SimpleRecord::Base.connection
-                next_token = nil
-                ret = []
-                begin
-                    begin
-                        response =  @sdb.select(q, next_token)
-                        rs = response[:items]
-                        rs.each_with_index do |i, index|
-                            puts 'i=' + i.inspect
-                            i.each_key do |k|
-                                puts 'key=' + k.inspect
-                                if which == :first
-                                    return i[k].update("id"=>k)
-                                end
-                                ret << i[k]
-                            end
-#    break if index > 100
-                        end
-                        next_token = response[:next_token]
-                    end until next_token.nil?
-                rescue Aws::AwsError, Aws::ActiveSdb::ActiveSdbError
-                    if ($!.message().index("NoSuchDomain") != nil)
-                        puts 'NO SUCH DOMAIN!!!'
-                        # this is ok
-                    else
-                        raise $!
-                    end
+        ret
+      end
+
+
+      def self.get_results(which, q)
+        @sdb = SimpleRecord::Base.connection
+        next_token = nil
+        ret = []
+        begin
+          begin
+            response = @sdb.select(q, next_token)
+            rs = response[:items]
+            rs.each_with_index do |i, index|
+              puts 'i=' + i.inspect
+              i.each_key do |k|
+                puts 'key=' + k.inspect
+                if which == :first
+                  return i[k].update("id"=>k)
                 end
-                which == :first ? nil : ret
+                ret << i[k]
+              end
+#    break if index > 100
             end
-
+            next_token = response[:next_token]
+          end until next_token.nil?
+        rescue Aws::AwsError, Aws::ActiveSdb::ActiveSdbError
+          if ($!.message().index("NoSuchDomain") != nil)
+            puts 'NO SUCH DOMAIN!!!'
+            # this is ok
+          else
+            raise $!
+          end
         end
+        which == :first ? nil : ret
+      end
+
     end
+  end
 end
 	

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 30
-  version: 0.0.30
+  - 31
+  version: 0.0.31
 platform: ruby
 authors: 
 - Travis Reeder
@@ -107,9 +107,9 @@ files:
 - lib/appoxy_rails.rb
 - lib/appoxy_sessions.rb
 - lib/appoxy_ui.rb
-- lib/rails/api_controller.rb
-- lib/rails/signatures.rb
 - lib/railtie.rb
+- lib/server_api/api_controller.rb
+- lib/server_api/signatures.rb
 - lib/sessions/application_controller.rb
 - lib/sessions/oauth_token.rb
 - lib/sessions/sessions_controller.rb

data/lib/rails/signatures.rb

@@ -1,26 +0,0 @@
-module Appoxy
-    module Rails
-        module Signatures
-
-
-            def self.generate_timestamp(gmtime)
-                return gmtime.strftime("%Y-%m-%dT%H:%M:%SZ")
-            end
-
-
-            def self.generate_signature(operation, timestamp, secret_key)
-                my_sha_hmac = Digest::HMAC.digest(operation + timestamp, secret_key, Digest::SHA1)
-                my_b64_hmac_digest = Base64.encode64(my_sha_hmac).strip
-                return my_b64_hmac_digest
-            end
-
-
-            def self.hash_to_s(hash)
-                str = ""                 
-                hash.sort.each{|a| str+= "#{a[0]}#{a[1]}" }
-                #removing all characters that could differ after parsing with rails
-                return str.delete "\"\/:{}[]\' T"
-            end
-        end
-    end
-end