pod4 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d453deab24668df068eedf62267947f8f8d458a7
-  data.tar.gz: 96a25e9b4c8020a9af7ca58eaf842d20c015ae80
+  metadata.gz: 086836fbb544f8cb60fd83c340324338a8686ecb
+  data.tar.gz: 4291473bdecf9300a8064713ca1f5c046833fd58
 SHA512:
-  metadata.gz: b81b5e66b9334559ec2f349946a4a32c30e1cec56a88880d92e2dfe1758377820ce7ecb950f9ab6b59660f3ad961494dc631f35caf21c1d482565ee14cb5ae27
-  data.tar.gz: d9e4b08093eb2fb237c8c21e4eee887fc91a3b3a7ab5e2f45f4810d6aa667aee2372e27798c924ef6a7485237454120af0b8d7b6ae4f14ab9aa695233eb5c4d6
+  metadata.gz: 730c3f184730b30d60d8af2ef0d6459a0c6ca4be5850504b5f045eae2237d635663964a7ea95400023782670c59d7e0fc2bd5ae83e907b9bf578fa198f0fa514
+  data.tar.gz: ae839080b4e8e372da27e28b2033b7a5bcb30c751f70f913c8288fa53d963e16b69b222860d2836dd08a1b1c45884959198f8fcc411f411d24b8ad63b96df7b6

data/Gemfile

@@ -1,3 +1,41 @@
 source 'https://rubygems.org'
+
+
 gemspec
 
+
+group :development, :test do
+
+  # for bundler, management, etc etc
+  gem "bundler", "~> 1.11"
+  gem "rake",    "~> 10.5"
+  gem "rspec",   "~> 3.4"
+
+
+  # For testing
+  gem "sequel",          "~> 4.35"
+  gem "nebulous_stomp" , "~> 2"
+
+  platforms :mri do
+    gem "sqlite3",         "~> 1.3"
+    gem "tiny_tds",        "~> 0"
+    gem "pg",              "~> 0"
+  end
+
+  platforms :jruby do
+    gem "jruby-lint"
+  end
+
+
+  # Development tools
+  platforms :mri do
+    gem "rdoc"
+    gem "pry"
+    gem "pry-doc"
+    gem "ripper-tags"
+  end
+  
+end
+
+
+

data/Rakefile

@@ -1,26 +1,11 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-require 'rdoc/task'
+#require "bundler/gem_tasks"
+#require "rspec/core/rake_task"
 
-RSpec::Core::RakeTask.new(:spec)
+#RSpec::Core::RakeTask.new(:spec)
 
-namespace :rdoc do
-  RDoc::Task.new do |rdoc|
-    rdoc.main = "README.md"
-    rdoc.rdoc_files.include("*.md", "lib/*", "md/*")
-    rdoc.rdoc_dir = "doc"
-  end
-
-  desc "Push doc to HARS"
-  task :hars do
-    sh "rsync -aP --delete doc/ /home/hars/hars/public/pod4"
-  end
-
-end
-
-desc "Start Guard"
-task :guard do
-  sh "bundle exec guard"
+desc "Push doc to HARS"
+task :hars do
+  sh "rsync -aP --delete doc/ /home/hars/hars/public/pod4"
 end
 
 desc "Update vim tag data"
@@ -28,3 +13,16 @@ task :retag do
   sh "ripper-tags -R"
 end
 
+namespace :rspec do
+
+  desc "run tests (mri)"
+  task :mri do
+    sh "rspec --default-path spec_mri"
+  end
+
+  desc "run tests (jRuby)"
+  task :jruby do
+    sh "rspec --default-path spec_jruby"
+  end
+
+end

data/lib/pod4/model.rb

@@ -130,6 +130,41 @@ module Pod4
 
       end
 
+
+      def test_for_octo(param)
+        raise( ArgumentError, 
+               'Parameter must be a Hash or Octothorpe',
+               caller ) \
+          unless param.kind_of?(Hash) || param.kind_of?(Octothorpe)
+
+      end
+
+
+      def test_for_invalid_status(action, status)
+        raise( Pod4Error, 
+               "Invalid model status for an action of #{action}",
+               caller ) \
+          if [:empty, :deleted].include? status
+
+      end
+
+
+
+      def fail_no_id_fld
+        raise POd4Error, 
+              "No ID field defined in interface",
+              caller
+
+      end
+
+
+      def fail_no_id
+        raise Pod4Error, 
+              "ID field missing from record",
+              caller
+
+      end
+
     end
     ##
 
@@ -177,7 +212,7 @@ module Pod4
     # Call this to update the data source with the current attribute values
     #
     def update
-      fail_invalid_status(:update) if [:empty, :deleted].include? @model_status
+      Model.test_for_invalid_status(:update, @model_status)
 
       clear_alerts; validate 
       interface.update(@model_id, map_to_interface) \
@@ -193,8 +228,7 @@ module Pod4
     # Note: does not delete the instance...
     #
     def delete
-      fail_invalid_status(:delete) if [:empty, :deleted].include? @model_status
-
+      Model.test_for_invalid_status(:delete, @model_status)
       clear_alerts; validate 
       interface.delete(@model_id) 
       @model_status = :deleted
@@ -310,7 +344,7 @@ module Pod4
     # Merge an OT with our columns
     #
     def merge(ot)
-      test_for_octo(ot)
+      Model.test_for_octo(ot)
 
       columns.each do |col|
         instance_variable_set("@#{col}".to_sym, ot[col]) if ot.has_key?(col)
@@ -318,27 +352,6 @@ module Pod4
     end
 
 
-    def test_for_octo(param)
-      raise ArgumentError, 'Parameter must be a Hash or Octothorpe' \
-        unless param.kind_of?(Hash) || param.kind_of?(Octothorpe)
-
-    end
-
-
-    def fail_no_id_fld
-      raise POd4Error, "No ID field defined in interface"
-    end
-
-
-    def fail_no_id
-      raise Pod4Error, "ID field missing from record" 
-    end
-
-
-    def fail_invalid_status(action)
-      raise Pod4Error, "Invalid model status for an action of #{action}" 
-    end
-
   end
   ##
 

data/lib/pod4/null_interface.rb

@@ -123,7 +123,7 @@ module Pod4
     end
 
 
-    protected
+    private
 
 
     def handle_error(err, kaller=nil)

data/lib/pod4/version.rb

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

data/md/fixme.md

@@ -8,6 +8,9 @@ Things I Wish I Could Do
   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
 ============

data/pod4.gemspec

@@ -25,8 +25,9 @@ Gem::Specification.new do |spec|
   spec.extra_rdoc_files = spec.files.grep(%r{^md/})
 
   spec.add_runtime_dependency "devnull",    '~>0.1'
-  spec.add_runtime_dependency "octothorpe", '~>0.1'
+  spec.add_runtime_dependency "octothorpe", '~>0.2'
 
+=begin
   # for bundler, management, etc etc
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake",    "~> 10.5"
@@ -44,5 +45,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry"
   spec.add_development_dependency "pry-doc"
   spec.add_development_dependency "ripper-tags"
+=end
 
 end

data/spec_jruby/alert_spec.rb

@@ -0,0 +1 @@
+../spec_common/alert_spec.rb

data/spec_jruby/basic_model_spec.rb

@@ -0,0 +1 @@
+../spec_common/basic_model_spec.rb

data/spec_jruby/doc_no_pending.rb

@@ -0,0 +1 @@
+../spec_common/doc_no_pending.rb

data/spec_jruby/fixtures

@@ -0,0 +1 @@
+../spec_common/fixtures

data/spec_jruby/model_spec.rb

@@ -0,0 +1 @@
+../spec_common/model_spec.rb

data/spec_jruby/nebulous_interface_spec.rb

@@ -0,0 +1 @@
+../spec_common/nebulous_interface_spec.rb

data/spec_jruby/null_interface_spec.rb

@@ -0,0 +1 @@
+../spec_common/null_interface_spec.rb

data/spec_jruby/param_spec.rb

@@ -0,0 +1 @@
+../spec_common/param_spec.rb

data/spec_jruby/pod4_spec.rb

@@ -0,0 +1 @@
+../spec_common/pod4_spec.rb

data/spec_jruby/shared_examples_for_interface.rb

@@ -0,0 +1 @@
+../spec_common/shared_examples_for_interface.rb

data/spec_jruby/spec_helper.rb

@@ -0,0 +1,24 @@
+require 'pod4'
+
+
+include Pod4
+
+
+RSpec.configure do |config|
+  config.expect_with :rspec do |expectations|
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  config.mock_with :rspec do |mocks|
+    mocks.verify_partial_doubles = true
+  end
+
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+
+  if config.files_to_run.one?
+    config.default_formatter = 'doc'
+  end
+
+end
+

data/spec_mri/alert_spec.rb

@@ -0,0 +1 @@
+../spec_common/alert_spec.rb

data/spec_mri/basic_model_spec.rb

@@ -0,0 +1 @@
+../spec_common/basic_model_spec.rb

data/spec_mri/doc_no_pending.rb

@@ -0,0 +1 @@
+../spec_common/doc_no_pending.rb

data/spec_mri/fixtures

@@ -0,0 +1 @@
+../spec_common/fixtures

data/spec_mri/model_spec.rb

@@ -0,0 +1 @@
+../spec_common/model_spec.rb

data/spec_mri/nebulous_interface_spec.rb

@@ -0,0 +1 @@
+../spec_common/nebulous_interface_spec.rb

data/spec_mri/null_interface_spec.rb

@@ -0,0 +1 @@
+../spec_common/null_interface_spec.rb

data/spec_mri/param_spec.rb

@@ -0,0 +1 @@
+../spec_common/param_spec.rb

data/spec_mri/pod4_spec.rb

@@ -0,0 +1 @@
+../spec_common/pod4_spec.rb

data/spec_mri/sequel_interface_spec.rb

@@ -0,0 +1 @@
+../spec_common/sequel_interface_spec.rb

data/spec_mri/shared_examples_for_interface.rb

@@ -0,0 +1 @@
+../spec_common/shared_examples_for_interface.rb

data/spec_mri/spec_helper.rb

@@ -0,0 +1,25 @@
+require 'pry' #always useful when debugging
+require 'pod4'
+
+
+include Pod4
+
+
+RSpec.configure do |config|
+  config.expect_with :rspec do |expectations|
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  config.mock_with :rspec do |mocks|
+    mocks.verify_partial_doubles = true
+  end
+
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+
+  if config.files_to_run.one?
+    config.default_formatter = 'doc'
+  end
+
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod4
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Andy Jones
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-06 00:00:00.000000000 Z
+date: 2016-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devnull
@@ -30,182 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.11'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.11'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.5'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sequel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.35'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.35'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: tiny_tds
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: nebulous_stomp
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-doc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: ripper-tags
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
 description: |
   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
@@ -243,21 +75,44 @@ files:
 - md/fixme.md
 - md/roadmap.md
 - pod4.gemspec
-- spec/README.md
-- spec/alert_spec.rb
-- spec/basic_model_spec.rb
-- spec/doc_no_pending.rb
-- spec/fixtures/database.rb
-- spec/model_spec.rb
-- spec/nebulous_interface_spec.rb
-- spec/null_interface_spec.rb
-- spec/param_spec.rb
-- spec/pg_interface_spec.rb
-- spec/pod4_spec.rb
-- spec/sequel_interface_spec.rb
-- spec/shared_examples_for_interface.rb
-- spec/spec_helper.rb
-- spec/tds_interface_spec.rb
+- spec_common/README.md
+- spec_common/alert_spec.rb
+- spec_common/basic_model_spec.rb
+- spec_common/doc_no_pending.rb
+- spec_common/fixtures/database.rb
+- spec_common/model_spec.rb
+- spec_common/nebulous_interface_spec.rb
+- spec_common/null_interface_spec.rb
+- spec_common/param_spec.rb
+- spec_common/pod4_spec.rb
+- spec_common/sequel_interface_spec.rb
+- spec_common/shared_examples_for_interface.rb
+- spec_common/spec_helper.rb
+- spec_jruby/alert_spec.rb
+- spec_jruby/basic_model_spec.rb
+- spec_jruby/doc_no_pending.rb
+- spec_jruby/fixtures
+- spec_jruby/model_spec.rb
+- spec_jruby/nebulous_interface_spec.rb
+- spec_jruby/null_interface_spec.rb
+- spec_jruby/param_spec.rb
+- spec_jruby/pod4_spec.rb
+- spec_jruby/shared_examples_for_interface.rb
+- spec_jruby/spec_helper.rb
+- spec_mri/alert_spec.rb
+- spec_mri/basic_model_spec.rb
+- spec_mri/doc_no_pending.rb
+- spec_mri/fixtures
+- spec_mri/model_spec.rb
+- spec_mri/nebulous_interface_spec.rb
+- spec_mri/null_interface_spec.rb
+- spec_mri/param_spec.rb
+- spec_mri/pg_interface_spec.rb
+- spec_mri/pod4_spec.rb
+- spec_mri/sequel_interface_spec.rb
+- spec_mri/shared_examples_for_interface.rb
+- spec_mri/spec_helper.rb
+- spec_mri/tds_interface_spec.rb
 - tags
 homepage: https://bitbucket.org/andy-twosticks/pod4
 licenses:
@@ -283,20 +138,5 @@ rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Totally not an ORM
-test_files:
-- spec/README.md
-- spec/alert_spec.rb
-- spec/basic_model_spec.rb
-- spec/doc_no_pending.rb
-- spec/fixtures/database.rb
-- spec/model_spec.rb
-- spec/nebulous_interface_spec.rb
-- spec/null_interface_spec.rb
-- spec/param_spec.rb
-- spec/pg_interface_spec.rb
-- spec/pod4_spec.rb
-- spec/sequel_interface_spec.rb
-- spec/shared_examples_for_interface.rb
-- spec/spec_helper.rb
-- spec/tds_interface_spec.rb
+test_files: []
 has_rdoc: