thecity 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c176e00ec8bb0c18426ec2de367af7860f6d507
-  data.tar.gz: 97db6cae4dd681343fc3ab26cd9cf1398b1fdae7
+  metadata.gz: d34152f9f12969373d5f5eb2be4b02356ade4ffd
+  data.tar.gz: 693564268d37117d9f619b83998f872912262350
 SHA512:
-  metadata.gz: e31f5742ba57813ff9b5fb18b56e85dd55976b2273ba6ed6c6fa44b7e5ce820892ba63036bbb2e333f62f90e421bca52436091aee1f03ff2a7e244ddf8bb0d06
-  data.tar.gz: bb49a9510a57b7f2923cc67111376f4bcd9febe65f8fe42916e33d0ad4035220ab60dbdec1af6c81fbc7d50b644aff73673ff4651073d4d3187a8a8cb7d442ac
+  metadata.gz: 426501071ad8fd11f5cd1842799f2aa9b360607e30dbb2f6076af0cb38605316a5b6ac36cfa5439848510c9b66b796ac2078e0f85b5f9c66d36a61e201f7d92f
+  data.tar.gz: 31ee55ad21b32d3d007cafe9c38f8a695567af5a17e31ed65cbbefd05a596f4cbabe9397c4a1d2bbc111f2600b8320989995dc80fedc1bea64254cd3694afa91

data/lib/the_city/account.rb

@@ -25,7 +25,7 @@ module TheCity
     end
 
     def label_for(thecity_primitive)
-      terminology.send(thecity_primitive.downcase.to_sym)
+      terminology.send(thecity_primitive.downcase.to_sym) rescue nil
     end
 
   end

data/lib/the_city/api/groups.rb

@@ -8,7 +8,7 @@ module TheCity
   
       # Returns all the groups that the current user has an active role in
       #
-      # @req_scope group_contont or user_groups
+      # @req_scope group_content or user_groups
       # @param options [Hash] A customizable set of options.
       # @option options [Boolean] :force_download Forces the request to hit the server and flush the cached response
       # @return [Array<TheCity::Group>]

data/lib/the_city/content.rb

@@ -16,13 +16,12 @@ module TheCity
 
   class Content < TheCity::Base
     include TheCity::Time
-    attr_reader :id, :title, :body
+    attr_reader :id, :title, :body, :blurb, :group_id,
+                :leader_only, :priority, :member_only, :gender_only, :gender_only_gender, :featured, 
+                :short_url, :file_attachments, :plaza, :shareable, :address
     object_attr_reader :User, :user
     object_attr_reader :Group, :group
 
-    # def user
-    #   @user
-    # end
     alias author user
     
   end

data/lib/the_city/group.rb

@@ -1,6 +1,6 @@
 module TheCity
   class Group < TheCity::Base
-    attr_reader :name, :type, :id, :profile_picture, :role_title, :primary_campus
+    attr_reader :name, :type, :id, :profile_picture, :role_title, :primary_campus, :can_create
 
   end
 end

data/lib/the_city/permissions.rb

@@ -17,5 +17,13 @@ module TheCity
   class Permissions < TheCity::Base
     attr_reader :can_list_in_plaza, :member, :staff, :admin, :can_create_in_group_ids, :admin_privileges
 
+    def is_account_admin?
+      admin_privileges.any? {|ap| ap[:title] == 'Account Admin'} rescue false
+    end
+
+    def is_user_admin?
+      admin_privileges.any? {|ap| ap[:title] == 'User Admin'} rescue false
+    end
+
   end
 end

data/lib/the_city/topic.rb

@@ -7,4 +7,8 @@ module TheCity
   class Topic < TheCity::Content
   end
 
+  def valid?
+  	return (title and body and group_id)
+  end
+
 end

data/lib/the_city/user.rb

@@ -1,23 +1,56 @@
+require 'time'
+
 module TheCity
   class User < TheCity::Base
-    extend Forwardable
-
-    attr_reader :id, :name, :profile_picture, :gender
+    attr_reader :id, :title, :first, :last, :name, :profile_picture, #user_basic
+                :gender, :email ##user_extended
     attr_writer :permissions
 
-    def_delegators :@permissions, :member?, :staff?, :admin?
-
     # Returns the groups that the user belongs to
     #
     # @return [Array<TheCity::Group>]
     def groups
       memoize(:groups) do
-        Array(@attrs[:groups]).map do |g|
-          TheCity::Group.new(g)
+        if @attrs[:groups].any?
+          Array(@attrs[:groups]).map do |g|
+            TheCity::Group.new(g)
+          end
+        elsif @client
+          @client.my_groups
+        else
+          []
         end
       end
     end
 
+    def method_missing(method_sym, *arguments, &block)
+      if method_sym.to_s =~ /^is_in_group_(\d+)\??$/
+        is_in_group_with_title?($1.to_i, arguments.first)
+      else
+        super
+      end
+    end
+
+    # @note Returns true/false if the current user has an active role in the group (group_id).
+    #
+    # @param group_id [Integer] the id of TheCity::Group in question.
+    # @param title [Array<String>] the title or titles of the user's active role.
+    # @example see if the user is a leader in group 1234
+    #   current_user.is_in_group_with_title(1234, :leader)
+    # @return [Boolean]
+    def is_in_group_with_title?(group_id, title=nil)
+      return groups.any? {|g| g.id == group_id } if title.nil?
+      titles = [title].flatten
+      return groups.any? {|g| (g.id == group_id and titles.any? {|t| t.to_s.downcase == g.role_title.downcase } ) }
+    end
+
+    # Returns the user's birthdate as a ruby Date object.
+    #
+    # @return [Date]
+    def birthdate
+      @bday ||= Date.strptime(@attrs[:birthdate], '%m/%d/%Y') rescue nil
+    end
+
     # Returns the permissions for the current user
     #
     # @return [TheCity::Permissions]
@@ -25,17 +58,27 @@ module TheCity
       @permissions ||= @client.permissions if (@client and @client.current_user.id == id)
     end
 
-    # def member?
-    #   permissions.member? rescue false
-    # end
+    # Returns true/false if the current user is an admin on the current church (Group Admin, Account Admin, etc).
+    # If you need to check for a specific admin privilege, you will need to go through TheCity::Permissions object.
+    #
+    # @return [Boolean]
+    def admin?
+      @attrs[:admin] || permissions.admin? rescue nil
+    end
 
-    # def staff?
-    #   permissions.staff? rescue false
-    # end
+    # Returns true/false if the current user is a member of the current church.
+    #
+    # @return [Boolean]
+    def member?
+      @attrs[:member] || permissions.member? rescue nil
+    end
 
-    # def admin?
-    #   permissions.admin? rescue false
-    # end
+    # Returns true/false if the current user is on staff at the current church.
+    #
+    # @return [Boolean]
+    def staff?
+      @attrs[:staff] || permissions.staff? rescue nil
+    end
 
   end
 end

data/lib/the_city/version.rb

@@ -2,7 +2,7 @@ module TheCity
   class Version
     MAJOR = 0
     MINOR = 0
-    PATCH = 7
+    PATCH = 8
     PRE = nil
 
     class << self

data/spec/helper.rb

@@ -11,8 +11,16 @@ SimpleCov.start
 require 'the_city'
 require 'rspec'
 require 'webmock/rspec'
+require 'vcr'
+require 'typhoeus'
+require 'active_support/core_ext'
 
-WebMock.disable_net_connect!(:allow => 'coveralls.io')
+VCR.configure do |c|
+  c.cassette_library_dir = "spec/vcr_cassettes"
+  c.hook_into :webmock
+  c.default_cassette_options = {:re_record_interval => 7.days}
+  c.configure_rspec_metadata!
+end
 
 RSpec.configure do |config|
   config.expect_with :rspec do |c|
@@ -20,42 +28,64 @@ RSpec.configure do |config|
   end
 end
 
-def a_delete(path)
-  a_request(:delete, TheCity::API::Client::ENDPOINT + path)
-end
 
-def a_get(path)
-  a_request(:get, TheCity::API::Client::ENDPOINT + path)
-end
-
-def a_post(path)
-  a_request(:post, TheCity::API::Client::ENDPOINT + path)
-end
-
-def a_put(path)
-  a_request(:put, TheCity::API::Client::ENDPOINT + path)
-end
-
-def stub_delete(path)
-  stub_request(:delete, TheCity::API::Client::ENDPOINT + path)
-end
-
-def stub_get(path)
-  stub_request(:get, TheCity::API::Client::ENDPOINT + path)
-end
-
-def stub_post(path)
-  stub_request(:post, TheCity::API::Client::ENDPOINT + path)
-end
-
-def stub_put(path)
-  stub_request(:put, TheCity::API::Client::ENDPOINT + path)
+def get_oauth_token_for(username, password, subdomain='')
+  auth_response = Typhoeus.post("https://authentication.onthecity.org/",
+                :params => {"app_id" => APP_ID, "secret" => SECRET, "login" => username, "password" => password, "subdomain" => subdomain})
+  typhoeus_token = JSON.parse(auth_response.options[:response_body])['access_token']['token'] rescue nil
+  vcr_token = JSON.parse(auth_response.options[:body])['access_token']['token'] rescue nil
+  if typhoeus_token.nil?
+    return vcr_token
+  else
+    return typhoeus_token
+  end
 end
 
-def fixture_path
-  File.expand_path("../fixtures", __FILE__)
+def fire_up_test_client(subdomain='')
+  ENV['THECITY_SUBDOMAIN'] = subdomain
+  client = TheCity::API::Client.new do |config|
+    config.app_id        = APP_ID
+    config.app_secret    = SECRET
+  end
+  return client
 end
 
-def fixture(file)
-  File.new(fixture_path + '/' + file)
-end
+#def a_delete(path)
+#  a_request(:delete, TheCity::API::Client::ENDPOINT + path)
+#end
+#
+#def a_get(path)
+#  a_request(:get, TheCity::API::Client::ENDPOINT + path)
+#end
+#
+#def a_post(path)
+#  a_request(:post, TheCity::API::Client::ENDPOINT + path)
+#end
+#
+#def a_put(path)
+#  a_request(:put, TheCity::API::Client::ENDPOINT + path)
+#end
+#
+#def stub_delete(path)
+#  stub_request(:delete, TheCity::API::Client::ENDPOINT + path)
+#end
+#
+#def stub_get(path)
+#  stub_request(:get, TheCity::API::Client::ENDPOINT + path)
+#end
+#
+#def stub_post(path)
+#  stub_request(:post, TheCity::API::Client::ENDPOINT + path)
+#end
+#
+#def stub_put(path)
+#  stub_request(:put, TheCity::API::Client::ENDPOINT + path)
+#end
+#
+#def fixture_path
+#  File.expand_path("../fixtures", __FILE__)
+#end
+#
+#def fixture(file)
+#  File.new(fixture_path + '/' + file)
+#end

data/spec/thecity/user_spec.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 require 'helper'
 
 describe TheCity::User do
@@ -16,6 +15,7 @@ describe TheCity::User do
       expect(user.groups.first).to be_a TheCity::Group
       expect(user.groups.first.name).to eq("My Group")
     end
+
     it "is empty when not set" do
       user = TheCity::User.new(:id => 6753948)
       expect(user.groups).to be_empty

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thecity
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Robert Leib
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-26 00:00:00.000000000 Z
+date: 2013-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -104,7 +104,6 @@ files:
 - lib/the_city/api/events.rb
 - lib/the_city/api/groups.rb
 - lib/the_city/api/needs.rb
-- lib/the_city/api/oauth.rb
 - lib/the_city/api/prayers.rb
 - lib/the_city/api/request/multipart_with_file.rb
 - lib/the_city/api/response/parse_json.rb
@@ -139,14 +138,12 @@ files:
 - lib/the_city/rate_limit.rb
 - lib/the_city/terminology.rb
 - lib/the_city/time.rb
-- lib/the_city/token.rb
 - lib/the_city/topic.rb
 - lib/the_city/user.rb
 - lib/the_city/version.rb
 - lib/the_city.rb
 - spec/fixtures/me.json
 - spec/helper.rb
-- spec/thecity/api/users_spec.rb
 - spec/thecity/base_spec.rb
 - spec/thecity/user_spec.rb
 - spec/thecity_spec.rb
@@ -177,7 +174,6 @@ summary: A Ruby interface to The City API.
 test_files:
 - spec/fixtures/me.json
 - spec/helper.rb
-- spec/thecity/api/users_spec.rb
 - spec/thecity/base_spec.rb
 - spec/thecity/user_spec.rb
 - spec/thecity_spec.rb

data/lib/the_city/api/oauth.rb

@@ -1,50 +0,0 @@
-require 'the_city/api/utils'
-require 'the_city/token'
-
-module TheCity
-  module API
-    module OAuth
-      include TheCity::API::Utils
-
-      def authentication_url
-        "https://authentication.onthecity.org/oauth/authorize?#{authentication_headers}"
-      end
-
-      def authentication_headers
-
-      end
-
-      def authentication_params
-        "scope=user_basic&app_id="
-      end
-
-      def authorization_url(code)
-      end
-
-      # Allows a registered application to obtain an OAuth 2 Bearear Token, which can be used to make API requests
-      # on an application's own behalf, without a user context.
-      #
-      # Only one bearer token may exist outstanding for an application, and repeated requests to this method
-      # will yield the same already-existent token until it has been invalidated.
-      #
-      # @return [TheCity::Token] The Bearer Token. token_type should be 'bearer'.
-      # @example Generate a Bearer Token
-      #   client = TheCity::API::Client.new(:consumer_key => "abc", :consumer_secret => 'def')
-      #   bearer_token = client.token
-      def token
-        object_from_response(TheCity::Token, :post, "/oauth2/token", :grant_type => "client_credentials", :bearer_token_request => true)
-      end
-      alias bearer_token token
-
-      # Allows a registered application to revoke an issued OAuth 2 Bearer Token by presenting its client credentials.
-      #
-      # @param access_token [String, TheCity::Token] The bearer token to revoke.
-      # @return [TheCity::Token] The invalidated token. token_type should be nil.
-      def invalidate_token(access_token)
-        access_token = access_token.access_token if access_token.is_a?(TheCity::Token)
-        object_from_response(TheCity::Token, :post, "/oauth2/invalidate_token", :access_token => access_token)
-      end
-
-    end
-  end
-end

data/lib/the_city/token.rb

@@ -1,16 +0,0 @@
-require 'the_city/base'
-
-module TheCity
-  class Token < TheCity::Base
-    attr_reader :access_token, :token_type
-    alias to_s access_token
-
-    BEARER_TYPE = "bearer"
-
-    # @return [Boolean]
-    def bearer?
-      @attrs[:token_type] == BEARER_TYPE
-    end
-
-  end
-end

data/spec/thecity/api/users_spec.rb

@@ -1,24 +0,0 @@
-require 'helper'
-
-describe TheCity::API::Users do
-
-  before do
-    @client = TheCity::API::Client.new(:app_id => "CK", :app_secret => "CS", :access_token => "AT")
-  end
-
-  describe "#me" do
-    before do
-      stub_get("/me").to_return(:body => fixture("me.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-    end
-    it "requests the correct resource" do
-      @client.me
-      expect(a_get("/me")).to have_been_made
-    end
-    it "returns the requesting user" do
-      user = @client.me
-      expect(user).to be_a TheCity::User
-      expect(user.id).to eq(6753948)
-    end
-  end
-
-end