xhive 1.2.0.pre → 1.2.1.pre

data/app/models/xhive/mapper.rb

@@ -38,11 +38,23 @@ module Xhive
     #
     def self.map_resource(site, page, resource, action, key = nil)
       mapper = find_map(site, resource, action, key)
-      mapper = new(:site_id => site.id, :resource => resource, :action => action, :key => key) unless mapper.present?
+      mapper = new(:site_id => site.id, :resource => resource,
+                   :action => action, :key => key.present? ? key : nil) unless mapper.present?
       mapper.page = page
       mapper.save
     end
 
+    # Public: returns all the mappers for a specific resource.
+    #
+    # site     - The Site owner of the mappers.
+    # resource - The String containing the resource to filter by.
+    #
+    # Returns: an ActiveRecord::Relation filtered by resource.
+    #
+    def self.all_by_resource(site, resource)
+      where(:site_id => site.id).where(:resource => resource)
+    end
+
   private
 
     # Private: looks for a mapper object.
@@ -55,8 +67,10 @@ module Xhive
     # Returns: the mapper object or nil if not found.
     #
     def self.find_map(site, resource, action, key)
-      mapper = where(:site_id => site.id).where(:resource => resource).where(:action => action)
-      mapper = mapper.where(:key => key) if key.present?
+      mapper = where(:site_id => site.id)
+      mapper = mapper.where(:resource => resource)
+      mapper = mapper.where(:action => action)
+      mapper = mapper.where(:key => key.present? ? key : nil)
       mapper.first
     end
   end

data/lib/xhive/version.rb

@@ -1,3 +1,3 @@
 module Xhive
-  VERSION = "1.2.0.pre"
+  VERSION = "1.2.1.pre"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xhive
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre
+  version: 1.2.1.pre
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-13 00:00:00.000000000 Z
+date: 2012-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -297,7 +297,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4002595324166210209
+      hash: 2967828758709563627
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: