the-city-admin 0.1.1 → 0.1.2

data/Gemfile.lock

@@ -1,8 +1,8 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    ZenTest (4.8.1)
-    activesupport (3.2.6)
+    ZenTest (4.8.2)
+    activesupport (3.2.8)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     archive-tar-minitar (0.5.2)
@@ -10,22 +10,23 @@ GEM
       ZenTest (>= 4.4.1)
     columnize (0.3.6)
     diff-lcs (1.1.3)
-    factory_girl (3.5.0)
+    factory_girl (4.0.0)
       activesupport (>= 3.0.0)
-    i18n (0.6.0)
-    json (1.7.3)
+    ffi (1.1.5)
+    i18n (0.6.1)
+    json (1.7.5)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
-    mime-types (1.18)
+    mime-types (1.19)
     multi_json (1.3.6)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.2)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.2)
     ruby-debug-base19 (0.11.25)
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
@@ -36,8 +37,9 @@ GEM
       ruby-debug-base19 (>= 0.11.19)
     ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
-    typhoeus (0.3.3)
-      mime-types
+    typhoeus (0.4.2)
+      ffi (~> 1.0)
+      mime-types (~> 1.18)
 
 PLATFORMS
   ruby

data/index.rb

@@ -8,116 +8,136 @@
 require 'ruby-debug'
 require File.dirname(__FILE__) + '/lib/the_city_admin.rb'
 
-# staging
-# key = 'bc6b57204b0ee4818bb4b3befd0f3292e93a2d0a'
-# token = '7cfed59b037125d3' 
-
-# Local
-key = '66c59e2ee24553e7237259e30b4c17365681b95c'
-token = 'a9ae4af3c3e80102'
-
+key = 'cf2903151e3213e66fd8080c7d8b65b1d6ccdd31'
+token = '5c88b32edda7653c'
 
 TheCity::AdminApi.connect(key, token)
 
-###### USERS / GROUPS #######
+# puts "-----------------------------"
+# puts "##### USERS #######"
+# puts "-----------------------------"
 
-puts "-----------------------------"
 
-user = TheCity::User.new
-user.title = 'Deacon'
-user.first = 'James'
-user.middle = 'Wesley'
-user.last = 'Hays'
-user.nickname = 'Wes'
-user.gender = TheCity::User::Gender[:male]
-user.email = 'wes+tc6@onthecity.org'
-user.staff = false
-user.member_since = Time.now.strftime("%Y-%m-%d")
-user.birthdate = '1980-09-27'
-user.primary_phone = '775-745-3013'
-user.primary_phone_type = TheCity::User::PhoneType[:mobile]
-user.secondary_phone = '775-677-7707'
-user.secondary_phone_type = TheCity::User::PhoneType[:home]
-#user.marital_status = TheCity::User::MaritalStatus[:married]
-#user.primary_campus_id
-#user.external_id_1
-#user.external_id_2
-#user.external_id_3
-unless user.save
-  user.error_messages.each { |em| puts em }
-end
-
-user.delete
+# user_list = TheCity::UserList.new
 
+# user_list.each do |u|
+#   puts u.full_name
+# end
 
 # puts "-----------------------------"
 
+# user = TheCity::User.new
+# user.title = 'Deacon'
+# user.first = 'James'
+# user.middle = 'Wesley'
+# user.last = 'Hays'
+# user.nickname = 'Wes'
+# user.gender = TheCity::User::Gender[:male]
+# user.email = 'someguy@somewhere.org'
+# user.staff = false
+# user.member_since = Time.now.strftime("%Y-%m-%d")
+# user.birthdate = '1980-09-27'
+# user.primary_phone = '775-111-2222'
+# user.primary_phone_type = TheCity::User::PhoneType[:mobile]
+# user.secondary_phone = '775-333-4444'
+# user.secondary_phone_type = TheCity::User::PhoneType[:home]
+# user.marital_status = TheCity::User::MaritalStatus[:married]
+# #user.primary_campus_id
+# #user.external_id_1
+# #user.external_id_2
+# #user.external_id_3
+
+# if user.save
+#   puts "User #{user.full_name} saved (#{user.id})"
+# else
+#   user.error_messages.each { |em| puts em }
+# end
 
-# user = the_city.users[0]
-# puts user.full_name
-# user.first = 'Wes'
-# puts user.full_name
-# user.save
-# puts user.id
-# user2 = TheCity::User.load_user_by_id(user.id)
-# puts user2.full_name
+# user2 = TheCity::User.load_by_id(user.id)
+# user2.email = 'somegirl@somewhere.org'
+# user2.nickname = 'dog'
 
-# group = the_city.groups[0]
-# puts group.name
-# group.name = 'Wes Group'
-# puts group.name
-# group.save
-# group2 = TheCity::Group.load_group_by_id(group.id)
-# puts group2.name
+# if user2.save
+#   puts "User #{user2.full_name} updated (#{user2.id})"
+# else
+#   user2.error_messages.each { |em| puts em }
+# end
 
+# if user.delete
+#   puts "User #{user.full_name} deleted (#{user.id})"
+# else
+#   puts "Something bad happened"
+#   #user.error_messages.each { |em| puts em }
+# end
 
 
+puts "-----------------------------"
 
-###### USERS #######
+user_list = TheCity::UserList.new
 
-# user = the_city.users[0]
-# puts user.full_name
+user = user_list[0]
+puts user.full_name
+user.first = 'Wes'
+puts user.full_name
+user.save
+puts user.id
 
+user2 = TheCity::User.load_by_id(user.id)
+puts user2.full_name
 
-# user2 = TheCity::User.load_user_by_id(1068169470) #(564114313)
-# puts user2.full_name
+puts "User has #{user.addresses.size} addresses"
+puts "User has #{user.family.size} family members"
+puts "User has #{user.notes.size} notes"
+puts "User has #{user.roles.size} roles"
+puts "User has #{user.skills.size} skills"
+#puts "User has #{user.processes.size} processes"
+puts "User has #{user.invitations.size} invitations"
+#puts "User has #{user.admin_privileges.size} admin_privileges"
 
-# user = the_city.users[1]
-# puts user.full_name
 
 # This is currenly returning a 404 if no family members are found
 # puts user.family[0].name
 
-# puts user.addresses[0].location_type
-# puts user.notes[0].author
-# puts user.roles[0].group_name
-# puts user.skills[0].name
-# puts user.processes[0].name
-# puts user.invitations[0].source
-# puts user.admin_privileges[0].title
 
 
-###### GROUPS #######
+# puts "-----------------------------"
 
-# group = the_city.groups[0]
+# group_list = TheCity::GroupList.new
+# group = group_list[0]
 # puts group.name
-# puts group.id
+# group.name = 'Wes Group'
+# puts group.name
+# group.save
+# group2 = TheCity::Group.load_by_id(group.id)
+# puts group2.name
+
+
+# # puts "-----------------------------"
+# # puts "##### GROUPS #######"
+# # puts "-----------------------------"
 
-# Fails with 500 error
-# puts group.addresses[0].location_type
+# group_list = TheCity::GroupList.new
 
-# puts group.roles[0].user_name
-# puts group.tags[0].name
+# group = group_list[13]
+# puts "Group Name: #{group.name} (#{group.id})"
 
-# puts group.invitations[0].source
+# if group.roles.size == 0
+#   puts "No group roles found"
+# else
+#   puts group.roles[0].title
+# end
 
-# metric = the_city.metrics[0]
+# if group.tags.size == 0
+#   puts "No group tags found"
+# else
+#   puts group.tags[0].name
+# end
 
-# puts metric.name
-# metric.measurements.total_entries.times do |i|
-#   puts "#{metric.measurements[i].created_at}: #{metric.measurements[i].value}"
+# if group.invitations.size == 0
+#   puts "No group invitations found"
+# else
+#   puts group.invitations[0].id
 # end
-# new_measurement = TheCity::MetricMeasurement.new(:id => metric.id, :value => 999)
-# new_measurement.save
+
 
 

data/lib/api/user.rb

@@ -41,7 +41,8 @@ module TheCity
                      :external_id_2,
                      :external_id_3,
                      :middle,
-                     :email       
+                     :email,
+                     :marital_status  
 
 
     # Loads the user by the specified ID.

data/lib/common.rb

@@ -1,37 +1,23 @@
 module TheCity
   require 'cgi'
+  require 'json'
 
 
   def self.admin_request(method, path, params = {})
     headers = self._build_admin_headers(method, path, params)
     url = THE_CITY_ADMIN_PATH+path
 
-    data_params = params.inject({}) {|h, (k,v)| h.update({k => v.nil? ? v : CGI.escape(v.to_s)})}
-
     response =
     case method
     when :post
-      Typhoeus::Request.post(url, {:headers => headers, :params => self._flatten_params(data_params)})
+      Typhoeus::Request.post(url, {:headers => headers, :params => params})
     when :get
-      Typhoeus::Request.get(url, {:headers => headers, :params => self._flatten_params(data_params)})
+      Typhoeus::Request.get(url, {:headers => headers, :params => params})
     when :put
-      Typhoeus::Request.put(url, {:headers => headers, :params => self._flatten_params(data_params)})
+      Typhoeus::Request.put(url, {:headers => headers, :params => params})
     when :delete
-      Typhoeus::Request.delete(url, {:headers => headers, :params => self._flatten_params(data_params)})
-    end
-
-    # unless response.success?
-    #   if response.curl_error_message != 'No error'
-    #     raise TheCityExceptions::UnableToConnectToTheCity.new(response.curl_error_message)
-    #   else
-    #     begin
-    #       raise TheCityExceptions::TheCityResponseError.new( JSON.parse(response.body)['error_message'] )
-    #     rescue
-    #       raise TheCityExceptions::UnknownErrorConnectingToTheCity.new('Unknown error when connecting to The City')
-    #     end
-    #   end
-    # end
-
+      Typhoeus::Request.delete(url, {:headers => headers, :params => params})
+    end    
 
     unless response.success?
       if response.curl_error_message != 'No error'
@@ -51,21 +37,9 @@ module TheCity
   end
 
 
-  def self._flatten_params(params)
-    retval = {}
-    params.each do |key, value|
-      if value.instance_of?(Array)
-        value.each_with_index { |a_val, indx| retval["#{key}[#{indx}]"] = a_val }
-      else # assume string
-        retval[key] = value
-      end
-    end
-    retval
-  end
-
-
   def self._build_admin_headers(method, path, params)
-    get_vars = '?' + params.to_a.sort.collect { |kv_pair| "#{kv_pair[0]}=#{kv_pair[1]}" }.join('&')
+    get_vars = method == :post ? '' : '?'
+    get_vars += params.to_a.sort.collect { |kv_pair| "#{kv_pair[0]}=#{kv_pair[1].to_s}" }.join('&')
     get_vars = '' if get_vars == '?'
     method_request = method.to_s.upcase
     url = THE_CITY_ADMIN_PATH + path + get_vars
@@ -75,141 +49,11 @@ module TheCity
     unescaped_hmac = Base64.encode64(unencoded_hmac).chomp
     hmac_signature = CGI.escape(unescaped_hmac)
 
-    headers = {'X-City-Sig' => hmac_signature,
-               'X-City-User-Token' => TheCity::AdminApi::API_TOKEN,
-               'X-City-Time' => current_time,
-               'Accept' => 'application/vnd.thecity.admin.v1+json'}
-
-
-    # This is causing issues.... not sure if it is needed (docs might be lieing)
-    # if [:post, :put].include?(method)
-    # headers['Content-Type'] = 'application/json'
-    # headers['Content-Length'] = params.to_json.length
-    # end
-
-    headers
+    {'X-City-Sig' => hmac_signature,
+     'X-City-User-Token' => TheCity::AdminApi::API_TOKEN,
+     'X-City-Time' => current_time,
+     'Accept' => 'application/vnd.thecity.admin.v1+json',
+     'Content-Type' => 'application/json'}
   end 
 
-
-
-#   def self.admin_request(method, path, params = {})    
-#     # data_params = params.inject({}) {|h, (k,v)| h.update({k => v.nil? ? v : v.to_s})}
-#     # flattened_params = self._flatten_params(data_params)
-
-#     flattened_params = self._flatten_params(params)
-
-# # puts "############################"
-# # puts "flattened_params: #{flattened_params}"
-# # puts "############################"
-
-#     headers = self._build_admin_headers(method, path, flattened_params) 
-#     url = THE_CITY_ADMIN_PATH+path
-
-#     response = 
-#     case method 
-#     when :post
-#       Typhoeus::Request.post(url, {:headers => headers, :params => flattened_params})
-#     when :get  
-#       Typhoeus::Request.get(url, {:headers => headers, :params => flattened_params})
-#     when :put  
-#       Typhoeus::Request.put(url, {:headers => headers, :params => flattened_params})
-#     when :delete      
-#       Typhoeus::Request.delete(url, {:headers => headers, :params => flattened_params})
-#     end
-
-#     unless response.success?
-#       if response.curl_error_message != 'No error'
-#         raise TheCityExceptions::UnableToConnectToTheCity.new(response.curl_error_message)
-#       else
-#         begin
-#           error_messages = JSON.parse(response.body)['error_message']
-#         rescue
-#           raise TheCityExceptions::UnknownErrorConnectingToTheCity.new('Unknown error when connecting to The City')
-#         else
-#           raise TheCityExceptions::TheCityResponseError.new(error_messages)
-#         end
-#       end
-#     end
-
-#     response
-#   end
-
-
-#   def self._flatten_params(params, prefix='')
-#     retval = []
-#     if params.instance_of?(Array)
-#       if params.empty?
-#         retval << self._flatten_params('', "#{prefix.to_s}[0]")
-#       else
-#         params.each_with_index do |value, indx|
-#           retval << self._flatten_params(value, "#{prefix.to_s}[#{indx}]")
-#         end
-#       end
-#     elsif params.instance_of?(Hash)
-#       params.each do |key, value|
-#         retval << self._flatten_params(value, prefix.empty? ? key.to_s : "#{prefix}[#{key.to_s}]")
-#       end
-#     else # assume string
-#       retval << "#{prefix}=#{params}"
-#     end
-
-#     if prefix.empty?
-#       hvals = {}
-#       retval.flatten.sort.each { |v| hvals[v.split('=')[0]] = v.split('=')[1] }
-#       hvals
-#     else  
-#       retval.flatten.sort
-#     end
-#     #retval.flatten.sort
-#   end
-
-
-
-#   def self._build_admin_headers(method, path, params) 
-#     # get_vars = '?' + params.to_a.sort.collect { |kv_pair| "#{kv_pair[0]}=#{kv_pair[1]}" }.join('&')
-#     # get_vars = '' if get_vars == '?'
-
-
-#     get_vars = '?' + params.to_a.sort.collect { |kv_pair| 
-#       if kv_pair[1].class == Array
-#         puts "ARRAY"
-#         kv_pair[1].each_with_index do |v, indx|
-#           "#{kv_pair[0]}[#{indx}]=#{v}" 
-#         end
-#       else
-#         "#{kv_pair[0]}=#{kv_pair[1]}" 
-#       end
-#     }.join('&')
-#     get_vars = '' if get_vars == '?'
-
-
-# # puts "############################"
-# # puts "params: #{params}"
-# # puts '------------'
-# # puts "get_vars: #{get_vars}"
-# # puts "############################"
-
-#     method_request = method.to_s.upcase
-#     url = THE_CITY_ADMIN_PATH + path + get_vars
-#     current_time = Time.now.to_i.to_s
-#     string_to_sign = current_time.to_s + method_request + url
-#     unencoded_hmac = OpenSSL::HMAC.digest('sha256', TheCity::AdminApi::API_KEY, string_to_sign)
-#     unescaped_hmac = Base64.encode64(unencoded_hmac).chomp
-#     hmac_signature = CGI.escape(unescaped_hmac)
-
-#     headers = {'X-City-Sig' => hmac_signature,
-#                'X-City-User-Token' => TheCity::AdminApi::API_TOKEN,
-#                'X-City-Time' => current_time,
-#                'Accept' => 'application/vnd.thecity.admin.v1+json'}
-
-
-#     # This is causing issues.... not sure if it is needed (docs might be lieing)
-#     # if [:post, :put].include?(method)
-#     #   headers['Content-Type'] = 'application/json'
-#     #   headers['Content-Length'] = params.to_json.length
-#     # end
-
-#     headers
-#   end  
-
 end

data/test_scripts/city_keys.rb

@@ -1,6 +1,6 @@
 module CityKeys
 
-  KEY = '66c59e2ee24553e7237259e30b4c17365681b95c'
-  TOKEN = 'a9ae4af3c3e80102'
+  KEY = 'cf2903151e3213e66fd8080c7d8b65b1d6ccdd31'
+  TOKEN = '5c88b32edda7653c'
 
 end

data/thecity_admin_api.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   PROJECT_GEM = 'the-city-admin'
-  PROJECT_GEM_VERSION = '0.1.1'
+  PROJECT_GEM_VERSION = '0.1.2'
   
   s.name = PROJECT_GEM
   s.version = PROJECT_GEM_VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: the-city-admin
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-30 00:00:00.000000000 Z
+date: 2012-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus