cornflakeomnisocial 0.1.2.3 → 0.1.2.4

data/README.md

@@ -10,7 +10,7 @@ To use OmniSocial in a Rails 3 application:
 
 2. Install it by running `bundle`.
 
-3. Run `rails g omnisocial` to copy an initializer and some CSS and image assets into your base application directory.
+3. Run `rails g omnisocial` to copy an initializer, database migration and some CSS and image assets into your base application directory.
 
 4. Edit `config/initializers/omnisocial.rb` and include your application's Twitter and Facebook OAuth configuration.
 

data/app/controllers/omnisocial/auth_controller.rb

@@ -25,13 +25,13 @@ module Omnisocial
         flash[:message] = 'You have logged in successfully.'
         redirect_back_or_default(root_path)
       else
-        @user = ::User.new(:display_name => @account.name)
+        @user = User.new(:display_name => @account.name)
       end
     end
     
     def confirm
       @account = Omnisocial::LoginAccount.find(params[:account_id])
-      @user = ::User.new(params[:user].merge(:picture_url => @account.picture_url))
+      @user = User.new(params[:omnisocial_user].merge(:picture_url => @account.picture_url))
       if @user.save
         @account.update_attributes(:user => @user)
         self.current_user = @user

data/app/models/omnisocial/facebook_account.rb

@@ -5,14 +5,13 @@ module Omnisocial
       self.remote_account_id  = auth_hash['uid']
       self.login              = auth_hash['user_info']['nickname']
       self.name               = auth_hash['user_info']['name']
-      self.picture_url        = generate_picture_url
     end
   
     def account_url
       "http://facebook.com/#{self.login}"
     end
   
-    def generate_picture_url
+    def picture_url
       if self.login.include?('profile.php')
         "https://graph.facebook.com/#{self.login.gsub(/[^\d]/, '')}/picture?type=square"
       else

data/app/models/omnisocial/login_account.rb

@@ -1,19 +1,9 @@
 module Omnisocial
-  class LoginAccount
-    include Mongoid::Document
-    include Mongoid::Timestamps
-    
-    referenced_in :user
-  
-    field :token
-    field :secret
-    field :remote_account_id
-    field :name
-    field :login
-    field :picture_url
+  class LoginAccount < ActiveRecord::Base
+    belongs_to :user
   
     def self.find_or_create_from_auth_hash(auth_hash)
-      if (account = first(:conditions => {:remote_account_id => auth_hash['uid']}))
+      if (account = find_by_remote_account_id(auth_hash['uid']))
         account.assign_account_info(auth_hash)
         account.save
         account
@@ -23,10 +13,9 @@ module Omnisocial
     end
   
     def self.create_from_auth_hash(auth_hash)
-      account = create!
-      account.assign_account_info(auth_hash)
-      account.save
-      account
+      create do |account|
+        account.assign_account_info(auth_hash)
+      end
     end
   
   end

data/app/models/omnisocial/user.rb

@@ -1,15 +1,6 @@
 module Omnisocial
-  class User
-    include Mongoid::Document
-    include Mongoid::Timestamps
-    
-    field :remember_token
-    field :display_name
-    field :email_address
-    field :picture_url
-    
-    references_many :login_accounts, :class_name => 'Omnisocial::LoginAccount', :dependent => :destroy
-
+  class User < ActiveRecord::Base
+    has_many :login_accounts, :class_name => 'Omnisocial::LoginAccount', :dependent => :destroy
     validates_presence_of :display_name, :email_address
   
     def facebook_account

data/lib/extensions/action_controller/base.rb

@@ -32,9 +32,9 @@ class ActionController::Base
   
   def current_user
     @current_user ||= if session[:user_id]
-      User.first(:conditions => {:id => session[:user_id]})
+      User.find_by_id(session[:user_id])
     elsif cookies[:remember_token]
-      User.first(:conditions => {:remember_token => cookies[:remember_token]})
+      User.find_by_remember_token(cookies[:remember_token])
     else
       false
     end

data/lib/generators/omnisocial/omnisocial_generator.rb

@@ -1,16 +1,31 @@
 require 'rails/generators'
+require 'rails/generators/migration'
 
 module Omnisocial
   module Generators
     class OmnisocialGenerator < Rails::Generators::Base
       include Rails::Generators::Migration
       
-      desc 'Creates an omnisocial initializer and copies image and CSS assets.'
+      desc 'Creates an omnisocial initializer and migration, and copies image and CSS assets.'
 
       def self.source_root
         File.join(File.dirname(__FILE__), 'templates')
       end
 
+      # Implement the required interface for Rails::Generators::Migration:
+      # http://github.com/rails/rails/blob/master/activerecord/lib/generators/active_record.rb
+      def self.next_migration_number(dirname)
+        if ActiveRecord::Base.timestamped_migrations
+          Time.now.utc.strftime("%Y%m%d%H%M%S")
+        else
+          "%.3d" % (current_migration_number(dirname) + 1)
+        end
+      end
+
+      def create_migration_file
+        migration_template 'migration.rb', 'db/migrate/create_omnisocial_tables.rb'
+      end
+      
       def copy_initializer
         template 'omnisocial.rb', 'config/initializers/omnisocial.rb'
       end

data/lib/generators/omnisocial/templates/migration.rb

@@ -0,0 +1,35 @@
+class CreateOmnisocialTables < ActiveRecord::Migration
+  def self.up
+    create_table :users do |t|
+      t.string :remember_token
+      # Any additional fields here
+      t.string :display_name
+      t.string :email_address
+      t.string :picture_url
+      
+      t.timestamps
+    end
+    
+    create_table :login_accounts do |t|
+      t.string :type
+      t.string :user_id
+      t.string :remote_account_id
+      t.string :name
+      t.string :login
+      t.string :picture_url
+      # Any additional fields here 
+      
+      t.timestamps
+    end
+    
+    add_index :login_accounts, :user_id
+    add_index :login_accounts, :type
+  end
+
+  def self.down
+    remove_index :login_accounts, :type
+    remove_index :login_accounts, :user_id
+    drop_table :login_accounts
+    drop_table :users
+  end
+end

data/lib/omnisocial/version.rb

@@ -1,3 +1,3 @@
 module Omnisocial
-  VERSION = '0.1.2.3'.freeze
+  VERSION = '0.1.2.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: cornflakeomnisocial
 version: !ruby/object:Gem::Version 
-  hash: 73
+  hash: 71
   prerelease: false
   segments: 
   - 0
   - 1
   - 2
-  - 3
-  version: 0.1.2.3
+  - 4
+  version: 0.1.2.4
 platform: ruby
 authors: 
 - Jason Kotchoff
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-10 00:00:00 +11:00
+date: 2011-01-17 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -77,6 +77,7 @@ extra_rdoc_files: []
 files: 
 - README.md
 - lib/generators/omnisocial/templates/omnisocial.rb
+- lib/generators/omnisocial/templates/migration.rb
 - lib/generators/omnisocial/templates/assets/images/signin_twitter.png
 - lib/generators/omnisocial/templates/assets/images/twitter.gif
 - lib/generators/omnisocial/templates/assets/images/signin_facebook.png