zen 0.3b → 0.3b1

data/AUTHORS

@@ -1,4 +1,4 @@
 Following persons have contributed to Zen.
 (Sorted by number of submitted patches, then alphabetically)
 
-   308 Yorick Peterse <yorickpeterse@gmail.com>
+   313 Yorick Peterse <yorickpeterse@gmail.com>

data/guide/changelog.md

@@ -1,6 +1,10 @@
 # Changelog
 
-## Git Head
+## 0.3.b1 - November 24th, 2011
+
+* Added a markup option for retrieving entries.
+
+## 0.3.b - November 23rd, 2011
 
 * Started using checkboxes in favor of select boxes as they're easier to use.
 * Fixed a small issue that would make it impossible to add/update categories of

data/lib/zen/package/sections/lib/sections/helper/section_frontend.rb

@@ -51,6 +51,9 @@ module Ramaze
       # @option options [TrueClass|FalseClass] :user Whether or not the user
       #  objects should be eager loaded for all entries. Set to ``false`` by
       #  default.
+      # @option options [TrueClass|FalseClass] :markup When set to true
+      #  (default) the values of custom fields are processed using
+      #  {Zen::Markup}}.
       # @return [Mixed]
       #
       def get_entries(section, options = {})
@@ -64,7 +67,8 @@ module Ramaze
           :order_by            => :id,
           :order               => :desc,
           :custom_field_values => true,
-          :user                => false
+          :user                => false,
+          :markup              => true
         }.merge(options)
 
         eager = [:section]
@@ -108,8 +112,13 @@ module Ramaze
           # Get the fields?
           if options[:custom_field_values] == true
             row.custom_field_values.each do |field_value|
-              name             = field_value.custom_field.slug.to_sym
-              row.fields[name] = field_value.html
+              name = field_value.custom_field.slug.to_sym
+
+              if options[:markup] == true
+                row.fields[name] = field_value.html
+              else
+                row.fields[name] = field_value.value
+              end
             end
           end
         end
@@ -125,18 +134,29 @@ module Ramaze
       #
       # @since  0.3
       # @param  [String|Fixnum] entry The ID or slug of an entry to retrieve.
+      # @param  [Hash] options A hash containing various options to customize
+      #  the return value.
+      # @option options [TrueClass|FalseClass] :markup When set to true
+      #  (default) the values of custom fields are processed using
+      #  {Zen::Markup}}.
       # @return [Mixed]
       #
-      def get_entry(entry)
-        row = Sections::Model::SectionEntry.find_by_pk_or_slug(entry)
+      def get_entry(entry, options = {})
+        options = {:markup => true}.merge(options)
+        row     = Sections::Model::SectionEntry.find_by_pk_or_slug(entry)
 
         return row if row.nil?
 
         row.fields ||= {}
 
         row.custom_field_values.each do |field_value|
-          name             = field_value.custom_field.slug.to_sym
-          row.fields[name] = field_value.html
+          name = field_value.custom_field.slug.to_sym
+
+          if options[:markup] == true
+            row.fields[name] = field_value.html
+          else
+            row.fields[name] = field_value.value
+          end
         end
 
         return row

data/lib/zen/version.rb

@@ -1,4 +1,4 @@
 module Zen
   # :nodoc:
-  VERSION = '0.3b'
+  VERSION = '0.3b1'
 end

data/proto/app/config/config.rb.erb

@@ -39,3 +39,10 @@ Ramaze::Cache.options.session  = Ramaze::Cache::LRU
 # Ramaze::Cache.options.session you should use an external cache in case you're
 # running a multi-process based setup.
 Ramaze::Cache.options.settings = Ramaze::Cache::LRU
+
+# The cache driver to use for storing translations. If no value is specified in
+# your application Ramaze::Cache::LRU is used.
+#
+# For this setting it is highly recommended to use an external cache such as
+# Redis or Memcached as it can greatly reduce the amount of used memory.
+Ramaze::Cache.options.translations = Ramaze::Cache::LRU

data/spec/zen/package/sections/helper/section_frontend.rb

@@ -145,6 +145,18 @@ describe('Ramaze::Helper::SectionFrontend') do
     page.find('p:first-child').text.should == entry_1.title
   end
 
+  it('Retrieve a number of entries without their markup converted') do
+    entries = get_entries(section.slug, :markup => false)
+
+    entries[1].fields[:'spec-field'].should == 'hello'
+  end
+
+  it('Retrieve a single entry without processing the markup') do
+    entry = get_entry(entry_1.id, :markup => false)
+
+    entry.fields[:'spec-field'].should == 'hello'
+  end
+
   [
     field,
     group,

data/zen.gemspec

@@ -5,7 +5,7 @@ path = File.expand_path('../', __FILE__)
 Gem::Specification.new do |s|
   s.name        = 'zen'
   s.version     = Zen::VERSION
-  s.date        = '2011-11-23'
+  s.date        = '2011-11-24'
   s.authors     = ['Yorick Peterse']
   s.email       = 'info@yorickpeterse.com'
   s.summary     = 'Zen is a modular CMS written using Ramaze.'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zen
 version: !ruby/object:Gem::Version
-  version: 0.3b
+  version: 0.3b1
   prerelease: 3
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-23 00:00:00.000000000 Z
+date: 2011-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &2160155880 !ruby/object:Gem::Requirement
+  requirement: &2156048860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.28.0
   type: :runtime
   prerelease: false
-  version_requirements: *2160155880
+  version_requirements: *2156048860
 - !ruby/object:Gem::Dependency
   name: ramaze
-  requirement: &2160155400 !ruby/object:Gem::Requirement
+  requirement: &2156046360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2011.10.23
   type: :runtime
   prerelease: false
-  version_requirements: *2160155400
+  version_requirements: *2156046360
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  requirement: &2160154920 !ruby/object:Gem::Requirement
+  requirement: &2156044660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2160154920
+  version_requirements: *2156044660
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2160154440 !ruby/object:Gem::Requirement
+  requirement: &2156043180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *2160154440
+  version_requirements: *2156043180
 - !ruby/object:Gem::Dependency
   name: loofah
-  requirement: &2160153960 !ruby/object:Gem::Requirement
+  requirement: &2156042240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2160153960
+  version_requirements: *2156042240
 - !ruby/object:Gem::Dependency
   name: ramaze-asset
-  requirement: &2160153480 !ruby/object:Gem::Requirement
+  requirement: &2155894260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *2160153480
+  version_requirements: *2155894260
 - !ruby/object:Gem::Dependency
   name: shebang
-  requirement: &2160153000 !ruby/object:Gem::Requirement
+  requirement: &2155891860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2160153000
+  version_requirements: *2155891860
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &2152757080 !ruby/object:Gem::Requirement
+  requirement: &2155889700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 1.6.8
   type: :development
   prerelease: false
-  version_requirements: *2152757080
+  version_requirements: *2155889700
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &2152755980 !ruby/object:Gem::Requirement
+  requirement: &2156040220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 4.2.8
   type: :development
   prerelease: false
-  version_requirements: *2152755980
+  version_requirements: *2156040220
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &2152754480 !ruby/object:Gem::Requirement
+  requirement: &2156035120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *2152754480
+  version_requirements: *2156035120
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2152753060 !ruby/object:Gem::Requirement
+  requirement: &2156034260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *2152753060
+  version_requirements: *2156034260
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2160204560 !ruby/object:Gem::Requirement
+  requirement: &2156033340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: 1.1.1
   type: :development
   prerelease: false
-  version_requirements: *2160204560
+  version_requirements: *2156033340
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2160204080 !ruby/object:Gem::Requirement
+  requirement: &2156031840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: 1.3.4
   type: :development
   prerelease: false
-  version_requirements: *2160204080
+  version_requirements: *2156031840
 - !ruby/object:Gem::Dependency
   name: defensio
-  requirement: &2160203600 !ruby/object:Gem::Requirement
+  requirement: &2156029320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: 0.9.1
   type: :development
   prerelease: false
-  version_requirements: *2160203600
+  version_requirements: *2156029320
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2160203120 !ruby/object:Gem::Requirement
+  requirement: &2156027760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *2160203120
+  version_requirements: *2156027760
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &2160202640 !ruby/object:Gem::Requirement
+  requirement: &2156026440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,7 +186,7 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2160202640
+  version_requirements: *2156026440
 description: Zen is a modular CMS written using Ramaze. Zen gives you complete freedom
   to build whatever you want in whatever way you might want to build it.
 email: info@yorickpeterse.com