pk-merb_sequel 1.0.3 → 1.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. data/README.rdoc +13 -0
  2. data/Rakefile +1 -1
  3. data/lib/merb/orms/sequel/connection.rb +1 -1
  4. metadata +3 -3
data/README.rdoc CHANGED
@@ -21,6 +21,19 @@ In Merb, add it as a dependency to your config/dependencies.rb:
21
21
 
22
22
  dependency 'pk-merb_sequel', :require_as => 'merb_sequel'
23
23
 
24
+ <b>Because of Merb ORM plugin loading mechanism you neeed to change init.rb</b>:
25
+
26
+ use_orm :sequel
27
+
28
+ to
29
+
30
+ Merb.orm = :sequel
31
+
32
+ If you don't do this Merb will complain that there is no merb_sequel gem also
33
+ if you have merb_sequel installed it will load your system wide gem instead of
34
+ the pk-merb_sequel gem.
35
+
36
+
24
37
  == Compatibility
25
38
 
26
39
  ===Ruby 1.8.7:
data/Rakefile CHANGED
@@ -17,7 +17,7 @@ GEM_EMAIL = "wayneeseguin@gmail.com, lancecarlson@gmail.com, email@loriholden.c
17
17
 
18
18
  GEM_NAME = "merb_sequel"
19
19
  PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
20
- GEM_VERSION = (Merb::MORE_VERSION rescue "1.0.3") + PKG_BUILD
20
+ GEM_VERSION = (Merb::MORE_VERSION rescue "1.0.4") + PKG_BUILD
21
21
 
22
22
  RELEASE_NAME = "REL #{GEM_VERSION}"
23
23
 
data/lib/merb/orms/sequel/connection.rb CHANGED
@@ -16,7 +16,7 @@ module Merb
16
16
  # ==== Returns
17
17
  # Bool:: True if using Sequel >= 2.12.0 or False
18
18
  def new_sequel?
19
- !!/^(2.12|3)/ =~ ::Sequel.version
19
+ !!(/^(2.12|3)/ =~ ::Sequel.version)
20
20
  end
21
21
 
22
22
  def copy_sample_config
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: pk-merb_sequel
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.3
4
+ version: 1.0.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Wayne E. Seguin, Lance Carlson, Lori Holden
@@ -9,7 +9,7 @@ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2009-05-09 00:00:00 -07:00
12
+ date: 2009-05-12 00:00:00 -07:00
13
13
  default_executable:
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
@@ -90,7 +90,7 @@ files:
90
90
  - lib/merb_sequel.rb
91
91
  - lib/sequel_ext
92
92
  - lib/sequel_ext/model.rb
93
- has_rdoc: true
93
+ has_rdoc: false
94
94
  homepage: http://merbivore.com
95
95
  post_install_message:
96
96
  rdoc_options: []