spontaneous 0.2.0.alpha7 → 0.2.0.beta1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spontaneous
 version: !ruby/object:Gem::Version
-  version: 0.2.0.alpha7
+  version: 0.2.0.beta1
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-01 00:00:00.000000000 Z
+date: 2013-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -43,6 +43,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: bcrypt-ruby
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -224,7 +240,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.4.1
   type: :runtime
@@ -232,25 +248,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.4.1
-- !ruby/object:Gem::Dependency
-  name: rack-fiber_pool
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -304,17 +304,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.36.1
+        version: 3.43.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.36.1
+        version: 3.43.0
 - !ruby/object:Gem::Dependency
   name: shine
   requirement: !ruby/object:Gem::Requirement
@@ -338,7 +338,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -346,7 +346,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -727,15 +727,15 @@ files:
 - application/js/event_source.js
 - application/js/extensions.js
 - application/js/field.js
+- application/js/field/date.js
+- application/js/field/file.js
+- application/js/field/image.js
+- application/js/field/long_string.js
+- application/js/field/markdown.js
+- application/js/field/select.js
+- application/js/field/string.js
+- application/js/field/webvideo.js
 - application/js/field_preview.js
-- application/js/field_types/date_field.js
-- application/js/field_types/file_field.js
-- application/js/field_types/image_field.js
-- application/js/field_types/long_string_field.js
-- application/js/field_types/markdown_field.js
-- application/js/field_types/select_field.js
-- application/js/field_types/string_field.js
-- application/js/field_types/webvideo_field.js
 - application/js/image.js
 - application/js/init.js
 - application/js/load.js
@@ -847,9 +847,11 @@ files:
 - db/migrations/20120418153903_add_ownership_of_content.rb
 - db/migrations/20120423175416_add_pending_modifications.rb
 - db/migrations/20120525164947_add_field_versions.rb
+- db/migrations/20130109125023_add_page_publish_lock.rb
+- db/migrations/20130111161934_convert_bcrypt_passwords.rb
+- db/migrations/20130114120000_create_revision_tables.rb
+- db/migrations/20130116220423_add_index_to_archive.rb
 - docs/recipe-interface-screenshot.png
-- lib/sequel/plugins/content_table_inheritance.rb
-- lib/sequel/plugins/scoped_table_name.rb
 - lib/spontaneous.rb
 - lib/spontaneous/application.rb
 - lib/spontaneous/application/feature.rb
@@ -866,6 +868,7 @@ files:
 - lib/spontaneous/cli.rb
 - lib/spontaneous/cli/assets.rb
 - lib/spontaneous/cli/console.rb
+- lib/spontaneous/cli/fields.rb
 - lib/spontaneous/cli/generate.rb
 - lib/spontaneous/cli/init.rb
 - lib/spontaneous/cli/media.rb
@@ -880,10 +883,22 @@ files:
 - lib/spontaneous/collections/field_set.rb
 - lib/spontaneous/collections/prototype_set.rb
 - lib/spontaneous/collections/style_set.rb
+- lib/spontaneous/concern.rb
 - lib/spontaneous/config.rb
 - lib/spontaneous/constants.rb
-- lib/spontaneous/content.rb
 - lib/spontaneous/content_query.rb
+- lib/spontaneous/crypt.rb
+- lib/spontaneous/crypt/version.rb
+- lib/spontaneous/data_mapper.rb
+- lib/spontaneous/data_mapper/content_model.rb
+- lib/spontaneous/data_mapper/content_model/associations.rb
+- lib/spontaneous/data_mapper/content_model/column_accessors.rb
+- lib/spontaneous/data_mapper/content_model/instance_hooks.rb
+- lib/spontaneous/data_mapper/content_model/serialization.rb
+- lib/spontaneous/data_mapper/content_model/timestamps.rb
+- lib/spontaneous/data_mapper/content_table.rb
+- lib/spontaneous/data_mapper/dataset.rb
+- lib/spontaneous/data_mapper/scope.rb
 - lib/spontaneous/errors.rb
 - lib/spontaneous/extensions/array.rb
 - lib/spontaneous/extensions/class.rb
@@ -896,18 +911,19 @@ files:
 - lib/spontaneous/extensions/object_space.rb
 - lib/spontaneous/extensions/string.rb
 - lib/spontaneous/facet.rb
-- lib/spontaneous/field_types.rb
-- lib/spontaneous/field_types/date_field.rb
-- lib/spontaneous/field_types/field.rb
-- lib/spontaneous/field_types/file_field.rb
-- lib/spontaneous/field_types/image_field.rb
-- lib/spontaneous/field_types/location_field.rb
-- lib/spontaneous/field_types/long_string_field.rb
-- lib/spontaneous/field_types/markdown_field.rb
-- lib/spontaneous/field_types/select_field.rb
-- lib/spontaneous/field_types/string_field.rb
-- lib/spontaneous/field_types/webvideo_field.rb
-- lib/spontaneous/field_version.rb
+- lib/spontaneous/field.rb
+- lib/spontaneous/field/base.rb
+- lib/spontaneous/field/date.rb
+- lib/spontaneous/field/field_version.rb
+- lib/spontaneous/field/file.rb
+- lib/spontaneous/field/image.rb
+- lib/spontaneous/field/location.rb
+- lib/spontaneous/field/long_string.rb
+- lib/spontaneous/field/markdown.rb
+- lib/spontaneous/field/select.rb
+- lib/spontaneous/field/string.rb
+- lib/spontaneous/field/update.rb
+- lib/spontaneous/field/webvideo.rb
 - lib/spontaneous/generators.rb
 - lib/spontaneous/generators/page.rb
 - lib/spontaneous/generators/page/inline.html.cut
@@ -929,7 +945,7 @@ files:
 - lib/spontaneous/generators/site/config/indexes.rb.tt
 - lib/spontaneous/generators/site/config/schema.yml
 - lib/spontaneous/generators/site/config/user_levels.yml
-- lib/spontaneous/generators/site/lib/site.rb.tt
+- lib/spontaneous/generators/site/lib/content.rb.tt
 - lib/spontaneous/generators/site/lib/tasks/site.rake.tt
 - lib/spontaneous/generators/site/public/css/site.scss
 - lib/spontaneous/generators/site/public/favicon.ico
@@ -948,6 +964,44 @@ files:
 - lib/spontaneous/logger.rb
 - lib/spontaneous/media.rb
 - lib/spontaneous/media/file.rb
+- lib/spontaneous/media/temp_file.rb
+- lib/spontaneous/model.rb
+- lib/spontaneous/model/box.rb
+- lib/spontaneous/model/box/allowed_types.rb
+- lib/spontaneous/model/core.rb
+- lib/spontaneous/model/core/aliases.rb
+- lib/spontaneous/model/core/boxes.rb
+- lib/spontaneous/model/core/content_groups.rb
+- lib/spontaneous/model/core/editor_class.rb
+- lib/spontaneous/model/core/entries.rb
+- lib/spontaneous/model/core/entry.rb
+- lib/spontaneous/model/core/fields.rb
+- lib/spontaneous/model/core/instance_code.rb
+- lib/spontaneous/model/core/media.rb
+- lib/spontaneous/model/core/modifications.rb
+- lib/spontaneous/model/core/page_search.rb
+- lib/spontaneous/model/core/permissions.rb
+- lib/spontaneous/model/core/prototypes.rb
+- lib/spontaneous/model/core/publishing.rb
+- lib/spontaneous/model/core/render.rb
+- lib/spontaneous/model/core/schema_hierarchy.rb
+- lib/spontaneous/model/core/schema_id.rb
+- lib/spontaneous/model/core/schema_title.rb
+- lib/spontaneous/model/core/serialisation.rb
+- lib/spontaneous/model/core/styles.rb
+- lib/spontaneous/model/core/supertype.rb
+- lib/spontaneous/model/core/visibility.rb
+- lib/spontaneous/model/page.rb
+- lib/spontaneous/model/page/controllers.rb
+- lib/spontaneous/model/page/formats.rb
+- lib/spontaneous/model/page/layouts.rb
+- lib/spontaneous/model/page/locks.rb
+- lib/spontaneous/model/page/page_tree.rb
+- lib/spontaneous/model/page/paths.rb
+- lib/spontaneous/model/page/request.rb
+- lib/spontaneous/model/page/site_map.rb
+- lib/spontaneous/model/page/site_timestamps.rb
+- lib/spontaneous/model/piece.rb
 - lib/spontaneous/output.rb
 - lib/spontaneous/output/assets.rb
 - lib/spontaneous/output/assets/compression.rb
