pod4 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14459fc92264f22a30f5fc92078d2de5343102b0
-  data.tar.gz: 8595eb150b4615d49ba9447972a1dc25bca60406
+  metadata.gz: 5f29b0bd813bbf2094177505acbaea2c3f53fdaa
+  data.tar.gz: 869b71281afe127ed15230298bfad61e070e77d5
 SHA512:
-  metadata.gz: 0002b34674f809b1320cb0d47b05f8c1514eb91d2993639d5210c2ac4b9be08d57d08c7edc47112f657c326204be4301977037a2363772108a21e602a09fbde6
-  data.tar.gz: e983618952a89b09f28514bcf7bf299cf261f3e33347444b9a0a0a14444ce69fedde0e3c30c7972e254486471162285b34ebc33dfdd70de29e7a3aa9a15bf0c5
+  metadata.gz: b33eaf931088d4d31ad52d560d8a45b969eb402a3c9baf4d22ec8c8bed017cca67de1ee001c23c6625200ee8f6d0c86107ada232e027c4134a69c9c7e73527c7
+  data.tar.gz: dc7a67002ffcd2c3f7911d18e5bbb131c36c41c630ed7ee2c91c6d461d98caafaa2a500877914eec66d90475201a9420b44952ba355265c4990c5db42888b2e1

data/.hgtags

@@ -20,3 +20,4 @@ dc22541876279b47dd366ddb44d262775ccdb933 0.6.1
 e41769b310f2eaab5f37d285ce9ad8658b689916 0.7.1
 2c28b064a96d4760d124da3f1842242f52f4cc69 0.7.2
 ccb4a8711560725e358f7fb87c76f4787eac5ed5 0.8.0
+8dff4cc52ea1e16536ad0677d8d62f52f4201366 0.8.1

data/.ruby-version

@@ -1 +1 @@
-2.3.0
+2.3.2

data/Gemfile

@@ -6,15 +6,15 @@ gemspec
 group :development, :test do
 
   # for bundler, management, etc etc
-  gem "bundler", "~> 1.11"
-  gem "rake",    "~> 10.5"
-  gem "rspec",   "~> 3.4"
+  gem "bundler", "~> 1.13"
+  gem "rake",    "~> 12.0" 
+  gem "rspec",   "~> 3.5"
   gem 'pry'
   gem "pry-doc"
 
   # For testing
-  gem "sequel",         "~> 4.35"
-  gem "nebulous_stomp", "~> 2"
+  gem "sequel",         "~> 4.41" 
+  gem "nebulous_stomp", "~> 3"
 
   platforms :ruby do
     gem "sqlite3",  "~> 1.3"

data/lib/pod4/errors.rb

@@ -22,6 +22,11 @@ module Pod4
 
     def initialize(msg=nil)
       super(msg || $! && $!.message)
+      @cos = $!
+    end
+
+    unless defined?(cause)
+      define_method(:cause) { @cos }
     end
 
   end

data/lib/pod4/nebulous_interface.rb

@@ -57,7 +57,7 @@ module Pod4
 
     attr_reader :id_fld
 
-    # The NebResponse object from the last message sent, or nil otherwise
+    # The NebulousStomp Message object holding the response from the last message sent, or, nil.
     attr_reader :response 
     
     # The status of the response from the last message: 
@@ -153,10 +153,10 @@ module Pod4
     ##
     # In normal operation, takes no parameters.
     #
-    # For testing purposes you may pass an instance of a class here. It must respond to a #send
-    # method with parameters (verb, parameter string, cache yes/no) by returning some kind of
-    # NebRequest (presumably either a double or an instance of NebRequestNull). This method will be
-    # called instead of creating a NebRequest directly.
+    # For testing purposes you may pass something here. Whatever it is you pass, it must respond to
+    # a `send` method, take the same parameters as NebulousStomp::Request.new (that is, a target
+    # and a message) and return something that behaves like a NebulousStomp::Request. This method
+    # will be called instead of creating a NebulousStomp::Request directly.
     #
     def initialize(requestObj=nil)
       @request_object  = requestObj # might as well be a reference 
@@ -184,9 +184,7 @@ module Pod4
         end
 
       send_message( verb_for(:list), sel )
-
-      @response.body_to_h # should be an array irrespective of the method name
-        .map{|e| Octothorpe.new(e) }
+      @response.body.is_a?(Array) ? @response.body.map{|e| Octothorpe.new e} : []
 
     rescue => e
       handle_error(e)
@@ -219,7 +217,7 @@ module Pod4
 
       send_message( verb_for(:read), param_string(:read, nil, id) )
 
-      Octothorpe.new( @response.body_to_h )
+      Octothorpe.new( @response.body.is_a?(Hash) ? @response.body : {} )
     end
 
 
@@ -365,11 +363,12 @@ module Pod4
     # returns the response to the request.
     #
     def send_message_helper(verb, paramStr, with_cache)
+      message = NebulousStomp::Message.new(verb: verb, params: paramStr)
       request = 
         if @request_object
-          @request_object.send(verb, paramStr, with_cache)
+          @request_object.send(self.class.target, message)
         else
-          NebulousStomp::NebRequest.new(self.class.target, verb, paramStr)
+          NebulousStomp::Request.new(self.class.target, message)
         end
 
       if @clear_cache

data/lib/pod4/pg_interface.rb

@@ -139,9 +139,9 @@ module Pod4
 
     rescue => e
       # Select has already wrapped the error in a Pod4Error, but in this case we want to catch
-      # something
+      # something. Ruby 2.0 doesn't define Exception.cause, but in that case, we do on Pod4Error.
       raise CantContinue, "That doesn't look like an ID" \
-        if e.cause.class == PG::InvalidTextRepresentation
+        if e.respond_to?(:cause) && e.cause.class == PG::InvalidTextRepresentation
 
       handle_error(e)
     end

data/lib/pod4/tds_interface.rb

@@ -171,9 +171,11 @@ module Pod4
 
     rescue => e
       # select already wrapped any error in a Pod4::DatabaseError, but in this case we want to try
-      # to catch something. (Side note: TinyTds' error class structure is a bit poor...)
+      # to catch something. Ruby 2.0 doesn't define Exception.cause, but if it doesn't, we do in
+      # Pod4Error, so. (Side note: TinyTds' error class structure is a bit poor...)
       raise CantContinue, "Problem reading record. Is '#{id}' really an ID?" \
-        if e.cause.class   == TinyTds::Error \
+        if e.respond_to?(:cause) \
+        && e.cause.class   == TinyTds::Error \
         && e.cause.message =~ /conversion failed/i
 
 

data/lib/pod4/typecasting.rb

@@ -33,7 +33,7 @@ module Pod4
     #
     def self.included(base)
       base.extend  ClassMethods
-      base.prepend InstanceMethods
+      base.send(:prepend, InstanceMethods)
     end
 
 

data/lib/pod4/version.rb

@@ -1,3 +1,3 @@
 module Pod4 
-  VERSION = '0.8.0'
+  VERSION = '0.8.1'
 end

data/pod4.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Andy Jones"]
   spec.email         = ["andy.jones@twosticksconsulting.co.uk"]
   spec.summary       = %q|Totally not an ORM|
-  spec.description   = <<~DESC
+  spec.description   = <<-DESC.gsub(/^\s+/, "")
     Provides a simple, common framework to talk to a bunch of data sources,
     using model classes which consist of a bare minimum of DSL plus vanilla Ruby
     inheritance.
@@ -27,24 +27,4 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "devnull",    '~>0.1'
   spec.add_runtime_dependency "octothorpe", '~>0.3'
 
-=begin
-  # for bundler, management, etc etc
-  spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake",    "~> 10.5"
-  spec.add_development_dependency "rspec",   "~> 3.4"
-  spec.add_development_dependency "rdoc"
-  
-  # For testing
-  spec.add_development_dependency "sequel",          "~> 4.35"
-  spec.add_development_dependency "sqlite3",         "~> 1.3"
-  spec.add_development_dependency "tiny_tds",        "~> 0"
-  spec.add_development_dependency "pg",              "~> 0"
-  spec.add_development_dependency "nebulous_stomp" , "~> 2"
-
-  # Development tools
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "pry-doc"
-  spec.add_development_dependency "ripper-tags"
-=end
-
 end

data/spec/common/basic_model_spec.rb

@@ -4,45 +4,37 @@ require 'pod4/basic_model'
 require 'pod4/null_interface'
 
 
-##
-# We define a model class to test, since in normal operation we would never use
-# Model directly, and since it needs an inner Interface.
-#
-# We can't use a mock for the interface -- class definitions fall outside the
-# RSpec DSL as far as I can tell, so I can neither create a mock here or inject
-# it. Which means we can't mock the interface in the rest of the test either;
-# any mock we created would not get called.
-#
-# But: we want to test that Model calls Interface correctly.
-#
-# We do have what appears to be a perfectly sane way of testing. We can define
-# an inner class based on the genuinely existing, non-mock NullInterface class;
-# and then define expectations on it. When we do this, Rspec fails to pass the
-# call on to the object, unless we specifically say `.and_call_original`
-# instead of `.and_return`. 
-#
-# This is actually quite nice, but more than a little confusing when you see it
-# for the first time. Its use isn't spelled out in the RSpec docs AFAICS. 
-#
-class WeirdModel < Pod4::BasicModel
-  set_interface NullInterface.new(:id, :name, :price, :groups, [])
-
-  def fake_an_alert(*args)
-    add_alert(*args) #protected method
-  end
-
-  def reset_alerts; @alerts = []; end
-end
+describe 'WeirdModel' do
 
+  ##
+  # We define a model class to test, since in normal operation we would never use Model directly,
+  # and since it needs an inner Interface.
+  #
+  # We define an inner class based on the genuinely existing, non-mock NullInterface class; and
+  # then define expectations on it. When we do this, Rspec fails to pass the call on to the object,
+  # unless we specifically say `.and_call_original` instead of `.and_return`. 
+  #
+  # This is actually quite nice, but more than a little confusing when you see it for the first
+  # time. Its use isn't spelled out in the RSpec docs AFAICS. 
+  #
+  let(:weird_model_class) do
+    Class.new Pod4::BasicModel do
+      set_interface NullInterface.new(:id, :name, :price, :groups, [])
+
+      def fake_an_alert(*args)
+        add_alert(*args) #protected method
+      end
 
+      def reset_alerts; @alerts = []; end
+    end
+  end
 
-describe 'WeirdModel' do
-  let(:model) { WeirdModel.new(20) }
+  let(:model) { weird_model_class.new(20) }
 
 
   describe 'Model.set_interface' do
     it 'requires an Interface object' do
-      expect( WeirdModel ).to respond_to(:set_interface).with(1).argument
+      expect( weird_model_class ).to respond_to(:set_interface).with(1).argument
     end
 
     # it 'sets interface' - covered by the interface test
@@ -52,8 +44,8 @@ describe 'WeirdModel' do
   
   describe 'Model.interface' do
     it 'is the interface object' do
-      expect( WeirdModel.interface ).to be_a_kind_of NullInterface
-      expect( WeirdModel.interface.id_fld ).to eq :id
+      expect( weird_model_class.interface ).to be_a_kind_of NullInterface
+      expect( weird_model_class.interface.id_fld ).to eq :id
     end
   end
   ##
@@ -62,25 +54,25 @@ describe 'WeirdModel' do
   describe '#new' do
 
     it 'takes an optional ID' do
-      expect{ WeirdModel.new    }.not_to raise_exception
-      expect{ WeirdModel.new(1) }.not_to raise_exception
+      expect{ weird_model_class.new    }.not_to raise_exception
+      expect{ weird_model_class.new(1) }.not_to raise_exception
     end
 
     it 'sets the ID attribute' do
-      expect( WeirdModel.new(23).model_id ).to eq 23
+      expect( weird_model_class.new(23).model_id ).to eq 23
     end
 
     it 'sets the status to empty' do
-      expect( WeirdModel.new.model_status ).to eq :empty
+      expect( weird_model_class.new.model_status ).to eq :empty
     end
 
     it 'initializes the alerts attribute' do
-      expect( WeirdModel.new.alerts ).to eq([])
+      expect( weird_model_class.new.alerts ).to eq([])
     end
 
     it 'doesn''t freak out if the ID is not an integer' do
-      expect{ CustomerModel.new("france") }.not_to raise_exception
-      expect( CustomerModel.new("france").model_id ).to eq "france"
+      expect{ weird_model_class.new("france") }.not_to raise_exception
+      expect( weird_model_class.new("france").model_id ).to eq "france"
     end
 
   end
@@ -89,8 +81,8 @@ describe 'WeirdModel' do
 
   describe '#interface' do
     it 'returns the interface set in the class definition, again' do
-      expect( WeirdModel.new.interface ).to be_a_kind_of NullInterface
-      expect( WeirdModel.new.interface.id_fld ).to eq :id
+      expect( weird_model_class.new.interface ).to be_a_kind_of NullInterface
+      expect( weird_model_class.new.interface.id_fld ).to eq :id
     end
   end
   ##
@@ -98,7 +90,7 @@ describe 'WeirdModel' do
 
   describe '#alerts' do
     it 'returns the list of alerts against the model' do
-      cm = WeirdModel.new
+      cm = weird_model_class.new
       cm.fake_an_alert(:warning, :foo, 'one')
       cm.fake_an_alert(:error,   :bar, 'two')
 
@@ -195,7 +187,7 @@ describe 'WeirdModel' do
   describe '#raise_exceptions' do
 
     it 'is also known as .or_die' do
-      cm = WeirdModel.new
+      cm = weird_model_class.new
       expect( cm.method(:raise_exceptions) ).to eq( cm.method(:or_die) )
     end
 

data/spec/common/model_plus_typecasting_spec.rb

@@ -5,17 +5,17 @@ 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(:product_model_class) do
+    Class.new Pod4::Model do
+      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
+  end
+
   let(:records) do
     [ {id: 10, code: 'aa1', product: 'beans',   price: 1.23},
       {id: 20, code: 'bb1', product: 'pears',   price: 2.34},
@@ -23,10 +23,10 @@ describe 'ProductModel' do
       {id: 40, code: 'cc2', product: 'matches', price: 4.56} ]
   end
 
-  let(:model) { ProductModel.new(20) }
+  let(:model) { product_model_class.new(20) }
 
   let(:model2) do
-    m = ProductModel.new(30)
+    m = product_model_class.new(30)
 
     allow( m.interface ).to receive(:read).
       and_return( Octothorpe.new(records[2]) )
@@ -43,20 +43,20 @@ describe 'ProductModel' do
   describe 'Model.force_encoding' do
 
     it 'requires an encoding' do
-      expect( ProductModel ).to respond_to(:force_encoding).with(1).argument
+      expect( product_model_class ).to respond_to(:force_encoding).with(1).argument
 
-      expect{ ProductModel.force_encoding('foo') }.to raise_exception Pod4Error
+      expect{ product_model_class.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) }.
+      expect{ product_model_class.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)
+      expect{ product_model_class.encoding }.not_to raise_exception
+      expect( product_model_class.encoding ).to eq(Encoding::ISO_8859_1)
     end
 
   end