pod4 0.6.4 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 086836fbb544f8cb60fd83c340324338a8686ecb
-  data.tar.gz: 4291473bdecf9300a8064713ca1f5c046833fd58
+  metadata.gz: 94046b48debbb6c1be2839e60a1b2a4519f0e711
+  data.tar.gz: 083cf3ff2f1d154d71c867878448bf9e855db67e
 SHA512:
-  metadata.gz: 730c3f184730b30d60d8af2ef0d6459a0c6ca4be5850504b5f045eae2237d635663964a7ea95400023782670c59d7e0fc2bd5ae83e907b9bf578fa198f0fa514
-  data.tar.gz: ae839080b4e8e372da27e28b2033b7a5bcb30c751f70f913c8288fa53d963e16b69b222860d2836dd08a1b1c45884959198f8fcc411f411d24b8ad63b96df7b6
+  metadata.gz: fd8210e95713b24475f1415dd6c60b62e3d56478ab813bbe614a2e30cb8e2a46ed9a3f62865f336e158a16a46de8b6a3e8e8c0c01e68914b25536263e0163563
+  data.tar.gz: 48e38561b7ae5fd64c399c4ed9576be0f9f8f068bb3130cb829348472933f19862c4a70c951d7f19315886dc11cb50d48d65376909d3dbd1f12faa977a0ab10e

data/lib/pod4/typecasting.rb

@@ -0,0 +1,75 @@
+require 'pod4/errors'
+require 'pod4/metaxing'
+
+
+module Pod4
+
+
+  ##
+  # A mixin to give you some more options to control how Pod4 maps the
+  # interface to the model.
+  #
+  # Eventually we will actually have typecasting in here. For now all this
+  # allows you to do is enforce an encoding -- which will be of use if you are
+  # dealing with MSSQL, or with certain interfaces which appear to deal with
+  # the code page poorly:
+  #
+  #     class FOo < Pod4::Model
+  #       include Pod4::TypeCasting
+  #
+  #       force_encoding Encoding::UTF-8
+  #
+  #       ...
+  #     end
+  #
+  module TypeCasting
+
+    ##
+    # A little bit of magic, for which I apologise. 
+    #
+    # When you include this module it actually adds the methods in ClassMethods
+    # to the class as if you had called `extend TypeCasting:ClassMethds` *AND*
+    # adds the methods in InstanceMethods as if you had written `prepend
+    # TypeCasting::InstanceMethods`.  
+    #
+    # In my defence: I didn't want to have to make you remember to do that...
+    #
+    def self.included(base)
+      base.extend  ClassMethods
+      base.prepend InstanceMethods
+    end
+
+
+    module ClassMethods
+      include Metaxing
+
+      def force_encoding(enc)
+        raise Pod4Error, "Bad encoding" unless enc.kind_of? Encoding
+        define_class_method(:encoding){enc}
+      end
+
+      def encoding; nil; end
+    end
+    ##
+
+
+    module InstanceMethods
+
+      def map_to_model(ot)
+        enc = self.class.encoding
+        
+        ot.each do |_,v| 
+          v.force_encoding(enc) if v.kind_of?(String) && enc
+        end
+
+        super(ot)
+      end
+
+    end
+    ##
+
+  end
+
+
+end
+

data/lib/pod4/version.rb

@@ -1,3 +1,3 @@
 module Pod4 
-  VERSION = '0.6.4'
+  VERSION = '0.7.0'
 end

data/md/fixme.md

@@ -4,13 +4,6 @@ Things I Wish I Could Do
 * TinyTds gem fails to cast date fields as date. Nothing we can do about that,
   AFAICS.
 
-* PG gem raises lots of "please cast this type explicitly" warnings for money,
-  numeric types. There is no documentation for how to do this, and apparently
-  no-one knows how /O\
-
-* Like an idiot I've made some tidying "raise an error" instance methods .. and
-  then called them from class methods.  ::headdesk::
-
 
 Things To Do
 ============
@@ -21,15 +14,9 @@ Things To Do
   passing selection parameters to SequelInterface.list if the schema is set. We
   need to tie down a test for that and fix it if it exists.
 
-* PgInterface works pretty well for the PG gem, but not the pg_jruby gem. We
-  need to take a rather more paranoid approach to the thing; how we go about
-  adding test coverage for this I have literally no idea...
-
 * TinyTDS just updated to 1.0 and ... fell over.  We need to work out what's
   going on there.
 
 * Ideally interfaces should support parameterised insertion. Ideally in a
   manner consistent for all interfaces...
 
-* We should have a test suite for jRuby.
-

data/spec_mri/model_plus_typecasting_spec.rb

@@ -0,0 +1,82 @@
+require 'octothorpe'
+
+require 'pod4'
+require 'pod4/typecasting'
+require 'pod4/null_interface'
+
+
+class ProductModel < Pod4::Model
+  include Pod4::TypeCasting
+  force_encoding Encoding::ISO_8859_1   # I assume we are running as UTF8 here
+  attr_columns :id, :code, :product, :price
+  set_interface NullInterface.new(:id, :code, :product, :price, [])
+end
+
+
+
+describe 'ProductModel' do
+
+  let(:records) do
+    [ {id: 10, code: 'aa1', product: 'beans',   price: 1.23},
+      {id: 20, code: 'bb1', product: 'pears',   price: 2.34},
+      {id: 30, code: 'cc1', product: 'soap',    price: 3.45},
+      {id: 40, code: 'cc2', product: 'matches', price: 4.56} ]
+  end
+
+  let(:model) { ProductModel.new(20) }
+
+  let(:model2) do
+    m = ProductModel.new(30)
+
+    allow( m.interface ).to receive(:read).
+      and_return( Octothorpe.new(records[2]) )
+
+    m.read.or_die
+  end
+
+  let(:records_as_ot)  { records.map{|r| Octothorpe.new(r) } }
+
+
+  ###
+
+
+  describe 'Model.force_encoding' do
+
+    it 'requires an encoding' do
+      expect( ProductModel ).to respond_to(:force_encoding).with(1).argument
+
+      expect{ ProductModel.force_encoding('foo') }.to raise_exception Pod4Error
+
+      # Cheating here: this has to be the same as above or other tests will
+      # fail...
+      expect{ ProductModel.force_encoding(Encoding::ISO_8859_1) }.
+        not_to raise_exception
+
+    end
+
+    it 'sets the encoding to be returned by Model.encoding' do
+      expect{ ProductModel.encoding }.not_to raise_exception
+      expect( ProductModel.encoding ).to eq(Encoding::ISO_8859_1)
+    end
+
+  end
+  ##
+  
+
+  describe '#map_to_model' do
+
+    it 'forces each string to map to the given encoding' do
+      # map_to_model has already happened at this point. No matter.
+      ot = model2.to_ot
+      expect( ot.>>.id ).to eq 30
+      expect( ot.>>.price ).to eq 3.45
+      expect( ot.>>.code.encoding ).to eq Encoding::ISO_8859_1
+      expect( ot.>>.product.encoding ).to eq Encoding::ISO_8859_1
+    end
+
+  end
+
+
+
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod4
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.7.0
 platform: ruby
 authors:
 - Andy Jones
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-15 00:00:00.000000000 Z
+date: 2016-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devnull
@@ -71,6 +71,7 @@ files:
 - lib/pod4/pg_interface.rb
 - lib/pod4/sequel_interface.rb
 - lib/pod4/tds_interface.rb
+- lib/pod4/typecasting.rb
 - lib/pod4/version.rb
 - md/fixme.md
 - md/roadmap.md
@@ -103,6 +104,7 @@ files:
 - spec_mri/basic_model_spec.rb
 - spec_mri/doc_no_pending.rb
 - spec_mri/fixtures
+- spec_mri/model_plus_typecasting_spec.rb
 - spec_mri/model_spec.rb
 - spec_mri/nebulous_interface_spec.rb
 - spec_mri/null_interface_spec.rb