social_stream 0.3.5 → 0.3.6

data/lib/generators/social_stream/templates/public/stylesheets/jqcloud.css

@@ -22,7 +22,7 @@ div#wordcloud span {
 }
 div#wordcloud span.w10 {
   font-size: 44px;
-  color: #0cf;
+  color: #1F4A75;
 }
 div#wordcloud span.w9 {
   font-size: 40px;
@@ -34,7 +34,7 @@ div#wordcloud span.w8 {
 }
 div#wordcloud span.w7 {
   font-size: 30px;
-  color: #39d;
+  color: #0cf;
 }
 div#wordcloud span.w6 {
   font-size: 24px;

data/lib/generators/social_stream/templates/public/stylesheets/users.css

@@ -1,22 +0,0 @@
-#ajax_loader_icon, .pagination{
-    text-align:center;
-    padding-top: 20px;
-}
-
-.letters{
-    text-align:center;
-    padding-bottom: 20px;
-}
-
-.search_input{
-    border-color: #0656a4;
-    color: #2A3890;
-    margin-left: 5px;
-    padding: 2px 2px 2px 2px;
-    border:1px solid #BDC7D8;
-}
-
-#search_button{
-    cursor: pointer;
-    margin-top: 2px;
-}

data/lib/generators/social_stream/templates/relations.yml

@@ -1,43 +1,48 @@
-# Relations for Social Stream
+# Default relations for Social Stream
 #
-# Define the relations and permissions supported by your application
+# Define the default relations and permissions supported by your application
+# Though subjects can customize their own relations, these are the defaults
+# to start up 
+#
+# Detailed information on permissions is available at:
+# http://rdoc.info/gems/social_stream/Permission
 #
 user:
   friend:
     name: friend
     permissions:
-      - [ follow ]
-      - [ create,  activity, weak_set ]
-      - [ read,    activity, star_set ]
-      - [ update,  activity, weak_set ]
-      - [ destroy, activity, weak_set ]
+      - [ follow ]                       # follow the activities of the friend
+      - [ create,  activity, tie ]       # let the friend create activities to the same tie
+      - [ read,    activity, star_ties ] # friend can read activities from the other friends
+      - [ update,  activity, tie ]       # update activities to the same tie
+      - [ destroy, activity, tie ]       # destroy activities to the same tie
   acquaintance:
     name: acquaintance
-    parent: friend
+    parent: friend # friend relation is stronger than acquaintance
     permissions:
-      - [ read,    activity, star_set ]
+      - [ read,    activity, star_ties ]
   public:
     name: public
-    parent: acquaintance
+    parent: acquaintance # acquaintance is stronger than public
     permissions:
-      - [ read,    activity, star_set ]
+      - [ read,    activity, star_ties ]
 
 group:
   member:
     name: member
     permissions:
-      - [ represent ]
-      - [ create,  activity, weak_set ]
-      - [ read,    activity, star_set ]
-      - [ update,  activity, weak_star_set ]
-      - [ destroy, activity, weak_star_set ]
+      - [ represent ]                         # let the member act as the group
+      - [ create,  activity, weak_ties ]      # let them member create activities at the level of member, partner and public
+      - [ read,    activity, star_ties ]      # read activities from other members
+      - [ update,  activity, weak_star_ties ] # update and destroy activities to members,
+      - [ destroy, activity, weak_star_ties ] # acquaintance and public
   partner:
     name: partner
-    parent: member
+    parent: member # member is stronger than partner
     permissions:
-      - [ read,    activity, star_set ]
+      - [ read,    activity, star_ties ]
   public:
     name: public
-    parent: partner
+    parent: partner # partner is stronger than public
     permissions:
-      - [ read,    activity, star_set ]
+      - [ read,    activity, star_ties ]

data/lib/social_stream.rb

@@ -19,7 +19,7 @@ module SocialStream
 
   mattr_accessor :devise_modules
   @@devise_modules = [ :database_authenticatable, :registerable, :recoverable,
-                       :rememberable, :trackable ]
+                       :rememberable, :trackable, :omniauthable ]
 
   mattr_accessor :objects
   @@objects = [ :post, :comment ]

data/lib/social_stream/models/subject.rb

@@ -2,7 +2,15 @@ require 'active_support/concern'
 
 module SocialStream
   module Models
-    # Additional features for models that are subtypes of actors, like User or Group
+    # {Subject Subjects} are subtypes of {Actor}. {SocialStream} provides two
+    # {Subject Subjects}, {User} and {Group}
+    #
+    # Each {Subject} is defined in +config/initializers/social_stream.rb+
+    #
+    # This module provides additional features for models that are subjects,
+    # extending them. Including the module in each {Subject} model is not required!
+    # After declared in +config/initializers/social_stream.rb+, {SocialStream} is
+    # responsible for adding subject features to each model.
     module Subject
       extend ActiveSupport::Concern
 

data/lib/social_stream/rails.rb

@@ -19,6 +19,8 @@ require 'paperclip'
 require 'paperclip/social_stream'
 # Pagination
 require 'will_paginate'
+# Oauth
+require 'omniauth/oauth'
 
 module SocialStream
   class Engine < ::Rails::Engine #:nodoc:

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.3.5".freeze
+  VERSION = "0.3.6".freeze
 end

data/social_stream.gemspec

@@ -12,13 +12,15 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('atd-ancestry', '1.3.0')
   s.add_runtime_dependency('nested_set', '~> 1.5.3')
   s.add_runtime_dependency('foreigner', '~> 0.9.1')
-  s.add_runtime_dependency('devise', '~> 1.1.7')
+  s.add_runtime_dependency('devise', '~> 1.2.rc')
   s.add_runtime_dependency('inherited_resources', '~> 1.1.2')
   s.add_runtime_dependency('stringex', '~> 1.2.0')
   s.add_runtime_dependency('paperclip', '~> 2.3.4')
   s.add_runtime_dependency('jquery-rails', '~> 0.2.5')
   s.add_runtime_dependency('cancan', '~> 1.5.1')
   s.add_runtime_dependency('will_paginate', '~> 3.0.pre2')
+  s.add_runtime_dependency('omniauth','~> 0.2.0.beta5')	
+  s.add_runtime_dependency('oauth-plugin','~> 0.4.0.pre1')	
   s.add_development_dependency('rails', '~> 3.0.5')
   s.add_development_dependency('capybara', '~> 0.3.9')
   s.add_development_dependency('sqlite3-ruby')
@@ -29,4 +31,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency('factory_girl', '~> 1.3.2')
   s.add_development_dependency('forgery', '~> 0.3.6')
   s.add_development_dependency('ci_reporter', '~> 1.6.4')
+  s.add_development_dependency('nifty-generators','~> 0.4.5')
 end

data/spec/dummy/config/initializers/devise.rb

@@ -15,23 +15,37 @@ Devise.setup do |config|
   require 'devise/orm/active_record'
 
   # ==> Configuration for any authentication mechanism
-  # Configure which keys are used when authenticating an user. By default is
+  # Configure which keys are used when authenticating a user. The default is
   # just :email. You can configure it to use [:username, :subdomain], so for
-  # authenticating an user, both parameters are required. Remember that those
+  # authenticating a user, both parameters are required. Remember that those
   # parameters are used only when authenticating and not when retrieving from
   # session. If you need permissions, you should implement that in a before filter.
+  # You can also supply a hash where the value is a boolean determining whether
+  # or not authentication should be aborted when the value is not present.
   # config.authentication_keys = [ :email ]
 
+  # Configure parameters from the request object used for authentication. Each entry
+  # given should be a request method and it will automatically be passed to the
+  # find_for_authentication method and considered in your model lookup. For instance,
+  # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
+  # The same considerations mentioned for authentication_keys also apply to request_keys.
+  # config.request_keys = []
+
+  # Configure which authentication keys should be case-insensitive.
+  # These keys will be downcased upon creating or modifying a user and when used
+  # to authenticate or find a user. Default is :email.
+  # config.case_insensitive_keys = [ :email ]
+
   # Tell if authentication through request.params is enabled. True by default.
   # config.params_authenticatable = true
 
-  # Tell if authentication through HTTP Basic Auth is enabled. True by default.
-  # config.http_authenticatable = true
+  # Tell if authentication through HTTP Basic Auth is enabled. False by default.
+  # config.http_authenticatable = false
 
-  # Set this to true to use Basic Auth for AJAX requests.  True by default.
+  # If http headers should be returned for AJAX requests. True by default.
   # config.http_authenticatable_on_xhr = true
 
-  # The realm used in Http Basic Authentication
+  # The realm used in Http Basic Authentication. "Application" by default.
   # config.http_authentication_realm = "Application"
 
   # ==> Configuration for :database_authenticatable
@@ -39,22 +53,13 @@ Devise.setup do |config|
   # using other encryptors, it sets how many times you want the password re-encrypted.
   config.stretches = 10
 
-  # Define which will be the encryption algorithm. Devise also supports encryptors
-  # from others authentication tools as :clearance_sha1, :authlogic_sha512 (then
-  # you should set stretches above to 20 for default behavior) and :restful_authentication_sha1
-  # (then you should set stretches to 10, and copy REST_AUTH_SITE_KEY to pepper)
-  config.encryptor = :bcrypt
-
-  # Setup a pepper to generate the encrypted password.
-  config.pepper = "0f41b9a7507f1d62d825b9599df4ba96b82b0455b6ab2bc4569aaad4b7a948631bce63227ab7f6211e4c00275077020158402e54a72ddc309d261023424d5e6c"
-
   # ==> Configuration for :confirmable
   # The time you want to give your user to confirm his account. During this time
-  # he will be able to access your application without confirming. Default is nil.
-  # When confirm_within is zero, the user won't be able to sign in without confirming. 
-  # You can use this to let your user access some features of your application 
-  # without confirming the account, but blocking it after a certain period 
-  # (ie 2 days). 
+  # he will be able to access your application without confirming. Default is 0.days
+  # When confirm_within is zero, the user won't be able to sign in without confirming.
+  # You can use this to let your user access some features of your application
+  # without confirming the account, but blocking it after a certain period
+  # (ie 2 days).
   # config.confirm_within = 2.days
 
   # ==> Configuration for :rememberable
@@ -67,8 +72,12 @@ Devise.setup do |config|
   # If true, extends the user's remember period when remembered via cookie.
   # config.extend_remember_period = false
 
+  # If true, uses the password salt as remember token. This should be turned
+  # to false if you are not using database authenticatable.
+  config.use_salt_as_remember_token = true
+
   # ==> Configuration for :validatable
-  # Range for password length
+  # Range for password length. Default is 6..20.
   # config.password_length = 6..20
 
   # Regex to use to validate the email address
@@ -76,8 +85,8 @@ Devise.setup do |config|
 
   # ==> Configuration for :timeoutable
   # The time you want to timeout the user session without activity. After this
-  # time the user will be asked for credentials again.
-  # config.timeout_in = 10.minutes
+  # time the user will be asked for credentials again. Default is 30 minutes.
+  # config.timeout_in = 30.minutes
 
   # ==> Configuration for :lockable
   # Defines which strategy will be used to lock an account.
@@ -99,44 +108,66 @@ Devise.setup do |config|
   # Time interval to unlock the account if :time is enabled as unlock_strategy.
   # config.unlock_in = 1.hour
 
+  # ==> Configuration for :encryptable
+  # Allow you to use another encryption algorithm besides bcrypt (default). You can use
+  # :sha1, :sha512 or encryptors from others authentication tools as :clearance_sha1,
+  # :authlogic_sha512 (then you should set stretches above to 20 for default behavior)
+  # and :restful_authentication_sha1 (then you should set stretches to 10, and copy
+  # REST_AUTH_SITE_KEY to pepper)
+  # config.encryptor = :sha512
+
+  # Setup a pepper to generate the encrypted password.
+  # config.pepper = "6efecaefd488a07abded679d45be30dc97935d74c44825b647149a6fa30ee8cd5e05bb3a426ce8a87fcd75b04079b1bac68a079acdcc175800c4131dde7961f0"
+
   # ==> Configuration for :token_authenticatable
   # Defines name of the authentication token params key
   # config.token_authentication_key = :auth_token
 
+  # If true, authentication through token does not store user in session and needs
+  # to be supplied on each request. Useful if you are using the token as API token.
+  # config.stateless_token = false
+
   # ==> Scopes configuration
   # Turn scoped views on. Before rendering "sessions/new", it will first check for
   # "users/sessions/new". It's turned off by default because it's slower if you
   # are using only default views.
-  # config.scoped_views = true
+  # config.scoped_views = false
 
   # Configure the default scope given to Warden. By default it's the first
-  # devise role declared in your routes.
+  # devise role declared in your routes (usually :user).
   # config.default_scope = :user
 
-  # Configure sign_out behavior. 
-  # By default sign_out is scoped (i.e. /users/sign_out affects only :user scope).
-  # In case of sign_out_all_scopes set to true any logout action will sign out all active scopes.
-  # config.sign_out_all_scopes = false
+  # Configure sign_out behavior.
+  # Sign_out action can be scoped (i.e. /users/sign_out affects only :user scope).
+  # The default is true, which means any logout action will sign out all active scopes.
+  # config.sign_out_all_scopes = true
 
   # ==> Navigation configuration
   # Lists the formats that should be treated as navigational. Formats like
   # :html, should redirect to the sign in page when the user does not have
   # access, but formats like :xml or :json, should return 401.
+  #
   # If you have any extra navigational formats, like :iphone or :mobile, you
-  # should add them to the navigational formats lists. Default is [:html]
-  # config.navigational_formats = [:html, :iphone]
+  # should add them to the navigational formats lists.
+  #
+  # The :"*/*" format below is required to match Internet Explorer requests.
+  # config.navigational_formats = [:"*/*", :html]
+
+  # The default HTTP method used to sign out a resource. Default is :get.
+  # config.sign_out_via = :get
+
+  # ==> OmniAuth
+  # Add a new OmniAuth provider. Check the wiki for more information on setting
+  # up on your models and hooks.
+  # config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo'
 
   # ==> Warden configuration
-  # If you want to use other strategies, that are not (yet) supported by Devise,
-  # you can configure them inside the config.warden block. The example below
-  # allows you to setup OAuth, using http://github.com/roman/warden_oauth
+  # If you want to use other strategies, that are not supported by Devise, or
+  # change the failure app, you can configure them inside the config.warden block.
   #
   # config.warden do |manager|
-  #   manager.oauth(:twitter) do |twitter|
-  #     twitter.consumer_secret = <YOUR CONSUMER SECRET>
-  #     twitter.consumer_key  = <YOUR CONSUMER KEY>
-  #     twitter.options :site => 'http://twitter.com'
-  #   end
-  #   manager.default_strategies(:scope => :user).unshift :twitter_oauth
+  #   manager.failure_app   = AnotherApp
+  #   manager.intercept_401 = false
+  #   manager.default_strategies(:scope => :user).unshift :some_external_strategy
   # end
 end

data/spec/dummy/config/initializers/social_stream.rb

@@ -8,8 +8,8 @@ SocialStream.setup do |config|
   # Others available are:
   # :token_authenticatable, :confirmable, :lockable, :timeoutable, :validatable
   # config.devise_modules :database_authenticatable, :registerable,
-  #                       :recoverable, :rememberable, :trackable
-
+  #                       :recoverable, :rememberable, :trackable, :omniauthable
+  
   # Type of activities managed by actors
   # Remember you must add an "activity_object_id" foreign key column to your migration!
   #

data/spec/dummy/config/relations.yml

@@ -1,43 +1,48 @@
-# Relations for Social Stream
+# Default relations for Social Stream
 #
-# Define the relations and permissions supported by your application
+# Define the default relations and permissions supported by your application
+# Though subjects can customize their own relations, these are the defaults
+# to start up 
+#
+# Detailed information on permissions is available at:
+# http://rdoc.info/gems/social_stream/Permission
 #
 user:
   friend:
     name: friend
     permissions:
-      - [ follow ]
-      - [ create,  activity, weak_set ]
-      - [ read,    activity, star_set ]
-      - [ update,  activity, weak_set ]
-      - [ destroy, activity, weak_set ]
+      - [ follow ]                       # follow the activities of the friend
+      - [ create,  activity, tie ]       # let the friend create activities to the same tie
+      - [ read,    activity, star_ties ] # friend can read activities from the other friends
+      - [ update,  activity, tie ]       # update activities to the same tie
+      - [ destroy, activity, tie ]       # destroy activities to the same tie
   acquaintance:
     name: acquaintance
-    parent: friend
+    parent: friend # friend relation is stronger than acquaintance
     permissions:
-      - [ read,    activity, star_set ]
+      - [ read,    activity, star_ties ]
   public:
     name: public
-    parent: acquaintance
+    parent: acquaintance # acquaintance is stronger than public
     permissions:
-      - [ read,    activity, star_set ]
+      - [ read,    activity, star_ties ]
 
 group:
   member:
     name: member
     permissions:
-      - [ represent ]
-      - [ create,  activity, weak_set ]
-      - [ read,    activity, star_set ]
-      - [ update,  activity, weak_star_set ]
-      - [ destroy, activity, weak_star_set ]
+      - [ represent ]                         # let the member act as the group
+      - [ create,  activity, weak_ties ]      # let them member create activities at the level of member, partner and public
+      - [ read,    activity, star_ties ]      # read activities from other members
+      - [ update,  activity, weak_star_ties ] # update and destroy activities to members,
+      - [ destroy, activity, weak_star_ties ] # acquaintance and public
   partner:
     name: partner
-    parent: member
+    parent: member # member is stronger than partner
     permissions:
-      - [ read,    activity, star_set ]
+      - [ read,    activity, star_ties ]
   public:
     name: public
-    parent: partner
+    parent: partner # partner is stronger than public
     permissions:
-      - [ read,    activity, star_set ]
+      - [ read,    activity, star_ties ]

data/spec/models/activity_spec.rb

@@ -205,10 +205,10 @@ describe Activity do
         create_ability_accessed_by_receiver
       end
 
-      it_should_behave_like "Allows Creating"
+      it_should_behave_like "Denies Creating"
       it_should_behave_like "Allows Reading"
-      it_should_behave_like "Allows Updating"
-      it_should_behave_like "Allows Destroying"
+      it_should_behave_like "Denies Updating"
+      it_should_behave_like "Denies Destroying"
     end
     
     describe "accessed by a friend" do