acts_as_oqgraph 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/acts_as_oqgraph.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{acts_as_oqgraph}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Stuart Coyle"]

data/lib/acts_as_oqgraph.rb

@@ -75,7 +75,7 @@ module OQGraph
         oqgraph_table_name = options[:oqgraph_table_name] || "#{self.name}Oqgraph".underscore  
         from_key = options[:from_key] || 'from_id'
         to_key = options[:to_key]   || 'to_id' 
-        
+        weight_column = options[:weight_column] || 'weight'
         # Create the Edge Model
         eval <<-EOS
           class ::#{class_name} < ::GraphEdge
@@ -84,10 +84,13 @@ module OQGraph
             belongs_to :from, :class_name => '#{self.name}', :foreign_key => '#{from_key}'
             belongs_to :to, :class_name => '#{self.name}', :foreign_key => '#{to_key}'
             
+            cattr_accessor :node_class, :oqgraph_table_name, :to_key, :from_key, :weight_column
+            
             @@oqgraph_table_name = '#{oqgraph_table_name}'
             @@from_key = '#{from_key}'
             @@to_key = '#{to_key}'
             @@node_class = #{self}
+            @@weight_column = '#{weight_column}'
             
             create_graph_table
           end

data/lib/graph_edge.rb

@@ -6,7 +6,6 @@ class GraphEdge < ActiveRecord::Base
   after_destroy :remove_from_graph
   after_update  :update_graph
   
-  cattr_accessor :node_class, :oqgraph_table_name, :to_key, :from_key
   
   # Creates the OQgraph table if it does not exist.
   # Deletes all entries if it does exist and then repopulates with 

data/test/models/custom_test_model.rb

@@ -1,3 +1,3 @@
 class CustomTestModel < ActiveRecord::Base
-  acts_as_oqgraph :class_name => 'CustomEdge', :from_key => 'orig_id', :to_key => 'dest_id'
+  acts_as_oqgraph :class_name => 'CustomEdge', :from_key => 'orig_id', :to_key => 'dest_id', :weight_column => 'length'
 end

data/test/test_acts_as_oqgraph.rb

@@ -66,6 +66,12 @@ class TestActsAsOqgraph < ActiveSupport::TestCase
     assert_equal CustomEdge, CustomTestModel.edge_class
   end
   
+  def test_custom_keys
+    assert_equal 'dest_id', CustomEdge.to_key
+    assert_equal 'orig_id', CustomEdge.from_key
+    assert_equal 'length', CustomEdge.weight_column
+  end
+  
   def test_test_model_edge_creation
     @test_1.create_edge_to(@test_2)
     assert_not_nil edge = TestModelEdge.find(:first, :conditions => {:from_id => @test_1.id, :to_id => @test_2.id, :weight => 1.0})

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Stuart Coyle