private_person 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83ae9de02a72d032f9b41ad89fad651a3153de40
-  data.tar.gz: 8ae33b693b2aa66cb4026ad7cb09fc721d7664c5
+  metadata.gz: 2ea4a8f4f6cabb8537ca689a8b83f58b09822b2f
+  data.tar.gz: ff11f0adc4df97999397aaeaec63893019c713d5
 SHA512:
-  metadata.gz: 43461e8b9274eaecbc576d35912d2a8f52d4cc4fa7e492ec8383c592111608366196b5193cd7dfa93117f372a5dc558bc4b663f24b28ac6aa85a3a9b2f1b9cdc
-  data.tar.gz: bba75865148e11f401b98f58f01a7d4d8504363c50aa71140fdc4568e974b7a6f80d548b1cd28ed9ef8422e603526bc309948d58e3edcf4b18c441c378e62ec7
+  metadata.gz: 4b68dbebec12d3ce0cd05873c0adb64bec4e2159f1f1c9faaa1f602ac706577cc388c6a084f28963fbc29359f8e431913e5f6c3a68e8c4bc3dbcfbf255bccd3c
+  data.tar.gz: dbab508ccb006ca7907b91a82310af472f5d35d84f9446c33dafcecc1564d0b400f9b36952812838f837f5df5e5a29c193d4c76c404c081fb1181010514ff7c2

data/Gemfile

@@ -15,8 +15,7 @@ group :development, :test do
   gem 'shoulda-matchers'
   gem 'factory_girl_rails'
   gem 'database_cleaner'
-  gem 'acts_as_follower'
+  gem 'chalk_dust', :git => 'git://github.com/nerakdon/chalk_dust.git'
 end
 
 gem 'rails'
-gem 'protected_attributes'

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/private_person/models/permission.rb

@@ -2,9 +2,6 @@ class Permission < ActiveRecord::Base
   belongs_to :permissor, :polymorphic => true
   belongs_to :permissible, :polymorphic => true
 
-  attr_accessible :permissible, :permissible_type, :permissible_id, :relationship_type
-  validates_presence_of :permissor, :permissible_type, :relationship_type
-
   def self.by_permissor(permissor)
     where("permissor_type = ? AND permissor_id = ?", permissor.class.name, permissor.id)
   end

data/lib/private_person/models/permissor.rb

@@ -31,13 +31,11 @@ module PrivatePerson
         end
 
         def permission_params(whom, what)
-          params = ActionController::Parameters.new({:relationship_type => whom, :permissible => what})
-          params.permit!
+          ActionController::Parameters.new({:relationship_type => whom, :permissible_type => what.class.name, :permissible_id => what.id}).permit!
         end
 
         def wildcard_permission_params(whom, what)
-          params = ActionController::Parameters.new({:relationship_type => whom, :permissible_type => what})
-          params.permit!
+          ActionController::Parameters.new({:relationship_type => whom, :permissible_type => what}).permit!
         end
       end
     end

data/lib/private_person/models/permitted.rb

@@ -39,7 +39,7 @@ module PrivatePerson
           # Then check for a slow method
           for relationship_method in permissor.class.of
             relationship_members = permissor.send(relationship_method.to_sym)
-            if relationship_members.present? and relationship_members.exists?(:id => self.id)
+            if relationship_members.present? and relationship_members.include? self
               return relationship_method.to_s
             end
           end

data/private_person.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "private_person"
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Karen Lundgren"]
@@ -38,7 +38,6 @@ Gem::Specification.new do |s|
     "script/rails",
     "spec/dummy/.rspec",
     "spec/dummy/Rakefile",
-    "spec/dummy/app/models/follow.rb",
     "spec/dummy/app/models/page.rb",
     "spec/dummy/app/models/user.rb",
     "spec/dummy/config.ru",
@@ -58,10 +57,8 @@ Gem::Specification.new do |s|
     "spec/dummy/config/locales/en.yml",
     "spec/dummy/config/routes.rb",
     "spec/dummy/db/development.sqlite3",
-    "spec/dummy/db/migrate/20130906211525_create_permissions_table.rb",
     "spec/dummy/db/migrate/20130906213557_create_users_table.rb",
     "spec/dummy/db/migrate/20130906213612_create_pages_table.rb",
-    "spec/dummy/db/migrate/20130907010108_acts_as_follower_migration.rb",
     "spec/dummy/db/schema.rb",
     "spec/dummy/db/test.sqlite3",
     "spec/dummy/script/rails",
@@ -88,7 +85,6 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rails>, [">= 0"])
-      s.add_runtime_dependency(%q<protected_attributes>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
@@ -98,10 +94,9 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<shoulda-matchers>, [">= 0"])
       s.add_development_dependency(%q<factory_girl_rails>, [">= 0"])
       s.add_development_dependency(%q<database_cleaner>, [">= 0"])
-      s.add_development_dependency(%q<acts_as_follower>, [">= 0"])
+      s.add_development_dependency(%q<chalk_dust>, [">= 0"])
     else
       s.add_dependency(%q<rails>, [">= 0"])
-      s.add_dependency(%q<protected_attributes>, [">= 0"])
       s.add_dependency(%q<rdoc>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
@@ -111,11 +106,10 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<shoulda-matchers>, [">= 0"])
       s.add_dependency(%q<factory_girl_rails>, [">= 0"])
       s.add_dependency(%q<database_cleaner>, [">= 0"])
-      s.add_dependency(%q<acts_as_follower>, [">= 0"])
+      s.add_dependency(%q<chalk_dust>, [">= 0"])
     end
   else
     s.add_dependency(%q<rails>, [">= 0"])
-    s.add_dependency(%q<protected_attributes>, [">= 0"])
     s.add_dependency(%q<rdoc>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
@@ -125,7 +119,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<shoulda-matchers>, [">= 0"])
     s.add_dependency(%q<factory_girl_rails>, [">= 0"])
     s.add_dependency(%q<database_cleaner>, [">= 0"])
-    s.add_dependency(%q<acts_as_follower>, [">= 0"])
+    s.add_dependency(%q<chalk_dust>, [">= 0"])
   end
 end
 

data/spec/dummy/app/models/user.rb

@@ -1,9 +1,18 @@
 class User < ActiveRecord::Base
-  acts_as_follower
-  acts_as_followable
-
   acts_as_permissor :of => [:following_users, :user_followers, :following_of_followings, :follower_of_followers], :class_name => 'User'
 
+  def follow(user)
+    ChalkDust.subscribe(self, :to => user)
+  end
+
+  def following_users
+    ChalkDust.publishers_of(self)
+  end
+
+  def user_followers
+    ChalkDust.subscribers_of(self)
+  end
+
   def following_of_followings
     ids = []
     for user in following_users
@@ -19,12 +28,4 @@ class User < ActiveRecord::Base
     end
     User.where(:id => ids)
   end
-
-  def is_following_user_of?(item)
-    self.followed_by?(item)
-  end
-
-  def is_user_follower_of?(item)
-    item.followed_by?(self)
-  end
 end

data/spec/dummy/config/application.rb

@@ -6,7 +6,7 @@ require "active_record/railtie"
 
 Bundler.require
 require "private_person"
-require 'acts_as_follower'
+require 'chalk_dust'
 
 module Dummy
   class Application < Rails::Application
@@ -45,12 +45,6 @@ module Dummy
     # This is necessary if your schema can't be completely dumped by the schema dumper,
     # like if you have constraints or database-specific column types
     # config.active_record.schema_format = :sql
-
-    # Enforce whitelist mode for mass assignment.
-    # This will create an empty whitelist of attributes available for mass-assignment for all models
-    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
-    # parameters by using an attr_accessible or attr_protected declaration.
-    config.active_record.whitelist_attributes = true
   end
 end
 

data/spec/dummy/config/environments/development.rb

@@ -17,11 +17,4 @@ Dummy::Application.configure do
 
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
-
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
-
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  config.active_record.auto_explain_threshold_in_seconds = 0.5
 end

data/spec/dummy/config/environments/test.rb

@@ -17,9 +17,6 @@ Dummy::Application.configure do
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
-
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
 end

data/spec/dummy/db/schema.rb

@@ -9,48 +9,63 @@
 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
-# It's strongly recommended to check this file into your version control system.
-
-ActiveRecord::Schema.define(:version => 20130907010108) do
-
-  create_table "follows", :force => true do |t|
-    t.integer  "followable_id",                      :null => false
-    t.string   "followable_type",                    :null => false
-    t.integer  "follower_id",                        :null => false
-    t.string   "follower_type",                      :null => false
-    t.boolean  "blocked",         :default => false, :null => false
-    t.datetime "created_at",                         :null => false
-    t.datetime "updated_at",                         :null => false
+# It's strongly recommended that you check this file into your version control system.
+
+ActiveRecord::Schema.define(version: 20130930161545) do
+
+  create_table "activity_items", force: true do |t|
+    t.integer  "performer_id"
+    t.string   "performer_type"
+    t.string   "event"
+    t.integer  "target_id"
+    t.string   "target_type"
+    t.integer  "owner_id"
+    t.string   "owner_type"
+    t.string   "topic"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "activity_items", ["owner_id", "owner_type", "created_at", "topic"], name: "activity_items_owner_id_type_created_at_topic"
+  add_index "activity_items", ["owner_id", "owner_type", "created_at"], name: "index_activity_items_on_owner_id_and_owner_type_and_created_at"
+
+  create_table "connections", force: true do |t|
+    t.integer  "subscriber_id"
+    t.string   "subscriber_type"
+    t.integer  "publisher_id"
+    t.string   "publisher_type"
+    t.string   "topic"
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  add_index "follows", ["followable_id", "followable_type"], :name => "fk_followables"
-  add_index "follows", ["follower_id", "follower_type"], :name => "fk_follows"
+  add_index "connections", ["publisher_id", "publisher_type", "topic"], name: "index_connections_on_publisher_id_and_publisher_type_and_topic", unique: true
 
-  create_table "pages", :force => true do |t|
+  create_table "pages", force: true do |t|
     t.string   "title"
     t.text     "body"
     t.integer  "user_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  create_table "permissions", :force => true do |t|
+  create_table "permissions", force: true do |t|
     t.string   "permissor_type"
     t.integer  "permissor_id"
     t.string   "permissible_type"
     t.integer  "permissible_id"
-    t.string   "relationship_type", :default => "none"
-    t.datetime "created_at",                            :null => false
-    t.datetime "updated_at",                            :null => false
+    t.string   "relationship_type", default: "none"
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  add_index "permissions", ["permissible_type", "permissible_id"], :name => "index_permissions_on_permissible_type_and_permissible_id"
-  add_index "permissions", ["permissor_type", "permissor_id"], :name => "index_permissions_on_permissor_type_and_permissor_id"
+  add_index "permissions", ["permissible_type", "permissible_id"], name: "index_permissions_on_permissible_type_and_permissible_id"
+  add_index "permissions", ["permissor_type", "permissor_id"], name: "index_permissions_on_permissor_type_and_permissor_id"
 
-  create_table "users", :force => true do |t|
+  create_table "users", force: true do |t|
     t.string   "nickname"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
 end

data/spec/models/permission_spec.rb

@@ -5,17 +5,6 @@ describe Permission do
   it { should belong_to(:permissor) }
   it { should belong_to(:permissible) }
 
-  # Check accessible attributes
-  it { should allow_mass_assignment_of(:permissible) }
-  it { should allow_mass_assignment_of(:permissible_type) }
-  it { should allow_mass_assignment_of(:permissible_id) }
-  it { should allow_mass_assignment_of(:relationship_type) }
-
-  # Check validations
-  it { should validate_presence_of(:permissor) }
-  it { should validate_presence_of(:permissible_type) }
-  it { should validate_presence_of(:relationship_type) }
-
   describe 'Class Methods' do
     include_context 'permissions support'
 

data/spec/spec_helper.rb

@@ -13,7 +13,7 @@ FactoryGirl.definition_file_paths = %w(spec/factories)
 
 require 'database_cleaner'
 require 'shoulda-matchers'
-require 'acts_as_follower'
+require 'chalk_dust'
 require 'private_person'
 
 # Requires supporting files with custom matchers and macros, etc,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: private_person
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Karen Lundgren
@@ -24,20 +24,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: protected_attributes
-  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: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -165,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: acts_as_follower
+  name: chalk_dust
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -209,7 +195,6 @@ files:
 - script/rails
 - spec/dummy/.rspec
 - spec/dummy/Rakefile
-- spec/dummy/app/models/follow.rb
 - spec/dummy/app/models/page.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/config.ru
@@ -229,10 +214,8 @@ files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/db/development.sqlite3
-- spec/dummy/db/migrate/20130906211525_create_permissions_table.rb
 - spec/dummy/db/migrate/20130906213557_create_users_table.rb
 - spec/dummy/db/migrate/20130906213612_create_pages_table.rb
-- spec/dummy/db/migrate/20130907010108_acts_as_follower_migration.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/script/rails

data/spec/dummy/app/models/follow.rb

@@ -1,16 +0,0 @@
-class Follow < ActiveRecord::Base
-
-  attr_accessible :followable_type, :followable_id
-
-  extend ActsAsFollower::FollowerLib
-  extend ActsAsFollower::FollowScopes
-
-  # NOTE: Follows belong to the "followable" interface, and also to followers
-  belongs_to :followable, :polymorphic => true
-  belongs_to :follower,   :polymorphic => true
-
-  def block!
-    self.update_attribute(:blocked, true)
-  end
-
-end

data/spec/dummy/db/migrate/20130906211525_create_permissions_table.rb

@@ -1,18 +0,0 @@
-class CreatePermissionsTable < ActiveRecord::Migration
-  def self.up
-    create_table :permissions do |t|
-      t.string      :permissor_type
-      t.integer     :permissor_id
-      t.string      :permissible_type
-      t.integer     :permissible_id
-      t.string      :relationship_type, :default => 'none'
-      t.timestamps
-    end
-
-    add_index :permissions, [:permissor_type, :permissor_id]
-    add_index :permissions, [:permissible_type, :permissible_id]
-  end
-  def self.down
-    drop_table :permissions
-  end
-end

data/spec/dummy/db/migrate/20130907010108_acts_as_follower_migration.rb

@@ -1,17 +0,0 @@
-class ActsAsFollowerMigration < ActiveRecord::Migration
-  def self.up
-    create_table :follows, :force => true do |t|
-      t.references :followable, :polymorphic => true, :null => false
-      t.references :follower,   :polymorphic => true, :null => false
-      t.boolean :blocked, :default => false, :null => false
-      t.timestamps
-    end
-
-    add_index :follows, ["follower_id", "follower_type"],     :name => "fk_follows"
-    add_index :follows, ["followable_id", "followable_type"], :name => "fk_followables"
-  end
-
-  def self.down
-    drop_table :follows
-  end
-end