private_person 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ea4a8f4f6cabb8537ca689a8b83f58b09822b2f
-  data.tar.gz: ff11f0adc4df97999397aaeaec63893019c713d5
+  metadata.gz: 8fc5ea2ff01d3b1c9aa4fdf1d08b1e89d4b59fda
+  data.tar.gz: 53cdaee285d896caf9591c4bfed3d4897af94e40
 SHA512:
-  metadata.gz: 4b68dbebec12d3ce0cd05873c0adb64bec4e2159f1f1c9faaa1f602ac706577cc388c6a084f28963fbc29359f8e431913e5f6c3a68e8c4bc3dbcfbf255bccd3c
-  data.tar.gz: dbab508ccb006ca7907b91a82310af472f5d35d84f9446c33dafcecc1564d0b400f9b36952812838f837f5df5e5a29c193d4c76c404c081fb1181010514ff7c2
+  metadata.gz: f7fa47f819e68afc2931b7cf9a0f8ac845fe559dee7948b3616e51498957a9f5d7ae42490a263593a850abc656e4e9cbbdfae91c13bb31aef23964d0daaabdf4
+  data.tar.gz: f760e1935c191e8f78fbde750decc436dcd80993b70eb080a2ecd9e3a50a0900308e9e0323b6c12b58c5f57e1a6875b5f03c4e104c4762a2eeeeb7d010c9d461

data/Gemfile

@@ -3,19 +3,8 @@ source 'http://rubygems.org'
 # Example:
 #   gem 'activesupport', '>= 2.3.5'
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development, :test do
-  gem 'rdoc'
-  gem 'bundler'
-  gem 'jeweler'
-  gem 'sqlite3'
-  gem 'rspec'
-  gem 'rspec-rails'
-  gem 'shoulda-matchers'
-  gem 'factory_girl_rails'
-  gem 'database_cleaner'
-  gem 'chalk_dust', :git => 'git://github.com/nerakdon/chalk_dust.git'
-end
+gem 'rails', '>= 4.0'
+gem 'activerecord', '>= 4.0'
+gem 'chalk_dust', group: :test, git: 'https://github.com/nerakdon/chalk_dust.git'
 
-gem 'rails'
+gemspec

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Sour Cherry Web
+Copyright (c) 2013-2014 Gem Vein
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -1,8 +1,12 @@
 = PrivatePerson
 
+{<img src="https://badge.fury.io/rb/private_person.svg" alt="Gem Version" />}[http://badge.fury.io/rb/private_person]
+{<img src="https://travis-ci.org/gemvein/private_person.svg?branch=master" alt="Build Status" />}[https://travis-ci.org/gemvein/private_person]
+{<img src="https://coveralls.io/repos/gemvein/private_person/badge.png" alt="Coverage Status" />}[https://coveralls.io/r/gemvein/private_person]
+
 Private person is an active record extension gem that allows a model to be given privacy settings over arbitrary models and polymorphic relations, putting users' accounts in control of their own privacy policies.
 
-== Contributing to Person
+== Contributing to Private Person
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
@@ -14,5 +18,5 @@ Private person is an active record extension gem that allows a model to be given
 
 == Copyright
 
-Copyright (c) 2013 Sour Cherry Web. See LICENSE.txt for further details.
+Copyright (c) 2013-2014 Gem Vein. See LICENSE.txt for further details.
 

data/Rakefile

@@ -15,11 +15,11 @@ require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "private_person"
-  gem.homepage = "http://github.com/nerakdon/private_person"
+  gem.homepage = "http://www.gemvein.com/museum/cases/private_person"
   gem.license = "MIT"
   gem.summary = %Q{Private person puts your users in control of their own privacy policies.}
   gem.description = %Q{Private person is an active record extension gem that allows a model to be given privacy settings over arbitrary models and polymorphic relations, putting users' accounts in control of their own privacy policies.}
-  gem.email = "webmaster@sourcherryweb.com"
+  gem.email = "karen.e.lundgren@gmail.com"
   gem.authors = ["Karen Lundgren"]
   # dependencies defined in Gemfile
 end
@@ -37,13 +37,3 @@ RSpec::Core::RakeTask.new(:rcov) do |spec|
 end
 
 task :default => :spec
-
-require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "private_person #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/lib/private_person.rb

@@ -1,14 +1,14 @@
 module PrivatePerson
   require 'rails'
   require 'private_person/version'
-  require 'private_person/models/permissor'
   require 'private_person/models/permission'
-  require 'private_person/models/permissible'
-  require 'private_person/models/permitted'
-end
+  require 'private_person/extensions/acts_as_permissor'
+  require 'private_person/extensions/acts_as_permissible'
+  require 'private_person/extensions/acts_as_permitted'
 
-if defined?(ActiveRecord::Base)
-  ActiveRecord::Base.extend PrivatePerson::Permitted
-  ActiveRecord::Base.extend PrivatePerson::Permissor
-  ActiveRecord::Base.extend PrivatePerson::Permissible
+  if defined?(ActiveRecord::Base)
+    ActiveRecord::Base.send(:include, ActsAsPermitted)
+    ActiveRecord::Base.send(:include, ActsAsPermissor)
+    ActiveRecord::Base.send(:include, ActsAsPermissible)
+  end
 end

data/lib/private_person/extensions/acts_as_permissible.rb

@@ -0,0 +1,27 @@
+module PrivatePerson
+  module ActsAsPermissible
+
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def acts_as_permissible(params = {})
+        if params[:by].nil?
+          raise 'Called acts_as_permissible, but without a :by parameter.'
+        end
+        class_attribute :by
+        self.by = params[:by]
+
+        has_many :permissions, :as => :permissible, :class_name => 'PrivatePerson::Permission'
+        has_many :permissors, :through => :permissions, :as => :permissible
+
+        send :include, InstanceMethods
+      end
+    end
+
+    module InstanceMethods
+      def is_public?
+        !permissions.by_relationship_type(nil).empty?
+      end
+    end
+  end
+end

data/lib/private_person/extensions/acts_as_permissor.rb

@@ -0,0 +1,58 @@
+module PrivatePerson
+  module ActsAsPermissor
+
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def acts_as_permissor(params = {})
+        if params[:of].nil?
+          raise 'Called acts_as_permissor, but without an :of parameter.'
+        end
+        class_attribute :of
+        self.of = params[:of]
+        class_name = params[:class_name] || params[:of].to_s.classify
+        class_name.constantize.acts_as_permitted
+
+        has_many :permissions_as_permissor, :as => :permissor, :class_name => 'PrivatePerson::Permission'
+        has_many :permissibles, :through => :permissions, :as => :permissor
+        
+        send :include, InstanceMethods
+      end
+    end
+
+    module InstanceMethods
+      def permit!(whom, what)
+        existing = self.permissions_as_permissor.by_relationship_type(whom).by_permissible(what)
+
+        if existing.empty?
+          self.permissions_as_permissor.create!(permission_params(whom, what))
+        end
+        self.permissions_as_permissor.reload
+      end
+
+      def wildcard_permit!(whom, what)
+        existing = self.permissions_as_permissor.by_relationship_type(whom).where(:permissible_type, what)
+
+        # if existing.empty?
+          self.permissions_as_permissor.create!(wildcard_permission_params(whom, what))
+        # end
+        self.permissions_as_permissor.reload
+      end
+
+      def permission_params(whom, what)
+        ::ActionController::Parameters.new({
+          :relationship_type => whom, 
+          :permissible_type => what.class.name, 
+          :permissible_id => what.id
+        }).permit!
+      end
+
+      def wildcard_permission_params(whom, what)
+        ::ActionController::Parameters.new({
+          :relationship_type => whom, 
+          :permissible_type => what
+        }).permit!
+      end
+    end
+  end
+end

data/lib/private_person/extensions/acts_as_permitted.rb

@@ -0,0 +1,58 @@
+module PrivatePerson
+  module ActsAsPermitted
+
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def acts_as_permitted
+        send :include, InstanceMethods
+      end
+    end
+
+    module InstanceMethods
+      def is_permitted?(permissor, permissible)
+        if permissible.nil?
+          raise 'Called is_permitted? on nil. Does not compute. Preparing to self destruct.'
+        end
+        unless PrivatePerson::Permission.by_permissible(permissible).blocked.empty?
+          return false
+        end
+        wildcards = permissions_by(permissor).by_wildcard(permissible.class.name).legitimate
+        if wildcards.present?
+          return true
+        end
+        permissions = permissions_by(permissor).by_permissible(permissible).legitimate
+        if permissions.present?
+          return true
+        end
+        return false
+      end
+
+      def permissions_by(permissor)
+        PrivatePerson::Permission.by_permissor(permissor).by_relationship_type(relationship_to(permissor))
+      end
+
+      def relationship_to(permissor)
+        # First make sure we're not a new user
+        if self.new_record?
+          return 'public'
+        end
+        # Next check for an efficient method
+        for relationship_method in permissor.class.of
+          is_method = ('is_' + relationship_method.to_s.singularize + '_of?').to_sym
+          if respond_to?(is_method) and self.send(is_method, permissor)
+            return relationship_method.to_s
+          end
+        end
+        # 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.include? self
+            return relationship_method.to_s
+          end
+        end
+        return 'public'
+      end
+    end
+  end
+end

data/lib/private_person/models/permission.rb

@@ -1,55 +1,57 @@
-class Permission < ActiveRecord::Base
-  belongs_to :permissor, :polymorphic => true
-  belongs_to :permissible, :polymorphic => true
+module PrivatePerson
+  class Permission < ActiveRecord::Base
+    belongs_to :permissor, :polymorphic => true
+    belongs_to :permissible, :polymorphic => true
 
-  def self.by_permissor(permissor)
-    where("permissor_type = ? AND permissor_id = ?", permissor.class.name, permissor.id)
-  end
-
-  def self.by_permissible(permissible)
-    where("permissible_type = ? AND permissible_id = ?", permissible.class.name, permissible.id)
-  end
+    def self.by_permissor(permissor)
+      where("permissor_type = ? AND permissor_id = ?", permissor.class.name, permissor.id)
+    end
 
-  def self.by_wildcard(permissible_type)
-    where(:permissible_type => permissible_type, :permissible_id => nil)
-  end
+    def self.by_permissible(permissible)
+      where("permissible_type = ? AND permissible_id = ?", permissible.class.name, permissible.id)
+    end
 
-  def self.by_relationship_type(relationship_type)
-    if relationship_type == 'public' or relationship_type.nil?
-      return where("relationship_type = 'public'")
+    def self.by_wildcard(permissible_type)
+      where(:permissible_type => permissible_type, :permissible_id => nil)
     end
-    if(self.permissible_types.include? relationship_type)
-      return where("relationship_type = ? OR relationship_type = 'public'", relationship_type)
+
+    def self.by_relationship_type(relationship_type)
+      if relationship_type == 'public' or relationship_type.nil?
+        return where("relationship_type = 'public'")
+      end
+      if(self.permissible_types.include? relationship_type)
+        return where("relationship_type = ? OR relationship_type = 'public'", relationship_type)
+      end
+      return where(0)
     end
-    return where(0)
-  end
 
-  def self.blocked
-    where('NOT(relationship_type IN (?))', self.permissible_types)
-  end
+    def self.blocked
+      where('NOT(relationship_type IN (?))', self.permissible_types)
+    end
 
-  def self.legitimate
-    where('relationship_type IN (?)', self.permissible_types)
-  end
+    def self.legitimate
+      where('relationship_type IN (?)', self.permissible_types)
+    end
 
-  def self.permissible_types
-    permissible_types = ['public']
-    for record in self.group('permissor_type').group('permissor_id')
-      permissor = record.permissor_type.constantize.find(record.permissor_id)
-      unless permissor.nil?
-        for method in permissor.class.of
-          permissible_types << method.to_s
+    def self.permissible_types
+      permissible_types = ['public']
+      for record in self.group('permissor_type').group('permissor_id')
+        permissor = record.permissor_type.constantize.find(record.permissor_id)
+        unless permissor.nil?
+          for method in permissor.class.of
+            permissible_types << method.to_s
+          end
         end
       end
+      permissible_types.compact
     end
-    permissible_types.compact
-  end
 
-  def existing_types
-    existing_types = ['public']
-    for method in permissor.class.of
-      existing_types << method.to_s
+    def existing_types
+      existing_types = ['public']
+      for method in permissor.class.of
+        existing_types << method.to_s
+      end
+      existing_types
     end
-    existing_types
   end
 end

data/private_person.gemspec

@@ -2,16 +2,18 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: private_person 0.4.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "private_person"
-  s.version = "0.3.1"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Karen Lundgren"]
-  s.date = "2013-09-30"
+  s.date = "2014-10-10"
   s.description = "Private person is an active record extension gem that allows a model to be given privacy settings over arbitrary models and polymorphic relations, putting users' accounts in control of their own privacy policies."
-  s.email = "webmaster@sourcherryweb.com"
+  s.email = "karen.e.lundgren@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -29,10 +31,10 @@ Gem::Specification.new do |s|
     "lib/generators/private_person/install/templates/migrate/create_permissions_table.rb",
     "lib/generators/private_person/utils.rb",
     "lib/private_person.rb",
-    "lib/private_person/models/permissible.rb",
+    "lib/private_person/extensions/acts_as_permissible.rb",
+    "lib/private_person/extensions/acts_as_permissor.rb",
+    "lib/private_person/extensions/acts_as_permitted.rb",
     "lib/private_person/models/permission.rb",
-    "lib/private_person/models/permissor.rb",
-    "lib/private_person/models/permitted.rb",
     "lib/private_person/version.rb",
     "private_person.gemspec",
     "script/rails",
@@ -52,7 +54,6 @@ Gem::Specification.new do |s|
     "spec/dummy/config/initializers/mime_types.rb",
     "spec/dummy/config/initializers/secret_token.rb",
     "spec/dummy/config/initializers/session_store.rb",
-    "spec/dummy/config/initializers/wrap_parameters.rb",
     "spec/dummy/config/locales/devise.en.yml",
     "spec/dummy/config/locales/en.yml",
     "spec/dummy/config/routes.rb",
@@ -74,52 +75,57 @@ Gem::Specification.new do |s|
     "spec/support/permissor_support.rb",
     "spec/support/users_support.rb"
   ]
-  s.homepage = "http://github.com/nerakdon/private_person"
+  s.homepage = "http://www.gemvein.com/museum/cases/private_person"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.3"
+  s.rubygems_version = "2.2.2"
   s.summary = "Private person puts your users in control of their own privacy policies."
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     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<rails>, [">= 4.0"])
+      s.add_runtime_dependency(%q<activerecord>, [">= 4.0"])
+      s.add_runtime_dependency(%q<private_person>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<rspec-rails>, [">= 0"])
+      s.add_development_dependency(%q<rspec-its>, [">= 0"])
       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<chalk_dust>, [">= 0"])
     else
-      s.add_dependency(%q<rails>, [">= 0"])
+      s.add_dependency(%q<rails>, [">= 4.0"])
+      s.add_dependency(%q<activerecord>, [">= 4.0"])
+      s.add_dependency(%q<private_person>, [">= 0"])
       s.add_dependency(%q<rdoc>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<rspec-rails>, [">= 0"])
+      s.add_dependency(%q<rspec-its>, [">= 0"])
       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<chalk_dust>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rails>, [">= 0"])
+    s.add_dependency(%q<rails>, [">= 4.0"])
+    s.add_dependency(%q<activerecord>, [">= 4.0"])
+    s.add_dependency(%q<private_person>, [">= 0"])
     s.add_dependency(%q<rdoc>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<rspec-rails>, [">= 0"])
+    s.add_dependency(%q<rspec-its>, [">= 0"])
     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<chalk_dust>, [">= 0"])
   end
 end
 

data/spec/factories/permissions.rb

@@ -1,5 +1,5 @@
 FactoryGirl.define do
-  factory :permission do
+  factory :permission, class: PrivatePerson::Permission do
     relationship_type 'none'
     permissible
     permissor

data/spec/models/page_spec.rb

@@ -2,5 +2,5 @@ require 'spec_helper'
 
 describe Page do
   it { should have_many(:permissions) }
-  it { should have_one(:permissor) }
+  it { should have_many(:permissors) }
 end

data/spec/models/permission_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Permission do
+describe PrivatePerson::Permission do
   # Check relationships
   it { should belong_to(:permissor) }
   it { should belong_to(:permissible) }
@@ -9,8 +9,8 @@ describe Permission do
     include_context 'permissions support'
 
     describe '.by_permissor' do
-      subject { Permission.by_permissor(followed_user) }
-      it { should have_exactly(8).items }
+      subject { PrivatePerson::Permission.by_permissor(followed_user) }
+      its(:count) { should be 8 }
       it { should include general_permission }
       it { should include following_users_permission }
       it { should include user_followers_permission }
@@ -22,33 +22,33 @@ describe Permission do
     end
 
     describe '.by_permissible' do
-      subject { Permission.by_permissible(following_page) }
+      subject { PrivatePerson::Permission.by_permissible(following_page) }
       it { should eq [following_users_permission]}
     end
 
     describe '.by_wildcard' do
-      subject { Permission.by_wildcard('Page') }
+      subject { PrivatePerson::Permission.by_wildcard('Page') }
       it { should eq [general_permission] }
     end
 
     describe '.by_relationship_type' do
-      subject { Permission.by_relationship_type('following_users') }
-      it { should have_exactly(3).items }
+      subject { PrivatePerson::Permission.by_relationship_type('following_users') }
+      its(:count) { should be 3 }
       it { should include general_permission }
       it { should include following_users_permission }
       it { should include public_permission }
     end
 
     describe '.blocked' do
-      subject { Permission.blocked }
-      it { should have_exactly(2).items }
+      subject { PrivatePerson::Permission.blocked }
+      its(:count) { should be 2 }
       it { should include none_permission }
       it { should include forbidden_permission }
     end
 
     describe '.legitimate' do
-      subject { Permission.legitimate }
-      it { should have_exactly(6).items }
+      subject { PrivatePerson::Permission.legitimate }
+      its(:count) { should be 6 }
       it { should include general_permission }
       it { should include following_users_permission }
       it { should include user_followers_permission }
@@ -58,7 +58,7 @@ describe Permission do
     end
 
     describe '.permissible_types' do
-      subject { Permission.permissible_types.sort }
+      subject { PrivatePerson::Permission.permissible_types.sort }
       it { should be_an Array }
       it { should eq %w{following_users user_followers following_of_followings follower_of_followers public}.sort }
     end

data/spec/models/user_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe User do
 
-  describe PrivatePerson::Permitted do
+  describe 'acts_as_permitted' do
     it { should have_many(:permissions_as_permissor) }
     it { should have_many(:permissibles) }
 
@@ -40,26 +40,26 @@ describe User do
         context 'when following' do
           subject { following_user.permissions_by(followed_user) }
           it { should be_an ActiveRecord::Relation }
-          its(:first) { should be_a Permission }
+          its(:first) { should be_a PrivatePerson::Permission }
           it { should include following_users_permission }
           it { should include public_permission }
         end
         context 'when follower' do
           subject { follower_user.permissions_by(followed_user) }
           it { should be_an ActiveRecord::Relation }
-          its(:first) { should be_a Permission }
+          its(:first) { should be_a PrivatePerson::Permission }
           it { should include user_followers_permission }
         end
         context 'when following_of_followings' do
           subject { following_of_following_user.permissions_by(followed_user) }
           it { should be_an ActiveRecord::Relation }
-          its(:first) { should be_a Permission }
+          its(:first) { should be_a PrivatePerson::Permission }
           it { should include following_of_followings_permission }
         end
         context 'when follower_of_follower' do
           subject { follower_of_follower_user.permissions_by(followed_user) }
           it { should be_an ActiveRecord::Relation }
-          its(:first) { should be_a Permission }
+          its(:first) { should be_a PrivatePerson::Permission }
           it { should include follower_of_followers_permission }
         end
       end
@@ -101,7 +101,7 @@ describe User do
     end
   end
 
-  describe PrivatePerson::Permissor do
+  describe 'acts_as_permissor' do
     include_context 'users support'
     include_context 'permissor support'
     context 'Instance Methods' do

data/spec/spec_helper.rb

@@ -7,6 +7,7 @@ require 'rails/all'
 require 'sqlite3'
 require 'rspec'
 require 'rspec/rails'
+require 'rspec/its'
 
 require 'factory_girl_rails'
 FactoryGirl.definition_file_paths = %w(spec/factories)

data/spec/support/permissions_support.rb

@@ -18,7 +18,7 @@ shared_context 'permissions support' do
   let!(:forbidden_permission)  { FactoryGirl.create(:permission, :permissor => followed_user, :permissible => forbidden_page, :relationship_type => 'forbidden') }
   let!(:none_permission)  { FactoryGirl.create(:permission, :permissor => followed_user, :permissible => none_page, :relationship_type => 'none') }
 
-  let!(:permissions) { Permission.all }
-  let!(:wildcards) { Permission.by_wildcard('Page') }
+  let!(:permissions) { PrivatePerson::Permission.all }
+  let!(:wildcards) { PrivatePerson::Permission.by_wildcard('Page') }
 
 end

metadata

@@ -1,182 +1,210 @@
 --- !ruby/object:Gem::Specification
 name: private_person
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Karen Lundgren
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-30 00:00:00.000000000 Z
+date: 2014-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: private_person
+  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
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   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
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: shoulda-matchers
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: chalk_dust
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Private person is an active record extension gem that allows a model
   to be given privacy settings over arbitrary models and polymorphic relations, putting
   users' accounts in control of their own privacy policies.
-email: webmaster@sourcherryweb.com
+email: karen.e.lundgren@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files:
-- .document
-- .idea/scopes/scope_settings.xml
-- .rspec
+- ".document"
+- ".idea/scopes/scope_settings.xml"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.rdoc
@@ -186,10 +214,10 @@ files:
 - lib/generators/private_person/install/templates/migrate/create_permissions_table.rb
 - lib/generators/private_person/utils.rb
 - lib/private_person.rb
-- lib/private_person/models/permissible.rb
+- lib/private_person/extensions/acts_as_permissible.rb
+- lib/private_person/extensions/acts_as_permissor.rb
+- lib/private_person/extensions/acts_as_permitted.rb
 - lib/private_person/models/permission.rb
-- lib/private_person/models/permissor.rb
-- lib/private_person/models/permitted.rb
 - lib/private_person/version.rb
 - private_person.gemspec
 - script/rails
@@ -209,7 +237,6 @@ files:
 - spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/secret_token.rb
 - spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/devise.en.yml
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
@@ -230,7 +257,7 @@ files:
 - spec/support/permissions_support.rb
 - spec/support/permissor_support.rb
 - spec/support/users_support.rb
-homepage: http://github.com/nerakdon/private_person
+homepage: http://www.gemvein.com/museum/cases/private_person
 licenses:
 - MIT
 metadata: {}
@@ -240,17 +267,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Private person puts your users in control of their own privacy policies.

data/lib/private_person/models/permissible.rb

@@ -1,20 +0,0 @@
-module PrivatePerson
-  module Permissible
-    def acts_as_permissible(params = {})
-      if params[:by].nil?
-        raise 'Called acts_as_permissible, but without a :by parameter.'
-      end
-      class_attribute :by
-      self.by = params[:by]
-
-      class_eval do
-        has_many :permissions, :as => :permissible
-        has_one :permissor, :through => :permissions, :as => :permissor
-
-        def is_public?
-          !permissions.by_relationship_type(nil).empty?
-        end
-      end
-    end
-  end
-end

data/lib/private_person/models/permissor.rb

@@ -1,43 +0,0 @@
-module PrivatePerson
-  module Permissor
-    def acts_as_permissor(params = {})
-      if params[:of].nil?
-        raise 'Called acts_as_permissor, but without an :of parameter.'
-      end
-      class_attribute :of
-      self.of = params[:of]
-      class_name = params[:class_name] || params[:of].to_s.classify
-      class_name.constantize.acts_as_permitted
-      class_eval do
-        has_many :permissions_as_permissor, :as => :permissor, :class_name => 'Permission'
-        has_many :permissibles, :through => :permissions, :as => :permissor
-
-        def permit!(whom, what)
-          existing = self.permissions_as_permissor.by_relationship_type(whom).by_permissible(what)
-
-          if existing.empty?
-            self.permissions_as_permissor.create!(permission_params(whom, what))
-          end
-          self.permissions_as_permissor.reload
-        end
-
-        def wildcard_permit!(whom, what)
-          existing = self.permissions_as_permissor.by_relationship_type(whom).where(:permissible_type, what)
-
-          if existing.empty?
-            self.permissions_as_permissor.create!(wildcard_permission_params(whom, what))
-          end
-          self.permissions_as_permissor.reload
-        end
-
-        def permission_params(whom, what)
-          ActionController::Parameters.new({:relationship_type => whom, :permissible_type => what.class.name, :permissible_id => what.id}).permit!
-        end
-
-        def wildcard_permission_params(whom, what)
-          ActionController::Parameters.new({:relationship_type => whom, :permissible_type => what}).permit!
-        end
-      end
-    end
-  end
-end

data/lib/private_person/models/permitted.rb

@@ -1,51 +0,0 @@
-module PrivatePerson
-  module Permitted
-    def acts_as_permitted
-      class_eval do
-        def is_permitted?(permissor, permissible)
-          if permissible.nil?
-            raise 'Called is_permitted? on nil. Does not compute. Preparing to self destruct.'
-          end
-          unless Permission.by_permissible(permissible).blocked.empty?
-            return false
-          end
-          wildcards = permissions_by(permissor).by_wildcard(permissible.class.name).legitimate
-          if wildcards.present?
-            return true
-          end
-          permissions = permissions_by(permissor).by_permissible(permissible).legitimate
-          if permissions.present?
-            return true
-          end
-          return false
-        end
-
-        def permissions_by(permissor)
-          Permission.by_permissor(permissor).by_relationship_type(relationship_to(permissor))
-        end
-
-        def relationship_to(permissor)
-          # First make sure we're not a new user
-          if self.new_record?
-            return 'public'
-          end
-          # Next check for an efficient method
-          for relationship_method in permissor.class.of
-            is_method = ('is_' + relationship_method.to_s.singularize + '_of?').to_sym
-            if respond_to?(is_method) and self.send(is_method, permissor)
-              return relationship_method.to_s
-            end
-          end
-          # 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.include? self
-              return relationship_method.to_s
-            end
-          end
-          return 'public'
-        end
-      end
-    end
-  end
-end

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

@@ -1,14 +0,0 @@
-# Be sure to restart your server when you modify this file.
-#
-# This file contains settings for ActionController::ParamsWrapper which
-# is enabled by default.
-
-# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
-ActiveSupport.on_load(:action_controller) do
-  wrap_parameters :format => [:json]
-end
-
-# Disable root element in JSON by default.
-ActiveSupport.on_load(:active_record) do
-  self.include_root_in_json = false
-end