sequel_bitemporal 0.6.16 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1c4e0550d4e85ddec581ad5c9289081ad2c7a5e
-  data.tar.gz: 278691b26ac3cf9385d6e2431a3f4d2ff15e38ce
+  metadata.gz: 2ba7a32d43c79c445e1e16d04211bd92fef7859a
+  data.tar.gz: b3843cf42e0923c0db13d5032a7d5a797706f969
 SHA512:
-  metadata.gz: 4a7aa095e7f26e392151725df64983c359862784ac2e664d57cb59d6a0815cc1a3e1f0188c52e69b36fb87d69cc2e2cb9b050e023c9b1a1b2e2f6b1dd5f99f1d
-  data.tar.gz: 1ed9559ecec830a2d07fee118038b09ac9a3d54fe31a21a693907e1178361d3b41f0a57b162198588e24ea57373bcc13af270f1892dcef0f1bc1809f9b00fb64
+  metadata.gz: 4e01ff6312719f3c62f400e1e2f7d73266a02664a4fd6fdce68071a4b837c686d8263eb615b22693ae233e479a69caf65cb3a337b4c4ded0ebba6d412f7d5b57
+  data.tar.gz: 389ad9ac4318a3a4054985966c8378403ed6f6d2ad24806fad895d1d7ca01b08fde85d3ce803da88286b9e071e96e38006ff9760fca14645e7278866e6689fa0

data/.rspec

@@ -0,0 +1 @@
+--colour

data/.travis.yml

@@ -1,11 +1,11 @@
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.0
+  - jruby-19mode
+  - jruby-20mode
 env:
   - SQLITE=1
   - PG=1
-notifications:
-  disabled: true
-matrix:
-  allow_failures:
-    - env: PG=1
+addons:
+  postgresql: 9.2

data/Gemfile

@@ -2,3 +2,13 @@ source "http://rubygems.org"
 gemspec
 
 gem "pry"
+
+platforms :ruby do
+  gem "pg"
+  gem "sqlite3"
+end
+
+platforms :jruby do
+  gem "jdbc-postgres"
+  gem "jdbc-sqlite3"
+end

data/LICENSE

@@ -1,4 +1,4 @@
-sequel_bitemporal is Copyright © 2013 TalentBox SA
+sequel_bitemporal is Copyright © 2011 TalentBox SA
 
 MIT License
 

data/README.md

@@ -44,4 +44,4 @@ Build Status
 License
 -------
 
-sequel_bitemporal is Copyright © 2013 TalentBox SA. It is free software, and may be redistributed under the terms specified in the LICENSE file.
+sequel_bitemporal is Copyright © 2011 TalentBox SA. It is free software, and may be redistributed under the terms specified in the LICENSE file.

data/lib/sequel/plugins/bitemporal.rb

@@ -44,6 +44,13 @@ module Sequel
         raise Error, "please specify version class to use for bitemporal plugin" unless version
         missing = bitemporal_version_columns - version.columns
         raise Error, "bitemporal plugin requires the following missing column#{"s" if missing.size>1} on version class: #{missing.join(", ")}" unless missing.empty?
+
+        if Sequel::Plugins::Bitemporal.pg_jdbc?(master.db)
+          master.plugin :pg_typecast_on_load, *master.columns
+        elsif Sequel::Plugins::Bitemporal.jdbc?(master.db)
+          master.plugin :typecast_on_load, *master.columns
+        end
+
         master.instance_eval do
           @version_class = version
           base_alias = name ? underscore(demodulize(name)) : table_name
@@ -130,6 +137,12 @@ module Sequel
         end
         version.many_to_one :master, class: master, key: :master_id
         version.class_eval do
+          if Sequel::Plugins::Bitemporal.pg_jdbc?(db)
+            plugin :pg_typecast_on_load, *columns
+          elsif Sequel::Plugins::Bitemporal.jdbc?(master.db)
+            plugin :typecast_on_load, *columns
+          end
+
           def current?
             t = ::Sequel::Plugins::Bitemporal.point_in_time
             n = ::Sequel::Plugins::Bitemporal.now
@@ -273,12 +286,17 @@ module Sequel
             end if current_version?
             model.version_class.new current_attributes
           end
-          pending_version.set attributes
+          pending_version.set_all attributes
         end
 
         def update_attributes(attributes={})
           self.attributes = attributes
-          save(raise_on_failure: false) && self
+          if save raise_on_failure: false
+            _refresh_set_values @values
+            self
+          else
+            false
+          end
         end
 
         def before_create
@@ -478,19 +496,25 @@ module Sequel
 
         def save_fossil(expired, attributes={})
           fossil = model.version_class.new
-          expired_attributes = expired.values.dup
+          expired_attributes = expired.keys.each_with_object({}) do |key, hash|
+            hash[key] = expired.send key
+          end
           expired_attributes.delete :id
-          fossil.send :set_values, expired_attributes.merge(attributes)
+          fossil.set_all expired_attributes.merge(attributes)
           fossil.save validate: false
+          fossil.send :_refresh_set_values, fossil.values
         end
 
         def save_propagated(version, attributes={})
           propagated = model.version_class.new
-          version_attributes = version.values.dup
+          version_attributes = version.keys.each_with_object({}) do |key, hash|
+            hash[key] = version.send key
+          end
           version_attributes.delete :id
           version_attributes[:created_at] = Sequel::Plugins::Bitemporal.point_in_time
-          propagated.send :set_values, version_attributes.merge(attributes)
+          propagated.set_all version_attributes.merge(attributes)
           propagated.save validate: false
+          propagated.send :_refresh_set_values, propagated.values
           propagated
         end
 

data/lib/sequel_bitemporal.rb

@@ -1,2 +1,21 @@
 require "sequel"
+
+module Sequel
+  module Plugins
+    module Bitemporal
+      def self.jruby?
+        (defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby') || defined?(JRUBY_VERSION)
+      end
+
+      def self.jdbc?(db)
+        db.adapter_scheme==:jdbc
+      end
+
+      def self.pg_jdbc?(db)
+        db.database_type==:postgres && jdbc?(db)
+      end
+    end
+  end
+end
+
 require "sequel/plugins/bitemporal"

data/sequel_bitemporal.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "sequel_bitemporal"
-  s.version     = "0.6.16"
+  s.version     = "0.7.0"
   s.authors     = ["Joseph HALTER", "Jonathan TRON"]
   s.email       = ["joseph.halter@thetalentbox.com", "jonathan.tron@thetalentbox.com"]
   s.homepage    = "https://github.com/TalentBox/sequel_bitemporal"
@@ -16,10 +16,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency "sequel", "~> 3.30"
+  s.add_runtime_dependency "sequel", ">= 3.30", "< 5.0"
 
-  s.add_development_dependency "sqlite3"
-  s.add_development_dependency "pg"
   s.add_development_dependency "rspec", "~> 2.10.0"
   s.add_development_dependency "timecop"
   s.add_development_dependency "rake"

data/spec/bitemporal_date_with_range_spec.rb

@@ -360,7 +360,7 @@ if DbHelpers.pg?
           | Single Standard | 12    | 1      | 1     | 2009-11-30 | 2009-12-01 | 2009-12-01 | 2009-12-02 |         |
           | Single Standard | 12    |        | 1     | 2009-12-01 |            | 2009-11-28 | 2009-11-30 |         |
           | Single Standard | 12    | 3      | 4     | 2009-12-01 |            | 2009-11-30 | 2009-12-01 |         |
-          | Single Standard | 12    | 1      | 4     | 2009-12-01 |            | 2009-12-01 | 2009-12-02 |         |
+          | Single Standard | 12    | 3      | 4     | 2009-12-01 |            | 2009-12-01 | 2009-12-02 |         |
         }
       ensure
         @master_class.instance_variable_set :@propagate_per_column, propagate_per_column

data/spec/bitemporal_serialization_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 require "json"
 
-describe "Sequel::Plugins::Bitemporal" do
+describe "Sequel::Plugins::Bitemporal", :skip_jdbc_sqlite do
   before :all do
     db_setup
     @version_class.instance_eval do

data/spec/spec_helper.rb

@@ -5,12 +5,26 @@ require "pry"
 Dir[File.expand_path("../support/*.rb", __FILE__)].each{|f| require f}
 ENV["TZ"]="UTC"
 
+require "sequel_bitemporal"
+
+rspec_exclusions = {}
+
 DB = if DbHelpers.pg?
   `createdb sequel_bitemporal_test`
   Sequel.extension :pg_range, :pg_range_ops
-  Sequel.postgres "sequel_bitemporal_test"
+  if ::Sequel::Plugins::Bitemporal.jruby?
+    Sequel.connect "jdbc:postgresql://localhost/sequel_bitemporal_test"
+  else
+    Sequel.postgres "sequel_bitemporal_test"
+  end
 else
-  Sequel.sqlite
+  if Sequel::Plugins::Bitemporal.jruby?
+    rspec_exclusions[:skip_jdbc_sqlite] = true
+    Sequel::Model.plugin :typecast_on_load
+    Sequel.connect "jdbc:sqlite::memory:"
+  else
+    Sequel.sqlite
+  end
 end
 
 if ENV["DEBUG"]
@@ -20,7 +34,8 @@ end
 
 RSpec.configure do |config|
   config.include DbHelpers
-
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.filter_run_excluding rspec_exclusions
   config.before :each do
     db_truncate
   end

data/spec/support/db.rb

@@ -4,6 +4,10 @@ module DbHelpers
     ENV.has_key? "PG"
   end
 
+  def self.jruby?
+    (defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby') || defined?(JRUBY_VERSION)
+  end
+
   def db_setup(opts={})
     use_time = opts[:use_time]
     DB.drop_table(:room_versions) if DB.table_exists?(:room_versions)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel_bitemporal
 version: !ruby/object:Gem::Version
-  version: 0.6.16
+  version: 0.7.0
 platform: ruby
 authors:
 - Joseph HALTER
@@ -9,90 +9,68 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-16 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.30'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.30'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  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'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.10.0
 - !ruby/object:Gem::Dependency
   name: timecop
   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: rake
   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'
 description: Bitemporal versioning for sequel, fully tested.
@@ -103,9 +81,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -131,17 +110,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Bitemporal versioning for sequel.