openstax_connect 0.0.8 → 0.0.9

data/README.md

@@ -35,25 +35,45 @@ There is also a logout path helper for `/connect/sessions/destroy`, given by `lo
 
     config.logout_via = :delete
 
-Make sure to install the engine's migrations:
+OpenStax Connect provides you with an `OpenStax::Connect::User` object.  You can
+use this as your app's User object without modification, you can modify it to suit
+your app's needs (not recommended), or you can provide your own custom User object
+that references the OpenStax Connect User object.  
 
-    rake openstax_connect:install:migrations
+OpenStax Connect also provides you methods for getting and setting the current 
+signed in user (`current_user` and `current_user=` methods).  If you choose to create 
+your own custom User object that references the User object provide by Connect, 
+you can teach OpenStax Connect how to translate between your app's custom User 
+object and OpenStax Connect's built-in User object.
 
-You also need to create your own User and AnonymousUser models.  Once you do this, include concerns from the connect gem to get their baseline functionality.
+To do this, you need to set a `user_provider` in this configuration.  
 
-    class User < ActiveRecord::Base
-      include OpenStax::Connect::Models::User
-      ...
-    end
+    config.user_provider = MyUserProvider
 
-and
+The user_provider is a class that provides two class methods:
 
-    class AnonymousUser < ActiveRecord::Base
-      include OpenStax::Connect::Models::AnonymousUser
-      ...
+    def self.connect_user_to_app_user(connect_user)
+      # converts the given connect user to an app user
+      # if you want to cache the connect_user in the app user
+      # this is the place to do it.
+      # If no app user exists for this connect user, one should
+      # be created.
     end
+  
+    def self.app_user_to_connect_user(app_user)
+      # converts the given app user to a connect user
+    end 
 
-Check out the engine code in app/concerns to see what this gets you.
+Connect users are never nil.  When a user is signed out, the current connect user 
+is an anonymous user (responding true to `is_anonymous?`).  You can follow the same
+pattern in your app or you can use nil for the current user.  Just remember to check
+the anonymous status of connect users when doing your connect <-> app translations.
+
+The default `user_provider` just uses OpenStax::Connect::User as the app user.
+
+Make sure to install the engine's migrations:
+
+    rake openstax_connect:install:migrations
 
 Example Application
 -------------------

data/config/initializers/02_extend_builtins.rb

@@ -1,30 +1,24 @@
 class ActionController::Base
 
-  before_filter { 
-    @current_user_manager = OpenStax::Connect::CurrentUserManager.new(request, 
-                                                                      session, 
-                                                                      cookies) 
-  }
-
   # Returns the current app user
   def current_user
-    @current_user_manager.current_user
+    current_user_manager.current_user
   end
 
   # Signs in the given user; the argument can be either a connect user or
   # an app user
   def sign_in(user)
-    @current_user_manager.sign_in(user)
+    current_user_manager.sign_in(user)
   end
 
   # Signs out the current user
   def sign_out!
-    @current_user_manager.sign_out!
+    current_user_manager.sign_out!
   end
 
   # Returns true iff there is a user signed in
   def signed_in?
-    @current_user_manager.signed_in?
+    current_user_manager.signed_in?
   end
 
   # Useful in before_filters
@@ -38,5 +32,11 @@ protected
 
   helper_method :current_user, :signed_in?
 
+  def current_user_manager
+    @current_user_manager ||= OpenStax::Connect::CurrentUserManager.new(request,
+                                                                        session,
+                                                                        cookies)
+  end
+
 end
 

data/lib/omniauth/strategies/openstax.rb

@@ -11,7 +11,7 @@ module OmniAuth
         :authorize_url => "/oauth/authorize"
       }
 
-      uid        { raw_info["uid"] }
+      uid        { raw_info["id"] }
 
       info do
         {
@@ -23,7 +23,7 @@ module OmniAuth
       end
 
       def raw_info
-        @raw_info ||= access_token.get('/api/v1/me.json').parsed
+        @raw_info ||= access_token.get('/api/users/me.json').parsed
       end
     end
   end

data/lib/openstax/connect/engine.rb

@@ -10,6 +10,11 @@ module OpenStax
     class Engine < ::Rails::Engine
       isolate_namespace OpenStax::Connect
 
+      initializer "openstax_connect.factories",
+                  :after => "factory_girl.set_factory_paths" do
+        FactoryGirl.definition_file_paths << File.join(root, 'spec', 'factories') if defined?(FactoryGirl)
+      end
+
       config.autoload_paths << File.expand_path("../../../app/routines", __FILE__)
       config.autoload_paths << File.expand_path("../../../app/handlers", __FILE__)
       config.autoload_paths << File.expand_path("../../../app/concerns", __FILE__)

data/lib/openstax/connect/version.rb

@@ -1,5 +1,5 @@
 module OpenStax
   module Connect
-    VERSION = "0.0.8"
+    VERSION = "0.0.9"
   end
 end

data/lib/openstax_connect.rb

@@ -47,41 +47,7 @@ module OpenStax
         attr_accessor :default_errors_added_trigger
         attr_accessor :security_transgression_exception
 
-        # OpenStax Connect provides you with an OpenStax::Connect::User object.  You can
-        # use this as your app's User object without modification, you can modify it to suit
-        # your app's needs (not recommended), or you can provide your own custom User object
-        # that references the OpenStax Connect User object.  
-        #
-        # OpenStax Connect also provides you methods for getting and setting the current 
-        # signed in user (current_user and current_user= methods).  If you choose to create 
-        # your own custom User object that references the User object provide by Connect, 
-        # you can teach OpenStax Connect how to translate between your app's custom User 
-        # object and OpenStax Connect's built-in User object.
-        #
-        # To do this, you need to set a "user_provider" in this configuration.  
-        #
-        #   config.user_provider = MyUserProvider
-        #
-        # The user_provider is a class that provides two class methods:
-        #
-        #   def self.connect_user_to_app_user(connect_user)
-        #     # converts the given connect user to an app user
-        #     # if you want to cache the connect_user in the app user
-        #     # this is the place to do it.
-        #     # If no app user exists for this connect user, one should
-        #     # be created.
-        #   end
-        #
-        #   def self.app_user_to_connect_user(app_user)
-        #     # converts the given app user to a connect user
-        #   end 
-        #
-        # Connect users are never nil.  When a user is signed out, the current connect user 
-        # is an anonymous user (responding true is "is_anonymous?").  You can follow the same
-        # pattern in your app or you can use nil for the current user.  Just remember to check
-        # the anonymous status of connect users when doing your connect <-> app translations.
-        #
-        # The default user_provider just uses OpenStax::Connect::User as the app user.
+        # See the "user_provider" discussion in the README 
         attr_accessor :user_provider
 
         def openstax_services_url=(url)

data/spec/controllers/openstax/connect/sessions_controller_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+module OpenStax::Connect
+  describe SessionsController do
+  
+    describe "GET 'create'" do
+      it "returns http success" do
+        get 'create'
+        response.should be_success
+      end
+    end
+  
+  end
+end

data/spec/factories/openstax_connect_user.rb

@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :openstax_connect_user, :class => OpenStax::Connect::User do
+    sequence(:username){ |n| "Application #{n}" }
+    sequence(:openstax_uid){ |n| n }
+  end
+end

data/spec/helpers/openstax/connect/sessions_helper_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+# Specs in this file have access to a helper object that includes
+# the SessionsHelper. For example:
+#
+# describe SessionsHelper do
+#   describe "string concat" do
+#     it "concats two strings with spaces" do
+#       helper.concat_strings("this","that").should == "this that"
+#     end
+#   end
+# end
+module OpenStax::Connect
+  describe SessionsHelper do
+    pending "add some examples to (or delete) #{__FILE__}"
+  end
+end

data/spec/models/openstax/connect/user_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+module OpenStax::Connect
+  describe User do
+    pending "add some examples to (or delete) #{__FILE__}"
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,38 @@
+# This file is copied to spec/ when you run 'rails generate rspec:install'
+ENV["RAILS_ENV"] ||= 'test'
+require File.expand_path("../../config/environment", __FILE__)
+require 'rspec/rails'
+require 'rspec/autorun'
+
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
+
+RSpec.configure do |config|
+  # ## Mock Framework
+  #
+  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
+  #
+  # config.mock_with :mocha
+  # config.mock_with :flexmock
+  # config.mock_with :rr
+
+  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
+  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+
+  # If you're not using ActiveRecord, or you'd prefer not to run each of your
+  # examples within a transaction, remove the following line or assign false
+  # instead of true.
+  config.use_transactional_fixtures = true
+
+  # If true, the base class of anonymous controllers will be inferred
+  # automatically. This will be the default behavior in future versions of
+  # rspec-rails.
+  config.infer_base_class_for_anonymous_controllers = false
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = "random"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstax_connect
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-08 00:00:00.000000000 Z
+date: 2014-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: 3.2.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: 3.2.14
 - !ruby/object:Gem::Dependency
   name: omniauth
   requirement: !ruby/object:Gem::Requirement
@@ -91,6 +91,70 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.1
+- !ruby/object:Gem::Dependency
+  name: openstax_utilities
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: sass-rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.3
+- !ruby/object:Gem::Dependency
+  name: coffee-rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.1
+- !ruby/object:Gem::Dependency
+  name: uglifier
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +187,54 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: factory_girl_rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: quiet_assets
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Rails common code and bindings and for 'services' API
 email:
 - jps@kindlinglabs.com
@@ -170,9 +282,14 @@ files:
 - lib/openstax/connect/version.rb
 - lib/openstax_connect.rb
 - lib/tasks/connect-rails_tasks.rake
+- spec/factories/openstax_connect_user.rb
 - MIT-LICENSE
 - Rakefile
 - README.md
+- spec/controllers/openstax/connect/sessions_controller_spec.rb
+- spec/helpers/openstax/connect/sessions_helper_spec.rb
+- spec/models/openstax/connect/user_spec.rb
+- spec/spec_helper.rb
 homepage: http://github.com/openstax/connect-rails
 licenses: []
 post_install_message: 
@@ -187,7 +304,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4136033706291355193
+      hash: -3223969092906496929
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -196,11 +313,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4136033706291355193
+      hash: -3223969092906496929
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Rails common code and bindings and for 'services' API
-test_files: []
+test_files:
+- spec/controllers/openstax/connect/sessions_controller_spec.rb
+- spec/factories/openstax_connect_user.rb
+- spec/helpers/openstax/connect/sessions_helper_spec.rb
+- spec/models/openstax/connect/user_spec.rb
+- spec/spec_helper.rb