chrono_model 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cee551e571642d52fea58087df5f10e7462867ed
-  data.tar.gz: e1e4ba037b6fdda2b322743d777e0ba5fab27109
+  metadata.gz: 4e2c2ec8b0a57f2078ffabc946175c86b70b7201
+  data.tar.gz: 6ad882f7558a940c9e3766e5abf6a6101107ffd2
 SHA512:
-  metadata.gz: 105ae80bfc9669dba6eadee46d113d5c57276924cb2d702fde777a75a628c297ade0acf338bfc7fcce418676938c20bb66e371866c4f1763c81f5d7ec03926e0
-  data.tar.gz: 5285cbce3977b45c8580e649a859ea16c42a69871b9a8a7a23f2a6225db808fba5439754c84d24e86ec2ca920c4558a1eabffade89953104aa777da1f38d2e57
+  metadata.gz: 92eff9be8173deeb5092553a23403ff87918b5c993338825a79783470b74ec0988419ecc5f3c62075da785954e353f0d1f9447301c8c8b21349e7f9fc312788c
+  data.tar.gz: d62529c7d3c49aae5dde87ab4304377bdc290dffa7054b2fca4c421f6a7042b001cc4cf3dd7237af45bb81210c406488491b837661f0652b4c906faac647b854

data/.travis.yml

@@ -1,8 +1,8 @@
 rvm:
-  - 1.9.3
   - 2.0.0
-  - 2.1.7
-  - 2.2.3
+  - 2.1
+  - 2.2.5
+  - 2.3.1
 
 sudo: false
 

data/README.md

@@ -285,10 +285,6 @@ offers many more indexing abilities and better performance than JSON.
    [is broken][r4-tsrange-broken] and  [incomplete][r4-tsrange-incomplete]
    as of now, mainly due to a [design clash with ruby][pg-tsrange-and-ruby].
 
- * There is (yet) no upgrade path from [v0.5][chronomodel-0.5],
-   (PG 9.0-compatible, `box()` and hacks) to v0.6 and up (>=9.3-only, `tsrange`
-   and _less_ hacks).
-
  * The triggers and temporal indexes cannot be saved in schema.rb. The AR
    schema dumper is quite basic, and it isn't (currently) extensible.
    As we're using many database-specific features, Chronomodel forces the

data/chrono_model.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'hirb'
-  gem.add_development_dependency RUBY_VERSION.to_f == 1.9 ? 'debugger' : 'byebug'
+  gem.add_development_dependency 'byebug'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'fuubar'

data/lib/chrono_model.rb

@@ -14,33 +14,11 @@ if defined?(Rails)
   require 'chrono_model/railtie'
 end
 
-# We need to override the "scoped" method on AR::Association for temporal
-# associations to work. On Ruby 2.0 and up, the Module#prepend comes in
-# handy - on Ruby 1.9 we have to hack the inheritance hierarchy.
-#
 
-if RUBY_VERSION.to_i >= 2
-  ActiveRecord::Associations::Association.instance_eval do
-    prepend ChronoModel::Patches::Association
-  end
-
-  ActiveRecord::Relation.instance_eval do
-    prepend ChronoModel::Patches::Relation
-  end
-else
-  ActiveSupport::Deprecation.warn 'Ruby 1.9 is deprecated. Please update your Ruby <3'
-
-  silence_warnings do
-    class ChronoModel::Patches::AssociationPatch < ActiveRecord::Associations::Association
-      include ChronoModel::Patches::Association
-    end
-
-    ActiveRecord::Associations::Association = ChronoModel::Patches::AssociationPatch
-
-    class ChronoModel::Patches::RelationPatch < ActiveRecord::Relation
-      include ChronoModel::Patches::Relation
-    end
+ActiveRecord::Associations::Association.instance_eval do
+  prepend ChronoModel::Patches::Association
+end
 
-    ActiveRecord::Relation = ChronoModel::Patches::RelationPatch
-  end
+ActiveRecord::Relation.instance_eval do
+  prepend ChronoModel::Patches::Relation
 end

data/lib/chrono_model/schema_format.rake

@@ -6,20 +6,21 @@ namespace :db do
     task :dump => :environment do
       config = PG.config!
       target = ENV['DB_STRUCTURE'] || Rails.root.join('db', 'structure.sql')
-      schema_search_path = config[:schema_search_path]
+      schema = config[:schema_search_path]
 
-      unless schema_search_path.blank?
-        # add in chronomodel schemas
-        schema_search_path << ",#{ChronoModel::Adapter::TEMPORAL_SCHEMA}"
-        schema_search_path << ",#{ChronoModel::Adapter::HISTORY_SCHEMA}"
-
-        # convert to command line arguments
-        schema_search_path = schema_search_path.split(",").map{|part| "--schema=#{part.strip}" }.join(" ")
+      if schema.present?
+        # If a schema search path is configured, add also the ChronoModel schemas to the dump.
+        #
+        schema = schema.split /\s*,\s*/
+        schema = schema.concat [ ChronoModel::Adapter::TEMPORAL_SCHEMA, ChronoModel::Adapter::HISTORY_SCHEMA ]
+        schema = schema.map {|name| "--schema=#{name}" }
+      else
+        schema = [ ]
       end
-
+      
       PG.make_dump target,
                    *config.values_at(:username, :database),
-                   '-i', '-x', '-s', '-O', schema_search_path
+                   '-x', '-s', '-O', *schema
 
       # Add migration information, after resetting the schema to the default one
       File.open(target, 'a') do |f|
@@ -27,13 +28,13 @@ namespace :db do
         f.puts ActiveRecord::Base.connection.dump_schema_information
       end
 
-      # the structure.sql file will contain CREATE SCHEMA statements
-      # but chronomodel creates the temporal and history schemas
-      # when the connection is established, so a db:structure:load fails
-      # fix up create schema statements to include the IF NOT EXISTS directive
-
+      # The structure.sql includes CREATE SCHEMA statements, but as these are executed
+      # when the connection to the database is established, a db:structure:load fails.
+      # This code adds the IF NOT EXISTS clause to CREATE SCHEMA statements as long as
+      # it is not already present.
+      #
       sql = File.read(target)
-      sql.gsub!(/CREATE SCHEMA /, 'CREATE SCHEMA IF NOT EXISTS ')
+      sql.gsub!(/CREATE SCHEMA (?!IF NOT EXISTS)/, '\&IF NOT EXISTS ')
       File.open(target, "w") { |file| file << sql  }
     end
 

data/lib/chrono_model/version.rb

@@ -1,3 +1,3 @@
 module ChronoModel
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chrono_model
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Marcello Barnaba
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-20 00:00:00.000000000 Z
+date: 2017-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord