schild 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 806113777b9bbc25eb38105d179742884490e49a
-  data.tar.gz: a0828e0a253cab9379e28c21e09635d1cfd74a46
+  metadata.gz: 0381923a770fa822f45306da206222eb9ed9af25
+  data.tar.gz: 5ee8618b12e07393300fffb246507b0f4fbebff6
 SHA512:
-  metadata.gz: 633f4aeda86b695e08e54187ef7f0fa1eb43a4d37b68ed6244104e918471d581450c9a87797edc4eb5dd8d2a49490e443a4d68ea22d4405495c3249d8d8bf7a3
-  data.tar.gz: f9f3ebbeb374cb3f0ebca5bd5698fb43bf3a2e55edc4eddcdbece887a4bbc333549cc4989e9786f7d1022ccf76283afbb5acf5f90112fb2c39ff1ef6969fbd5b
+  metadata.gz: b548ab392d843987405b4d905ba6a25349e63eeddce2f7a4cbc69203c63edd53b0a56132e5cff0e1dbf0ed6e787e3c1f156028c7475af6aadf8067d44d927ddc
+  data.tar.gz: c04d780af9eae74628e1b25d96b451f8f6e8e19572369f45fec2bdc51c1f18bf29c00ccc465aec1c24fbce78aa2e72056ef332e039857b1287c4dcce707d07b0

data/lib/schild.rb

@@ -35,9 +35,16 @@ module SchildTypeSaver
   # bei include wird für jede Spalte in der Schild-Tabelle eine Ersatzmethode
   # erstellt, die bei nil ein Null-Objekt erstellt.
   def self.included(klass)
-    klass.columns.each do  |column|
+    klass.columns.each do |column|
       name = column.snake_case
-      define_method(name) { public_send(column) || create_null_object(klass, column)}
+      define_method(name) do |allow_nil=false|
+        ret = public_send(column)
+        if allow_nil || ret
+          ret
+        else
+         create_null_object(klass, column)
+        end
+      end
     end
   end
 
@@ -88,7 +95,7 @@ end
 # Das Schild Modul, das alle Klassen für die Datenbankanbindung bereitstellt
 module Schild
   # ist die Datenbank-Verbindung. Alle Daten können über diese Konstante abgerufen werden
-  DB = Sequel.connect(:adapter=>ENV['S_ADAPTER'], :host=>ENV['S_HOST'], :user=>ENV['S_USER'], :password=>ENV['S_PASSWORD'], :database=>ENV['S_DB'])
+  DB = Sequel.connect("#{ENV['S_ADAPTER']}://#{ENV['S_HOST']}/#{ENV['S_DB']}?user=#{ENV['S_USER']}&password=#{ENV['S_PASSWORD']}")
 
   # Stellt die Schüler-Tabelle samt Assoziationen bereit.
   class Schueler < Sequel::Model(:schueler)

data/lib/schild/version.rb

@@ -1,3 +1,3 @@
 module Schild
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/schild.gemspec

@@ -19,12 +19,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "~> 1"
+  spec.add_development_dependency "rake", "~> 10"
   spec.add_development_dependency "minitest", "~> 5"
   spec.add_development_dependency "minitest-rg", "~> 5"
+  spec.add_development_dependency "mysql2", "~> 0.4"
 
   spec.add_runtime_dependency "sequel", "~> 4"
-  spec.add_runtime_dependency "mysql2", "~> 0"
   spec.add_runtime_dependency "envyable", "~> 0"
 end

data/specs/type_safe_spec.rb

@@ -47,5 +47,21 @@ describe Schueler do
       @sm.Geburtsdatum.must_equal nil
     end
   end
+
+  describe 'allow_nil entweder true oder false' do
+    before do
+      # lade einen Standardschueler
+      @sm = Schueler.where(:Status => 2, :Geloescht => "-", :Gesperrt => "-").first
+    end
+
+    it 'gibt leer zurück, wenn default' do
+      @sm.bemerkungen.must_equal ''
+    end
+
+    it 'gibt nil zurück, wenn leer und typensicher und true bei allow_nil' do
+      @sm.bemerkungen(true).must_equal nil
+      @sm.geburtsdatum(true).must_equal nil
+    end
+  end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schild
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - HMT
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-16 00:00:00.000000000 Z
+date: 2015-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -67,33 +67,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5'
 - !ruby/object:Gem::Dependency
-  name: sequel
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
-  type: :runtime
+        version: '0.4'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: envyable
   requirement: !ruby/object:Gem::Requirement