merb_sequel 0.4.3 → 0.5

data/Rakefile

@@ -3,9 +3,9 @@ require "rake/gempackagetask"
 
 PLUGIN   = "merb_sequel"
 NAME     = "merb_sequel"
-VERSION  = "0.4.3"
-AUTHOR   = "Wayne E. Seguin"
-EMAIL    = "wayneeseguin@gmail.com"
+VERSION  = "0.5"
+AUTHOR   = "Wayne E. Seguin, Lance Carlson"
+EMAIL    = "wayneeseguin@gmail.com, lancecarlson@gmail.com"
 HOMEPAGE = "http://merb-plugins.rubyforge.org/merb_sequel/"
 SUMMARY  = "Merb plugin that provides support for Sequel and Sequel::Model"
 
@@ -23,7 +23,7 @@ specification = Gem::Specification.new do |spec|
   spec.require_path = "lib"
   spec.extra_rdoc_files = ["README", "LICENSE", 'TODO']
   # Dependencies
-  spec.add_dependency("merb",         ">= 0.4.2")
+  spec.add_dependency("merb",         ">= 0.5")
   spec.add_dependency("sequel",       ">= 1.0.0")
   spec.add_dependency("sequel_model", ">= 0.2")
   spec.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs,sequel_generators}/**/*")

data/lib/merb/orms/sequel/connection.rb

@@ -3,9 +3,11 @@ require "fileutils"
 module Merb
   module Orms
     module Sequel
+
       class << self
-        def config_file() MERB_ROOT / "config" / "database.yml" end
-        def sample_dest() MERB_ROOT / "config" / "database.sample.yml" end
+
+        def config_file() Merb.root / "config" / "database.yml" end
+        def sample_dest() Merb.root / "config" / "database.sample.yml" end
         def sample_source() File.dirname(__FILE__) / "database.sample.yml" end
       
         def copy_sample_config
@@ -13,37 +15,42 @@ module Merb
         end
       
         def config
+
           @config ||=
-            begin
-              # Convert string keys to symbols
-              full_config = Erubis.load_yaml_file(config_file)
-              config = (Merb::Plugins.config[:merb_sequel] = {})
-              (full_config[MERB_ENV.to_sym] || full_config[MERB_ENV]).each do |key, value|
-                config[key.to_sym] = value
-              end
-              config
+          begin
+            # Convert string keys to symbols
+            full_config = Erubis.load_yaml_file(config_file)
+            config = (Merb::Plugins.config[:merb_sequel] = {})
+            (full_config[Merb.environment.to_sym] || full_config[Merb.environment]).each do |key, value|
+              config[key.to_sym] = value
             end
+            config
+          end
+
         end
       
         # Database connects as soon as the gem is loaded
         def connect
+          
           require "sequel"
           require "sequel_model"
 
           if File.exists?(config_file)
             puts "#{Time.now.httpdate}: Connecting to the '#{config[:database]}' database on '#{config[:host]}' using '#{config[:adapter]}' ..."
             connection = ::Sequel.connect(config_options(config))
-            MERB_LOGGER.error("Connection Error: #{e}") unless connection
+            Merb.logger.error("Connection Error: #{e}") unless connection
             connection
           else
             copy_sample_config
-            puts "#{Time.now.httpdate}: No database.yml file found in #{MERB_ROOT}/config."
+            puts "#{Time.now.httpdate}: No database.yml file found in #{Merb.root}/config."
             puts "A sample file was created called config/database.sample.yml for you to copy and edit."
             exit(1)
           end
+          
         end
         
         def config_options(config = {})
+          
           options = {}
           options[:adapter]  = (config[:adapter]  || "sqlite")
           options[:host]     = (config[:host]     || "localhost")
@@ -53,20 +60,22 @@ module Merb
             options[:encoding] = (config[:encoding] || config[:charset])
           end
           options[:database] = config[:database]  if config[:database]
-          options[:logger]   = MERB_LOGGER
+          options[:logger]   = Merb.logger
           options
         end
         
         # Registering this ORM lets the user choose sequel as a session store
         # in merb.yml's session_store: option.
         def register_session_type
-          Merb::Server.register_session_type("sequel",
+          Merb::BootLoader.register_session_type("sequel",
             "merb/session/sequel_session",
             "Using Sequel database sessions")
         end
 
       end
+      
     end
+    
   end
 
 end

data/lib/merb/session/sequel_session.rb

@@ -1,43 +1,45 @@
-require 'base64'
+require "base64"
 
 module Merb
+
   module SessionMixin
-    
+
     def setup_session
-      MERB_LOGGER.info("Setting up session")
+      Merb.logger.info("Setting up session")
       before = cookies[_session_id_key]
       request.session, cookies[_session_id_key] = Merb::SequelSession.persist(cookies[_session_id_key])
       @_fingerprint = Marshal.dump(request.session.data).hash
       @_new_cookie = cookies[_session_id_key] != before
     end
-  
+
     def finalize_session
-      MERB_LOGGER.info("Finalize session")
+      Merb.logger.info("Finalize session")
       request.session.save if @_fingerprint != Marshal.dump(request.session.data).hash
       set_cookie(_session_id_key, request.session.values[:session_id], _session_expiry) if (@_new_cookie || request.session.needs_new_cookie)
     end
-    
+
   end
 
-  table_name = (Merb::Plugins.config[:sequel][:session_table_name] || "sessions")
+  table_name = (Merb::Plugins.config[:merb_sequel][:session_table_name] || "sessions")
 
   class SequelSession < Sequel::Model(table_name.to_sym)
+    
     set_schema do
       primary_key :id
       varchar :session_id
       varchar :data
       timestamp :created_at
     end
-  
+
     attr_accessor :needs_new_cookie
-  
+
     class << self
       # Generates a new session ID and creates a row for the new session in the database.
       def generate
         create(:session_id => Merb::SessionMixin::rand_uuid,
-                       :data => marshal({}), :created_at => Time.now)
+        :data => marshal({}), :created_at => Time.now)
       end
-    
+
       # Gets the existing session based on the <tt>session_id</tt> available in cookies.
       # If none is found, generates a new session.
       def persist(session_id)
@@ -49,90 +51,91 @@ module Merb
         end
         [session, session.values[:session_id]]
       end
-    
+
       # Don't try to reload ARStore::Session in dev mode.
       def reloadable? #:nodoc:
         false
       end
-    
+
       def data_column_size_limit
         255
       end
-    
+
       def marshal(data)
         Base64.encode64(Marshal.dump(data)) if data
       end
-      
+
       def unmarshal(data)
         Marshal.load(Base64.decode64(data)) if data
       end
-      
+
       alias :create_table! :create_table
       alias :drop_table! :drop_table
     end
-  
+
     # Regenerate the Session ID
     def regenerate
       update_attributes(:session_id => Merb::SessionMixin::rand_uuid)
       self.needs_new_cookie = true
     end 
-  
+
     # Recreates the cookie with the default expiration time 
     # Useful during log in for pushing back the expiration date 
     def refresh_expiration
       self.needs_new_cookie = true
     end
-  
+
     # Lazy-delete of session data 
     def delete(key = nil)
       key ? self.data.delete(key) : self.data.clear
     end
-  
+
     def [](key)
       data[key]
     end
-  
+
     def []=(key, val)
       data[key] = val
     end
-  
+
     def empty?
       data.empty?
     end
-  
+
     def each(&b)
       data.each(&b)
     end
-  
+
     # Lazy-unmarshal session state.
     def data
       @data ||= self.class.unmarshal(@values[:data]) || {}
     end
-  
+
     # Has the session been loaded yet?
     def loaded?
       !! @data
     end
-  
-  private
-  
+
+    private
+
     attr_writer :data
-  
+
     before_save do # marshal_data!
       # return false if !loaded?
       @values[:data] = self.class.marshal(self.data)
     end
-  
+
     # Ensures that the data about to be stored in the database is not
     # larger than the data storage column. Raises
     # ActionController::SessionOverflowError.
     # before_save do # raise_on_session_data_overflow!
-      # return false if !loaded?
-      # limit = self.class.data_column_size_limit
-      # if loaded? and limit and read_attribute(@@data_column_name).size > limit
-        # raise MerbController::SessionOverflowError
-      # end
+    # return false if !loaded?
+    # limit = self.class.data_column_size_limit
+    # if loaded? and limit and read_attribute(@@data_column_name).size > limit
+    # raise MerbController::SessionOverflowError
+    # end
     # end
+    
   end
 
   unless Sequel::Model.db.table_exists?(table_name.to_sym)
@@ -144,5 +147,5 @@ module Merb
 
     puts "Created sessions table."
   end
-  
+
 end

data/lib/merb_sequel.rb

@@ -1,6 +1,6 @@
 # make sure we're running inside Merb
 if defined?(Merb::Plugins)
-  if Merb::Server.app_loaded?
+  if Merb::BootLoader.app_loaded?
     puts "Warning: The merb_sequel gem must be loaded before the application"
   else
     require "merb/orms/sequel/connection"

data/lib/merbtasks.rb

@@ -16,7 +16,7 @@ namespace :sequel do
     desc "Creates session migration"
     task :create => :merb_env do
       # TODO: this should not use '001' always...
-      dest = File.join(MERB_ROOT, "schema", "migrations","001_add_sessions_table.rb")
+      dest = File.join(Merb.root, "schema", "migrations","001_add_sessions_table.rb")
       source = File.join(File.dirname(__FILE__), "merb", "session","001_add_sessions_table.rb")
       
       FileUtils.cp source, dest unless File.exists?(dest)

metadata

@@ -1,116 +1,109 @@
 --- !ruby/object:Gem::Specification 
+rubygems_version: 0.9.0
+specification_version: 1
 name: merb_sequel
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
-platform: ruby
-authors: 
-- Wayne E. Seguin
+  version: "0.5"
+date: 2008-01-09 00:00:00 -08:00
+summary: Merb plugin that provides support for Sequel and Sequel::Model
+require_paths: 
+- lib
+email: wayneeseguin@gmail.com, lancecarlson@gmail.com
+homepage: http://merb-plugins.rubyforge.org/merb_sequel/
+rubyforge_project: 
+description: Merb plugin that provides support for Sequel and Sequel::Model
 autorequire: merb_sequel
-bindir: bin
-cert_chain: []
-
-date: 2008-01-07 00:00:00 -05:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: merb
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.4.2
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: sequel
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.0.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: sequel_model
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0.2"
-    version: 
-description: Merb plugin that provides support for Sequel and Sequel::Model
-email: wayneeseguin@gmail.com
-executables: []
-
-extensions: []
-
-extra_rdoc_files: 
-- README
-- LICENSE
-- TODO
+bindir: bin
+has_rdoc: true
+required_ruby_version: !ruby/object:Gem::Version::Requirement 
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 0.0.0
+  version: 
+platform: ruby
+signing_key: 
+cert_chain: 
+post_install_message: 
+authors: 
+- Wayne E. Seguin, Lance Carlson
 files: 
 - LICENSE
 - README
 - Rakefile
 - TODO
 - lib/merb
+- lib/merb_sequel.rb
+- lib/merbtasks.rb
 - lib/merb/orms
+- lib/merb/session
 - lib/merb/orms/sequel
 - lib/merb/orms/sequel/connection.rb
 - lib/merb/orms/sequel/database.sample.yml
-- lib/merb/session
 - lib/merb/session/001_add_sessions_table.rb
 - lib/merb/session/sequel_session.rb
-- lib/merb_sequel.rb
-- lib/merbtasks.rb
 - specs/merb_sequel_spec.rb
 - specs/spec_helper.rb
 - sequel_generators/migration
+- sequel_generators/model
+- sequel_generators/resource_controller
 - sequel_generators/migration/migration_generator.rb
 - sequel_generators/migration/templates
-- sequel_generators/migration/templates/new_migration.erb
 - sequel_generators/migration/USAGE
-- sequel_generators/model
+- sequel_generators/migration/templates/new_migration.erb
 - sequel_generators/model/model_generator.rb
 - sequel_generators/model/templates
-- sequel_generators/model/templates/sequel_model_template.erb
 - sequel_generators/model/USAGE
-- sequel_generators/resource_controller
+- sequel_generators/model/templates/sequel_model_template.erb
 - sequel_generators/resource_controller/resource_controller_generator.rb
 - sequel_generators/resource_controller/templates
+- sequel_generators/resource_controller/USAGE
 - sequel_generators/resource_controller/templates/controller.rb
 - sequel_generators/resource_controller/templates/edit.html.erb
 - sequel_generators/resource_controller/templates/helper.rb
 - sequel_generators/resource_controller/templates/index.html.erb
 - sequel_generators/resource_controller/templates/new.html.erb
 - sequel_generators/resource_controller/templates/show.html.erb
-- sequel_generators/resource_controller/USAGE
-has_rdoc: true
-homepage: http://merb-plugins.rubyforge.org/merb_sequel/
-post_install_message: 
+test_files: []
+
 rdoc_options: []
 
-require_paths: 
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-requirements: []
+extra_rdoc_files: 
+- README
+- LICENSE
+- TODO
+executables: []
 
-rubyforge_project: 
-rubygems_version: 1.0.1
-signing_key: 
-specification_version: 2
-summary: Merb plugin that provides support for Sequel and Sequel::Model
-test_files: []
+extensions: []
+
+requirements: []
 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: merb
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0.5"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: sequel
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: sequel_model
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0.2"
+    version: