rich_cms 1.0.0 → 2.0.0

data/lib/assets/sass/rich_cms/_dock.sass

@@ -0,0 +1,44 @@
+
+#rich_cms_dock
+  margin: 15px
+  z-index: 999
+  +inline_block
+  +fixed
+  *position: absolute
+  
+  &.top
+    top: 0
+  &.bottom
+    bottom: 0
+  &.left
+    left: 0
+  &.right
+    right: 0
+  &.middle
+    width: 500px
+    left: 50%
+    margin-left: -250px
+    text-align: center
+  
+  &.ui-draggable-dragging
+    +opacity(0.5)
+
+#x1, #x2, #y1, #x, #y
+  display: none
+  +fixed
+  &.display
+    +block
+
+#x1, #x2, #x
+  width: 1px
+  height: 100%
+
+#y1, #y
+  width: 100%
+  height: 1px
+
+#x1, #x2, #y1
+  background: red
+
+#x, #y
+  background: green

data/lib/assets/sass/rich_cms/_menu.sass

@@ -0,0 +1,38 @@
+
+#rich_cms_menu
+  padding: 5px 0
+  color: #222
+  font:
+    family: "Helvetica Neue", "Helvetica", "Arial", "sans-serif"
+    size: 12px
+    weight: bold
+  *border: 1px solid #555
+  background: #FDFDFD
+  +inline_block
+  +border_radius(5px)
+  +box_shadow(rgba(0, 0, 0, 0.5), 0, 1px, 2px)
+  
+  li
+    padding: 0 17px
+    *padding: 1px 17px
+    line-height: 1
+    border-right: 1px solid #BBB
+    +box-shadow(white, 1px, 0, 0)
+    +inline_block
+    
+    &:first-child
+      cursor: move
+    &:last-child
+      border: 0
+      +box-shadow(transparent, 0, 0, 0)
+    &.last
+      *border: 0
+
+    a
+      color: #4183C4
+      cursor: pointer
+      outline: 0
+      text-decoration: none
+      &:hover
+        text-decoration: underline
+        +text-shadow(transparent, 0, 0)

data/lib/assets/sass/rich_cms/_panel.sass

@@ -0,0 +1,24 @@
+
+#rich_cms_panel
+  width: 200px
+  padding-right: 5px
+
+  form
+    .inputs
+      label
+        font-size: 12px
+        +block
+        abbr
+          padding-left: 2px
+          border: 0
+      li
+        &.string, &.password
+          input
+            width: 100%
+            +block
+
+    .buttons
+      padding-top: 9px
+
+      a
+        font-size: 12px

data/lib/assets/sass/rich_cms.sass

@@ -1,4 +1,7 @@
 
-@import mixins
-@import bar
-@import editables
+@import tools/mixins
+@import tools/css3
+@import rich_cms/dock
+@import rich_cms/menu
+@import rich_cms/panel
+@import rich_cms/content

data/lib/assets/sass/tools/_css3.sass

@@ -0,0 +1,18 @@
+
+=text_shadow(!color, !x, !y, !blur = 0)
+  text-shadow: !color !x !y !blur
+
+=gradient(!top, !bottom)
+  background: !top
+  background-image: -webkit-gradient(linear, left top, left bottom, from(!top), to(!bottom))
+  background-image: -moz-linear-gradient(top, !top, !bottom)
+
+=border_radius(!radius)
+  border-radius = !radius
+  -moz-border-radius = !radius
+  -webkit-border-radius = !radius
+
+=box_shadow(!color, !x, !y, !size)
+  box-shadow: !color !x !y !size
+  -moz-box-shadow: !color !x !y !size
+  -webkit-box-shadow: !color !x !y !size

data/lib/config/routes.rb

@@ -1,17 +1,19 @@
-# Redefine clear! method to do nothing (usually it erases the routes)
+# TODO: add routes the right way as this is evil
 class << ActionController::Routing::Routes;self;end.class_eval do
   define_method :clear!, lambda {}
 end
+# END
 
 ActionController::Routing::Routes.draw do |map|
-
   map.namespace :rich, :path_prefix => "" do |rich|
     
-    rich.cms_root "cms", :controller => "cms", :action => "show"
-    %w(hide login logout update).each do |action|
+    %w(login logout update).each do |action|
       rich.send "cms_#{action}", "cms/#{action}", :controller => "cms", :action => action
     end
     
+    rich.cms      "cms"         , :controller => "cms", :action => "display", :display => true
+    rich.cms_hide "cms/hide"    , :controller => "cms", :action => "display", :display => false
+    rich.connect  "cms/position", :controller => "cms", :action => "position"
+    
   end
-
 end

data/lib/rich/cms/actionpack/action_controller/base.rb

@@ -2,15 +2,23 @@
 module ActionController
   class Base
 
-    around_filter :assign_current_controller
-    helper_method :current_rich_cms_admin, :current_rich_cms_admin_name, :rich_cms_authenticated_class, :rich_cms_authentication_inputs
+    around_filter :prepare_rich_cms
     
-    def assign_current_controller
+    def prepare_rich_cms
       ::Rich::Cms::Engine.current_controller = self
       yield
     ensure
       ::Rich::Cms::Engine.current_controller = nil
     end
+    
+    view_path = File.join File.dirname(__FILE__), "..", "..", "..", "..", "app", "views"
+    if respond_to? :append_view_path
+      self.append_view_path view_path
+    elsif respond_to? :view_paths
+      self.view_paths << view_path
+    end
+    
+    helper_method :current_rich_cms_admin, :current_rich_cms_admin_name, :rich_cms_authenticated_class, :rich_cms_authentication_inputs
 
     def require_current_rich_cms_admin
       unless current_rich_cms_admin
@@ -50,12 +58,5 @@ module ActionController
       end
     end
     
-    view_path = File.join File.dirname(__FILE__), "..", "..", "..", "..", "app", "views"
-    if respond_to? :append_view_path
-      self.append_view_path view_path
-    elsif respond_to? :view_paths
-      self.view_paths << view_path
-    end
-    
   end
 end

data/lib/rich/cms/actionpack/action_view/base.rb

@@ -3,13 +3,21 @@ module ActionView
   class Base
     
   	def rich_cms
-  	  render :file => File.join(File.dirname(__FILE__), "..", "..", "..", "..", "app", "views", "rich_cms.html.erb") if session[:rich_cms].try(:fetch, :display, nil)
+  	  render :file => File.join(File.dirname(__FILE__), "..", "..", "..", "..", "app", "views", "rich_cms.html.erb") if display_rich_cms?
   	end
   	
+    def display_rich_cms?
+      !!session[:rich_cms].try(:fetch, :display, nil)
+    end
+  	
   	def link(name, options = nil)
   	  options = {:class => options || name.underscore} unless options.is_a?(Hash)
   	  link_to name, "#", options
   	end
+  	
+  	def rich_cms_tag(*args)
+  	  Rich::Cms::Engine.to_content_tag *args
+  	end
 
   end
 end

data/lib/rich/cms/content/item.rb

@@ -44,23 +44,27 @@ module Rich
           hash.merge({:__selector__ => selector, :__identifier__ => identifier})
         end
       
-        def to_tag
-          default = @object.attributes.values_at(*@group.identifiers) if @object.new_record?
+        def to_tag(options = {})
+          tag   = options[:tag] || @group.tag || :span
+          attrs = []
           
-          return @object.send(@group.value) unless Engine.can_render_metadata?
+          default = @group.identifiers.size == 1 ? @object.send(@group.identifiers.first) : @object.attributes.values_at(*@group.identifiers).inspect
+          value   = @object.send(@group.value)
           
-          keys  = @group.keys << @group.value.to_s
-          data  = @object.attributes.reject{|k, v| !keys.include?(k.to_s)}
-                
-          tag   = @group.tag || :span             
-          attrs = data.collect{|k, v| "data-#{k}=\"#{::ERB::Util.html_escape v}\""}.join " "
-          value = @object.new_record? ? "< #{default.size == 1 ? default.first : default.inspect} >" : @object.send(@group.value)
+          if Engine.can_render_metadata?
+            default = "< #{default} >"
+            keys    = @group.keys << @group.value.to_s
+            data    = @object.attributes.reject{|k, v| !keys.include?(k.to_s)}
           
-          if class_name = @group.selector.match(/^\.\w+$/)
-            attrs = "class=\"#{class_name.to_s.gsub(/^\./, "")}\" #{attrs}"
+            if class_name = @group.selector.match(/^\.\w+$/)
+              (options[:html] ||= {}).store :class, [class_name.to_s.gsub(/^\./, ""), options[:html].try(:fetch, :class, nil)].compact.join(" ")
+            end
+            
+            attrs << options[:html].collect{|k, v|      "#{k}=\"#{::ERB::Util.html_escape v}\""}.join(" ") if options[:html]
+            attrs << data          .collect{|k, v| "data-#{k}=\"#{::ERB::Util.html_escape v}\""}.join(" ")
           end
           
-          "<#{tag} #{attrs}>#{value}</#{tag}>"
+          "<#{tag} #{attrs.join(" ")}>#{value.blank? ? default : value}</#{tag}>"
         end
       
       end

data/lib/rich/cms/engine.rb

@@ -21,10 +21,15 @@ module Rich
           ActiveSupport::Dependencies.load_once_paths.delete path
         end
         
-        ::Jzip::Plugin.add_template_location({File.join(File.dirname(__FILE__), "..", "..", "assets", "jzip") => File.join(RAILS_ROOT, "public", "javascripts")})
+        ::Jzip::Engine.add_template_location({File.join(File.dirname(__FILE__), "..", "..", "assets", "jzip") => File.join(RAILS_ROOT, "public", "javascripts")})
         ::Sass::Plugin.add_template_location( File.join(File.dirname(__FILE__), "..", "..", "assets", "sass"),   File.join(RAILS_ROOT, "public", "stylesheets") )
       end
       
+      def current_controller=(current_controller)
+        @current_controller  = current_controller
+        @can_render_metadata = nil
+      end
+      
       def authenticate(logic, specs)
         @authentication = AuthenticationSpecs.new(logic, specs)
       end
@@ -39,19 +44,17 @@ module Rich
         end
       end
       
-      def to_content_tag(selector, identifiers)
-        editable_content[selector].fetch(identifiers).to_tag
+      def to_content_tag(*args)
+  	    selector    = args.shift
+  	    options     = args.extract_options!
+  	    identifiers = args
+        editable_content[selector].fetch(identifiers).to_tag options
       end
       
       def editable_content_javascript_hash
         "{#{@editable_content.collect{|k, v| v.to_javascript_hash}.join ", "}}"
       end
       
-      def current_controller=(current_controller)
-        @current_controller  = current_controller
-        @can_render_metadata = nil
-      end
-      
       def can_render_metadata?
         if @can_render_metadata.nil?
           @can_render_metadata = case authentication.logic

data/lib/rich_cms.rb

@@ -1,6 +1,8 @@
 
-require "config/routes"
+require "jzip"
+require "sass/plugin"
 
+require "config/routes"
 require "rich/cms/actionpack"
 require "rich/cms/engine"
 require "rich/cms/content/group"

data/rich_cms.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rich_cms}
-  s.version = "1.0.0"
+  s.version = "2.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Engel"]
-  s.date = %q{2010-08-16}
+  s.date = %q{2010-09-03}
   s.description = %q{Rich-CMS is a module of E9s (http://github.com/archan937/e9s) which provides a frontend for your CMS content. You can use this gem to manage CMS content or translations (in an internationalized application). The installation and setup process is very easily done. You will have to register content at the Rich-CMS engine and also you will have to specify the authentication mechanism. Both are one-liners.}
   s.email = %q{paul.engel@holder.nl}
   s.extra_rdoc_files = [
@@ -24,30 +24,50 @@ Gem::Specification.new do |s|
      "VERSION",
      "init.rb",
      "install.rb",
+     "lib/app/controllers/rich/._cms_controller.rb",
      "lib/app/controllers/rich/cms_controller.rb",
-     "lib/app/views/rich/cms/_bar.html.erb",
-     "lib/app/views/rich/cms/_config.html.erb",
-     "lib/app/views/rich/cms/bar/_menu.html.erb",
-     "lib/app/views/rich/cms/bar/_panel.html.erb",
-     "lib/app/views/rich/cms/bar/panel/_edit.html.erb",
-     "lib/app/views/rich/cms/bar/panel/_login.html.erb",
+     "lib/app/views/._rich_cms.html.erb",
+     "lib/app/views/rich/cms/_dock.html.erb",
+     "lib/app/views/rich/cms/dock/.__menu.html.erb",
+     "lib/app/views/rich/cms/dock/.__panel.html.erb",
+     "lib/app/views/rich/cms/dock/_menu.html.erb",
+     "lib/app/views/rich/cms/dock/_panel.html.erb",
+     "lib/app/views/rich/cms/dock/panel/.__login.html.erb",
+     "lib/app/views/rich/cms/dock/panel/_edit.html.erb",
+     "lib/app/views/rich/cms/dock/panel/_login.html.erb",
      "lib/app/views/rich_cms.html.erb",
-     "lib/assets/jzip/jquery/core.js",
+     "lib/assets/jzip/jquery/core.jz",
      "lib/assets/jzip/jquery/extensions/ajaxify.js",
+     "lib/assets/jzip/jquery/extensions/browser_detect.js",
      "lib/assets/jzip/jquery/extensions/modules.js",
      "lib/assets/jzip/jquery/extensions/object.js",
+     "lib/assets/jzip/jquery/raccoon_tip.js",
+     "lib/assets/jzip/jquery/ui/components/core.js",
+     "lib/assets/jzip/jquery/ui/components/draggable.js",
+     "lib/assets/jzip/jquery/ui/components/mouse.js",
+     "lib/assets/jzip/jquery/ui/components/widget.js",
+     "lib/assets/jzip/jquery/ui/rich_cms/core.jz",
+     "lib/assets/jzip/jquery/ui/rich_cms/draggable.jz",
+     "lib/assets/jzip/jquery/ui/rich_cms/mouse.jz",
+     "lib/assets/jzip/jquery/ui/rich_cms/widget.jz",
      "lib/assets/jzip/rich.js",
      "lib/assets/jzip/rich/cms.js",
+     "lib/assets/jzip/rich/cms/dock.js",
      "lib/assets/jzip/rich/cms/editor.js",
-     "lib/assets/jzip/rich/cms/login.js",
+     "lib/assets/jzip/rich/cms/menu.js",
      "lib/assets/jzip/rich_cms.jz",
-     "lib/assets/sass/_bar.sass",
-     "lib/assets/sass/_editables.sass",
-     "lib/assets/sass/_mixins.sass",
      "lib/assets/sass/rich_cms.sass",
+     "lib/assets/sass/rich_cms/_content.sass",
+     "lib/assets/sass/rich_cms/_dock.sass",
+     "lib/assets/sass/rich_cms/_menu.sass",
+     "lib/assets/sass/rich_cms/_panel.sass",
+     "lib/assets/sass/tools/_css3.sass",
+     "lib/assets/sass/tools/_mixins.sass",
      "lib/config/routes.rb",
      "lib/rich/cms/actionpack.rb",
+     "lib/rich/cms/actionpack/action_controller/._base.rb",
      "lib/rich/cms/actionpack/action_controller/base.rb",
+     "lib/rich/cms/actionpack/action_view/._base.rb",
      "lib/rich/cms/actionpack/action_view/base.rb",
      "lib/rich/cms/content/group.rb",
      "lib/rich/cms/content/item.rb",
@@ -75,18 +95,18 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<jzip>, [">= 0"])
+      s.add_runtime_dependency(%q<jzip>, [">= 1.0.10"])
       s.add_runtime_dependency(%q<haml>, [">= 3"])
-      s.add_runtime_dependency(%q<formtastic>, [">= 0"])
+      s.add_runtime_dependency(%q<formtastic>, ["= 0.9.7"])
     else
-      s.add_dependency(%q<jzip>, [">= 0"])
+      s.add_dependency(%q<jzip>, [">= 1.0.10"])
       s.add_dependency(%q<haml>, [">= 3"])
-      s.add_dependency(%q<formtastic>, [">= 0"])
+      s.add_dependency(%q<formtastic>, ["= 0.9.7"])
     end
   else
-    s.add_dependency(%q<jzip>, [">= 0"])
+    s.add_dependency(%q<jzip>, [">= 1.0.10"])
     s.add_dependency(%q<haml>, [">= 3"])
-    s.add_dependency(%q<formtastic>, [">= 0"])
+    s.add_dependency(%q<formtastic>, ["= 0.9.7"])
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rich_cms
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 15
   prerelease: false
   segments: 
-  - 1
+  - 2
   - 0
   - 0
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors: 
 - Paul Engel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-16 00:00:00 +02:00
+date: 2010-09-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,8 +28,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
+        - 1
         - 0
-        version: "0"
+        - 10
+        version: 1.0.10
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -52,12 +54,14 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 53
         segments: 
         - 0
-        version: "0"
+        - 9
+        - 7
+        version: 0.9.7
   type: :runtime
   version_requirements: *id003
 description: Rich-CMS is a module of E9s (http://github.com/archan937/e9s) which provides a frontend for your CMS content. You can use this gem to manage CMS content or translations (in an internationalized application). The installation and setup process is very easily done. You will have to register content at the Rich-CMS engine and also you will have to specify the authentication mechanism. Both are one-liners.
@@ -77,30 +81,50 @@ files:
 - VERSION
 - init.rb
 - install.rb
+- lib/app/controllers/rich/._cms_controller.rb
 - lib/app/controllers/rich/cms_controller.rb
-- lib/app/views/rich/cms/_bar.html.erb
-- lib/app/views/rich/cms/_config.html.erb
-- lib/app/views/rich/cms/bar/_menu.html.erb
-- lib/app/views/rich/cms/bar/_panel.html.erb
-- lib/app/views/rich/cms/bar/panel/_edit.html.erb
-- lib/app/views/rich/cms/bar/panel/_login.html.erb
+- lib/app/views/._rich_cms.html.erb
+- lib/app/views/rich/cms/_dock.html.erb
+- lib/app/views/rich/cms/dock/.__menu.html.erb
+- lib/app/views/rich/cms/dock/.__panel.html.erb
+- lib/app/views/rich/cms/dock/_menu.html.erb
+- lib/app/views/rich/cms/dock/_panel.html.erb
+- lib/app/views/rich/cms/dock/panel/.__login.html.erb
+- lib/app/views/rich/cms/dock/panel/_edit.html.erb
+- lib/app/views/rich/cms/dock/panel/_login.html.erb
 - lib/app/views/rich_cms.html.erb
-- lib/assets/jzip/jquery/core.js
+- lib/assets/jzip/jquery/core.jz
 - lib/assets/jzip/jquery/extensions/ajaxify.js
+- lib/assets/jzip/jquery/extensions/browser_detect.js
 - lib/assets/jzip/jquery/extensions/modules.js
 - lib/assets/jzip/jquery/extensions/object.js
+- lib/assets/jzip/jquery/raccoon_tip.js
+- lib/assets/jzip/jquery/ui/components/core.js
+- lib/assets/jzip/jquery/ui/components/draggable.js
+- lib/assets/jzip/jquery/ui/components/mouse.js
+- lib/assets/jzip/jquery/ui/components/widget.js
+- lib/assets/jzip/jquery/ui/rich_cms/core.jz
+- lib/assets/jzip/jquery/ui/rich_cms/draggable.jz
+- lib/assets/jzip/jquery/ui/rich_cms/mouse.jz
+- lib/assets/jzip/jquery/ui/rich_cms/widget.jz
 - lib/assets/jzip/rich.js
 - lib/assets/jzip/rich/cms.js
+- lib/assets/jzip/rich/cms/dock.js
 - lib/assets/jzip/rich/cms/editor.js
-- lib/assets/jzip/rich/cms/login.js
+- lib/assets/jzip/rich/cms/menu.js
 - lib/assets/jzip/rich_cms.jz
-- lib/assets/sass/_bar.sass
-- lib/assets/sass/_editables.sass
-- lib/assets/sass/_mixins.sass
 - lib/assets/sass/rich_cms.sass
+- lib/assets/sass/rich_cms/_content.sass
+- lib/assets/sass/rich_cms/_dock.sass
+- lib/assets/sass/rich_cms/_menu.sass
+- lib/assets/sass/rich_cms/_panel.sass
+- lib/assets/sass/tools/_css3.sass
+- lib/assets/sass/tools/_mixins.sass
 - lib/config/routes.rb
 - lib/rich/cms/actionpack.rb
+- lib/rich/cms/actionpack/action_controller/._base.rb
 - lib/rich/cms/actionpack/action_controller/base.rb
+- lib/rich/cms/actionpack/action_view/._base.rb
 - lib/rich/cms/actionpack/action_view/base.rb
 - lib/rich/cms/content/group.rb
 - lib/rich/cms/content/item.rb

data/lib/app/views/rich/cms/_bar.html.erb

@@ -1,4 +0,0 @@
-<div id="rich_cms_bar">
-  <%= render :partial => "rich/cms/bar/menu"  %>
-  <%= render :partial => "rich/cms/bar/panel" %>
-</div>

data/lib/app/views/rich/cms/_config.html.erb

@@ -1,5 +0,0 @@
-<script type="text/javascript">
-  $(function() {
-    Rich.Cms.Editor.register(<%= Rich::Cms::Engine.editable_content_javascript_hash %>);
-  });
-</script>

data/lib/app/views/rich/cms/bar/_menu.html.erb

@@ -1,16 +0,0 @@
-<div class="menu">
-  <% if current_rich_cms_admin %>
-    <%= link "Mark copy", :class => "mark" %>
-  <% end %>
-  
-  <% unless current_rich_cms_admin %>
-    <%= link "Login" %>
-  <% else %>
-    <div class="admin">
-      Logged in as <strong><%= current_rich_cms_admin_name %></strong>
-      &nbsp;&nbsp;
-      <%= link_to "Hide"  , rich_cms_hide_path   %>
-      <%= link_to "Logout", rich_cms_logout_path %>
-    </div>
-  <% end %>
-</div>

data/lib/app/views/rich/cms/bar/_panel.html.erb

@@ -1,3 +0,0 @@
-<div class="panel">
-  <%= render :partial => "rich/cms/bar/panel/#{current_rich_cms_admin.nil? ? "login" : "edit"}" %>
-</div>