@@ -963,8 +1017,7 @@ files:
 - lib/spontaneous/output/template.rb
 - lib/spontaneous/output/template/engine.rb
 - lib/spontaneous/output/template/renderer.rb
-- lib/spontaneous/page.rb
-- lib/spontaneous/page_controller.rb
+- lib/spontaneous/page_lock.rb
 - lib/spontaneous/page_piece.rb
 - lib/spontaneous/paths.rb
 - lib/spontaneous/permissions.rb
@@ -972,9 +1025,6 @@ files:
 - lib/spontaneous/permissions/access_key.rb
 - lib/spontaneous/permissions/user.rb
 - lib/spontaneous/permissions/user_level.rb
-- lib/spontaneous/piece.rb
-- lib/spontaneous/plugins/aliases.rb
-- lib/spontaneous/plugins/allowed_types.rb
 - lib/spontaneous/plugins/application/facets.rb
 - lib/spontaneous/plugins/application/features.rb
 - lib/spontaneous/plugins/application/paths.rb
@@ -982,49 +1032,6 @@ files:
 - lib/spontaneous/plugins/application/serialisation.rb
 - lib/spontaneous/plugins/application/state.rb
 - lib/spontaneous/plugins/application/system.rb
-- lib/spontaneous/plugins/boxes.rb
-- lib/spontaneous/plugins/content_groups.rb
-- lib/spontaneous/plugins/controllers.rb
-- lib/spontaneous/plugins/entries.rb
-- lib/spontaneous/plugins/entry.rb
-- lib/spontaneous/plugins/field/editor_class.rb
-- lib/spontaneous/plugins/fields.rb
-- lib/spontaneous/plugins/instance_code.rb
-- lib/spontaneous/plugins/layouts.rb
-- lib/spontaneous/plugins/media.rb
-- lib/spontaneous/plugins/modifications.rb
-- lib/spontaneous/plugins/page/formats.rb
-- lib/spontaneous/plugins/page/request.rb
-- lib/spontaneous/plugins/page/site_timestamps.rb
-- lib/spontaneous/plugins/page_search.rb
-- lib/spontaneous/plugins/page_tree.rb
-- lib/spontaneous/plugins/paths.rb
-- lib/spontaneous/plugins/permissions.rb
-- lib/spontaneous/plugins/prototypes.rb
-- lib/spontaneous/plugins/publishing.rb
-- lib/spontaneous/plugins/render.rb
-- lib/spontaneous/plugins/schema_hierarchy.rb
-- lib/spontaneous/plugins/schema_id.rb
-- lib/spontaneous/plugins/schema_title.rb
-- lib/spontaneous/plugins/serialisation.rb
-- lib/spontaneous/plugins/site/features.rb
-- lib/spontaneous/plugins/site/helpers.rb
-- lib/spontaneous/plugins/site/hooks.rb
-- lib/spontaneous/plugins/site/instance.rb
-- lib/spontaneous/plugins/site/level.rb
-- lib/spontaneous/plugins/site/map.rb
-- lib/spontaneous/plugins/site/paths.rb
-- lib/spontaneous/plugins/site/publishing.rb
-- lib/spontaneous/plugins/site/schema.rb
-- lib/spontaneous/plugins/site/search.rb
-- lib/spontaneous/plugins/site/selectors.rb
-- lib/spontaneous/plugins/site/state.rb
-- lib/spontaneous/plugins/site/storage.rb
-- lib/spontaneous/plugins/site/url.rb
-- lib/spontaneous/plugins/site_map.rb
-- lib/spontaneous/plugins/styles.rb
-- lib/spontaneous/plugins/supertype.rb
-- lib/spontaneous/plugins/visibility.rb
 - lib/spontaneous/prototypes/box_prototype.rb
 - lib/spontaneous/prototypes/field_prototype.rb
 - lib/spontaneous/prototypes/layout_prototype.rb
@@ -1032,6 +1039,7 @@ files:
 - lib/spontaneous/publishing.rb
 - lib/spontaneous/publishing/event_client.rb
 - lib/spontaneous/publishing/immediate.rb
+- lib/spontaneous/publishing/revision.rb
 - lib/spontaneous/publishing/simultaneous.rb
 - lib/spontaneous/publishing/threaded.rb
 - lib/spontaneous/rack.rb
@@ -1045,12 +1053,12 @@ files:
 - lib/spontaneous/rack/cookie_authentication.rb
 - lib/spontaneous/rack/css.rb
 - lib/spontaneous/rack/event_source.rb
-- lib/spontaneous/rack/fiber_pool.rb
 - lib/spontaneous/rack/front.rb
 - lib/spontaneous/rack/helpers.rb
 - lib/spontaneous/rack/http.rb
 - lib/spontaneous/rack/js.rb
 - lib/spontaneous/rack/media.rb
+- lib/spontaneous/rack/page_controller.rb
 - lib/spontaneous/rack/public.rb
 - lib/spontaneous/rack/query_authentication.rb
 - lib/spontaneous/rack/reloader.rb
@@ -1071,7 +1079,22 @@ files:
 - lib/spontaneous/search/results.rb
 - lib/spontaneous/sequel.rb
 - lib/spontaneous/server.rb
+- lib/spontaneous/simultaneous.rb
 - lib/spontaneous/site.rb
+- lib/spontaneous/site/features.rb
+- lib/spontaneous/site/helpers.rb
+- lib/spontaneous/site/hooks.rb
+- lib/spontaneous/site/instance.rb
+- lib/spontaneous/site/level.rb
+- lib/spontaneous/site/map.rb
+- lib/spontaneous/site/paths.rb
+- lib/spontaneous/site/publishing.rb
+- lib/spontaneous/site/schema.rb
+- lib/spontaneous/site/search.rb
+- lib/spontaneous/site/selectors.rb
+- lib/spontaneous/site/state.rb
+- lib/spontaneous/site/storage.rb
+- lib/spontaneous/site/url.rb
 - lib/spontaneous/state.rb
 - lib/spontaneous/storage.rb
 - lib/spontaneous/storage/backend.rb
@@ -1089,6 +1112,7 @@ files:
 - lib/spontaneous/version.rb
 - spontaneous.gemspec
 - test/disabled/test_slots.rb
+- test/experimental/test_crypt.rb
 - test/experimental/test_features.rb
 - test/fixtures/application/js/test.js
 - test/fixtures/application/static/favicon.ico
@@ -1151,6 +1175,7 @@ files:
 - test/fixtures/example_application/config/schema.yml
 - test/fixtures/example_application/config/unicorn.rb
 - test/fixtures/example_application/config/user_levels.yml
+- test/fixtures/example_application/lib/content.rb
 - test/fixtures/example_application/public/css/test.css
 - test/fixtures/example_application/public/favicon.ico
 - test/fixtures/example_application/public/js/test.js
@@ -1336,6 +1361,8 @@ files:
 - test/unit/test_config.rb
 - test/unit/test_content.rb
 - test/unit/test_content_inheritance.rb
+- test/unit/test_datamapper.rb
+- test/unit/test_datamapper_content.rb
 - test/unit/test_extensions.rb
 - test/unit/test_fields.rb
 - test/unit/test_formats.rb
@@ -1363,11 +1390,10 @@ files:
 - test/unit/test_storage.rb
 - test/unit/test_structure.rb
 - test/unit/test_styles.rb
-- test/unit/test_table_scoping.rb
 - test/unit/test_templates.rb
 - test/unit/test_type_hierarchy.rb
 - test/unit/test_visibility.rb
-homepage: http://spontaneouscms.org
+homepage: http://spontaneous.io
 licenses: []
 post_install_message: 
 rdoc_options:
@@ -1379,7 +1405,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/sequel/plugins/content_table_inheritance.rb

@@ -1,203 +0,0 @@
-# encoding: UTF-8
-
-module Sequel
-  module Plugins
-    # The single_table_inheritance plugin allows storing all objects
-    # in the same class hierarchy in the same table.  It makes it so
-    # subclasses of this model only load rows related to the subclass,
-    # and when you retrieve rows from the main class, you get instances
-    # of the subclasses (if the rows should use the subclasses's class).
-    #
-    # By default, the plugin assumes that the +sti_key+ column (the first
-    # argument to the plugin) holds the class name as a string.  However,
-    # you can override this by using the <tt>:model_map</tt> option and/or
-    # the <tt>:key_map</tt> option.
-    #
-    # You should only load this plugin in the parent class, not in the subclasses.
-    #
-    # You shouldn't call set_dataset in the model after applying this
-    # plugin, otherwise subclasses might use the wrong dataset. You should
-    # make sure this plugin is loaded before the subclasses. Note that since you
-    # need to load the plugin before the subclasses are created, you can't use
-    # direct class references in the plugin class.  You should specify subclasses
-    # in the plugin call using class name strings or symbols, see usage below.
-    #
-    # Usage:
-    #
-    #   # Use the default of storing the class name in the sti_key
-    #   # column (:kind in this case)
-    #   Employee.plugin :single_table_inheritance, :kind
-    #
-    #   # Using integers to store the class type, with a :model_map hash
-    #   # and an sti_key of :type
-    #   Employee.plugin :single_table_inheritance, :type,
-    #     :model_map=>{1=>:Staff, 2=>:Manager}
-    #
-    #   # Using non-class name strings
-    #   Employee.plugin :single_table_inheritance, :type,
-    #     :model_map=>{'line staff'=>:Staff, 'supervisor'=>:Manager}
-    #
-    #   # Using custom procs, with :model_map taking column values
-    #   # and yielding either a class, string, symbol, or nil,
-    #   # and :key_map taking a class object and returning the column
-    #   # value to use
-    #   Employee.plugin :single_table_inheritance, :type,
-    #     :model_map=>proc{|v| v.reverse},
-    #     :key_map=>proc{|klass| klass.name.reverse}
-    #
-    # One minor issue to note is that if you specify the <tt>:key_map</tt>
-    # option as a hash, instead of having it inferred from the <tt>:model_map</tt>,
-    # you should only use class name strings as keys, you should not use symbols
-    # as keys.
-    module ContentTableInheritance
-      # Setup the necessary STI variables, see the module RDoc for SingleTableInheritance
-      def self.configure(model, key, opts={})
-        model.instance_eval do
-          @sti_dataset_root = model
-          @sti_model_map = lambda { |id| Spontaneous.schema[id] }
-          @sti_key_map = lambda { |klass| klass.schema_id.to_s }
-          @sti_key_array = nil
-          @sti_subclasses_array = [sti_key_map[model]]
-          @sti_key = key
-          @sti_dataset = dataset
-          @is_content_inheritance_root = false
-          @is_site_inheritance_root = false
-          dataset.row_proc = lambda{|r| model.sti_load(r)}
-        end
-      end
-
-      module ClassMethods
-        attr_reader :sti_dataset_root
-
-        # The base dataset for STI, to which filters are added to get
-        # only the models for the specific STI subclass.
-        attr_reader :sti_dataset
-
-        # The column name holding the STI key for this model
-        attr_reader :sti_key
-
-        # Array holding keys for all subclasses of this class, used for the
-        # dataset filter in subclasses. Nil in the main class.
-        attr_reader :sti_key_array
-
-        # A hash/proc with class keys and column value values, mapping
-        # the the class to a particular value given to the sti_key column.
-        # Used to set the column value when creating objects, and for the
-        # filter when retrieving objects in subclasses.
-        attr_reader :sti_key_map
-
-        # A hash/proc with column value keys and class values, mapping
-        # the value of the sti_key column to the appropriate class to use.
-        attr_reader :sti_model_map
-
-        attr_reader :sti_subclasses_array
-
-        attr_reader :is_site_inheritance_root
-
-        # Copy the necessary attributes to the subclasses, and filter the
-        # subclass's dataset based on the sti_kep_map entry for the class.
-        def inherited(subclass)
-          super
-          sk = sti_key
-          sd = sti_dataset
-          sdr = sti_dataset_root
-          skm = sti_key_map
-          smm = sti_model_map
-          key = skm[subclass]
-          ska = [key].reject { |k| k.blank? }
-          subclass.instance_eval do
-            @sti_key = sk
-            @sti_key_array = ska
-            @sti_subclasses_array = [skm[subclass]]
-            @sti_dataset = sd
-            @sti_key_map = skm
-            @sti_model_map = smm
-            @simple_table = nil
-            @sti_dataset_root = sdr
-          end
-          sti_subclass_added(key, subclass)
-        end
-
-        # used by Page and Piece classes to control the subclasses used in searches
-        # see 'test_content_inheritance.rb'
-        def set_inheritance_root
-          @is_content_inheritance_root = true
-          dataset.row_proc = Spontaneous::Content.dataset.row_proc
-        end
-
-        def set_site_inheritance_root
-          @is_site_inheritance_root = true
-          dataset.row_proc = Spontaneous::Content.dataset.row_proc
-        end
-
-        def unset_site_inheritance_root
-          @is_site_inheritance_root = false
-        end
-
-        # Return an instance of the class specified by sti_key,
-        # used by the row_proc.
-        def sti_load(r)
-          sti_class(sti_model_map[r[sti_key]]).load(r)
-        end
-
-        # Make sure that all subclasses of the parent class correctly include
-        # keys for all of their descendant classes.
-        # Subclasses of Spontaneous::[Page, Piece] as well as ::Page & ::Piece are treated specially
-        # they only return instances of that one class as this is the intuitively correct result
-        # The top level Page & Piece classes return all sub-classes
-        def sti_subclass_added(key, subclass = nil)
-          if sti_key_array
-            if subclass && subclass.name
-              # alright, so this is a bit of a hack
-              # we want the site defined ::Page, ::Piece classes to work like Spot::[Page,Piece]
-              # but we don't want generic subclasses of Spot::[Page, Piece] to do so
-              if subclass.name.demodulize == self.name.demodulize && @is_content_inheritance_root
-                subclass.set_site_inheritance_root
-              end
-            end
-            unless key.blank?
-              if @is_site_inheritance_root or @is_content_inheritance_root
-                sti_key_array << key unless sti_key_array.include?(key)
-              end
-              sti_subclasses_array << key
-            end
-            superclass.sti_subclass_added(key)
-          end
-        end
-
-        def dataset
-          return super if self == sti_dataset_root
-          sti_dataset_root.dataset.filter(SQL::QualifiedIdentifier.new(sti_dataset_root.table_name, sti_key)=>sti_key_array)
-        end
-
-        private
-
-        # Return a class object.  If a class is given, return it directly.
-        # Treat strings and symbols as class names.  If nil is given or
-        # an invalid class name string or symbol is used, return self.
-        # Raise an error for other types.
-        def sti_class(v)
-          case v
-          when String, Symbol
-            constantize(v) rescue self
-          when nil
-            self
-          when Class
-            v
-          else
-            raise(Error, "Invalid class type used: #{v.inspect}")
-          end
-        end
-
-      end
-
-      module InstanceMethods
-        # Set the sti_key column based on the sti_key_map.
-        def before_create
-          send("#{model.sti_key}=", model.sti_key_map[model]) unless self[model.sti_key]
-          super
-        end
-      end
-    end
-  end
-end

data/lib/sequel/plugins/scoped_table_name.rb

@@ -1,54 +0,0 @@
-# encoding: UTF-8
-
-module Sequel::Plugins
-  # Provides models with a mechanism for changing the table name used by queries
-  # within a particular block
-  module ScopedTableName
-    def self.configure(model)
-      model.class_variable_set :"@@unscoped_table_name", model.dataset.opts[:from].first
-    end
-
-    module ClassMethods
-      def unscoped_table_name
-        class_variable_get :"@@unscoped_table_name"
-      end
-
-      def fast_instance_delete_sql
-        nil
-      end
-
-      def primary_key_lookup(pk)
-        dataset[primary_key_hash(pk)]
-      end
-
-      def with_table(table_name, &block)
-        @dataset.with_table(unscoped_table_name, table_name, &block)
-      end
-    end
-
-    module DatasetMethods
-      # set up a mapping from the datasets original name to the one that should be used
-      # in the current scope.
-      # called from the model class this
-      def with_table(original_table_name, current_table_name)
-        saved_table_name = table_mappings[original_table_name]
-        table_mappings[original_table_name] = current_table_name.to_s
-
-        yield if block_given?
-      ensure
-        table_mappings[original_table_name] = saved_table_name
-      end
-
-      # use the table_mappings to convert the original table name to the current version
-      def quote_identifier_append(sql, name)
-        name = (table_mappings[name.to_sym] || name) if name.respond_to?(:to_sym)
-        super(sql, name)
-      end
-
-      # the table name mappings are shared across all dataset instances
-      def table_mappings
-        Thread.current[:scoped_table_names] ||= {}
-      end
-    end
-  end
-end