restpack_user_service 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fdd6e9e5ea385023ee95d8ca4fe6374255a4b20
-  data.tar.gz: dde09dfcf8e9b9e76673aeb8e984c17d5ee0a462
+  metadata.gz: c0c271281a82e716ca91f3f90867b30ddd94d30a
+  data.tar.gz: 0c129e97bebd4f6552aec4fdb2b9f4fb26fc3d10
 SHA512:
-  metadata.gz: 950120dce2af643bd5ec69d923d08edcbd20e9e74c255dbf78b1e9bb27aab07a92ea8a2fb154170585e6e129ce8d283e89a015422f5fee825f3c60323dc52462
-  data.tar.gz: 1f1462758a45abe54380a2abebc7033f4cf62e2944b712c2c24a39e4ca5383497d81372c6bcef867e6d29c1408355a4cdc131e36edec3421487f1569c01f9c4d
+  metadata.gz: 27c4036f51ca0c80f49252a0946332f45180777534a7a0ec770cc4dc8bdda331ba082da76cb713d1f6a848bb7dc6192a5ffdb3018a18340d0380c9e5bad40309
+  data.tar.gz: 92e5baf3af87b2beb187c22212b5cd30ca43932cd9137b46ce1eac9bce93a376b4b41680fcbedb8b053e844bd9dff8a682ef239d9add77ac9bb8f1cded21245d

data/Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in restpack_user_service.gemspec
 gemspec

data/db/migrate/{20130807130942_create_users.rb → 20130807130943_create_users.rb}

@@ -1,6 +1,6 @@
 class CreateUsers < ActiveRecord::Migration
   def change
-    create_table :restpack_users do |t|
+    create_table :restpack_user_users do |t|
       t.string :name, :limit => 128
       t.string :nickname, :limit => 128
       t.string :email, :limit => 512

data/db/migrate/{20130807130949_create_authentications.rb → 20130807130950_create_authentications.rb}

@@ -1,6 +1,6 @@
 class CreateAuthentications < ActiveRecord::Migration
   def change
-    create_table :restpack_authentications do |t|
+    create_table :restpack_user_authentications do |t|
       t.string  :provider, :limit => 128, :null => false
       t.string  :uid, :limit => 1024, :null => false
       t.json    :omniauth, :null => false

data/lib/restpack_user_service.rb

@@ -1,2 +1,2 @@
 require 'restpack_service'
-RestPack::Service::Loader.load 'user', Dir.pwd
+RestPack::Service::Loader.load 'restpack_user_service', 'Users'

data/lib/restpack_user_service/commands/user/get.rb

@@ -1,25 +1,8 @@
-module RestPack::User::Service::Commands
-  module User
-    class Get < RestPack::Service::Command
-      required do
-        integer :id
-        integer :application_id
-      end
-
-      def execute
-        #TODO: GJ: remove the :application_id scope when we can specify custom serializer filters
-        #          https://github.com/RestPack/restpack_serializer/issues/42
-        result = Serializers::User.resource(
-          inputs,
-          Models::User.where(application_id: inputs[:application_id])
-        )
-
-        if result[:users].empty?
-          status :not_found
-        else
-          result
-        end
-      end
+module Commands::Users::User
+  class Get < RestPack::Service::Commands::Get
+    required do
+      integer :id
+      integer :application_id
     end
   end
 end

data/lib/restpack_user_service/commands/user/list.rb

@@ -0,0 +1,15 @@
+module Commands::Users::User
+  class List < RestPack::Service::Commands::List
+    required do
+      integer :application_id
+    end
+
+    optional do
+      integer :account_id
+      string :email
+      string :include
+      integer :page
+      integer :page_size
+    end
+  end
+end

data/lib/restpack_user_service/commands/user/omni_authenticate.rb

@@ -1,34 +1,48 @@
-module RestPack::User::Service::Commands
-  module User
-    class OmniAuthenticate < RestPack::Service::Command
-      required do
-        integer :application_id
-        hash :omniauth_response do
-          required do
-            string :provider
-            string :uid
-            hash :info
-          end
+require 'restpack_service_messaging'
+
+module Commands::Users::User
+  class OmniAuthenticate < RestPack::Service::Command
+    required do
+      integer :application_id
+      hash :omniauth_response do
+        required do
+          string :provider
+          string :uid
+          hash :info
         end
       end
+    end
 
-      optional do
-        integer :user_id
-      end
+    optional do
+      integer :user_id
+    end
 
-      def execute
-        user = Models::User.authenticate(
-          user_id,
-          application_id,
-          raw_inputs[:omniauth_response]
-        )
+    def execute
+      user = Models::Users::User.authenticate(
+        user_id,
+        application_id,
+        raw_inputs[:omniauth_response]
+      )
 
-        if user
-          return Serializers::User.resource(user)
-        else
-          status :unauthorized
-        end
+      if user
+        record_activity(user, inputs)
+        return Serializers::Users::User.resource(user)
+      else
+        status :unauthorized
       end
     end
+
+    private
+
+    def record_activity(user, inputs)
+      provider = inputs[:omniauth_response][:provider]
+      type = 'login' #TODO: GJ: differentiate between login and signup
+      Messaging::Activity::Create.run({
+        application_id: inputs[:application_id],
+        user_id: user.id,
+        content: "#{user.name} logged in via #{inputs[:omniauth_response][:provider]}",
+        tags: "service:users,auth:#{type},provider:#{provider}"
+      })
+    end
   end
 end

data/lib/restpack_user_service/models/authentication.rb

@@ -1,7 +1,6 @@
-
-module RestPack::User::Service::Models
+module Models::Users
   class Authentication < ActiveRecord::Base
-    self.table_name = :restpack_authentications
+    self.table_name = :restpack_user_authentications
 
     attr_accessible :application_id, :oauth, :provider, :uid, :user_id, :omniauth
     serialize :oauth, JSON

data/lib/restpack_user_service/models/user.rb

@@ -1,6 +1,6 @@
-module RestPack::User::Service::Models
+module Models::Users
   class User < ActiveRecord::Base
-    self.table_name = :restpack_users
+    self.table_name = :restpack_user_users
     attr_accessible :application_id, :description, :email, :image, :location, :name, :nickname
 
     validates_presence_of :application_id

data/lib/restpack_user_service/serializers/authentication.rb

@@ -0,0 +1,11 @@
+module Serializers::Users
+  class Authentication
+    include RestPack::Serializer
+
+    self.model_class = Models::Users::Authentication
+    self.key = :authentications
+
+    attributes :id, :provider, :uid
+    can_include :user
+  end
+end

data/lib/restpack_user_service/serializers/user.rb

@@ -1,12 +1,14 @@
-module RestPack::User::Service::Serializers
+module Serializers::Users
   class User
     include RestPack::Serializer
 
-    self.model_class = Models::User
+    self.model_class = Models::Users::User
     self.key = :users
 
     attributes :id, :application_id, :description, :email,
                :image, :avatar, :location, :name, :nickname, :href
+    can_include :authentications
+    can_filter_by :application_id
 
     def avatar
       image || "http://robohash.org/#{id}.png?size=200x200"

data/lib/restpack_user_service/version.rb

@@ -1,7 +1,7 @@
 module RestPack
   module User
     module Service
-      VERSION = "0.0.4"
+      VERSION = "0.0.5"
     end
   end
 end

data/restpack_user_service.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "restpack_service"
+  spec.add_dependency "restpack_service_messaging"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "database_cleaner", "~> 1.0.1"

data/spec/commands/user/get_spec.rb

@@ -1,6 +1,6 @@
-require_relative '../../spec_helper'
+require 'spec_helper'
 
-describe Commands::User::Get do
+describe Commands::Users::User::Get do
   is_required :id, :application_id
 
   let(:response) { subject.class.run(params) }

data/spec/commands/user/list_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+
+describe Commands::Users::User::List do
+  is_required :application_id
+  is_optional :account_id, :email, :include, :page, :page_size
+
+  pending
+end

data/spec/commands/user/omni_authenticate_spec.rb

@@ -1,11 +1,11 @@
-require_relative '../../spec_helper'
+require 'spec_helper'
 
-describe Commands::User::OmniAuthenticate do
+describe Commands::Users::User::OmniAuthenticate do
   is_required :application_id, :omniauth_response
   is_optional :user_id
 
-  User = Models::User
-  Authentication = Models::Authentication
+  User = Models::Users::User
+  Authentication = Models::Users::Authentication
 
   let(:response) { subject.class.run(params) }
 
@@ -23,7 +23,7 @@ describe Commands::User::OmniAuthenticate do
     context 'existing authentication' do
       it 'returns the existing user' do
         response.success?.should == true
-        response.result.should == Serializers::User.resource(@authentication.user)
+        response.result.should == Serializers::Users::User.resource(@authentication.user)
       end
     end
 
@@ -35,7 +35,7 @@ describe Commands::User::OmniAuthenticate do
 
       it 'returns the existing user' do
         response.success?.should == true
-        response.result.should == Serializers::User.resource(@authentication.user)
+        response.result.should == Serializers::Users::User.resource(@authentication.user)
         @authentication.user.authentications.length.should == 2
       end
     end

data/spec/factories/authentication_factory.rb

@@ -1,5 +1,5 @@
 FactoryGirl.define do
-  factory :authentication, :class => Models::Authentication do
+  factory :authentication, :class => Models::Users::Authentication do
     user
     application_id { user.application_id }
     provider 'twitter'

data/spec/factories/user_factory.rb

@@ -1,5 +1,5 @@
 FactoryGirl.define do
-  factory :user, :class => Models::User do
+  factory :user, :class => Models::Users::User do
     sequence(:application_id)
     sequence(:description)  {|n| "Description ##{n}" }
     sequence(:email)        {|n| "email ##{n}" }

data/spec/models/authentication_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Models::Authentication do
+describe Models::Users::Authentication do
   it { should validate_presence_of(:application_id) }
   it { should validate_presence_of(:omniauth) }
   it { should validate_presence_of(:provider) }
@@ -11,7 +11,6 @@ describe Models::Authentication do
   it { should ensure_length_of(:uid).is_at_most(1024) }
 
   it { should belong_to(:user) }
-  it { subject.class.table_name.should == 'restpack_authentications' }
 
   let(:application_id) { 123 }
   let(:omniauth) { {

data/spec/models/user_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Models::User do
+describe Models::Users::User do
   it { should validate_presence_of(:application_id) }
   it { should ensure_length_of(:name).is_at_most(128) }
   it { should ensure_length_of(:nickname).is_at_most(128) }
@@ -8,7 +8,6 @@ describe Models::User do
   it { should ensure_length_of(:image).is_at_most(1024) }
   it { should ensure_length_of(:location).is_at_most(512) }
   it { should ensure_length_of(:description).is_at_most(1024) }
-  it { subject.class.table_name.should == 'restpack_users' }
 
   describe "#authenticate" do
     pending

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restpack_user_service
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Gavin Joyce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-21 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: restpack_service
@@ -24,6 +24,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: restpack_service_messaging
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -137,20 +151,23 @@ files:
 - README.md
 - Rakefile
 - config/database.yml
-- db/migrate/20130807130942_create_users.rb
-- db/migrate/20130807130949_create_authentications.rb
+- db/migrate/20130807130943_create_users.rb
+- db/migrate/20130807130950_create_authentications.rb
 - lib/restpack_user_service.rb
 - lib/restpack_user_service/commands/user/get.rb
+- lib/restpack_user_service/commands/user/list.rb
 - lib/restpack_user_service/commands/user/omni_authenticate.rb
 - lib/restpack_user_service/configuration.rb
 - lib/restpack_user_service/models/authentication.rb
 - lib/restpack_user_service/models/user.rb
+- lib/restpack_user_service/serializers/authentication.rb
 - lib/restpack_user_service/serializers/user.rb
 - lib/restpack_user_service/tasks/db.rake
 - lib/restpack_user_service/tasks/tasks.rb
 - lib/restpack_user_service/version.rb
 - restpack_user_service.gemspec
 - spec/commands/user/get_spec.rb
+- spec/commands/user/list_spec.rb
 - spec/commands/user/omni_authenticate_spec.rb
 - spec/factories/authentication_factory.rb
 - spec/factories/user_factory.rb
@@ -177,12 +194,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: Users and Authentications
 test_files:
 - spec/commands/user/get_spec.rb
+- spec/commands/user/list_spec.rb
 - spec/commands/user/omni_authenticate_spec.rb
 - spec/factories/authentication_factory.rb
 - spec/factories/user_factory.rb