sequel-crushyform 0.1.3 → 0.1.4

data/README.md

@@ -361,6 +361,7 @@ CHANGE LOG
 0.1.1 Use strftime fordate/time (do not know why I did not !!!)
 0.1.2 Monkey patch, just prevent to have text areas instead of text fields when using PostgreSQL
 0.1.3 Still use the @schema value for :text type when :schema plugin is used
+0.1.4 Do not raise when there is a mismatch between db_schema and schema
 
 COPYRIGHT
 =========

data/lib/sequel_crushyform.rb

@@ -1,7 +1,7 @@
 module ::Sequel::Plugins::Crushyform
   
   module ClassMethods
-    def crushyform_version; [0,1,3]; end
+    def crushyform_version; [0,1,4]; end
     # Schema
     def crushyform_schema
       @crushyform_schema ||= default_crushyform_schema
@@ -9,7 +9,7 @@ module ::Sequel::Plugins::Crushyform
     def default_crushyform_schema
       out = {}
       db_schema.each do |k,v|
-        out[k] = if respond_to?(:schema) && @schema.columns.find{|c|c[:name]==k}[:type]==:text
+        out[k] = if respond_to?(:schema) && (@schema.columns.find{|c|c[:name]==k}||{:type=>nil})[:type]==:text
           {:type=>:text} # Using :schema plugin is the safest
         elsif [:sqlite,:mysql].include?(@db.database_type) && v[:db_type]=='text'
           {:type=>:text} # Without :schema plugin Postgres uses text even for strings

data/sequel-crushyform.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s| 
   s.name = 'sequel-crushyform'
-  s.version = "0.1.3"
+  s.version = "0.1.4"
   s.platform = Gem::Platform::RUBY
   s.summary = "A Sequel plugin that helps building forms"
   s.description = "A Sequel plugin that helps building forms. It basically does them for you so that you can forget about the boring part. The kind of thing which is good to have in your toolbox for building a CMS."

data/test/spec_crushyform.rb

@@ -131,6 +131,19 @@ end
 
 class WithAccronymYMCAName < ::Sequel::Model; end
 
+DB.create_table :mismatches do
+  primary_key :id
+  String :title
+  text :body
+end
+class Mismatch < ::Sequel::Model
+  plugin :schema
+  set_schema do
+    primary_key :id
+    String :title
+  end
+end
+
 # ========
 # = Test =
 # ========
@@ -173,6 +186,14 @@ describe 'Crushyform when schema plugin is used' do
     }
   end
   
+  should 'not raise when there is a database column that is not in @schema' do
+    Mismatch.default_crushyform_schema.should=={
+      :title=>{:type=>:string}, 
+      :id=>{:type=>:integer}, 
+      :body=>{:type=>:text}
+    }
+  end
+  
 end
 
 describe 'Crushyform miscellaneous helpers' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sequel-crushyform
 version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Mickael Riga
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-15 00:00:00 +01:00
+date: 2011-09-29 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -63,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: A Sequel plugin that helps building forms