zen 0.3b1 → 0.3

data/AUTHORS

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

data/guide/changelog.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 0.3 - November 27th, 2011
+
+* Fixed slug generation.
+* Don't load a language file if it is empty.
+* Log migration notices using Ramaze::Log.
+* Simplified the Rake task for the change list.
+* Fixed the rake task for building a change list
+* Serialize setting values upon migrating them.
+* Log Marshal notices as debug messages.
+
 ## 0.3.b1 - November 24th, 2011
 
 * Added a markup option for retrieving entries.

data/lib/vendor/sequel_sluggable.rb

@@ -38,7 +38,7 @@ module Sequel
             # If a slug is an empty string or a nil value it's value should be
             # pulled from the source attribute.
             if value.nil? or (value.respond_to?(:empty?) and value.empty?)
-              slug = self.send(self.class.sluggable_options[:source])
+              slug = to_slug(self.send(self.class.sluggable_options[:source]))
             end
 
             slug ||= to_slug(value)

data/lib/zen/language.rb

@@ -235,9 +235,11 @@ module Zen
           # Load the language
           if File.exist?(path)
             require(path)
-            language.collections[lang_name].load
 
-            return
+            unless language.collections[lang_name].nil?
+              language.collections[lang_name].load
+              return
+            end
           end
         end
 

data/lib/zen/package/settings/lib/settings/setting.rb

@@ -145,7 +145,10 @@ module Settings
           name = name.to_s
 
           if !settings.include?(name)
-            Zen.database[:settings].insert(:name => name)
+            Zen.database[:settings].insert(
+              :name  => name,
+              :value => setting.serialize(setting.default)
+            )
           end
         end
       end
@@ -337,8 +340,6 @@ module Settings
       return val.is_a?(String) && val == '1'
     end
 
-    private
-
     ##
     # Serializes a value using Marshal and packs it so that it can be stored in
     # the database.
@@ -366,7 +367,7 @@ module Settings
         begin
           return Marshal.load(value)
         rescue
-          Ramaze::Log.info(
+          Ramaze::Log.debug(
             'Failed to unpack the setting using Marshal, using the ' \
               'raw value instead'
           )

data/lib/zen/task/build.rake

@@ -43,12 +43,9 @@ namespace :build do
   task :changes, [:tag] do |t, args|
     args.with_defaults(:tag => `git tag`.split(/\n/)[-1])
 
-    stop  = `git log -1 --pretty=oneline --color=never`.split(/\s+/)[0]
-    start = `git show #{args[:tag]} --pretty=oneline --color=never` \
-      .split(/\s+/)[0]
-
-    log = `git --no-pager log --color=never --pretty=oneline \
-      #{start}..#{stop}`.split(/\n/)
+    stop = `git log -1 --pretty=oneline --color=never`.split(/\s+/)[0]
+    log  = `git --no-pager log --color=never --pretty=oneline \
+      #{args[:tag]}..#{stop}`.split(/\n/)
 
     log.each do |line|
       line    = line.split(/\s+/, 2)[1].strip

data/lib/zen/task/db.rake

@@ -13,7 +13,9 @@ namespace :db do
       if pkg.respond_to?(:migrations) and !pkg.migrations.nil?
         dir = pkg.migrations
       else
-        puts "Skipping #{pkg.title} as it has no migrations directory"
+        Ramaze::Log.info(
+          "Skipping #{pkg.title} as it has no migrations directory"
+        )
         next
       end
 
@@ -45,7 +47,9 @@ namespace :db do
       if pkg.respond_to?(:migrations) and !pkg.migrations.nil?
         dir = pkg.migrations
       else
-        puts "Skipping #{pkg.title} as it has no migrations directory"
+        Ramaze::Log.info(
+          "Skipping #{pkg.title} as it has no migrations directory"
+        )
         next
       end
 

data/lib/zen/version.rb

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

data/spec/zen/package/sections/controller/section_entries.rb

@@ -85,6 +85,7 @@ describe("Sections::Controller::SectionEntries") do
 
     current_path.should                           =~ /#{edit_url}\/[0-9]+/
     page.find('input[name="title"]').value.should == 'Spec entry'
+    page.find('input[name="slug"]').value.should  == 'spec-entry'
 
     page.find('select[name="section_entry_status_id"] option[selected]') \
       .text.should == status_field

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-24'
+  s.date        = '2011-11-27'
   s.authors     = ['Yorick Peterse']
   s.email       = 'info@yorickpeterse.com'
   s.summary     = 'Zen is a modular CMS written using Ramaze.'

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: zen
 version: !ruby/object:Gem::Version
-  version: 0.3b1
-  prerelease: 3
+  version: '0.3'
+  prerelease: 
 platform: ruby
 authors:
 - Yorick Peterse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-24 00:00:00.000000000 Z
+date: 2011-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &2156048860 !ruby/object:Gem::Requirement
+  requirement: &2153035080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.28.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156048860
+  version_requirements: *2153035080
 - !ruby/object:Gem::Dependency
   name: ramaze
-  requirement: &2156046360 !ruby/object:Gem::Requirement
+  requirement: &2153034600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2011.10.23
   type: :runtime
   prerelease: false
-  version_requirements: *2156046360
+  version_requirements: *2153034600
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  requirement: &2156044660 !ruby/object:Gem::Requirement
+  requirement: &2153034120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2156044660
+  version_requirements: *2153034120
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156043180 !ruby/object:Gem::Requirement
+  requirement: &2153033640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *2156043180
+  version_requirements: *2153033640
 - !ruby/object:Gem::Dependency
   name: loofah
-  requirement: &2156042240 !ruby/object:Gem::Requirement
+  requirement: &2153033160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156042240
+  version_requirements: *2153033160
 - !ruby/object:Gem::Dependency
   name: ramaze-asset
-  requirement: &2155894260 !ruby/object:Gem::Requirement
+  requirement: &2153032680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *2155894260
+  version_requirements: *2153032680
 - !ruby/object:Gem::Dependency
   name: shebang
-  requirement: &2155891860 !ruby/object:Gem::Requirement
+  requirement: &2153032200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2155891860
+  version_requirements: *2153032200
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &2155889700 !ruby/object:Gem::Requirement
+  requirement: &2153031720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 1.6.8
   type: :development
   prerelease: false
-  version_requirements: *2155889700
+  version_requirements: *2153031720
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &2156040220 !ruby/object:Gem::Requirement
+  requirement: &2153031240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 4.2.8
   type: :development
   prerelease: false
-  version_requirements: *2156040220
+  version_requirements: *2153031240
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &2156035120 !ruby/object:Gem::Requirement
+  requirement: &2153030760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *2156035120
+  version_requirements: *2153030760
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2156034260 !ruby/object:Gem::Requirement
+  requirement: &2153030280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *2156034260
+  version_requirements: *2153030280
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2156033340 !ruby/object:Gem::Requirement
+  requirement: &2153029800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: 1.1.1
   type: :development
   prerelease: false
-  version_requirements: *2156033340
+  version_requirements: *2153029800
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2156031840 !ruby/object:Gem::Requirement
+  requirement: &2153029320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: 1.3.4
   type: :development
   prerelease: false
-  version_requirements: *2156031840
+  version_requirements: *2153029320
 - !ruby/object:Gem::Dependency
   name: defensio
-  requirement: &2156029320 !ruby/object:Gem::Requirement
+  requirement: &2152663560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: 0.9.1
   type: :development
   prerelease: false
-  version_requirements: *2156029320
+  version_requirements: *2152663560
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2156027760 !ruby/object:Gem::Requirement
+  requirement: &2153025980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *2156027760
+  version_requirements: *2153025980
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &2156026440 !ruby/object:Gem::Requirement
+  requirement: &2153025500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,7 +186,7 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2156026440
+  version_requirements: *2153025500
 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
@@ -612,9 +612,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10