dead_simple_cms 0.10.1 → 0.11.0

data/lib/dead_simple_cms.rb

@@ -80,7 +80,8 @@ module DeadSimpleCMS
 
     # Register any additional attribute classes for use in your configuration.
     register_attribute_classes(Attribute::Type::String, Attribute::Type::Text, Attribute::Type::Numeric, Attribute::Type::Integer,
-      Attribute::Type::Float, Attribute::Type::Boolean, Attribute::Type::File, Attribute::Type::Image, Attribute::Type::Symbol)
+      Attribute::Type::Float, Attribute::Type::Boolean, Attribute::Type::File, Attribute::Type::Image, Attribute::Type::Symbol,
+      Attribute::Type::Datetime)
 
     # Set the default form builder used for building the CMS forms in the app. You can replace this with :simple_form,
     # :simple_form_with_bootstrap or pass in the actual builder class. Your builder class must include the interface:

data/lib/dead_simple_cms/attribute/collection.rb

@@ -22,6 +22,21 @@ module DeadSimpleCMS
       end
 
       def update_attributes(attributes)
+        # Sometimes we have to do initial preparing of attributes, before sending them to updating.
+        # For example, if we use select_datetime from Rails, it creates many fields in params, so the resulting
+        # params may look like:
+        #
+        #    {'foo' => 'bar', 'date(1i)' => '2000', 'date(2i)' => '10', 'date(3i)' => '30'}
+        #
+        # Of course we have to modify it to put everything into the same key, like:
+        #
+        #    {'foo' => 'bar', 'date' => '2000-10-30'}
+        #
+        # or something like that. So, if your attribute type requires such transformations, please specify
+        # .convert_attributes method in it.
+        Configuration.attribute_classes.each do |klass|
+          klass.convert_attributes(attributes) if klass.respond_to?(:convert_attributes)
+        end
         attributes.each { |k, v| send("#{k}=", v) }
       end
 
@@ -42,4 +57,4 @@ module DeadSimpleCMS
 
     end
   end
-end
+end

data/lib/dead_simple_cms/attribute/type/all.rb

@@ -46,6 +46,27 @@ module DeadSimpleCMS
           value && value.to_i
         end
       end
+      class Datetime < Base
+        self.default_input_type = :datetime
+
+        def self.convert_attributes(attributes)
+          date_attrs = attributes.keys.inject({}) do |new_hash, key|
+            if key =~ /\(\d+i\)$/
+              attr_name = key.match(/^(.*)\(\d+i\)$/)[1]
+              new_hash[attr_name] ||= {}
+              new_hash[attr_name][key] = attributes.delete(key)
+            end
+            new_hash
+          end
+          if date_attrs.present?
+            date_attrs.each do |attr_name, values|
+              datetime = ::DateTime.civil(*values.sort.map(&:second).map(&:to_i))
+              attributes[attr_name] = datetime
+            end
+          end
+          attributes
+        end
+      end
       # Public: File attributes are stored at some publicly accessible url.
       class File < Base
         self.default_input_type = :file
@@ -106,4 +127,4 @@ module DeadSimpleCMS
       end
     end
   end
-end
+end

data/lib/dead_simple_cms/attribute/type/base.rb

@@ -20,7 +20,7 @@ module DeadSimpleCMS
         # Public: a Symbol representing the default input type required for forms
         class_attribute :default_input_type, :instance_writer => false
 
-        VALID_INPUT_TYPES = [:string, :text, :select, :file, :radio].freeze
+        VALID_INPUT_TYPES = [:string, :text, :select, :file, :radio, :datetime].freeze
 
         attr_reader   :hint, :input_type, :group_hierarchy, :required
         attr_accessor :section
@@ -74,4 +74,4 @@ module DeadSimpleCMS
       end
     end
   end
-end
+end

data/lib/dead_simple_cms/configuration.rb

@@ -1,5 +1,7 @@
 module DeadSimpleCMS
   class Configuration
+    class_attribute :attribute_classes
+    self.attribute_classes = []
 
     def section(identifier, options={}, &block)
       section = DeadSimpleCMS::Section.new(identifier, options, &block)
@@ -16,6 +18,7 @@ module DeadSimpleCMS
       classes.each do |klass|
         DeadSimpleCMS::Section::Builder.define_attribute_builder_method(klass)
         Group::Configuration.define_attribute_builder_method(klass)
+        attribute_classes << klass
       end
     end
 
@@ -47,4 +50,4 @@ module DeadSimpleCMS
     end
 
   end
-end
+end

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

@@ -10,12 +10,12 @@ module DeadSimpleCMS
               class_attribute :form_for_method
               self.form_for_method = :form_for
 
-              class_inheritable_hash :form_for_options
+              class_attribute :form_for_options
               self.form_for_options = {}
 
               [:update, :actions, :preview, :attribute].each do |name|
                 option_name = "#{name}_options"
-                class_inheritable_hash option_name, :instance_writer => false
+                class_attribute option_name, :instance_writer => false
                 self.send("#{option_name}=", {})
               end
             end
@@ -69,4 +69,4 @@ module DeadSimpleCMS
       end
     end
   end
-end
+end

data/lib/dead_simple_cms/version.rb

@@ -1,3 +1,3 @@
 module DeadSimpleCMS
-  VERSION = "0.10.1"
+  VERSION = "0.11.0"
 end

data/spec/dead_simple_cms/attribute/collection_spec.rb

@@ -23,6 +23,11 @@ describe DeadSimpleCMS::Attribute::Collection do
       subject.update_attributes(:foo => :bar)
     end
 
+    it "should convert attributes if there is attribute types, which support that" do
+      subject.stub(:foo=)
+      DeadSimpleCMS::Attribute::Type::Datetime.should_receive(:convert_attributes).with(:foo => :bar)
+      subject.update_attributes(:foo => :bar)
+    end
   end
 
   describe "#add_attribute" do

data/spec/dead_simple_cms/attribute/type/all_spec.rb

@@ -119,6 +119,38 @@ describe DeadSimpleCMS::Attribute::Type::Numeric do
   its(:default_input_type) { should == :string }
 
 end
+describe DeadSimpleCMS::Attribute::Type::Datetime do
+
+  include_context "Attribute Setup"
+
+  its(:default_input_type) { should == :datetime }
+
+  describe ".convert_attributes" do
+    let(:original_attributes) do
+      {
+        "foo" => "bar",
+        "bla(1i)" => "2000",
+        "bla(2i)" => "10",
+        "bla(3i)" => "23",
+        "bla(4i)" => "11",
+        "bla(5i)" => "55"
+      }
+    end
+    let(:final_attributes) { { "foo" => "bar", "bla" => DateTime.civil(2000, 10, 23, 11, 55) } }
+    subject { described_class.convert_attributes(original_attributes) }
+
+    it "returns hash with datatime object instead of flat string values" do
+      subject.should == final_attributes
+    end
+
+    it "modifies original attributes" do
+      subject
+      original_attributes.should == final_attributes
+    end
+  end
+
+end
+
 describe DeadSimpleCMS::Attribute::Type::Integer do
 
   include_context "Attribute Setup"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dead_simple_cms
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-13 00:00:00.000000000 -07:00
-default_executable: 
+date: 2012-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2168634220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,15 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168634220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &2168633620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +37,15 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168633620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: simple_form
-  requirement: &2168632880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168632880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2168632220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +69,15 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *2168632220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2168631700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168631700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2168631200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +101,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168631200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! "Dead Simple CMS is a library for modifying different parts of your
   website without the overhead of having a\nfullblown CMS. The idea with this library
   is simple: provide an easy way to hook into different parts of your\napplication
@@ -167,7 +196,6 @@ files:
 - spec/setup/shared.rb
 - spec/setup/test_file_uploader.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/Aryk/dead_simple_cms
 licenses: []
 post_install_message: 
@@ -180,15 +208,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4057074833708238682
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4057074833708238682
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: DeadSimpleCMS provides a way to define, modify, and present custom variables