atreides 2.0.0 → 2.0.1

data/app/assets/javascripts/atreides/admin.facebook.js

@@ -0,0 +1,137 @@
+$(function(){
+  if ( $(".authenticate-facebook").length ) {
+
+    var $permissions = ["read_insights","manage_pages"]
+
+    function status(msg,angry){
+      $("#status").css({
+        "padding": "10px 15px",
+        "width": "69%"
+      });
+
+      if ( angry ){
+        $("#status").css({
+          "background":"#ffaaaa",
+          border: "1px solid #ff6666"
+        })
+      } else {
+        $("#status").css({
+          "background":"#aaffaa",
+          border: "1px solid #44dd44"
+        })
+      }
+      $("#status").text(msg)
+    }
+
+    $(".deauthenticate-facebook").on("click", function(e){
+      e.preventDefault();
+      FB.logout(function(response){
+        $(".access-container").hide();
+        $(".login-container").show();
+      })
+    })
+
+
+    function checkPermissions(neededPerms, f, params, done){
+      console.log("checking permissions")
+      FB.api('/me/permissions', function(reponde) {
+        var permsArray = reponde.data[0];
+        var reUpPerms = new Array();
+        console.log(permsArray)
+        for(i in neededPerms){
+          if ( permsArray[neededPerms[i]] == null && typeof(neededPerms[i]) == "string") {
+            reUpPerms.push(neededPerms[i]);
+          }
+        }
+        if (reUpPerms.length > 0) {
+          FB.login(function(response){
+            if (done){
+              status("Please accept all permissions to continue.", true)
+              return false;
+            }
+            // Recheck, just in case the user didn't accept something.
+            checkPermissions(neededPerms, f, params, true);
+          }, {scope: neededPerms.join(",")});
+        } else {
+          f.apply(this, params)
+        }
+      });
+    }
+
+    function dealWithResponse(response, checked){
+
+      console.log(response)
+
+      if ( response.status == "connected" ) {
+        status("Connected to facebook")
+
+        // Check for permissions
+        if (!checked){
+          checkPermissions($permissions, dealWithResponse, [response, true])
+        } else {
+          var authResponse = response.authResponse,
+              accessToken = authResponse.accessToken,
+              userId = authResponse.userID,
+              expiry = authResponse.expiresIn;
+
+          // First, get extended token.
+          $.post("/admin/facebook",
+            {
+              access_token: accessToken,
+              user_id: userId,
+              authenticity_token: $.token,
+              expiry: expiry
+            }
+          ).success(function(){
+            status("Token successfully stored.")
+            setTimeout(function(){window.location.href = "/admin/"}, 500)
+          }).error(function(){
+            status("There was a problem updating the page token. Please ensure that you are an admin on Facebook page you are trying to collect analytics for.", true)
+          })
+        }
+      } else if (response.status == "not_authorized") {
+        status("Please accept the terms in the facebook dialog", true)
+      } else {
+        status("There was an error authorizing: " + response.status, true)
+      }
+    }
+
+
+    $("a.authenticate-facebook").on("click", function(e){
+      e.preventDefault();
+      FB.getLoginStatus(function(response){
+        if ( response.status == "connected" ){
+          dealWithResponse(response)
+        } else {
+          $("p.login-container").show();
+        }
+      })
+    })
+
+    $("a.fb-login").on("click", function(e){
+      e.preventDefault();
+      FB.login(function(response){
+        if (response.status == "connected"){
+          $(".access-container").show();
+          $(".login-container").hide();
+        } else {
+          // nothing
+        }
+      })
+    })
+
+
+    setTimeout(function(){
+      // Choose which link to show.
+      FB.getLoginStatus(function(response){
+        if ( response.status != "unknown" ) {
+          $(".access-container").show();
+        } else if ( response.status == "unknown" ) {
+          $(".login-container").show();
+        }
+      })
+    }, 500)
+
+
+  }
+});

data/app/assets/javascripts/atreides/admin.js

@@ -4,6 +4,7 @@
 //= require atreides/jquery.easing.1.3
 //= require jquery-ui
 //= require atreides/admin_base
+//= require atreides/admin.facebook
 
 /*
  * Atreides - Admin Behaviours

data/app/assets/javascripts/atreides/admin_base.js.erb

@@ -11,6 +11,32 @@
  *
  */
 
+$.token = function(){
+ return $("meta[name='csrf-token']").attr("content");
+}
+
+$.removeDiacriticalMarks = function(string) {
+  var dictionary = {"a":["\xaa","\xe0","\xe1","\xe2","\xe3","\xe4","\xe5","\u0101","\u0103","\u0105","\u01ce","\u0201","\u0203","\u0227","\u1d43","\u1e01","\u1e9a","\u1ea1","\u1ea3","\u2090","\uff41"],"A":["\xc0","\xc1","\xc2","\xc3","\xc4","\xc5","\u0100","\u0102","\u0104","\u01cd","\u0200","\u0202","\u0226","\u1d2c","\u1e00","\u1ea0","\u1ea2","\uff21"],"b":["\u1d47","\u1e03","\u1e05","\u1e07","\uff42"],"B":["\u1d2e","\u1e02","\u1e04","\u1e06","\uff22"],"c":["\xe7","\u0107","\u0109","\u010b","\u010d","\u1d9c","\u217d","\uff43"],"C":["\xc7","\u0106","\u0108","\u010a","\u010c","\u216d","\uff23"],"d":["\u010f","\u1d48","\u1e0b","\u1e0d","\u1e0f","\u1e11","\u1e13","\u217e","\uff44"],"D":["\u010e","\u1d30","\u1e0a","\u1e0c","\u1e0e","\u1e10","\u1e12","\u216e","\uff24"],"e":["\xe8","\xe9","\xea","\xeb","\u0113","\u0115","\u0117","\u0119","\u011b","\u0205","\u0207","\u0229","\u1d49","\u1e19","\u1e1b","\u1eb9","\u1ebb","\u1ebd","\u2091","\uff45"],"E":["\xc8","\xc9","\xca","\xcb","\u0112","\u0114","\u0116","\u0118","\u011a","\u0204","\u0206","\u0228","\u1d31","\u1e18","\u1e1a","\u1eb8","\u1eba","\u1ebc","\uff25"],"f":["\u1da0","\u1e1f","\uff46"],"F":["\u1e1e","\u2109","\uff26"],"g":["\u011d","\u011f","\u0121","\u0123","\u01e7","\u01f5","\u1d4d","\u1e21","\uff47"],"G":["\u011c","\u011e","\u0120","\u0122","\u01e6","\u01f4","\u1d33","\u1e20","\uff27"],"h":["\u0125","\u021f","\u02b0","\u1e23","\u1e25","\u1e27","\u1e29","\u1e2b","\u1e96","\u210e","\uff48"],"H":["\u0124","\u021e","\u1d34","\u1e22","\u1e24","\u1e26","\u1e28","\u1e2a","\uff28"],"i":["\xec","\xed","\xee","\xef","\u0129","\u012b","\u012d","\u012f","\u01d0","\u0209","\u020b","\u1d62","\u1e2d","\u1ec9","\u1ecb","\u2071","\uff49"],"I":["\xcc","\xcd","\xce","\xcf","\u0128","\u012a","\u012c","\u012e","\u0130","\u01cf","\u0208","\u020a","\u1d35","\u1e2c","\u1ec8","\u1eca","\uff29"],"j":["\u0135","\u01f0","\u02b2","\uff4a"],"J":["\u0134","\u1d36","\uff2a"],"k":["\u0137","\u01e9","\u1d4f","\u1e31","\u1e33","\u1e35","\uff4b"],"K":["\u0136","\u01e8","\u1d37","\u1e30","\u1e32","\u1e34","\u212a","\uff2b"],"l":["\u013a","\u013c","\u013e","\u02e1","\u0140","\u1e37","\u1e3b","\u1e3d","\u217c","\uff4c"],"L":["\u0139","\u013b","\u013d","\u1d38","\u1e36","\u1e3a","\u1e3c","\u216c","\uff2c"],"m":["\u1d50","\u1e3f","\u1e41","\u1e43","\u217f","\uff4d"],"M":["\u1d39","\u1e3e","\u1e40","\u1e42","\u216f","\uff2d"],"n":["\xf1","\u0144","\u0146","\u0148","\u0149","\u1e45","\u1e47","\u1e49","\u1e4b","\uff4e"],"N":["\xd1","\u0143","\u0145","\u0147","\u1d3a","\u1e44","\u1e46","\u1e48","\u1e4a","\uff2e"],"o":["\xba","\xf2","\xf3","\xf4","\xf5","\xf6","\u014d","\u014f","\u0151","\u01d2","\u01eb","\u020d","\u020f","\u022f","\u1d52","\u1ecd","\u1ecf","\uff4f"],"O":["\xd2","\xd3","\xd4","\xd6","\xd5","\u014c","\u014e","\u0150","\u01d1","\u01ea","\u020c","\u020e","\u022e","\u1d3c","\u1ecc","\u1ece","\uff2f"],"p":["\u1d56","\u1e55","\u1e57","\uff50"],"P":["\u1d3e","\u1e54","\u1e56","\uff30"],"q":["\uff51"],"Q":["\uff31"],"r":["\u0155","\u0157","\u0159","\u0211","\u0213","\u02b3","\u1d63","\u1e59","\u1e5a","\u1e5b","\u1e5f","\uff52"],"R":["\u0154","\u0156","\u0158","\u0210","\u0212","\u1d3f","\u1e58","\u1e5e","\uff32"],"s":["\u015b","\u015d","\u015f","\u0161","\u0219","\u1e61","\u1e63","\uff53"],"S":["\u015a","\u015c","\u015e","\u0160","\u0218","\u1e60","\u1e62","\uff33"],"t":["\u0163","\u0165","\u021b","\u1d57","\u1e6b","\u1e6d","\u1e6f","\u1e71","\u1e97","\uff54"],"T":["\u0162","\u0164","\u021a","\u1d40","\u1e6a","\u1e6c","\u1e6e","\u1e70","\uff34"],"u":["\xf9","\xfa","\xfb","\xfc","\u0169","\u016b","\u016d","\u016f","\u0171","\u01b0","\u01d4","\u0215","\u0217","\u1d58","\u1d64","\u1e73","\u1e75","\u1e77","\u1ee5","\u1ee7","\uff55"],"U":["\xd9","\xda","\xdc","\xdb","\u0168","\u016a","\u016c","\u016e","\u0170","\u0172","\u01af","\u01d3","\u0214","\u0216","\u1d41","\u1e72","\u1e74","\u1e76","\u1ee4","\u1ee6","\uff35"],"v":["\u1e7d","\u1e7f","\u1d5b","\u1d65","\uff56"],"V":["\u1e7c","\u1e7e","\u2c7d","\uff36"],"w":["\u0175","\u02b7","\u1e81","\u1e83","\u1e85","\u1e87","\u1e89","\u1e98","\uff57"],"W":["\u0174","\u1d42","\u1e80","\u1e82","\u1e84","\u1e86","\u1e88","\uff37"],"x":["\u02e3","\u1e8b","\u1e8d","\u2093","\uff58"],"X":["\u1e8a","\u1e8c","\uff38"],"y":["\xfd","\xff","\u0177","\u0233","\u02b8","\u1e8f","\u1e99","\u1ef3","\u1ef5","\u1ef7","\u1ef9","\uff59"],"Y":["\xdd","\u0176","\u0178","\u0232","\u1e8e","\u1ef2","\u1ef4","\u1ef6","\u1ef8","\uff39"],"z":["\u017a","\u017c","\u017e","\u1e91","\u1e93","\u1e95","\uff5a"],"Z":["\u0179","\u017b","\u017d","\u1e90","\u1e92","\u1e94","\uff3a"]},
+  map = {}, chars, char, pattern = "", i, l;
+  for (char in dictionary) {
+      chars = dictionary[char];
+      for (i=0,l=chars.length; i<l; i++) {
+          map[chars[i]] = char;
+          pattern += chars[i];
+      }
+  }
+  pattern = new RegExp( "[" + pattern + "]", 'gi');
+  // return function(string) {
+  //     return string ? string.replace(pattern, function(char){
+  //         return char in map ? map[char] : char;
+  //     }) : string;
+  // };
+
+  return string ? string.replace(pattern, function(char){
+      return char in map ? map[char] : char;
+  }) : string;
+}
+
 jQuery.fn.bindAll = function(options) {
   var $this = this;
   jQuery.each(options, function(key, val){

data/app/controllers/admin/atreides/facebook_controller.rb

@@ -0,0 +1,38 @@
+class Admin::Atreides::FacebookController < ApplicationController
+
+  layout 'admin'
+
+  rescue_from CanCan::AccessDenied do |exception|
+    Rails.logger.info "AdminController: CanCan::AccessDenied #{exception.inspect}, admin?: #{current_user && !current_user.admin?}; #{current_user.inspect}"
+    if current_user && !current_user.admin?
+      @message = exception.message
+      render 'admin/common/access_denied'
+    else
+      if atreides_setup?
+        redirect_to new_user_session_path, :notice => exception.message
+      else
+        redirect_to atreides_setup_path
+      end
+    end
+  end
+
+
+  def index
+  end
+
+  def update
+    Atreides::FacebookUser.find_or_create(params)
+    if Atreides::FacebookUser.authorize_page(Settings.facebook.page_id)
+      render :nothing => true, :status => :ok
+    else
+      render :nothing => true, :status => :error
+    end
+  end
+
+  def destroy
+    Atreides::FacebookUser.clear
+    redirect_to("/admin/facebook")
+  end
+
+
+end

data/app/controllers/atreides/admin_home_controller.rb

@@ -59,13 +59,13 @@ class Atreides::AdminHomeController < Atreides::ApplicationController
     # TODO: parameterize the dates
     if params[:since]
       @since = Date.parse(params[:since]).beginning_of_day.to_date
-      @until = (@since + 31.days).beginning_of_day.to_date
-      @until = Date.today if @until > Date.today
     else
       @since = 1.month.ago.beginning_of_day.to_date
-      @until = Time.now.beginning_of_day.to_day
     end
 
+    @until = Time.now.end_of_month.beginning_of_day.to_date
+    @until = Date.today - 1.day if @until > Date.today
+
     puts "From #{@since.to_s} to #{@until.to_s}"
 
     @report_name = report_name = params[:report].to_sym
@@ -82,7 +82,7 @@ class Atreides::AdminHomeController < Atreides::ApplicationController
       @tweets = Atreides::Tweet.analytics(@since)
     when :fb_page_views
       # Facebook insights API
-      if Settings.facebook && Settings.facebook.page_token && Settings.facebook.page_id
+      if Settings.facebook && fb_page_token && Settings.facebook.page_id
         # @fb_page_views = fb.get(Settings.facebook.page_id, :type => 'insights/page_views/day', :params => {:since => @since})
         @fb_page_views = fetch_with_caching(5.minutes) do
           fb.get(Settings.facebook.page_id, :type => 'insights/page_impressions/day', :params => {:since => @since})
@@ -90,7 +90,7 @@ class Atreides::AdminHomeController < Atreides::ApplicationController
       end
     when :fb_page_likes
       # Facebook insights API
-      if Settings.facebook && Settings.facebook.page_token && Settings.facebook.page_id
+      if Settings.facebook && fb_page_token && Settings.facebook.page_id
         # @fb_page_likes = fb.get(Settings.facebook.page_id, :type => 'insights/page_like_adds/day', :params => {:since => @since})
         @fb_page_likes = fetch_with_caching(5.minutes) do
           fb.get(Settings.facebook.page_id, :type => 'insights/page_fan_adds/day', :params => {:since => @since})
@@ -194,7 +194,11 @@ class Atreides::AdminHomeController < Atreides::ApplicationController
 
   def fb
     MiniFB.disable_logging
-    @fb ||= MiniFB::OAuthSession.new(Settings.facebook.page_token)
+    @fb ||= MiniFB::OAuthSession.new(fb_page_token)
+  end
+
+  def fb_page_token
+    @page_token ||= Atreides::Preference.get("facebook.page_token")
   end
 
   def fetch_with_caching(duration, &block)

data/app/models/atreides/facebook_user.rb

@@ -0,0 +1,103 @@
+class Atreides::FacebookUser
+
+  class << self
+
+    def clear
+      ["user_id", "access_token", "expiration", "page_token"].each do |key|
+        Atreides::Preference.set("facebook.#{key}",nil)
+      end
+    end
+
+    def find_or_create(params)
+      Rails.logger.debug("[FacebookUser] find_or_create")
+      access_token = params[:access_token]
+      user_id = params[:user_id]
+      expiration = params[:expiry]
+
+      # if !has_valid_token?
+        # Current user is invalid or does not exist
+        Rails.logger.debug("[FacebookUser] determined invalid token")
+        # See if we can get an extended token
+        token_hash = extend_token(access_token)
+        if token_hash["status"] == "ok"
+          Rails.logger.debug("[FacebookUser] got extended token")
+          access_token = token_hash["access_token"]
+          expiration = token_hash["expires"]
+        else
+          Rails.logger.debug("[FacebookUser] did not get extended token")
+        end
+
+        expiration_date = Time.now + expiration.to_i
+        expiration_string = expiration_date.to_s(:db)
+
+        fb_pref("user_id", user_id)
+        fb_pref("access_token", access_token)
+        fb_pref("expiration", expiration_string)
+        Rails.logger.debug("[FacebookUser] set all vars")
+      # else
+      #   Rails.logger.debug("[FacebookUser] token is valid")
+      # end
+
+      Rails.logger.debug("[FacebookUser] leaving")
+      true
+    end
+
+    # def has_valid_token?
+    #   !(fb_pref("access_token").blank? || current_token_expired?)
+    # end
+
+    def current_token_expired?
+      return true if fb_pref("expiration").blank?
+      Time.parse(fb_pref("expiration")) < Time.now
+    end
+
+    # Returns @response
+    # @response is a hash with either keys => ["access_token", "expires", "status"] or keys => ["status"]
+    # You may check for errors with ["status"] == "error"
+    def extend_token(token)
+      begin
+        response = MiniFB.fb_exchange_token(Settings.facebook.app_id, Settings.facebook.app_secret, token)
+        response["status"] = "ok"
+        response
+      rescue => e
+        {"status" => "error"}
+      end
+    end
+
+    def authorize_page(page_id)
+      Rails.logger.debug("[FacebookUser] authorize_page")
+      response = fb.get(fb_pref("user_id"), :type => "accounts/#{page_id}")
+      found = false
+      response.data.each do |account|
+        Rails.logger.debug("[FacebookUser] checking account #{account.id}")
+        if account.id.to_s == page_id.to_s
+          Rails.logger.debug("[FacebookUser] found account #{account.id}")
+          fb_pref("page_token", account.access_token)
+          found = true
+          break
+        end
+      end
+
+      found
+    end
+
+    private
+
+    def fb
+      MiniFB.disable_logging
+      MiniFB::OAuthSession.new(fb_pref("access_token"))
+    end
+
+    def fb_pref(key,value = nil)
+      if value.nil?
+        Atreides::Preference.get("facebook.#{key}")
+      else
+        Atreides::Preference.set("facebook.#{key}",value)
+      end
+    end
+
+  end
+
+
+
+end

data/app/models/atreides/preferences.rb

@@ -0,0 +1,31 @@
+class Atreides::Preferences < Atreides::Base
+
+  #
+  # Constants
+  #
+
+  #
+  # Associatons
+  #
+
+  #
+  # Validations
+  #
+
+  #
+  # Callbacks
+  #
+
+
+  #
+  # Class Methods
+  #
+  class << self
+  end
+
+  #
+  # Instance Methods
+  #
+
+  include Atreides::Extendable
+end

data/app/views/admin/atreides/facebook/index.html.haml

@@ -0,0 +1,29 @@
+- content_for :js do
+  :javascript
+    (function(d, s, id) {
+      var js, fjs = d.getElementsByTagName(s)[0];
+      if (d.getElementById(id)) return;
+      js = d.createElement(s); js.id = id;
+      js.src = "//connect.facebook.net/en_US/all.js#xfbml=1&appId=#{Settings.facebook.app_id}";
+      fjs.parentNode.insertBefore(js, fjs);
+    }(document, 'script', 'facebook-jssdk'));
+
+- content_for :sidebar do
+  %ul
+    %li
+      %a.deauthenticate-facebook{:href => "javascript:;"}Clear current Facebook session
+      This will enable you to log in to a different account
+    %li{:style => "padding-top: 15px"}
+      %hr
+    %li
+      %a.clear-system{:href => "/admin/facebook", :"data-method" => "delete"} Un-associate account
+      Remove account currently associated with Pace Admin Analytics
+
+%h2 Facebook Analytics Setup
+%p#status
+%p
+  If you are an admin for the Pace Facebook page and the analytics aren't working, follow the directions below:
+%p.login-container{:style => "display: none;"}
+  %a.fb-login{:href => "javascript:;"} Click here to log into Facebook and then authenticate
+%p.access-container{:style => "display: none;"}
+  %a.authenticate-facebook{:href => "javascript:;"} Click here to authenticate

data/app/views/layouts/admin.html.haml

@@ -11,6 +11,7 @@
     = csrf_meta_tag
     = yield :head
   %body
+    #fb-root
     .container
       #header
         #nav
@@ -21,6 +22,8 @@
               %li.nav-users= link_to_unless_current ttt(:'.users'), admin_users_path
               %li.nav-github= link_to_unless_current ttt(:'.github'), admin_github_path
               %li.nav-logout= link_to_unless_current ttt(:'.logout'), destroy_user_session_path
+              - if current_user.admin?
+                %li.nav-facebook= link_to_unless_current ttt(:'.facebook'), admin_facebook_path
               %li.nav-search
                 = semantic_form_for Atreides::Post.new, :url => admin_search_path, :html => {:method => :get, :class => "auto-hide-text", :id => "admin_search"} do |f|
                   = link_to_function image_tag("atreides/admin/search_icon.png"), ''

data/config/locales/en.yml

@@ -19,6 +19,7 @@ en:
         logout: logout
         search: search
         users: users
+        facebook: facebook
         github: issues
 
     atreides:

data/config/routes.rb

@@ -21,6 +21,10 @@ Rails.application.routes.draw do
   post  '/admin/setup/', :to => "atreides/admin_home#setup!", :as => :atreides_do_setup
 
   namespace :admin do
+    get "facebook" => "atreides/facebook#index", :as => :facebook
+    post "facebook" => "atreides/facebook#update", :as => :update_facebook
+    delete "facebook" => "atreides/facebook#destroy", :as => :destroy_facebook
+
     resources :posts, :controller => "atreides/posts" do
       collection do
         match ':state/:month/:year(.:format)', :to => "atreides/posts#index", :as => :filter, :constraints => { :state => "published", :year => /\d{4}/, :month => /\d{1,2}/ }

data/lib/atreides/version.rb

@@ -1,4 +1,4 @@
 # Version string of the Atreides engine
 module Atreides
-  VERSION = "2.0.0".freeze
+  VERSION = "2.0.1".freeze
 end

data/lib/generators/atreides/atreides_generator.rb

@@ -32,7 +32,7 @@ module Atreides
            create_features create_products create_line_items create_links
            create_votes create_tweets create_sessions create_sites
            create_content_parts add_userid_to_resources devise_create_users
-           add_role_to_users).each do |f|
+           add_role_to_users, create_preferences).each do |f|
           src = "#{f}.rb"
           dst = "db/migrate/#{src}"
           migration_template(src, dst) rescue puts $!

data/lib/generators/templates/create_preferences.rb

@@ -0,0 +1,14 @@
+class CreatePreferences < ActiveRecord::Migration
+  def self.up
+    create_table :preferences, :force => true do |t|
+      t.string :key, :limit => 512
+      t.text :value, :default => ''
+      t.timestamps
+    end
+    add_index :preferences, :key
+  end
+
+  def self.down
+    drop_table :preferences
+  end
+end

data/lib/generators/templates/settings.yml

@@ -28,36 +28,13 @@ common: &common
     user_token:
     user_secret:
   facebook:
-    # GoTo:
-    # http://graph.facebook.com/oauth/authorize?client_id=CLIENT_ID&redirect_uri=REDIRECT_URL
-    # -> Get code param and save as the token
-    # GoTo:
-    #   https://graph.facebook.com/oauth/access_token?client_id=CLIENT_ID&redirect_uri=REDIRECT_URL&client_secret=CLIENT_SECRET&code=CODE
-    # -> Put resulting access_token into user_token val below
-    # -> Create a OAuth access_token object with: access_token = OAuth2::AccessToken.new(client, Settings.facebook.user_token)
-    # -> Get your page's access_token with: access_token.get("/me/accounts")
-    # -> Put the page's access_token into page_token below
-    secret_key:
-    api_key:
-    code:
-    user_token:
-    page_token:
     page_id:
     app_id:
+    app_secret:
   twitter:
     login:
     consumer_key:
     consumer_secret:
-    # oauth = Twitter::OAuth.new(Settings.twitter.consumer_key, Settings.twitter.consumer_secret, :sign_in => true)
-    # oauth.set_callback_url(app.root_url(:host => Settings.domain))
-    # rtoken  = oauth.request_token.token
-    # rsecret = oauth.request_token.secret
-    # oauth.request_token.authorize_url
-    # -- Go to above URL and sign-in/approve the app and retrieve the verifier param from the return-to-app URL
-    # oauth_verifier = VERIFIER_KEY
-    # oauth.authorize_from_request(rtoken, rsecret, oauth_verifier)
-    # oauth.access_token.token -> use below
-    # oauth.access_token.secret -> use below
     app_user_token:
     app_user_secret:
     search_for: atreides OR "The 88" OR "Le 88"
@@ -100,11 +77,6 @@ production:
     profile_id:
   domain: atreides.com
   facebook:
-    # See instructions above
-    secret_key:
-    api_key:
-    code:
-    user_token:
-    page_token:
+    app_secret:
     page_id:
     app_id:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: atreides
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,26 +9,42 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-05 00:00:00.000000000 Z
+date: 2012-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.3
+- !ruby/object:Gem::Dependency
+  name: acts_as_commentable
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -44,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: acts_as_commentable
+  name: analytical
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -124,7 +140,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coffee-script
+  name: chrisle-gattica
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -140,7 +156,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: delayed_job_active_record
+  name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -156,7 +172,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: devise
+  name: coffee-script
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -172,7 +188,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: dropbox-sdk
+  name: delayed_job_active_record
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -188,23 +204,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: dynamic_form
+  name: devise
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.2
 - !ruby/object:Gem::Dependency
-  name: formtastic
+  name: disqussion
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -220,7 +236,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: chrisle-gattica
+  name: dropbox-sdk
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -236,7 +252,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: oembed_links
+  name: dynamic_form
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -252,7 +268,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: grackle
+  name: em-http-request
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -268,7 +284,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: haml
+  name: em-net-http
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -284,7 +300,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: has_scope
+  name: em-synchrony
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -300,23 +316,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: htmlentities
+  name: formtastic
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
-  name: inherited_resources
+  name: grackle
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -332,7 +348,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jquery-rails
+  name: haml
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -348,7 +364,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mini_fb
+  name: has_scope
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -364,7 +380,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: htmlentities
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -380,7 +396,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: oauth2
+  name: inherited_resources
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -396,7 +412,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: paperclip
+  name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -412,39 +428,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: mini_fb
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: responders
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -460,7 +476,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: settingslogic
+  name: oauth2
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -476,7 +492,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: tumblr-api
+  name: oembed_links
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -492,7 +508,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: tweetstream
+  name: paperclip
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -508,23 +524,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: twitter
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: unicode_utils
+  name: rack-fiber_pool
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -540,7 +556,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: validates_email_format_of
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -556,23 +572,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: will_paginate
+  name: responders
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -588,7 +604,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: analytical
+  name: settingslogic
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -604,7 +620,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yajl-ruby
+  name: tumblr-api
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -620,55 +636,55 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: disqussion
+  name: tweetstream
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
-  name: sass-rails
+  name: twitter
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
-  name: coffee-rails
+  name: uglifier
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.7
 - !ruby/object:Gem::Dependency
-  name: uglifier
+  name: unicode_utils
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -684,7 +700,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack-fiber_pool
+  name: validates_email_format_of
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -700,23 +716,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: em-http-request
+  name: will_paginate
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.3
 - !ruby/object:Gem::Dependency
-  name: em-net-http
+  name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -732,7 +748,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: em-synchrony
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -1115,8 +1131,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Atreides is an engine providing a evented CMS following a KISS principle,
-  updated for Heroku
+description: Atreides is an engine providing a evented CMS following a KISS principle
 email:
 - hello@lovethe88.com
 executables: []
@@ -1218,6 +1233,7 @@ files:
 - lib/generators/templates/create_pages.rb
 - lib/generators/templates/create_photos.rb
 - lib/generators/templates/create_posts.rb
+- lib/generators/templates/create_preferences.rb
 - lib/generators/templates/create_products.rb
 - lib/generators/templates/create_sessions.rb
 - lib/generators/templates/create_sites.rb
@@ -1240,6 +1256,7 @@ files:
 - lib/tasks/cucumber.rake
 - lib/tasks/tasks.rake
 - lib/tasks/yard.rake
+- app/assets/javascripts/atreides/admin.facebook.js
 - app/assets/javascripts/atreides/admin.js
 - app/assets/javascripts/atreides/admin_base.js.erb
 - app/assets/javascripts/atreides/admin_edit.js
@@ -1260,6 +1277,7 @@ files:
 - app/controllers/admin/atreides/comments_controller.rb
 - app/controllers/admin/atreides/content_parts_controller.rb
 - app/controllers/admin/atreides/dropbox_controller.rb
+- app/controllers/admin/atreides/facebook_controller.rb
 - app/controllers/admin/atreides/features_controller.rb
 - app/controllers/admin/atreides/github_controller.rb
 - app/controllers/admin/atreides/links_controller.rb
@@ -1309,6 +1327,7 @@ files:
 - app/models/atreides/ability.rb
 - app/models/atreides/comment.rb
 - app/models/atreides/content_part.rb
+- app/models/atreides/facebook_user.rb
 - app/models/atreides/feature.rb
 - app/models/atreides/github.rb
 - app/models/atreides/like.rb
@@ -1319,6 +1338,7 @@ files:
 - app/models/atreides/page.rb
 - app/models/atreides/photo.rb
 - app/models/atreides/post.rb
+- app/models/atreides/preferences.rb
 - app/models/atreides/product.rb
 - app/models/atreides/site.rb
 - app/models/atreides/size.rb
@@ -1347,6 +1367,7 @@ files:
 - app/views/admin/atreides/dropbox/_uploader.html.haml
 - app/views/admin/atreides/dropbox/list.html.haml
 - app/views/admin/atreides/dropbox/setup.html.haml
+- app/views/admin/atreides/facebook/index.html.haml
 - app/views/admin/atreides/features/_form.html.haml
 - app/views/admin/atreides/features/edit.html.haml
 - app/views/admin/atreides/features/index.html.haml
@@ -1431,7 +1452,7 @@ files:
 - config/routes.rb
 - LICENSE
 - README.rdoc
-homepage: http://lovethe88.com
+homepage: http://the88.github.com/Atreides/
 licenses: []
 post_install_message: 
 rdoc_options: []