sequel_orderable 0.0.1 → 0.0.2

data/CHANGELOG

@@ -1 +1,3 @@
+* 2007.12.05 Modified for better readability and new plugin conventions.
+
 * 2007.12.02 Initial working revision.

data/Rakefile

@@ -3,7 +3,7 @@
 ##############################################################################
 
 PluginName = "sequel_orderable"
-Version    = "0.0.1"
+Version    = "0.0.2"
 Title      = "Orderable Sequel Plugin"
 Summary    = "Sequel Plugin"
 Authors    = "Wayne E. Seguin & Aman Gupta"

data/lib/sequel_orderable.rb

@@ -1,20 +1,50 @@
 module Sequel
   module Plugins
     module Orderable
-      
       def self.apply(model, opts = {})
-        position_field = opts[:field] || :position
+        # defaults
+        opts[:field] ||= :position
+
+        # custom behavior
+        position_field = opts[:field]
         scope_field = opts[:scope]
+        if scope_field
+          model.dataset.order!(scope_field, position_field)
+        else
+          model.dataset.order!(position_field)
+        end
+      end
 
-        model.class_def(:at_position) do |p|
-          if scope_field
+      module InstanceMethods
+        def position
+          @values[orderable_opts[:field]]
+        end
+
+        def at_position(p)
+          position_field = orderable_opts[:field]
+          if scope_field = orderable_opts[:scope]
             dataset.first(scope_field => @values[scope_field], position_field => p)
           else
             dataset.first(position_field => p)
           end
         end
 
-        model.class_def(:move_to) do |pos|
+        def prev(n = 1)
+          target = position - n
+          # XXX: error checking, negative target?
+          return self if position == target
+          at_position(target)
+        end
+
+        def next(n = 1)
+          target = position + n
+          at_position(target)
+        end
+
+        def move_to(pos)
+          position_field = orderable_opts[:field]
+          scope_field = orderable_opts[:scope]
+
           # XXX: error checking, negative pos?
           cur_pos = position
           return self if pos == cur_pos
@@ -33,37 +63,6 @@ module Sequel
           end
         end
 
-        model.class_def(:move_to_bottom) do
-          ds = dataset
-          ds = ds.filter(scope_field => @values[scope_field]) if scope_field
-          last = ds.select(:max[position_field] => :max).first.values[:max].to_i
-          self.move_to(last)
-        end
-
-        model.class_def(:position) {self[position_field]}
-
-        if scope_field
-          model.dataset.order!(scope_field, position_field)
-        else
-          model.dataset.order!(position_field)
-        end
-
-        model.send(:include, InstanceMethods)
-      end
-
-      module InstanceMethods
-        def prev(n = 1)
-          target = position - n
-          # XXX: error checking, negative target?
-          return self if position == target
-          at_position(target)
-        end
-
-        def next(n = 1)
-          target = position + n
-          at_position(target)
-        end
-
         def move_up(n = 1)
           # XXX: position == 1 already?
           self.move_to(position-n)
@@ -77,6 +76,15 @@ module Sequel
         def move_to_top
           self.move_to(1)
         end
+        
+        def move_to_bottom
+          position_field = orderable_opts[:field]
+          scope_field = orderable_opts[:scope]
+          ds = dataset
+          ds = ds.filter(scope_field => @values[scope_field]) if scope_field
+          last = ds.select(:max[position_field] => :max).first.values[:max].to_i
+          self.move_to(last)
+        end
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sequel_orderable
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Wayne E. Seguin & Aman Gupta
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2007-12-04 00:00:00 +02:00
+date: 2007-12-05 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency