acts_as_nested_interval 0.1.1 → 0.2.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81cfddc984871f10b119eb476a7e8a36a8f7ab33
-  data.tar.gz: 0a9723da4673631ba6b4fcd1e78fa2b0948c2b8a
+  metadata.gz: 7ca996b586ce5012168cde429320be3243c3d709
+  data.tar.gz: f8b4566aa2f030c896d1675ec0bad92eb717eeee
 SHA512:
-  metadata.gz: 433a11bb304a05b91948bb0f141fd48bd0d4015fb44f2475002f56d4a1effa4e8d7508f4b979eabddd674f859c9fd40ee8c4ac0fd386153b59522380bebb9914
-  data.tar.gz: 6c9a2a6025120e23f451228eedba0b7b72008d759409b433bbb822d21d7d3490fd275c99afd4f1aee643e626e8c228112697352eb5b6605458cf624604eab653
+  metadata.gz: 1bda1e75d4f062d0220336ea18320b826f5b789e5db7f496fa3e9541bf35287919510fd170cfabbd1db4e4910e49d155319329027991699fe697313da078c4cb
+  data.tar.gz: 60ddeeecca41bb1f7b549f0d62e23a24e9aa832e8ad3870843b204cccf5bb14e6c6e2919a0393ff8709b0cb49e26c031df4e7bb2575aa6ec77e2a76ebf3c5dc2

data/lib/acts_as_nested_interval.rb

@@ -6,6 +6,7 @@
 
 require 'acts_as_nested_interval/core_ext/integer'
 require 'acts_as_nested_interval/version'
+require 'acts_as_nested_interval/callbacks'
 require 'acts_as_nested_interval/instance_methods'
 require 'acts_as_nested_interval/class_methods'
 
@@ -13,50 +14,50 @@ require 'acts_as_nested_interval/class_methods'
 # or all ancestors with just one select query. You can insert and delete
 # records without a full table update.
 module ActsAsNestedInterval
+  extend ActiveSupport::Concern
   
-  # The +options+ hash can include:
-  # * <tt>:foreign_key</tt> -- the self-reference foreign key column name (default :parent_id).
-  # * <tt>:scope_columns</tt> -- an array of columns to scope independent trees.
-  # * <tt>:lft_index</tt> -- whether to use functional index for lft (default false).
-  # * <tt>:virtual_root</tt> -- whether to compute root's interval as in an upper root (default false)
-  # * <tt>:dependent</tt> -- dependency between the parent node and children nodes (default :restrict)
-  def acts_as_nested_interval(options = {})
-    cattr_accessor :nested_interval_foreign_key
-    cattr_accessor :nested_interval_scope_columns
-    cattr_accessor :nested_interval_lft_index
-    cattr_accessor :nested_interval_dependent
-      
-    cattr_accessor :virtual_root
-    self.virtual_root = !!options[:virtual_root]
-      
-    self.nested_interval_foreign_key = options[:foreign_key] || :parent_id
-    self.nested_interval_scope_columns = Array(options[:scope_columns])
-    self.nested_interval_lft_index = options[:lft_index]
-    self.nested_interval_dependent = options[:dependent] || :restrict
-      
-    belongs_to :parent, class_name: name, foreign_key: nested_interval_foreign_key
-    has_many :children, class_name: name, foreign_key: nested_interval_foreign_key,
-      dependent: nested_interval_dependent
-    scope :roots, -> { where(nested_interval_foreign_key => nil) }
-      
-    if self.table_exists? # Fix problem with migrating without table
-      if columns_hash["rgt"]
-        scope :preorder, -> { order('rgt DESC, lftp ASC') }
-      elsif columns_hash["rgtp"] && columns_hash["rgtq"]
-        scope :preorder, -> { order('1.0 * rgtp / rgtq DESC, lftp ASC') }
-      else
-        scope :preorder, -> { order('nested_interval_rgt(lftp, lftq) DESC, lftp ASC') }
-      end
+  module ClassMethods
+
+    # The +options+ hash can include:
+    # * <tt>:foreign_key</tt> -- the self-reference foreign key column name (default :parent_id).
+    # * <tt>:scope_columns</tt> -- an array of columns to scope independent trees.
+    # * <tt>:lft_index</tt> -- whether to use functional index for lft (default false).
+    # * <tt>:virtual_root</tt> -- whether to compute root's interval as in an upper root (default false)
+    # * <tt>:dependent</tt> -- dependency between the parent node and children nodes (default :restrict)
+    def acts_as_nested_interval(options = {})
+      cattr_accessor :nested_interval_foreign_key
+      cattr_accessor :nested_interval_scope_columns
+      cattr_accessor :nested_interval_lft_index
+      cattr_accessor :nested_interval_dependent
+
+      cattr_accessor :virtual_root
+      self.virtual_root = !!options[:virtual_root]
+
+      self.nested_interval_foreign_key = options[:foreign_key] || :parent_id
+      self.nested_interval_scope_columns = Array(options[:scope_columns])
+      self.nested_interval_lft_index = options[:lft_index]
+      self.nested_interval_dependent = options[:dependent] || :restrict_with_exception
 
-      before_create :create_nested_interval
-      before_destroy :destroy_nested_interval
-      before_update :update_nested_interval
-        
-      include ActsAsNestedInterval::InstanceMethods
-      extend ActsAsNestedInterval::ClassMethods
+      belongs_to :parent, class_name: name, foreign_key: nested_interval_foreign_key
+      has_many :children, class_name: name, foreign_key: nested_interval_foreign_key,
+        dependent: nested_interval_dependent
+      scope :roots, -> { where(nested_interval_foreign_key => nil) }
+
+      if self.table_exists? # Fix problem with migrating without table
+        if columns_hash["rgt"]
+          scope :preorder, -> { order('rgt DESC, lftp ASC') }
+        elsif columns_hash["rgtp"] && columns_hash["rgtq"]
+          scope :preorder, -> { order('1.0 * rgtp / rgtq DESC, lftp ASC') }
+        else
+          scope :preorder, -> { order('nested_interval_rgt(lftp, lftq) DESC, lftp ASC') }
+        end
+
+        include ActsAsNestedInterval::InstanceMethods
+        include ActsAsNestedInterval::Callbacks
+        extend ActsAsNestedInterval::ClassMethods
+      end
     end
   end
-
 end
 
-ActiveRecord::Base.send :extend, ActsAsNestedInterval
+#ActiveRecord::Base.send :extend, ActsAsNestedInterval

data/lib/acts_as_nested_interval/callbacks.rb

@@ -0,0 +1,42 @@
+module ActsAsNestedInterval
+  module Callbacks
+    extend ActiveSupport::Concern
+
+    included do
+
+      before_create :create_nested_interval
+      before_destroy :destroy_nested_interval
+      before_update :update_nested_interval
+        
+    end
+
+    # Destroys record.
+    def destroy_nested_interval
+      lock! rescue nil
+    end
+
+    # Creates record.
+    def create_nested_interval
+      if read_attribute(nested_interval_foreign_key).nil?
+        set_nested_interval_for_top
+      else
+        set_nested_interval *parent.lock!.next_child_lft
+      end
+    end
+
+    # Updates record, updating descendants if parent association updated,
+    # in which case caller should first acquire table lock.
+    def update_nested_interval
+      changed = send(:"#{nested_interval_foreign_key}_changed?")
+      if !changed
+        db_self = self.class.find(id, :lock => true)
+        write_attribute(nested_interval_foreign_key, db_self.read_attribute(nested_interval_foreign_key))
+        set_nested_interval db_self.lftp, db_self.lftq
+      else
+        # No locking in this case -- caller should have acquired table lock.
+        update_nested_interval_move
+      end
+    end
+    
+  end
+end

data/lib/acts_as_nested_interval/class_methods.rb

@@ -6,7 +6,7 @@ module ActsAsNestedInterval
       # temporary changes
       skip_callback :update, :before, :update_nested_interval
       old_default_scopes = default_scopes # save to revert later
-      default_scope where("#{quoted_table_name}.lftq > 0") # use lft1 > 0 as a "migrated?" flag
+      default_scope ->{ where("#{quoted_table_name}.lftq > 0") } # use lft1 > 0 as a "migrated?" flag
           
       # zero all intervals
       update_hash = {lftp: 0, lftq: 0}
@@ -31,4 +31,4 @@ module ActsAsNestedInterval
     end
     
   end
-end
+end

data/lib/acts_as_nested_interval/instance_methods.rb

@@ -5,14 +5,17 @@ module ActsAsNestedInterval
     # selectively define #descendants according to table features
     included do
       
+      #alias_method :parent_changed?, :"#{ nested_interval_foreign_key }_changed?"
+
       if columns_hash["lft"]
-        
+
         def descendants
-          quoted_table_name = self.class.quoted_table_name
-          nested_interval_scope.where <<-SQL
+          #quoted_table_name = self.class.quoted_table_name
+          #nested_interval_scope.where <<-SQL
               #{lftp} < #{quoted_table_name}.lftp AND 
               #{quoted_table_name}.lft BETWEEN #{1.0 * lftp / lftq} AND #{1.0 * rgtp / rgtq}
-          SQL
+          #SQL
+          nested_interval_scope.where( "lftp > :lftp AND lft BETWEEN :lft AND :rgt", lftp: lftp, rgt: rgt, lft: lft )
         end
         
       elsif nested_interval_lft_index
@@ -75,20 +78,6 @@ module ActsAsNestedInterval
       end
     end
 
-    # Creates record.
-    def create_nested_interval
-      if read_attribute(nested_interval_foreign_key).nil?
-        set_nested_interval_for_top
-      else
-        set_nested_interval *parent.lock!.next_child_lft
-      end
-    end
-
-    # Destroys record.
-    def destroy_nested_interval
-      lock! rescue nil
-    end
-
     def nested_interval_scope
       conditions = {}
       nested_interval_scope_columns.each do |column_name|
@@ -97,20 +86,6 @@ module ActsAsNestedInterval
       self.class.where conditions
     end
 
-    # Updates record, updating descendants if parent association updated,
-    # in which case caller should first acquire table lock.
-    def update_nested_interval
-      changed = send(:"#{nested_interval_foreign_key}_changed?")
-      if !changed
-        db_self = self.class.find(id, :lock => true)
-        write_attribute(nested_interval_foreign_key, db_self.read_attribute(nested_interval_foreign_key))
-        set_nested_interval db_self.lftp, db_self.lftq
-      else
-        # No locking in this case -- caller should have acquired table lock.
-        update_nested_interval_move
-      end
-    end
-    
     # Rewrite method
     def update_nested_interval_move
       return if self.class.readonly_attributes.include?(nested_interval_foreign_key.to_sym) # Fix issue #9
@@ -136,7 +111,8 @@ module ActsAsNestedInterval
 
       updates = {}
       vars = Set.new
-      mysql = ["MySQL", "Mysql2"].include?(connection.adapter_name)
+      # TODO
+      mysql = false #["MySQL", "Mysql2"].include?(connection.adapter_name)
       var = ->(v) { mysql ? vars.add?(v) ? "(@#{v} := #{v})" : "@#{v}" : v }
       multiply = ->(c, b) { "#{c} * #{var.(b)}" }
       add = ->(a, b) { "#{a} + #{b}" }
@@ -165,6 +141,10 @@ module ActsAsNestedInterval
         (node.lftp != rgtp || node.lftq != rgtq)
     end
 
+    def new_ancestors
+      nested_interval_scope.where("rgt >= CAST(:rgt AS FLOAT) AND lft < CAST(:lft AS FLOAT)", rgt: rgt, lft: lft)
+    end
+
     def ancestors
       sqls = ['0 = 1']
       p, q = lftp, lftq

data/lib/acts_as_nested_interval/version.rb

@@ -1,3 +1,3 @@
 module ActsAsNestedInterval
-  VERSION = "0.1.1"
+  VERSION = "0.2.0.pre"
 end

data/test/dummy/README.rdoc

@@ -1,261 +1,28 @@
-== Welcome to Rails
+== README
 
-Rails is a web-application framework that includes everything needed to create
-database-backed web applications according to the Model-View-Control pattern.
+This README would normally document whatever steps are necessary to get the
+application up and running.
 
-This pattern splits the view (also called the presentation) into "dumb"
-templates that are primarily responsible for inserting pre-built data in between
-HTML tags. The model contains the "smart" domain objects (such as Account,
-Product, Person, Post) that holds all the business logic and knows how to
-persist themselves to a database. The controller handles the incoming requests
-(such as Save New Account, Update Product, Show Post) by manipulating the model
-and directing data to the view.
+Things you may want to cover:
 
-In Rails, the model is handled by what's called an object-relational mapping
-layer entitled Active Record. This layer allows you to present the data from
-database rows as objects and embellish these data objects with business logic
-methods. You can read more about Active Record in
-link:files/vendor/rails/activerecord/README.html.
+* Ruby version
 
-The controller and view are handled by the Action Pack, which handles both
-layers by its two parts: Action View and Action Controller. These two layers
-are bundled in a single package due to their heavy interdependence. This is
-unlike the relationship between the Active Record and Action Pack that is much
-more separate. Each of these packages can be used independently outside of
-Rails. You can read more about Action Pack in
-link:files/vendor/rails/actionpack/README.html.
+* System dependencies
 
+* Configuration
 
-== Getting Started
+* Database creation
 
-1. At the command prompt, create a new Rails application:
-       <tt>rails new myapp</tt> (where <tt>myapp</tt> is the application name)
+* Database initialization
 
-2. Change directory to <tt>myapp</tt> and start the web server:
-       <tt>cd myapp; rails server</tt> (run with --help for options)
+* How to run the test suite
 
-3. Go to http://localhost:3000/ and you'll see:
-       "Welcome aboard: You're riding Ruby on Rails!"
+* Services (job queues, cache servers, search engines, etc.)
 
-4. Follow the guidelines to start developing your application. You can find
-the following resources handy:
+* Deployment instructions
 
-* The Getting Started Guide: http://guides.rubyonrails.org/getting_started.html
-* Ruby on Rails Tutorial Book: http://www.railstutorial.org/
+* ...
 
 
-== Debugging Rails
-
-Sometimes your application goes wrong. Fortunately there are a lot of tools that
-will help you debug it and get it back on the rails.
-
-First area to check is the application log files. Have "tail -f" commands
-running on the server.log and development.log. Rails will automatically display
-debugging and runtime information to these files. Debugging info will also be
-shown in the browser on requests from 127.0.0.1.
-
-You can also log your own messages directly into the log file from your code
-using the Ruby logger class from inside your controllers. Example:
-
-  class WeblogController < ActionController::Base
-    def destroy
-      @weblog = Weblog.find(params[:id])
-      @weblog.destroy
-      logger.info("#{Time.now} Destroyed Weblog ID ##{@weblog.id}!")
-    end
-  end
-
-The result will be a message in your log file along the lines of:
-
-  Mon Oct 08 14:22:29 +1000 2007 Destroyed Weblog ID #1!
-
-More information on how to use the logger is at http://www.ruby-doc.org/core/
-
-Also, Ruby documentation can be found at http://www.ruby-lang.org/. There are
-several books available online as well:
-
-* Programming Ruby: http://www.ruby-doc.org/docs/ProgrammingRuby/ (Pickaxe)
-* Learn to Program: http://pine.fm/LearnToProgram/ (a beginners guide)
-
-These two books will bring you up to speed on the Ruby language and also on
-programming in general.
-
-
-== Debugger
-
-Debugger support is available through the debugger command when you start your
-Mongrel or WEBrick server with --debugger. This means that you can break out of
-execution at any point in the code, investigate and change the model, and then,
-resume execution! You need to install ruby-debug to run the server in debugging
-mode. With gems, use <tt>sudo gem install ruby-debug</tt>. Example:
-
-  class WeblogController < ActionController::Base
-    def index
-      @posts = Post.all
-      debugger
-    end
-  end
-
-So the controller will accept the action, run the first line, then present you
-with a IRB prompt in the server window. Here you can do things like:
-
-  >> @posts.inspect
-  => "[#<Post:0x14a6be8
-          @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>,
-       #<Post:0x14a6620
-          @attributes={"title"=>"Rails", "body"=>"Only ten..", "id"=>"2"}>]"
-  >> @posts.first.title = "hello from a debugger"
-  => "hello from a debugger"
-
-...and even better, you can examine how your runtime objects actually work:
-
-  >> f = @posts.first
-  => #<Post:0x13630c4 @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>
-  >> f.
-  Display all 152 possibilities? (y or n)
-
-Finally, when you're ready to resume execution, you can enter "cont".
-
-
-== Console
-
-The console is a Ruby shell, which allows you to interact with your
-application's domain model. Here you'll have all parts of the application
-configured, just like it is when the application is running. You can inspect
-domain models, change values, and save to the database. Starting the script
-without arguments will launch it in the development environment.
-
-To start the console, run <tt>rails console</tt> from the application
-directory.
-
-Options:
-
-* Passing the <tt>-s, --sandbox</tt> argument will rollback any modifications
-  made to the database.
-* Passing an environment name as an argument will load the corresponding
-  environment. Example: <tt>rails console production</tt>.
-
-To reload your controllers and models after launching the console run
-<tt>reload!</tt>
-
-More information about irb can be found at:
-link:http://www.rubycentral.org/pickaxe/irb.html
-
-
-== dbconsole
-
-You can go to the command line of your database directly through <tt>rails
-dbconsole</tt>. You would be connected to the database with the credentials
-defined in database.yml. Starting the script without arguments will connect you
-to the development database. Passing an argument will connect you to a different
-database, like <tt>rails dbconsole production</tt>. Currently works for MySQL,
-PostgreSQL and SQLite 3.
-
-== Description of Contents
-
-The default directory structure of a generated Ruby on Rails application:
-
-  |-- app
-  |   |-- assets
-  |       |-- images
-  |       |-- javascripts
-  |       `-- stylesheets
-  |   |-- controllers
-  |   |-- helpers
-  |   |-- mailers
-  |   |-- models
-  |   `-- views
-  |       `-- layouts
-  |-- config
-  |   |-- environments
-  |   |-- initializers
-  |   `-- locales
-  |-- db
-  |-- doc
-  |-- lib
-  |   `-- tasks
-  |-- log
-  |-- public
-  |-- script
-  |-- test
-  |   |-- fixtures
-  |   |-- functional
-  |   |-- integration
-  |   |-- performance
-  |   `-- unit
-  |-- tmp
-  |   |-- cache
-  |   |-- pids
-  |   |-- sessions
-  |   `-- sockets
-  `-- vendor
-      |-- assets
-          `-- stylesheets
-      `-- plugins
-
-app
-  Holds all the code that's specific to this particular application.
-
-app/assets
-  Contains subdirectories for images, stylesheets, and JavaScript files.
-
-app/controllers
-  Holds controllers that should be named like weblogs_controller.rb for
-  automated URL mapping. All controllers should descend from
-  ApplicationController which itself descends from ActionController::Base.
-
-app/models
-  Holds models that should be named like post.rb. Models descend from
-  ActiveRecord::Base by default.
-
-app/views
-  Holds the template files for the view that should be named like
-  weblogs/index.html.erb for the WeblogsController#index action. All views use
-  eRuby syntax by default.
-
-app/views/layouts
-  Holds the template files for layouts to be used with views. This models the
-  common header/footer method of wrapping views. In your views, define a layout
-  using the <tt>layout :default</tt> and create a file named default.html.erb.
-  Inside default.html.erb, call <% yield %> to render the view using this
-  layout.
-
-app/helpers
-  Holds view helpers that should be named like weblogs_helper.rb. These are
-  generated for you automatically when using generators for controllers.
-  Helpers can be used to wrap functionality for your views into methods.
-
-config
-  Configuration files for the Rails environment, the routing map, the database,
-  and other dependencies.
-
-db
-  Contains the database schema in schema.rb. db/migrate contains all the
-  sequence of Migrations for your schema.
-
-doc
-  This directory is where your application documentation will be stored when
-  generated using <tt>rake doc:app</tt>
-
-lib
-  Application specific libraries. Basically, any kind of custom code that
-  doesn't belong under controllers, models, or helpers. This directory is in
-  the load path.
-
-public
-  The directory available for the web server. Also contains the dispatchers and the
-  default HTML files. This should be set as the DOCUMENT_ROOT of your web
-  server.
-
-script
-  Helper scripts for automation and generation.
-
-test
-  Unit and functional tests along with fixtures. When using the rails generate
-  command, template test files will be generated for you and placed in this
-  directory.
-
-vendor
-  External libraries that the application depends on. Also includes the plugins
-  subdirectory. If the app has frozen rails, those gems also go here, under
-  vendor/rails/. This directory is in the load path.
+Please feel free to use a different markup language if you do not plan to run
+<tt>rake doc:app</tt>.