talentbox-sequel-rails 0.3.3 → 0.3.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    talentbox-sequel-rails (0.3.3)
+    talentbox-sequel-rails (0.3.4)
       rails (~> 3.2.0)
       sequel (~> 3.28)
 
@@ -9,31 +9,31 @@ GEM
   remote: http://rubygems.org/
   specs:
     ZenTest (4.6.2)
-    actionmailer (3.2.3)
-      actionpack (= 3.2.3)
+    actionmailer (3.2.6)
+      actionpack (= 3.2.6)
       mail (~> 2.4.4)
-    actionpack (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
+    actionpack (3.2.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.1)
       rack (~> 1.4.0)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.2)
-    activemodel (3.2.3)
-      activesupport (= 3.2.3)
+      sprockets (~> 2.1.3)
+    activemodel (3.2.6)
+      activesupport (= 3.2.6)
       builder (~> 3.0.0)
-    activerecord (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
+    activerecord (3.2.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
-    activesupport (3.2.3)
+    activeresource (3.2.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)
+    activesupport (3.2.6)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
@@ -44,14 +44,14 @@ GEM
     erubis (2.7.0)
     hike (1.2.1)
     i18n (0.6.0)
-    journey (1.0.3)
+    journey (1.0.4)
     json (1.7.3)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.18)
-    multi_json (1.3.5)
+    mime-types (1.19)
+    multi_json (1.3.6)
     polyglot (0.3.3)
     rack (1.4.1)
     rack-cache (1.2)
@@ -60,21 +60,21 @@ GEM
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.2.3)
-      actionmailer (= 3.2.3)
-      actionpack (= 3.2.3)
-      activerecord (= 3.2.3)
-      activeresource (= 3.2.3)
-      activesupport (= 3.2.3)
+    rails (3.2.6)
+      actionmailer (= 3.2.6)
+      actionpack (= 3.2.6)
+      activerecord (= 3.2.6)
+      activeresource (= 3.2.6)
+      activesupport (= 3.2.6)
       bundler (~> 1.0)
-      railties (= 3.2.3)
-    railties (3.2.3)
-      actionpack (= 3.2.3)
-      activesupport (= 3.2.3)
+      railties (= 3.2.6)
+    railties (3.2.6)
+      actionpack (= 3.2.6)
+      activesupport (= 3.2.6)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.6)
+      thor (>= 0.14.6, < 2.0)
     rake (0.8.7)
     rcov (0.9.11)
     rdoc (3.12)
@@ -87,12 +87,12 @@ GEM
     rspec-expectations (2.7.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.7.0)
-    sequel (3.34.1)
+    sequel (3.37.0)
     sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    thor (0.14.6)
+    thor (0.15.4)
     tilt (1.3.3)
     treetop (1.4.10)
       polyglot

data/History.md

@@ -1,3 +1,21 @@
+0.3.5 - dev
+===========
+
+0.3.4
+=====
+
+* Make `rake db:schema:dump` generate a schema file which contains foreign_keys
+  and uses db types instead of ruby equivalents. This ensure loading the schema
+  file will result in a correct db
+
+* Map some Sequel specific exceptions to `ActiveRecord` equivalents, in 
+  `config.action_dispatch.rescue_responses`. This allows controllers to behave
+  more like `ActiveRecord` when Sequel raises exceptions. (Joshua Hansen)
+ 
+* New Sequel plugin added to all `Sequel::Model` which allows to use 
+  `Sequel::Model#find!` which will raise an exception if record does not exists.
+  This method is an alias to `Sequel::Model#[]` method. (Joshua Hansen)
+
 0.3.3
 =====
 

data/lib/generators/sequel.rb

@@ -38,7 +38,7 @@ module Sequel
       end
 
       def self.find(klass, params=nil)
-        "#{klass}[#{params}]"
+        "#{klass}.find!(#{params})"
       end
 
       def self.build(klass, params=nil)

data/lib/sequel/plugins/rails_extensions.rb

@@ -0,0 +1,35 @@
+require 'sequel'
+
+module Sequel
+  module Plugins
+    # The RailsExtensions plugin adds a single class method to Sequel::Model in
+    # order to make its use in controllers a little more like ActiveRecord's.
+    # The +find!+ method is added which will raise an exception if no object is
+    # found. By adding the following code to a Railtie:
+    #
+    #   config.action_dispatch.rescue_responses.merge!(
+    #    'Sequel::Plugins::RailsExtensions::ModelNotFound' => :not_found
+    #   )
+    # 
+    # Usage:
+    #
+    #   # Apply plugin to all models:
+    #   Sequel::Model.plugin :rails_extensions
+    #
+    #   # Apply plugin to a single model:
+    #   Album.plugin :rails_extensions
+    module RailsExtensions
+      class ModelNotFound < Sequel::Error
+      end
+      
+      module ClassMethods
+        def find!(args)
+          m = self[args]
+          raise ModelNotFound, "Couldn't find #{self} matching #{args}." unless m
+          m
+        end
+      end
+      
+    end
+  end
+end

data/lib/sequel-rails/railtie.rb

@@ -12,8 +12,8 @@ require 'active_model/railtie'
 require 'action_controller/railtie'
 
 require 'sequel-rails/setup'
-require "sequel-rails/railties/log_subscriber"
-require "sequel-rails/railties/i18n_support"
+require 'sequel-rails/railties/log_subscriber'
+require 'sequel-rails/railties/i18n_support'
 
 
 module Rails
@@ -26,6 +26,12 @@ module Rails
       config.app_generators.orm :sequel, :migration => true
       config.rails_fancy_pants_logging = true
 
+      config.action_dispatch.rescue_responses.merge!(
+        'Sequel::Plugins::RailsExtensions::ModelNotFound' => :not_found,
+        'Sequel::ValidationFailed'                        => :unprocessable_entity,
+        'Sequel::NoExistingObject'                        => :unprocessable_entity
+      )
+
       rake_tasks do
         load 'sequel-rails/railties/database.rake'
       end
@@ -43,28 +49,25 @@ module Rails
       end
 
       # Expose database runtime to controller for logging.
-      initializer "sequel.log_runtime" do |app|
+      initializer 'sequel.log_runtime' do |app|
         setup_controller_runtime(app)
       end
 
-      initializer "sequel.connect" do |app|
+      initializer 'sequel.connect' do |app|
         Rails::Sequel.setup(Rails.env)
       end
 
       # Run setup code after_initialize to make sure all config/initializers
       # are in effect once we setup the connection. This is especially necessary
       # for the cascaded adapter wrappers that need to be declared before setup.
-
       config.after_initialize do |app|
         ::Sequel::Model.plugin :active_model
         ::Sequel::Model.plugin :validation_helpers
-
+        ::Sequel::Model.plugin :rails_extensions
         ::Sequel::Model.raise_on_save_failure = false
       end
 
-
       # Support overwriting crucial steps in subclasses
-
       def configure_sequel(app)
         app.config.sequel = Rails::Sequel::Configuration.for(
           Rails.root, app.config.database_configuration
@@ -76,7 +79,7 @@ module Rails
       end
 
       def setup_controller_runtime(app)
-        require "sequel-rails/railties/controller_runtime"
+        require 'sequel-rails/railties/controller_runtime'
         ActionController::Base.send :include, Rails::Sequel::Railties::ControllerRuntime
       end
 

data/lib/sequel-rails/railties/database.rake

@@ -6,7 +6,7 @@ namespace :db do
       Sequel.extension :schema_dumper
       db = Sequel.connect(::Rails::Sequel.configuration.environment_for(Rails.env))
       File.open(ENV['SCHEMA'] || "#{Rails.root}/db/schema.rb", "w") do |file|
-        file.write(db.dump_schema_migration)
+        file.write db.dump_schema_migration(same_db: true)
       end
       Rake::Task["db:schema:dump"].reenable
     end

data/lib/sequel-rails/version.rb

@@ -1,5 +1,5 @@
 module Rails
   module Sequel
-    VERSION = "0.3.3"
+    VERSION = "0.3.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: talentbox-sequel-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-18 00:00:00.000000000 Z
+date: 2012-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &2162139960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,15 @@ dependencies:
         version: '3.28'
   type: :runtime
   prerelease: false
-  version_requirements: *2162139960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.28'
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2162137040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +38,15 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2162137040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2162133700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +54,15 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *2162133700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2162129900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +70,15 @@ dependencies:
         version: '0.5'
   type: :development
   prerelease: false
-  version_requirements: *2162129900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2162126940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +86,15 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *2162126940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &2162122940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +102,15 @@ dependencies:
         version: 4.4.6
   type: :development
   prerelease: false
-  version_requirements: *2162122940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.4.6
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2162120160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,7 +118,12 @@ dependencies:
         version: 0.9.11
   type: :development
   prerelease: false
-  version_requirements: *2162120160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.11
 description: Integrate Sequel with Rails 3
 email:
 - brasten@gmail.com
@@ -130,6 +165,7 @@ files:
 - lib/sequel-rails/setup.rb
 - lib/sequel-rails/storage.rb
 - lib/sequel-rails/version.rb
+- lib/sequel/plugins/rails_extensions.rb
 - spec/rcov.opts
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -155,7 +191,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1061361385848004113
+      hash: -3364849286179449129
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -164,10 +200,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1061361385848004113
+      hash: -3364849286179449129
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Use Sequel with Rails 3