strong_attributes 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da121740cc4a0a6f17cb4f4c60d330c830a7b4de
-  data.tar.gz: 81639530a105615c335f1bda7bb9bc3d8640b0d3
+  metadata.gz: c16f8c67c4ade076c784776b24f742121a9849d4
+  data.tar.gz: 08273a443123e27eec2ff657ab62f23379e10511
 SHA512:
-  metadata.gz: c4f2d82dede1d5bbbb52bdf4e217eeac317b1840a17c1e2ed78965a23356a1b8a82b0bbe8b7f9f9b67764cdd91d8d84383c9294ba924ee405770765edf5782b1
-  data.tar.gz: d18af71fbf9a1e071cc16ad255b790ff3e774cd16faa2c485a5b850d0a4e6e26aa1fad49d9cea7387e0144ed269d89bb3bab6b79f0a85696b130f3b4afbc68da
+  metadata.gz: a8e313f21c846d34479baae0b5cf2b7635c5d8a4da653a6d73909c24b470377b75eea58a33cf5cf9341a5ba930b40a971492f19ab5575a6a765c0594a6c6ab02
+  data.tar.gz: 5e1f356c3ef40603cb0f53c1898ad61e385f97ab3052d07529e8b510cc7e606a5881ea25de674fa39f11859f11c8e7c8631ebd7d9a1d6b3094a7ec85ac6a47c0

data/lib/strong_attributes.rb

@@ -1,5 +1,4 @@
 require 'active_support/concern'
-#require 'active_support/core_ext/hash/keys'
 
 require "strong_attributes/version"
 require "strong_attributes/permissions"

data/lib/strong_attributes/displayable.rb

@@ -8,49 +8,39 @@ module StrongAttributes
     # Calls and returns the result of each method call in the argument list. If a block is given, then each result
     # is passed to the block.
     #
-    #   user.displays :username, :email # returns [user.username, user.email]
+    #   user.presents :username, :email # returns [user.username, user.email]
     #
     # Or with two arguments, the name of the field is passed first:
     #
     #   <ul>
-    #     <% user.displays :username, :email, :address do |field, value| %>
+    #     <% user.presents :username, :email, :address do |field, value| %>
     #       <li><%= field.capitalize %>: <% value %></li>     
     #     <% end %>
     #   </ul>
     #
     # If only the presented value is desired, use `each`:
     #
-    #   <% user.displays(:username, :email).each do |value| %>
+    #   <% user.presents(:username, :email).each do |value| %>
     #     <td><%= value %></td>
     #   <% end %>
     #
     # Arguments can be included in an array:
     #
-    #   user.displays :username, [:notifications, :unread] # returns [user.username, user.notifications(:unread)]
-    #
-    def displays *attributes
-      select_permitted(*attributes).map do |attribute|
-        args = Array(attribute).dup
-        value = self
-        until args.empty? do
-          arity = value.method(args[0]).arity
-          if arity >= 0
-            value = value.public_send *args.slice!(0, arity+1)
-          else
-            value = value.public_send *args
-            break
-          end
-        end
-        yield attribute, value if block_given?
+    #   user.presents :username, [:notifications, :unread] # returns [user.username, user.notifications(:unread)]
+    #
+    def presents *attributes
+      select_permitted(*attributes).map do |attribute_path|
+        value = Array(attribute_path).inject(self) { |obj, args| obj.public_send *args }
+        yield attribute_path, value if block_given?
         value
       end
     end
 
-    # Same as displays, but for a single attribute. The differences are:
+    # Same as presents, but for a single attribute. The differences are:
     #   - the return value is not in an Array
     #   - passes the value only (without attribute key as the 1st argument) to a block
-    def display field
-      displays field do |key, value|
+    def present field
+      presents field do |key, value|
         yield value if block_given?
       end.first
     end

data/lib/strong_attributes/permissible.rb

@@ -37,12 +37,12 @@ module StrongAttributes
       @permitted_attributes ||= StrongAttributes::Permissions.new
     end
 
-    # Links presenter to permissions group of given presenter.
-    # @param [Presenter] parent_presenter
+    # Links permissions to that of the parent.
+    # @param [Permissible] parent
     # @param [Array<Symbol>] relative_path
-    #   The prefix prepended before every permission check relative to parent presenter.
-    def link_permissions parent_presenter, relative_path = []
-      @permitted_attributes = StrongAttributes::Permissions.new(parent_presenter.permitted_attributes, relative_path)
+    #   The prefix prepended before every permission check relative to parent.
+    def link_permissions parent, relative_path = []
+      @permitted_attributes = StrongAttributes::Permissions.new(parent.permitted_attributes, relative_path)
     end
 
   end

data/lib/strong_attributes/permissions.rb

@@ -19,6 +19,7 @@ module StrongAttributes
     def initialize(permissions = nil, prefix_path = [])
       unless permissions.nil?
         @permitted_paths = permissions.permitted_paths
+        @permittable_paths = permissions.permittable_paths
         @prefix_path = permissions.prefix_path + canonicalize(prefix_path) # copy on write
       end
     end
@@ -49,6 +50,11 @@ module StrongAttributes
       !path_tainted?(attribute_path) and permitted_by_wildcard?(prefix_path + attribute_path)  # wildcard match only if not tainted
     end
 
+    def permittable? attribute_path
+      attribute_path = canonicalize(attribute_path)
+      permittable_paths.include?(prefix_path + attribute_path)
+    end
+
     # Selects the attribute paths which are permitted.
     # @param [Array] prefix_path
     #   namespace in which each of the given attribute paths are in
@@ -81,17 +87,37 @@ module StrongAttributes
       attribute_paths = attribute_paths.map{|path|canonicalize(path).taint} # exact match
       reject_permitted(*attribute_paths).each do |attribute_path| # don't permit if already permitted
         permitted_paths << attribute_path # prefix_path = [] because of copy on write
+        raw_permittable(attribute_path.slice(0...-1))
       end
       self
     end
 
+    def permittable *attribute_paths
+      copy_on_write!
+      attribute_paths.each { |attribute_path| raw_permittable(canonicalize(attribute_path)) }
+      self
+    end
+
     protected
 
     def permitted_paths
       @permitted_paths ||= Set.new
     end
 
+    # some subpaths may be permitted
+    def permittable_paths
+      @permittable_paths ||= Set.new
+    end
+
     private
+    # will mutate attribute_path
+    def raw_permittable attribute_path
+      until attribute_path.empty? || permittable_paths.include?(attribute_path) do
+        permittable_paths << attribute_path.dup
+        attribute_path.pop
+      end
+    end
+
     # Is this still referencing another objects permissions?
     def reference?
       !@prefix_path.nil?
@@ -101,15 +127,22 @@ module StrongAttributes
     def copy_on_write!
       if prefix_path == []
         @permitted_paths = permitted_paths.dup
+        @permittable_paths = permittable_paths.dup
       elsif reference?
-        @permitted_paths, old_set = Set.new, permitted_paths
-        old_set.each do |path|
-          @permitted_paths << path[prefix_path.size...path.size] if path[0...prefix_path.size] == prefix_path
-        end
+        @permitted_paths = dup_paths permitted_paths, prefix_path
+        @permittable_paths = dup_paths permittable_paths, prefix_path
       end
       @prefix_path = nil
     end
 
+    def dup_paths old_set, prefix_path
+      new_set = Set.new
+      old_set.each do |path|
+        new_set << path[prefix_path.size...path.size] if path[0...prefix_path.size] == prefix_path
+      end
+      new_set
+    end
+
     def path_tainted? attribute_path
       attribute_path.tainted? or attribute_path.any? { |element| element.tainted? }
     end
@@ -120,19 +153,14 @@ module StrongAttributes
         path[-1] = :*
         return true if permitted_paths.include? path
       end
-      until path.empty?
-        path[-1] = :**
-        return true if permitted_paths.include? path
-        path.pop
-      end
       false
     end
 
     # Converts symbols to strings (except for wildcard symbol)
     def canonicalize array
       array = Array(array)
-      canonical_array = array.map{|e|e.is_a?(Symbol) ? e.to_s : e}
-      canonical_array[-1] = array.last if [:*, :**].include? array.last
+      canonical_array = array.map{|e| (e.is_a?(Array) ? e.first : e).instance_eval{ self.is_a?(Symbol) ? e.to_s : e } }
+      canonical_array[-1] = array.last if array.last == :*
       canonical_array.taint if array.tainted?
       canonical_array
     end

data/lib/strong_attributes/version.rb

@@ -1,3 +1,3 @@
 module StrongAttributes
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/strong_attributes/permissions_spec.rb

@@ -47,18 +47,13 @@ module StrongAttributes
     describe "#permitted?" do
       context 'with some attributes permitted' do
         before(:all) do
-          @permissions = Permissions.new.permit([:another, :array], [:attr, :array], :attr2, :attr3, [:a, :wildcard, :*], [:wild, :**])
+          @permissions = Permissions.new.permit([:another, :array], [:attr, :array], :attr2, :attr3, [:a, :wildcard, :*])
         end
 
         it 'permits single wildcard' do
           expect(@permissions.permitted?([:a, :wildcard, :irrelevant])).to be true
         end
 
-        it 'permits full wildcard' do
-          expect(@permissions.permitted?([:wild, :wildcard, :irrelevant])).to be true
-          expect(@permissions.permitted?([:wild, :irrelevant])).to be true
-        end
-
         it 'does not permit un-prefixed path' do
           permissions = Permissions.new(@permissions, :attr)
           expect(permissions.permitted?(:attr2)).to be false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: strong_attributes
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Ronald Chan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-30 00:00:00.000000000 Z
+date: 2013-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport