acts_as_oqgraph 0.1.7 → 1.0.1

data/Gemfile

@@ -0,0 +1,6 @@
+source "http://rubygems.org"
+source "http://gems.github.com"
+
+gem 'mysql2'
+gem 'activerecord'
+gem 'jeweler'

data/README.rdoc

@@ -77,11 +77,11 @@ This gem requires the use of MySQL or MariaDB with the OQGraph engine plugin.
 For details of this see: http://openquery.com/products/graph-engine
 
 You will need a table for the edges with the following schema:
-  create_table foo_edges do |t|
-      t.integer from_id
-      t.integer to_id
-      t.double weight
-  end   
+  create_table :foo_edges do |t|
+      t.integer :from_id
+      t.integer :to_id
+      t.float   :weight, :limit => 25
+  end
 The field names and table name can be changed via the options listed above.
 You should be able also to extend the edge model as you wish.
 The gem will automatically create the oqgraph table and the associations to it from your node model.
@@ -97,7 +97,7 @@ The associations are:
 = Examples of Use
 
 === Creating edges:
- foo.create_edge_to(bar) 
+ foo.create_edge_to(bar)
  foo.create_edge_to_and_from(bar)
 
 Edge creation using ActiveRecord associations: 
@@ -174,6 +174,13 @@ Here's an example request:
 
 Of course YMMV.
 
+== Compatability
+
+Versions < 1.0.0 use the mysql gem.
+
+For compatability with Rails 3: 
+Versions >= 1.0.0 use the mysql2 gem.
+
 == Hairy bits, bugs and gotchas
 
 To keep the oqgraph table up to date the edge model copies all of it records in when first instantiated.
@@ -188,6 +195,4 @@ I'm working on a way to tell if the oqgraph table is stale other than by the cur
 
 There is a method 'in_edges' in the edge model class. This does not currently work. 'out_edges' does.
 
-This gem is very new, the API is liable to change until it stabilises.
-
 Copyright (c) 2010 Stuart Coyle, released under the MIT license

data/Rakefile

@@ -37,7 +37,7 @@ rescue LoadError
   end
 end
 
-task :test => :check_dependencies
+task :test
 
 task :default => :test
 

data/VERSION

@@ -1 +1 @@
-0.1.7
+1.0.1

data/acts_as_oqgraph.gemspec

@@ -1,56 +1,57 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{acts_as_oqgraph}
-  s.version = "0.1.7"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Stuart Coyle"]
-  s.date = %q{2011-06-06}
+  s.date = %q{2011-09-13}
   s.description = %q{Acts As OQGraph allows ActiveRecord models to use the fast and powerful OQGraph engine for MYSQL.}
   s.email = %q{stuart.coyle@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "acts_as_oqgraph.gemspec",
-     "lib/acts_as_oqgraph.rb",
-     "lib/graph_edge.rb",
-     "test/helper.rb",
-     "test/models/custom_test_model.rb",
-     "test/models/test_model.rb",
-     "test/test_acts_as_oqgraph.rb"
+    "Gemfile",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "acts_as_oqgraph.gemspec",
+    "lib/acts_as_oqgraph.rb",
+    "lib/graph_edge.rb",
+    "test/helper.rb",
+    "test/models/custom_test_model.rb",
+    "test/models/test_model.rb",
+    "test/test_acts_as_oqgraph.rb"
   ]
   s.homepage = %q{http://github.com/stuart/acts_as_oqgraph}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Use the Open Query Graph engine with Active Record}
-  s.test_files = [
-    "test/helper.rb",
-     "test/models/custom_test_model.rb",
-     "test/models/test_model.rb",
-     "test/test_acts_as_oqgraph.rb"
-  ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<mysql2>, [">= 0"])
+      s.add_runtime_dependency(%q<activerecord>, [">= 0"])
+      s.add_runtime_dependency(%q<jeweler>, [">= 0"])
     else
+      s.add_dependency(%q<mysql2>, [">= 0"])
+      s.add_dependency(%q<activerecord>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
+    s.add_dependency(%q<mysql2>, [">= 0"])
+    s.add_dependency(%q<activerecord>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
   end
 end
 

data/lib/acts_as_oqgraph.rb

@@ -1,6 +1,5 @@
 require 'active_record'
 require File.join(File.dirname(__FILE__),'graph_edge')
-require 'mysql'
 
 module OQGraph
   def self.included(base)
@@ -133,10 +132,8 @@ module OQGraph
             edge_class.create_graph_table
           end
         EOF
-      end      
-      
+      end
 
-      
       private
       
       # Check that we have the OQGraph engine plugin installed in MySQL
@@ -144,8 +141,8 @@ module OQGraph
         begin
           result = false
           engines = self.connection.execute("SHOW ENGINES")
-          engines.each_hash do |engine|
-            result = true if (engine["Engine"]=="OQGRAPH" and engine["Support"]=="YES")
+          engines.each do |engine|
+            result = true if (engine[0]=="OQGRAPH" and engine[1]=="YES")
           end
           return result
         rescue ActiveRecord::StatementInvalid => e

data/test/test_acts_as_oqgraph.rb

@@ -3,7 +3,7 @@ require 'helper'
 class TestActsAsOqgraph < ActiveSupport::TestCase
   def setup
     ActiveRecord::Base.establish_connection(
-        :adapter  => "mysql",
+        :adapter  => "mysql2",
         :host     => "localhost",
         :username => "root",
         :password => "",
@@ -103,7 +103,7 @@ class TestActsAsOqgraph < ActiveSupport::TestCase
   def test_edge_model_creation_creates_oqgraph_edge
     @test_1.create_edge_to(@test_2, 2.5)
     oqedge = ActiveRecord::Base.connection.execute("SELECT * FROM test_model_oqgraph WHERE origid=#{@test_1.id} AND destid=#{@test_2.id};")
-    assert_equal [nil,"1","2","2.5",nil,nil], oqedge.fetch_row                                      
+    assert_equal [nil,1,2,2.5,nil,nil], oqedge.first                                      
   end
   
   def test_edge_model_removal_deletes_oqgraph_edge
@@ -111,17 +111,17 @@ class TestActsAsOqgraph < ActiveSupport::TestCase
     edge = @test_1.outgoing_edges.find(:first, :conditions => {:to_id => @test_2.id})
     edge.destroy
     oqedge = ActiveRecord::Base.connection.execute("SELECT * FROM test_model_oqgraph WHERE origid=#{@test_1.id} AND destid=#{@test_2.id};")
-    assert_equal nil, oqedge.fetch_row
+    assert_equal nil, oqedge.first
   end
   
   def test_edge_model_update
     edge = @test_1.create_edge_to(@test_2, 2.5) 
     edge.update_attributes(:weight => 3.0)
     oqedge = ActiveRecord::Base.connection.execute("SELECT * FROM test_model_oqgraph WHERE origid=#{@test_1.id} AND destid=#{@test_2.id};") 
-    assert_equal [nil,"1","2","3",nil,nil], oqedge.fetch_row
+    assert_equal [nil,1,2,3,nil,nil], oqedge.first
     edge.update_attributes(:to_id => 3)
     oqedge = ActiveRecord::Base.connection.execute("SELECT * FROM test_model_oqgraph WHERE origid=#{@test_1.id} AND destid=3;") 
-    assert_equal [nil,"1","3","3",nil,nil], oqedge.fetch_row
+    assert_equal [nil,1,3,3,nil,nil], oqedge.first
   end
   
   def test_gettting_the_shortest_path 
@@ -152,7 +152,7 @@ class TestActsAsOqgraph < ActiveSupport::TestCase
     @test_1.create_edge_to @test_2, 2.0
     @test_2.create_edge_to @test_3, 1.5
     @test_3.create_edge_to @test_4, 1.2
-    assert_equal [nil,"2","1.5","1.2"], @test_1.shortest_path_to(@test_4).map(&:weight)
+    assert_equal [nil, 2.0 ,1.5, 1.2], @test_1.shortest_path_to(@test_4).map(&:weight)
   end
   
   def test_path_weight
@@ -241,7 +241,6 @@ class TestActsAsOqgraph < ActiveSupport::TestCase
     
      assert_equal [@test_1, @test_2, @test_3, @test_4], @test_1.shortest_path_to(@test_4)
      assert_equal ['a','b','c','d'], @test_1.shortest_path_to(@test_4).map(&:name)
-   
    end
    
    

metadata

@@ -1,35 +1,61 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: acts_as_oqgraph
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 7
-  version: 0.1.7
+version: !ruby/object:Gem::Version
+  version: 1.0.1
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Stuart Coyle
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-06 00:00:00 +10:00
+date: 2011-09-13 00:00:00.000000000 +10:00
 default_executable: 
-dependencies: []
-
-description: Acts As OQGraph allows ActiveRecord models to use the fast and powerful OQGraph engine for MYSQL.
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: &2158235020 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2158235020
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &2158233940 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2158233940
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &2158233180 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2158233180
+description: Acts As OQGraph allows ActiveRecord models to use the fast and powerful
+  OQGraph engine for MYSQL.
 email: stuart.coyle@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - .document
-- .gitignore
+- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -44,37 +70,26 @@ files:
 has_rdoc: true
 homepage: http://github.com/stuart/acts_as_oqgraph
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Use the Open Query Graph engine with Active Record
-test_files: 
-- test/helper.rb
-- test/models/custom_test_model.rb
-- test/models/test_model.rb
-- test/test_acts_as_oqgraph.rb
+test_files: []

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC