sequel-string_nilifier 1.0.1 → 1.1.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YTQzMjJiOTViMjExMGI0MTk3N2RhZTJiNzM4NWFkYzQ1YjMxZTU0OQ==
+  data.tar.gz: !binary |-
+    NDZmZDdiMTQxMWIzM2VkNTNiOGUyZDkwMGM4MTMxMzQ0YjM3MDdhNw==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NjczMmEzZDdlOTMyMjhiYjcwNTU4MjY2NjI3Yzc5ZjM5ZGJmZjgyZTZlZGE1
+    N2E0ZmVhMGJhZTg1MjI2MDNlOTk3MTI5MDdlYzdhOTgxYzUwZTU4ODAwMTlm
+    OTIxNjM2YzFmODZkMWMwYjA5OGI4Yjg1MGIwMDdjNTBlYTk1MGQ=
+  data.tar.gz: !binary |-
+    NzY5MmYzMWRkZjM1MDljNmUyNDU2ZjM4MThiMjdkNDIzMWNkMWExNjhmMzA1
+    NTNlYTc2MzkyYThkZDExOGZhN2Q2MGE4NTM2NGVjOWQ2NjM5OWNhOWM1Yzcw
+    ZjE0NjUyYTlkZDFmODdmYTNmNTAxODdiYzhlNjNkMjBkMjAwY2Y=

data/lib/sequel/plugins/string_nilifier/version.rb

@@ -1,7 +1,7 @@
 module Sequel
   module Plugins
     module StringNilifier
-      VERSION = "1.0.1"
+      VERSION = "1.1.0"
     end
   end
 end

data/lib/sequel/plugins/string_nilifier.rb

@@ -1,34 +1,32 @@
 module Sequel
   module Plugins
     module StringNilifier
+      def self.apply(model)
+        model.plugin(:input_transformer, :string_nilifier) do |v|
+          if v.is_a?(String) && !v.is_a?(SQL::Blob) && v.strip.empty?
+            nil
+          else
+            v
+          end
+        end
+      end
+
       # Set blob columns as skipping nilifying when plugin is loaded.
       def self.configure(model)
-        model.instance_variable_set(:@skipped_string_nilifier_columns, [])
-        model.send(:set_skipped_string_nilifying_columns)
+        model.instance_eval{set_skipped_string_nilifying_columns if @dataset}
       end
 
       module ClassMethods
-        # Copy skipped nilifying columns from superclass into subclass.
-        def inherited(subclass)
-          subclass.instance_variable_set(:@skipped_string_nilifier_columns, @skipped_string_nilifier_columns.dup)
-          super
-        end
-
-        # Set blob columns as skipping nilifying when plugin is loaded.
-        def set_dataset(*)
-          res = super
-          set_skipped_string_nilifying_columns
-          res
-        end
+        Plugins.after_set_dataset(self, :set_skipped_string_nilifying_columns)
 
         # Skip nilifying for the given columns.
         def skip_string_nilifying(*columns)
-          @skipped_string_nilifier_columns.concat(columns).uniq!
+          skip_input_transformer(:string_nilifier, *columns)
         end
 
         # Return true if the column should not have values stripped.
         def skip_string_nilifying?(column)
-          @skipped_string_nilifier_columns.include?(column)
+          skip_input_transformer?(:string_nilifier, column)
         end
 
         private
@@ -41,20 +39,6 @@ module Sequel
           end
         end
       end
-
-      module InstanceMethods
-        # Strip value if it is a non-blob string and the model hasn't been set
-        # to skip nilifying for the column, before attempting to assign
-        # it to the model's values.
-        def nil_string?(k,str)
-          str.is_a?(String) && !str.is_a?(SQL::Blob) && str.strip.empty? && !model.skip_string_nilifying?(k)
-        end
-
-        def []=(k, v)
-          v = nil if nil_string? k, v
-          super(k, v)
-        end
-      end
     end
   end
 end

data/sequel-string_nilifier.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "sequel"
+  spec.add_runtime_dependency "sequel", "~> 3.48.0"
 
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"

data/spec/sequel/plugins/string_nilifier_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Sequel::Plugins::StringNilifier do
   before do
-    @db = Sequel::Database.new
+    @db = Sequel.mock
     @c = Class.new(Sequel::Model(@db[:test]))
     @c.columns :name, :b
     @c.db_schema[:b][:type] = :blob
@@ -58,6 +58,7 @@ describe Sequel::Plugins::StringNilifier do
   it "should work correctly for dataset changes" do
     c = Class.new(Sequel::Model(@db[:test]))
     c.plugin :string_nilifier
+    def @db.supports_schema_parsing?() true end
     def @db.schema(*) [[:name, {}], [:b, {:type=>:blob}]] end
     c.set_dataset(@db[:test2])
     o = c.new

data/spec/spec_helper.rb

@@ -16,9 +16,10 @@ class << Sequel::Model
 end
 
 Sequel::Model.use_transactions = false
-Sequel::Model.cache_anonymous_models = false
+Sequel.cache_anonymous_models = false
 
 db = Sequel.mock(:fetch=>{:id => 1, :x => 1}, :numrows=>1, :autoid=>proc{|sql| 10})
 def db.schema(*) [[:id, {:primary_key=>true}]] end
 def db.reset() sqls end
+def db.supports_schema_parsing?() true end
 Sequel::Model.db = MODEL_DB = db

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel-string_nilifier
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Jonathan Tron
@@ -10,56 +9,50 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-07 00:00:00.000000000 Z
+date: 2013-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  type: :runtime
+        version: 3.48.0
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
+        version: 3.48.0
+  type: :runtime
   prerelease: false
+  name: sequel
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  type: :development
   prerelease: false
+  name: rake
 - !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  type: :development
   prerelease: false
+  name: rspec
 description: Sequel plugin to store empty string as nil
 email:
 - jonathan.tron@metrilio.com
@@ -82,6 +75,7 @@ files:
 homepage: ''
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -90,25 +84,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: -1606853858529528596
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: -1606853858529528596
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Sequel plugin to store empty string as nil
 test_files:
 - spec/sequel/plugins/string_nilifier_spec.rb