xhive 1.6.6 → 1.6.7

data/app/models/xhive/mapper.rb

@@ -49,6 +49,24 @@ module Xhive
       mapper.save
     end
 
+    # Public: deletes a mapper for a specific resource.
+    #
+    # site     - The Site to associate the mapper to.
+    # resource - The String containing the associated resource name.
+    # action   - The String containing the associated action name.
+    # key      - The String containing the associated key.
+    # policy   - The String containing the policy class.
+    #
+    # Returns: true if created. False otherwise.
+    #
+    def self.unmap_resource(site, resource, action, key = nil, policy = nil)
+      check_policy_class(policy) if policy.present?
+
+      mapper = find_exact_map(site, resource, action, key, policy)
+
+      mapper.delete if mapper.present?
+    end
+
     # Public: returns all the mappers for a specific resource.
     #
     # site     - The Site owner of the mappers.

data/lib/xhive/active_record_extensions.rb

@@ -5,29 +5,43 @@ module Xhive
     module ClassMethods
       def mount_page(attr)
         # Define getter
-        define_method(attr.to_s) do
+        mount_page_getter(attr.to_s)
+
+        # Define setter
+        mount_page_setter(attr)
+
+        # Define content
+        define_method("#{attr}_content") do |opts={}|
+          self.send(attr.to_sym).present_content(opts.merge({self.class.name.downcase.to_sym => self}))
+        end
+      end
+
+    private
+
+      def mount_page_getter(attr)
+        define_method(attr) do
           # TODO: support multiple sites
           site = Xhive::Site.first
           begin
-            page = Xhive::Mapper.page_for(site, self.class.name.downcase, attr.to_s, id)
+            page = Xhive::Mapper.page_for(site, self.class.name.downcase, attr.to_s, self.id)
           rescue ActiveRecord::RecordNotFound
             page = nil
           end
           return page
         end
+      end
 
-        # Define setter
+      def mount_page_setter(attr)
         define_method("#{attr}=") do |value|
           fail RecordNotPersistedError, "Cannot assign a page to an unsaved #{self.class.name}" if new_record?
           # TODO: support multiple sites
           site = Xhive::Site.first
-          page = value.is_a?(Xhive::Page) ? value : site.pages.find(value)
-          Xhive::Mapper.map_resource(site, page, self.class.name.downcase, attr.to_s, id)
-        end
-
-        # Define content
-        define_method("#{attr}_content") do |opts={}|
-          self.send(attr.to_sym).present_content(opts.merge({self.class.name.downcase.to_sym => self}))
+          unless value.nil?
+            page = value.is_a?(Xhive::Page) ? value : site.pages.find(value)
+            Xhive::Mapper.map_resource(site, page, self.class.name.downcase, attr.to_s, self.id)
+          else
+            Xhive::Mapper.unmap_resource(site, self.class.name.downcase, attr.to_s, self.id)
+          end
         end
       end
     end

data/lib/xhive/version.rb

@@ -1,3 +1,3 @@
 module Xhive
-  VERSION = "1.6.6"
+  VERSION = "1.6.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xhive
 version: !ruby/object:Gem::Version
-  version: 1.6.6
+  version: 1.6.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-06 00:00:00.000000000 Z
+date: 2013-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -285,7 +285,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1571194282988339322
+      hash: -3766204056813361461
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -294,7 +294,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1571194282988339322
+      hash: -3766204056813361461
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.21