sidebar-engine 0.0.1 → 0.0.2

data/CHANGELOG

@@ -0,0 +1,2 @@
+v0.0.2  2013.5.21
+    * render_sidebar support name render

data/lib/scene_sidebar.rb

@@ -1,8 +1,12 @@
+#encoding: utf-8
 class SceneSidebar
   include Mongoid::Document
   field :name, :type => String
   field :description, :type => String
-  has_many :sidebars
+  has_and_belongs_to_many :sidebars
+
+  validates_presence_of :name
+  validates_uniqueness_of :name
 
   class << self
     def parse_scene(scence)

data/lib/sidebar.rb

@@ -1,9 +1,15 @@
+#encoding: utf-8
 class Sidebar
   include Mongoid::Document
+
+  field :name, :type => String
   field :description, :type => String
   field :display_name, :type => String
   field :config, :type=>Hash,:default=>{}
-  belongs_to :scene_sidebar
+  has_and_belongs_to_many :scene_sidebars
+
+  validates_presence_of :name
+  validates_uniqueness_of :name
 
   class ParamField
     attr_accessor :key
@@ -124,6 +130,10 @@ class Sidebar
 
 
   class << self
+    def parse_sidebar(sidebar)
+      self.find_by :name => sidebar.to_s
+    end
+
     def setting(key, default=nil, options = { })
       return if instance_methods.include?(key.to_s)
       param_fields << ParamField.build(key.to_s, default, options)

data/lib/sidebar_helper.rb

@@ -1,22 +1,33 @@
 module SidebarHelper
+  #==render scene sidebars
+  #  params:
+  #    +scene+       scene name
   def render_scene_sidebars(scene)
     scene_htmls = []
     begin
       @scene = SceneSidebar.parse_scene(scene)
       if @scene
         @scene.sidebars.each do |sb|
-          sb.parse_request(params,content_hash,controller.current_user)
           scene_htmls << render_sidebar(sb)
         end
       end
     end
-    scene_htmls.join
+    scene_htmls.join.html_safe
   end
 
-  def render_sidebar(sidebar)
-    render_to_string(:partial => sidebar.content_partial,
+  #==render_sidebar
+  #   params:
+  #      +sidebar+                Sidebar instance or sidebar name
+  #      +current_user+       sidebar of current_user, default controller.current_user 
+  #      +options+                optional parameters    
+  def render_sidebar(sidebar,current_user=controller.current_user,options={})
+    sidebar = sidebar.is_a?(Sidebar) ? sidebar : Sidebar.parse_sidebar(sidebar)
+    if sidebar
+      sidebar.parse_request(params,content_hash,current_user)
+      render_to_string(:partial => sidebar.content_partial,
                      :locals => sidebar.to_locals_hash,
-                     :layout => false)
+                     :layout => false).html_safe
+    end
   end
 
   # get controller instance variables

data/sidebar-engine.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "sidebar-engine"
-  gem.version       = "0.0.1"
+  gem.version       = "0.0.2"
   gem.platform      = Gem::Platform::RUBY
 
   gem.homepage      = "https://github.com/totothink/sidebar-engine"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidebar-engine
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-28 00:00:00.000000000 Z
+date: 2013-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid