sequel-table_inheritance 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 990ffca5c84259449f0611fc60340be0c5eaf0e1
-  data.tar.gz: a7862c8e89c3864e00cb8703553c464e8d7cc543
+  metadata.gz: 6ed02978f796f7ae6935d6802fc0726e41f217a6
+  data.tar.gz: de34bede536d2c62d471201a3f57a236c2b65c1c
 SHA512:
-  metadata.gz: e74da1f33ffc291fad375213039bcaf703f4ba2627be83e5aac312e90d644c1fbabe61a5af6904c310189f97ca03cff0d2fdda4a1fb4f46fc299a1842e8c223f
-  data.tar.gz: c408696275db6864a8bc4221ba6e81c6fbdf1673b1ab210471d0fde7f4b41bb7da4fa895640839e24ea511e011e08ae1054f531a8abae1e76247afaf38005dd3
+  metadata.gz: f6ed4d1a0f4653381fd67a51e296d75d33bf22f3b78813d77c50aba3f84a841ca1307d8b629d0822f3622e024523bf8b8c5e9f2182b09f124bef1b43d86c95c9
+  data.tar.gz: 751b1b4a598b7f091ea0bb92071da3d81f0ce46db13b618a8a2f8350c04a609780025805b09c58043cf93cb60ad3b6a8e1276777ce9928d4f6dbcf2ca8003c07

data/LICENSE.txt

@@ -2,6 +2,10 @@ The MIT License (MIT)
 
 Copyright (c) 2015 Quinn Harris
 
+Significant parts copied from Sequel (https://github.com/jeremyevans/sequel):
+Copyright (c) 2007-2008 Sharon Rosner
+Copyright (c) 2008-2015 Jeremy Evans
+
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights

data/lib/sequel/plugins/hybrid_table_inheritance.rb

@@ -229,15 +229,6 @@ module Sequel
         # Eager loading option
         attr_reader :cti_subclass_load
 
-        # Hash with table name symbol keys and arrays of column symbol values,
-        # giving the columns to update in each backing database table.
-        # Only needed to be compatible with class_table_inheritance plugin
-        def cti_columns
-          h = {}
-          cti_models.each { |m| h[m.table_name] = m.cti_table_columns }
-          h
-        end
-
         # An array of column symbols for the backing database table,
         # giving the columns to update in each backing database table.
         attr_reader :cti_table_columns
@@ -256,29 +247,35 @@ module Sequel
         # the implicit naming is incorrect.
         attr_reader :cti_table_map
 
+        # Hash with table name symbol keys and arrays of column symbol values,
+        # giving the columns to update in each backing database table.
+        # Only needed to be compatible with class_table_inheritance plugin
+        def cti_columns
+          h = {}
+          cti_models.each { |m| h[m.table_name] = m.cti_table_columns }
+          h
+        end
+
+        # Alias to single_table_inheritance methods to be compatible with
+        # class_table_inheritance plugin
+        def cti_key; sti_key; end
+        def cti_model_map; sti_model_map; end
+
+        Plugins.inherited_instance_variables(self, :@cti_models=>nil, :@cti_tables=>nil, :@cti_table_columns=>nil, :@cti_instance_dataset=>nil, :@cti_subclass_load=>nil, :@cti_table_map=>nil, :@cti_subclass_datasets=>proc{|v| {} })
+
         def inherited(subclass)
           ds = sti_dataset
 
           # Prevent inherited in model/base.rb from setting the dataset
           subclass.instance_eval { @dataset = nil }
 
-          @cti_tables.push ds.first_source_alias # Kludge to change filter to use root table
-          super # Call single_table_inheritance
-          @cti_tables.pop
-
-          cm = cti_models
-          ctm = cti_table_map
-          ct = cti_tables
-          ctc = cti_table_columns
-          cid = cti_instance_dataset
-          pk = primary_key
-          csl = cti_subclass_load
+          super
 
           # Set table if this is a class table inheritance
           table = nil
           columns = nil
           if (n = subclass.name) && !n.empty?
-            if table = ctm[n.to_sym]
+            if table = cti_table_map[n.to_sym]
               columns = db.from(table).columns
             else
               table = subclass.implicit_table_name
@@ -288,47 +285,40 @@ module Sequel
           end
           table = nil if table && (table == table_name)
 
-          subclass.instance_eval do
-            @cti_table_map = ctm
-            @cti_subclass_load = csl
-            @cti_subclass_datasets = {}
+          return unless table
 
-            if table
-              if ct.length == 1
-                ds = ds.select(*self.columns.map{|cc| Sequel.qualify(table_name, Sequel.identifier(cc))})
-              end
-              sel_app = (columns - [pk]).map{|cc| Sequel.qualify(table, Sequel.identifier(cc))}
-              @sti_dataset = ds.join(table, pk=>pk).select_append(*sel_app)
-              set_dataset(@sti_dataset)
-              set_columns(self.columns)
-              dataset.row_proc = lambda{|r| subclass.sti_load(r)}
-
-              @cti_models = cm + [self]
-              @cti_tables = ct + [table]
-              @cti_table_columns = columns
-              @cti_instance_dataset = db.from(table_name)
-
-              unless csl == :lazy_only
-                cm.each do |model|
-                  sd = model.instance_variable_get(:@cti_subclass_datasets)
-                  unless d = sd[cm.last]
-                    sd[self] = db.from(table).select(*columns.map{|cc| Sequel.qualify(table_name, Sequel.identifier(cc))})
-                  else
-                    sd[self] = d.join(table, pk=>pk).select_append(*sel_app)
-                  end
+          pk = primary_key
+          subclass.instance_eval do
+            if cti_tables.length == 1
+              ds = ds.select(*self.columns.map{|cc| Sequel.qualify(table_name, Sequel.identifier(cc))})
+            end
+            sel_app = (columns - [pk]).map{|cc| Sequel.qualify(table, Sequel.identifier(cc))}
+            @sti_dataset = ds.join(table, pk=>pk).select_append(*sel_app)
+            set_dataset(@sti_dataset)
+            set_columns(self.columns)
+            dataset.row_proc = lambda{|r| subclass.sti_load(r)}
+
+            unless cti_subclass_load == :lazy_only
+              cti_models.each do |model|
+                sd = model.instance_variable_get(:@cti_subclass_datasets)
+                unless d = sd[cti_table_model]
+                  sd[self] = db.from(table).select(*columns.map{|cc| Sequel.qualify(table, Sequel.identifier(cc))})
+                else
+                  sd[self] = d.join(table, pk=>pk).select_append(*sel_app)
                 end
               end
-              unless csl == :eager_only
-                (columns - [pk]).each{|a| define_lazy_attribute_getter(a, :dataset=>dataset, :table=>table)}
-              end
-              cti_tables.reverse.each do |ct|
-                db.schema(ct).each{|sk,v| db_schema[sk] = v}
-              end
-            else
-              @cti_models = cm
-              @cti_tables = ct
-              @cti_table_columns = ctc
-              @cti_instance_dataset = cid
+            end
+            unless cti_subclass_load == :eager_only
+              (columns - [pk]).each{|a| define_lazy_attribute_getter(a, :dataset=>dataset, :table=>table)}
+            end
+
+            @cti_models += [self]
+            @cti_tables += [table]
+            @cti_table_columns = columns
+            @cti_instance_dataset = db.from(table)
+
+            cti_tables.reverse.each do |ct|
+              db.schema(ct).each{|sk,v| db_schema[sk] = v}
             end
           end
         end

data/sequel-table_inheritance.gemspec

@@ -1,11 +1,10 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-#require 'sequel/table_inheritance/version'
 
 Gem::Specification.new do |s|
   s.name          = "sequel-table_inheritance"
-  s.version       = '0.1.3'
+  s.version       = '0.2.0'
   s.authors       = ["Quinn Harris"]
   s.email         = ["sequel@quinnharris.me"]
 
@@ -23,5 +22,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake", "~> 10.0"
   s.add_development_dependency "rspec"
 
-  s.add_dependency "sequel", "~> 4.19"
+  s.add_dependency "sequel", "~> 4.22"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel-table_inheritance
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Quinn Harris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-24 00:00:00.000000000 Z
+date: 2015-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.19'
+        version: '4.22'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.19'
+        version: '4.22'
 description: Alternative to single and class table inheritance plugins for sequel
 email:
 - sequel@quinnharris.me
@@ -102,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: Alternative to single and class table inheritance plugins for sequel