pk-merb_sequel 1.0.4 → 1.0.5

data/Rakefile

@@ -7,17 +7,17 @@ require "spec/rake/spectask"
 ##############################################################################
 # Package && release
 ##############################################################################
-RUBY_FORGE_PROJECT  = "merb"
-PROJECT_URL         = "http://merbivore.com"
+RUBY_FORGE_PROJECT  = "merb_sequel"
+PROJECT_URL         = "http://github.com/pk/merb_sequel"
 PROJECT_SUMMARY     = "Merb plugin that provides support for Sequel and Sequel::Model"
 PROJECT_DESCRIPTION = PROJECT_SUMMARY
 
-GEM_AUTHOR = "Wayne E. Seguin, Lance Carlson, Lori Holden"
-GEM_EMAIL  = "wayneeseguin@gmail.com, lancecarlson@gmail.com, email@loriholden.com"
+GEM_AUTHOR = "Wayne E. Seguin, Lance Carlson, Lori Holden, Pavel Kunc"
+GEM_EMAIL  = "wayneeseguin@gmail.com, lancecarlson@gmail.com, email@loriholden.com, pavel.kunc@gmail.com"
 
 GEM_NAME    = "merb_sequel"
 PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
-GEM_VERSION = (Merb::MORE_VERSION rescue "1.0.4") + PKG_BUILD
+GEM_VERSION = "1.0.5" + PKG_BUILD
 
 RELEASE_NAME    = "REL #{GEM_VERSION}"
 

data/lib/generators/templates/migration/schema/migrations/%file_name%.rb

@@ -1,6 +1,6 @@
-# For details on Sequel migrations see 
-# http://sequel.rubyforge.org/
-# http://sequel.rubyforge.org/rdoc/classes/Sequel/Database.html#M000607
+# For details on Sequel migrations see:
+#   * http://sequel.rubyforge.org/
+#   * http://sequel.rubyforge.org/rdoc-plugins/classes/Sequel/Migration.html
 
 class <%= class_name %> < Sequel::Migration
 

data/lib/generators/templates/resource_controller/app/controllers/%file_name%.rb

@@ -25,9 +25,10 @@ class <%= class_name %> < Application
   # POST /<%= resource_path %>
   def create
     @<%= singular_model %> = <%= model_class_name %>.new(params[:<%= singular_model %>])
-    if @<%= singular_model %>.save
+    begin
+      @<%= singular_model %>.save
       redirect url(:<%= (modules.collect{|m| m.downcase} << singular_model).join("_") %>, @<%= singular_model %>)
-    else
+    rescue Sequel::ValidationFailed
       render :new
     end
   end
@@ -44,10 +45,11 @@ class <%= class_name %> < Application
   def update
     @<%= singular_model %> = <%= model_class_name %>[params[:id]]
     raise NotFound unless @<%= singular_model %>
-    if @<%= singular_model %>.update(params[:<%= singular_model %>])
+    begin
+      @<%= singular_model %>.update(params[:<%= singular_model %>])
       redirect url(:<%= (modules.collect{|m| m.downcase} << singular_model).join("_") %>, @<%= singular_model %>)
-    else
-      raise BadRequest
+    rescue Sequel::ValidationFailed
+      render :edit
     end
   end
 
@@ -55,12 +57,13 @@ class <%= class_name %> < Application
   def destroy
     @<%= singular_model %> = <%= model_class_name %>[params[:id]]
     raise NotFound unless @<%= singular_model %>
-    if @<%= singular_model %>.destroy
+    begin
+      @<%= singular_model %>.destroy
       redirect url(:<%= (modules.collect{|m| m.downcase} << singular_model).join("_") %>s)
-    else
+    rescue Sequel::Error
       raise BadRequest
     end
   end
 
 end
-<% end -%>
+<% end -%>

data/lib/merb/session/sequel_session.rb

@@ -57,10 +57,15 @@ module Merb
       # session_id<String>:: ID of the session to set.
       # data<ContainerSession>:: The session to set.
       def store_session(session_id, data)
-        if item = find(:session_id => session_id)
-          item.update(:data => data)
-        else
-          create(:session_id => session_id, :data => data, :created_at => Time.now)
+        begin
+          if item = find(:session_id => session_id)
+            item.update(:data => data)
+          else
+            item = self.new(:session_id => session_id, :data => data, :created_at => Time.now)
+            item.save
+          end
+        rescue => e
+          Merb.logger.error("#{e.message} when trying to save #{data}")
         end
       end
 
@@ -86,12 +91,13 @@ module Merb
 
     # Lazy-unserialize session state.
     def data
-      @data ||= (@values[:data] ? Marshal.load(@values[:data]) : {})
+      data = (@values[:data] ? Marshal.load(@values[:data]) : {}) if @data.nil?
+      @data
     end
     
     # Virtual attribute writer - override.
     def data=(hsh)
-      @data = hsh if hsh.is_a?(Hash)
+      super(hsh) if hsh.is_a?(Hash)
     end
 
     # Has the session been loaded yet?

data/lib/merb_sequel.rb

@@ -4,6 +4,8 @@ if defined?(Merb::Plugins)
   require File.join(File.dirname(__FILE__) / "merb" / "orms" / "sequel" / "connection")
   Merb::Plugins.add_rakefiles "merb_sequel" / "merbtasks"
   
+  Sequel::Model.send(:include, Merb::Orms::Sequel::ModelExtensions)
+
   # Connects to the database and handles session
   #
   # Connects to the database and loads sequel sessions if we use them.

data/lib/sequel_ext/model.rb

@@ -1,7 +1,11 @@
-module Sequel
-  class Model
-    def new_record?
-      self.new?
+module Merb
+  module Orms
+    module Sequel
+      module ModelExtensions 
+        def new_record?
+          self.new?
+        end
+      end
     end
   end
-end
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: pk-merb_sequel
 version: !ruby/object:Gem::Version 
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors: 
-- Wayne E. Seguin, Lance Carlson, Lori Holden
+- Wayne E. Seguin, Lance Carlson, Lori Holden, Pavel Kunc
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-05-12 00:00:00 -07:00
+date: 2009-08-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,7 +33,7 @@ dependencies:
         version: 1.4.0
     version: 
 description: Merb plugin that provides support for Sequel and Sequel::Model
-email: wayneeseguin@gmail.com, lancecarlson@gmail.com, email@loriholden.com
+email: wayneeseguin@gmail.com, lancecarlson@gmail.com, email@loriholden.com, pavel.kunc@gmail.com
 executables: []
 
 extensions: []
@@ -90,8 +90,9 @@ files:
 - lib/merb_sequel.rb
 - lib/sequel_ext
 - lib/sequel_ext/model.rb
-has_rdoc: false
-homepage: http://merbivore.com
+has_rdoc: true
+homepage: http://github.com/pk/merb_sequel
+licenses: 
 post_install_message: 
 rdoc_options: []
 
@@ -111,10 +112,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: merb
-rubygems_version: 1.2.0
+rubyforge_project: merb_sequel
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: Merb plugin that provides support for Sequel and Sequel::Model
 test_files: []