xhive 1.0.8.pre → 1.0.9.pre

data/README.md

@@ -201,13 +201,13 @@ stylesheet = Xhive::Stylesheet.create(:name => 'Posts',
 Create a new mapper record for the posts resources
 
 ```
-mapper = Xhive::Mapper.create(:resource => 'posts', :action => 'index', :page => posts_page)
+mapper = Xhive::Mapper.map_resource(site, posts_page, 'posts', 'index')
 ```
 
-Create a new mapper record for some specific post
+If you want to map the page to a specific post
 
 ```
-mapper = Xhive::Mapper.create(:resource => 'posts', :action => 'show', :key => '1', :page => posts_page)
+mapper = Xhive::Mapper.map_resource(site, posts_page, 'posts', 'index', post.id)
 ```
 
 From your posts controller, render the posts page

data/app/helpers/xhive/application_helper.rb

@@ -9,7 +9,7 @@ module Xhive
     end
 
     def render_page_with(key = nil, options={})
-      page = current_site.mappers.page_for(controller_path, action_name, key)
+      page = Xhive::Mapper.page_for(current_site, controller_path, action_name, key)
       render :inline => page.presenter.render_content(options), :layout => true
     rescue
       render

data/app/models/xhive/mapper.rb

@@ -1,6 +1,6 @@
 module Xhive
   class Mapper < ActiveRecord::Base
-    attr_accessible :action, :page_id, :site_id, :resource
+    attr_accessible :action, :page_id, :site_id, :resource, :key
 
     belongs_to :site
     belongs_to :page
@@ -10,12 +10,26 @@ module Xhive
     validates :site, :presence => true
     validates :page, :presence => true
 
-    def self.page_for(resource, action, key = nil)
-      mapper = where(:resource => resource).where(:action => action)
-      mapper = mapper.where(:key => key) if key.present?
-      page   = mapper.first.try(:page)
+    def self.page_for(site, resource, action, key = nil)
+      mapper = find_map(site, resource, action, key)
+      page = mapper.try(:page)
       fail ActiveRecord::RecordNotFound unless page.present?
       page
     end
+
+    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.page = page
+      mapper.save
+    end
+
+  private
+
+    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.first
+    end
   end
 end

data/lib/xhive/version.rb

@@ -1,3 +1,3 @@
 module Xhive
-  VERSION = "1.0.8.pre"
+  VERSION = "1.0.9.pre"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xhive
 version: !ruby/object:Gem::Version
-  version: 1.0.8.pre
+  version: 1.0.9.pre
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-01 00:00:00.000000000 Z
+date: 2012-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -277,7 +277,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -363105832108409294
+      hash: -1538157182709527364
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: