active_restrictors 0.2.0 → 0.2.1

data/CHANGELOG.rdoc

@@ -1,3 +1,6 @@
+== v0.2.1
+* Restrictors not added if table does not exist (allows restrictors to be defined before migration has setup model)
+
 == v0.2.0
 * Removed any remaining Rails 2 support
 * Added new parameter structure for defining restrictors

data/Gemfile.lock

@@ -10,24 +10,18 @@ GEM
       activesupport (= 3.1.3)
       arel (~> 2.2.1)
       tzinfo (~> 0.3.29)
-    activerecord-jdbc-adapter (1.2.1)
-    activerecord-jdbcsqlite3-adapter (1.2.1)
-      activerecord-jdbc-adapter (~> 1.2.1)
-      jdbc-sqlite3 (~> 3.7.2)
     activesupport (3.1.3)
       multi_json (~> 1.0)
     arel (2.2.1)
     builder (3.0.0)
     i18n (0.6.0)
-    jdbc-sqlite3 (3.7.2)
-    minitest (2.10.0)
+    minitest (2.10.1)
     multi_json (1.0.4)
     rake (0.9.2.2)
     sqlite3 (1.3.5)
     tzinfo (0.3.31)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES

data/README.rdoc

@@ -9,26 +9,26 @@ Chainable ActiveRecord restrictions.
 Restrictions are made via join tables between two models and a User object. Imagine these models:
 
   +-------+       +---------------+      +------------+    +--------------+       +------+
-  | Fubar |<*----- FubarPermission|<-----| Permission |--->|UserPermission|-----*>| User |
+  | Asset |<*-----|AssetPermission|<-----| Permission |--->|UserPermission|-----*>| User |
   +-------+       +---------------+      +------------+    +--------------+       +------+
 
 Our model definitions would look something like:
 
   class Permission < ActiveRecord::Base
-    has_many :fubar_permissions, :dependent => :destroy
-    has_many :fubars, :through => :fubar_permissions
+    has_many :asset_permissions, :dependent => :destroy
+    has_many :assets, :through => :asset_permissions
     has_many :user_permissions, :dependent => :destroy
     has_many :users, :through => :user_permissions
   end
 
-  class FubarPermission < ActiveRecord::Base
-    belongs_to :fubar
+  class AssetPermission < ActiveRecord::Base
+    belongs_to :asset
     belongs_to :permission
   end
 
-  class Fubar < ActiveRecord::Base
-    has_many :fubar_permissions, :dependent => :destroy
-    has_many :permissions, :through => :fubar_permissions
+  class Asset < ActiveRecord::Base
+    has_many :asset_permissions, :dependent => :destroy
+    has_many :permissions, :through => :asset_permissions
   end
 
   class UserPermission < ActiveRecord::Base
@@ -41,14 +41,14 @@ Our model definitions would look something like:
     has_many :users, :through => :user_permissions
   end
 
-Now, suppose a User should only be allowed to to see a Fubar instance if the Fubar instance and the User both have the same permission assigned to them. We modify Fubar like so:
+Now, suppose a User should only be allowed to to see an Asset instance if the Asset instance and the User both have the same permission assigned to them. We modify Asset like so:
 
-  class Fubar < ActiveRecord::Base
+  class Asset < ActiveRecord::Base
     ...
     include ActiveRestrictor
 
     add_restrictor(:permissions,
-      :enabled => lambda{ User.current_user.fubars_enabled? },
+      :enabled => lambda{ User.current_user.assets_enabled? },
       :views => {
         :value => :name,
         :multiple => true,
@@ -63,16 +63,16 @@ A quick overview of what these options are doing.
 * :enabled -> Restrictor is applied/not applied. This can be a static value or it can be a callable block to allow dynamic enabling
 * :value -> This is the attribute on the Permission model that is displayed to the user
 * :multiple -> Allows multiple Permissions to be applied on the restriction
-* :default_view_all -> If Fubar has no Permissions applied, it is viewable by all
+* :default_view_all -> If Asset has no Permissions applied, it is viewable by all
 * :user_values_only -> Only Permissions assigned to the user will be viewable in edit mode
 
 With the inclusion of the restrictor, we now have two new methods available. The first is on User instances:
 
-  User.first.allowed_fubars -> Returns scoping of Fubars the given user instance has access to
+  User.first.allowed_assets -> Returns scoping of Assets the given user instance has access to
 
-The second is on Fubar instances:
+The second is on Asset instances:
 
-  Fubar.first.allowed_users -> Returns scoping of the Users allowed to acces this instance
+  Asset.first.allowed_users -> Returns scoping of the Users allowed to acces this instance
 
 == View Helpers
 
@@ -81,20 +81,20 @@ The second is on Fubar instances:
   %table
     %tr
       %td= 'Name'
-      %td= @fubar.name
-    - display_full_restictors(@fubar).each do |pair|
+      %td= @asset.name
+    - display_full_restictors(@asset).each do |pair|
       %tr
         %td= "#{pair.first}:"
         %td= pair.last
 
 === Edit
 
-  - form_for(@fubar) do |f|
+  - form_for(@asset) do |f|
     %table
       %tr
         %td= 'Name:'
         %td= f.text_field :name
-      - edit_full_restrictors(@fubar, f).each do |pair|
+      - edit_full_restrictors(@asset, f).each do |pair|
         %tr
           %td= "#{pair.first}:"
           %td= pair.last

data/gemfiles/activerecord3_0.gemfile

@@ -0,0 +1,10 @@
+source :rubygems
+
+gem 'activerecord', '~> 3.0.0'
+gem 'rake'
+gem 'minitest'
+gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
+gem "jdbc-sqlite3", :platform => :jruby
+gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
+
+gemspec :path => '../'

data/gemfiles/activerecord3_1.gemfile

@@ -0,0 +1,10 @@
+source :rubygems
+
+gem 'activerecord', '~> 3.1.0'
+gem 'rake'
+gem 'minitest'
+gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
+gem "jdbc-sqlite3", :platform => :jruby
+gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
+
+gemspec :path => '../'

data/gemfiles/activerecord3_1.gemfile.lock

@@ -0,0 +1,44 @@
+PATH
+  remote: /home/croberts/Projects/active_restrictors
+  specs:
+    active_restrictors (0.2.0)
+      activerecord (~> 3.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.1.3)
+      activesupport (= 3.1.3)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activerecord-jdbc-adapter (1.2.1)
+    activerecord-jdbcsqlite3-adapter (1.2.1)
+      activerecord-jdbc-adapter (~> 1.2.1)
+      jdbc-sqlite3 (~> 3.7.2)
+    activesupport (3.1.3)
+      multi_json (~> 1.0)
+    arel (2.2.1)
+    builder (3.0.0)
+    i18n (0.6.0)
+    jdbc-sqlite3 (3.7.2)
+    minitest (2.11.0)
+    multi_json (1.0.4)
+    rake (0.9.2.2)
+    tzinfo (0.3.31)
+
+PLATFORMS
+  java
+
+DEPENDENCIES
+  active_restrictors!
+  activerecord (~> 3.1.0)
+  activerecord-jdbcsqlite3-adapter
+  jdbc-sqlite3
+  minitest
+  rake
+  sqlite3

data/gemfiles/activerecord3_2.gemfile

@@ -0,0 +1,10 @@
+source :rubygems
+
+gem 'activerecord', '~> 3.2.0'
+gem 'rake'
+gem 'minitest'
+gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
+gem "jdbc-sqlite3", :platform => :jruby
+gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
+
+gemspec :path => '../'

data/lib/active_restrictors/active_restrictor.rb

@@ -23,20 +23,22 @@ module ActiveRestrictor
     #       Implicit type is run directly against the source model. (ex: Fubar.includes(:feebar).where(:feebars => {:user_id => User.current_user.id}))
     #       Full is a full restrictor using join tables and provides view helpers for management
     def add_restrictor(name, opts={})
-      self.restrictors ||= []
-      new_opts = {:name => name, :enabled => true, :type => :full, :scope => self.scoped, :default_allowed_all => false}.merge(opts)
-      new_opts[:views] ||= {}
-      new_opts = map_deprecated_hash(new_opts)
-      new_opts[:views][:id] ||= :id
-      new_opts[:class] = restrictor_class(new_opts)
-      if(new_opts[:type] == :full && new_opts[:views][:value].blank?)
-        if(new_opts[:class].column_names.include?('name'))
-          new_opts[:views][:value] = :name
-        else
-          raise 'Value must be defined for association to generate views'
+      if(table_exists?)
+        self.restrictors ||= []
+        new_opts = {:name => name, :enabled => true, :type => :full, :scope => self.scoped, :default_allowed_all => false}.merge(opts)
+        new_opts[:views] ||= {}
+        new_opts = map_deprecated_hash(new_opts)
+        new_opts[:views][:id] ||= :id
+        new_opts[:class] = restrictor_class(new_opts)
+        if(new_opts[:type] == :full && new_opts[:views][:value].blank?)
+          if(new_opts[:class].column_names.include?('name'))
+            new_opts[:views][:value] = :name
+          else
+            raise 'Value must be defined for association to generate views'
+          end
         end
+        self.restrictors.push(new_opts)
       end
-      self.restrictors.push(new_opts)
     end
 
     # TODO: Add in proper mapping plus scope building

data/lib/active_restrictors/version.rb

@@ -13,5 +13,5 @@ module ActiveRestrictors
     end
   end
 
-  VERSION = Version.new('0.2.0')
+  VERSION = Version.new('0.2.1')
 end

data/spec/model_definitions.rb

@@ -1,6 +1,4 @@
-require 'active_record'
-require 'active_record/migration'
-require 'benchmark'
+
 class ModelSetup < ActiveRecord::Migration
   def self.up
     create_table :users do |t|

data/spec/setup.rb

@@ -1,12 +1,11 @@
-$:.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib'))
 require 'rubygems'
 require 'bundler/setup'
-require 'active_record'
-if(RUBY_PLATFORM == 'java')
-  require 'jdbc/sqlite3'
-else
+unless(RUBY_PLATFORM == 'java')
   require 'sqlite3'
 end
+require 'active_record'
+require 'active_record/migration'
+require 'benchmark'
 require 'active_restrictors'
 require 'minitest/autorun'
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_restrictors
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Chris Roberts
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-20 00:00:00 -08:00
+date: 2012-01-27 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,6 +43,10 @@ extra_rdoc_files:
 - README.rdoc
 - CHANGELOG.rdoc
 files: 
+- gemfiles/activerecord3_2.gemfile
+- gemfiles/activerecord3_1.gemfile.lock
+- gemfiles/activerecord3_0.gemfile
+- gemfiles/activerecord3_1.gemfile
 - Gemfile.lock
 - spec/restrictor_spec.rb
 - spec/setup.rb