dead_simple_cms 0.12.0 → 0.12.1

data/lib/dead_simple_cms.rb

@@ -10,6 +10,7 @@ require 'active_model'
 
 require 'dead_simple_cms/configuration'
 
+require 'dead_simple_cms/util/string'
 require 'dead_simple_cms/util/identifier'
 require 'dead_simple_cms/file_uploader/base'
 
@@ -93,7 +94,7 @@ module DeadSimpleCMS
     # If you create your own, please provide the full class name.
     #
     # If you choose to use the database, make sure to create a database table to hold the data:
-    #      
+    #
     #    create_table :dead_simple_cms, :force => true do |t|
     #      t.string :key
     #      t.text :value
@@ -119,11 +120,11 @@ module DeadSimpleCMS
     #     def url
     #       # This should retrieve the url to where the photo will be uploaded to.
     #     end
-    #       
+    #
     #     def upload!
     #       AWS::S3::S3Object.store(path, data, "mybucket", :access => :public_read)
     #     end
-    
+
     #   end
     #
     #

data/lib/dead_simple_cms/rails/action_view/form_builders/interface.rb

@@ -55,7 +55,7 @@ module DeadSimpleCMS
             section_or_group.groups.values.map do |group|
               next if group.attributes.empty? && group.groups.empty?
               fields_for(group.identifier, options) do |builder|
-                @template.content_tag(:fieldset) do
+                @template.content_tag(:fieldset, :id => Util::String.csserize(group.identifier)) do
                   # Following fieldset/legend convention: https://github.com/twitter/bootstrap/issues/1214
                   legend        = @template.content_tag(:legend, group.label) unless group.root? # don't show the group name if it's the root group.
                   attributes    = group.attributes.values.map { |attribute| builder.attribute(attribute) }.join.html_safe

data/lib/dead_simple_cms/rails/action_view/presenter.rb

@@ -33,12 +33,13 @@ module DeadSimpleCMS
           JAVASCRIPT
           js << javascript_include_tag(options.delete(:bootstrap_tab_js)) if options[:bootstrap_tab_js]
           lis = DeadSimpleCMS.sections.values.map do |section|
-            content_tag(:li, link_to(section.label, "##{section.identifier.to_s.csserize}", :id => "#{section.identifier.to_s.csserize}-tab"))
+            section_id = Util::String.csserize(section.identifier)
+            content_tag(:li, link_to(section.label, "##{section_id}", :id => "#{section_id}-tab"))
           end.join.html_safe
           tabs = content_tag(:ul, lis, :class => "nav nav-tabs", :id => "section-tabs")
           sections = content_tag(:div, :class => "tab-content") do
             DeadSimpleCMS.sections.values.map do |section|
-              content_tag(:div, section(section), :class => "tab-pane", :id => "#{section.identifier.to_s.csserize}")
+              content_tag(:div, section(section), :class => "tab-pane", :id => Util::String.csserize(section.identifier))
             end.join.html_safe
           end
 
@@ -51,7 +52,9 @@ module DeadSimpleCMS
 
         def form(section, options={})
           options.reverse_merge!(:builder => form_builder, :url => {:action => :edit})
-          options.reverse_merge!(options[:builder].form_for_options)
+          # Options passed to simple_form_for are changed inplace inside gem, see -
+          # https://github.com/plataformatec/simple_form/blob/master/lib/simple_form/action_view_extensions/form_helper.rb#L26
+          options.reverse_merge!(options[:builder].form_for_options.deep_dup)
 
           (options[:html] ||= {}).update(:multipart => true) if section.attributes.values.any? { |a| a.input_type == :file }
 

data/lib/dead_simple_cms/util/string.rb

@@ -0,0 +1,18 @@
+module DeadSimpleCMS
+  module Util
+    module String
+      class << self
+        # Converts string into css DOM selector for use with class and ID. We
+        # currently do lowercase with dashes for cssnames.
+        def csserize(str)
+          name = str.to_s.dup
+          name.gsub!(/[^A-Za-z0-9]+/, " ") # can return nil
+          name.gsub!(/(\w)([A-Z])/, '\1-\2') # can return nil
+          name.squish!.downcase!
+          name.gsub!(" ", "-") # can return nil
+          name
+        end
+      end
+    end
+  end
+end

data/lib/dead_simple_cms/version.rb

@@ -1,3 +1,3 @@
 module DeadSimpleCMS
-  VERSION = "0.12.0"
+  VERSION = "0.12.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dead_simple_cms
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-19 00:00:00.000000000 Z
+date: 2013-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -164,6 +164,7 @@ files:
 - lib/dead_simple_cms/storage/redis.rb
 - lib/dead_simple_cms/util/identifier.rb
 - lib/dead_simple_cms/util/identifier/dictionary.rb
+- lib/dead_simple_cms/util/string.rb
 - lib/dead_simple_cms/version.rb
 - spec/dead_simple_cms/attribute/collection_spec.rb
 - spec/dead_simple_cms/attribute/type/all_spec.rb