neoid 0.0.2 → 0.0.5.alpha

data/spec/neoid/model_additions_spec.rb

@@ -1,90 +1,18 @@
-require 'spec_helper'
-
-class User < SuperModel::Base
-  include ActiveModel::Validations::Callbacks
-  
-  has_many :likes
-  has_many :movies, through: :likes
-  
-  
-  # _test_movies is here because SuperModel doesn't handle has_many queries
-  # it simulates the database. see comments in each method to see a regular AR implementation
-  def _test_movies
-    @_test_movies ||= []
-  end
-  
-  def likes?(movie)
-    # likes.where(movie_id: movie.id).exists?
-    _test_movies.any? { |it| it.movie_id == movie.id }
-  end
-  
-  def like!(movie)
-    # movies << movie unless likes?(movie)
-    _test_movies << Like.create(user_id: self.id, movie_id: movie.id) unless likes?(movie)
-  end
-  
-  def unlike!(movie)
-    # likes.where(movie_id: movie.id, user_id: self.id).destroy_all
-    _test_movies.delete_if { |it| it.destroy if it.movie_id == movie.id }
-  end
-  
-  include Neoid::Node
-  
-  def to_neo
-    neo_properties_to_hash(%w( name slug ))
-  end
-end
-
-class Movie < SuperModel::Base
-  include ActiveModel::Validations::Callbacks
-  
-  has_many :likes
-  has_many :users, through: :likes
-  
-  include Neoid::Node
-
-  def to_neo
-    neo_properties_to_hash(%w( name slug year ))
-  end
-end
-
-class Like < SuperModel::Base
-  include ActiveModel::Validations::Callbacks
-  
-  belongs_to :user
-  belongs_to :movie
-  
-  include Neoid::Relationship
-  
-  neoidable start_node: :user, end_node: :movie, type: :likes
-
-  def to_neo
-    neo_properties_to_hash(%w( rate ))
-  end
-end
-
 require 'spec_helper'
 require 'fileutils'
 
 describe Neoid::ModelAdditions do
-  before(:each) do
-    [ User, Movie ].each { |klass|
-      klass.instance_variable_set(:@_neo_subref_node, nil)
-    }
-    Neoid.ref_node = nil
-  end
-  
   context "nodes" do
     context "create graph nodes" do
       it "should call neo_create on a neo_node for user" do
         User.any_instance.should_receive(:neo_create)
 
-        User.create(name: "Elad Ossadon")
+        User.create!(name: "Elad Ossadon")
       end
   
       it "should create a neo_node for user" do
-        user = User.create(name: "Elad Ossadon", slug: "elado")
-      
+        user = User.create!(name: "Elad Ossadon", slug: "elado")
+
         user.neo_node.should_not be_nil
         
         user.neo_node.ar_id.should == user.id
@@ -93,7 +21,7 @@ describe Neoid::ModelAdditions do
       end
 
       it "should create a neo_node for movie" do
-        movie = Movie.create(name: "Memento", slug: "memento-1999", year: 1999)
+        movie = Movie.create!(name: "Memento", slug: "memento-1999", year: 1999)
       
         movie.neo_node.should_not be_nil
         
@@ -105,7 +33,7 @@ describe Neoid::ModelAdditions do
   
     context "find by id" do
       it "should find a neo_node for user" do
-        user = User.create(name: "Elad Ossadon", slug: "elado")
+        user = User.create!(name: "Elad Ossadon", slug: "elado")
       
         user.neo_node.should_not be_nil
         user.neo_find_by_id.should_not be_nil
@@ -132,7 +60,7 @@ describe Neoid::ModelAdditions do
     
     it "should delete a relationship on deleting a record" do
       user.like! movie
-      like = user.likes.first
+      like = user.likes.last
       
       relationship_neo_id = like.neo_relationship.neo_id
       
@@ -140,7 +68,61 @@ describe Neoid::ModelAdditions do
       
       user.unlike! movie
       
-      Neography::Relationship.load(relationship_neo_id).should be_nil
+      expect { Neography::Relationship.load(relationship_neo_id) }.to raise_error(Neography::RelationshipNotFoundException)
+    end
+
+    it "should update neo4j on manual set of a collection" do
+      movies = [
+        Movie.create(name: "Memento"),
+        Movie.create(name: "The Prestige"),
+        Movie.create(name: "The Dark Knight"),
+        Movie.create(name: "Spiderman")
+      ]
+
+      user.neo_node.outgoing(:likes).length.should == 0
+
+      expect {
+        user.movies = movies
+      }.to change{ user.neo_node.outgoing(:likes).length }.to(movies.length)
+
+      expect { expect {
+        user.movies -= movies[0..1]
+      }.to change{ user.movies.count }.by(-2)
+      }.to change{ user.neo_node.outgoing(:likes).length }.by(-2)
+
+      expect {
+        user.movies = []
+      }.to change{ user.neo_node.outgoing(:likes).length }.to(0)
+
+      expect {
+        user.movie_ids = movies[0...2].collect(&:id)
+      }.to change{ user.neo_node.outgoing(:likes).length }.to(2)
+    end
+  end
+
+  context "polymorphic relationship" do
+    let(:user) { User.create(name: "Elad Ossadon", slug: "elado") }
+
+    it "description" do
+      followed = [
+        User.create(name: "Some One", slug: "someone"),
+        Movie.create(name: "The Prestige"),
+        Movie.create(name: "The Dark Knight")
+      ]
+
+      expect {
+        followed.each do |item|
+          user.user_follows.create(item: item)
+        end
+      }.to change{ user.neo_node.outgoing(:follows).length }.to(followed.length)
+
+      expect {
+        user.user_follows = user.user_follows[0...1]
+      }.to change{ user.neo_node.outgoing(:follows).length }.to(1)
+
+      expect {
+        user.user_follows = []
+      }.to change{ user.neo_node.outgoing(:follows).length }.to(0)
     end
   end
 end

data/spec/neoid/model_config_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+require 'fileutils'
+
+
+describe Neoid::ModelConfig do
+  context "config on a model" do
+    it "should store search fields" do
+      Article.neoid_config.search_options.should_not be_nil
+      Article.neoid_config.search_options.index_fields.keys.should =~ [ :title, :body, :year ]
+    end
+
+    it "should store stored fields" do
+      Article.neoid_config.stored_fields.should_not be_nil
+      Article.neoid_config.stored_fields.keys.should =~ [ :title, :year, :title_length ]
+      Article.neoid_config.stored_fields[:title_length].should be_a(Proc)
+    end
+
+    it "should store stored fields based on blocks" do
+      article = Article.create! title: "Hello", year: 2012
+      
+      article.neo_node.title_length.should == article.title.length
+    end
+  end
+end

data/spec/neoid/search_spec.rb

@@ -0,0 +1,92 @@
+require 'spec_helper'
+require 'fileutils'
+
+describe Neoid::ModelAdditions do
+  context "search" do
+    let(:index_name) { "articles_search_index_#{Time.now.to_f.to_s.gsub('.', '')}" }
+    
+    it "should index and find node in fulltext" do
+      Neoid.db.create_node_index(index_name, "fulltext", "lucene")
+      
+      n = Neography::Node.create(name: "test hello world", year: 2012)
+      Neoid.db.add_node_to_index(index_name, "name", n.name, n)
+      Neoid.db.add_node_to_index(index_name, "year", n.year, n)
+      
+      [
+        "name:test",
+        "year:2012",
+        "name:test AND year:2012"
+      ].each { |q|
+        results = Neoid.db.find_node_index(index_name, q)
+        results.length.should == 1
+        Neoid.db.send(:get_id, results).should == n.neo_id
+      }
+    end
+    
+    it "should index item on save" do
+      r = rand(1000000)
+      article = Article.create!(title: "Hello world #{r}", body: "Lorem ipsum dolor sit amet", year: r)
+
+      [
+        "title:#{r}",
+        "year:#{r}",
+        "title:#{r} AND year:#{r}"
+      ].each do |q|
+        results = Neoid.db.find_node_index(Neoid::DEFAULT_FULLTEXT_SEARCH_INDEX_NAME, q)
+
+        results.should_not be_nil
+        results.length.should == 1
+        Neoid.db.send(:get_id, results).should == article.neo_node.neo_id
+      end
+    end
+    
+    context "search session" do
+      it "should return a search session" do
+        Article.neo_search("hello").should be_a(Neoid::SearchSession)
+      end
+      
+      it "should find hits" do
+        article = Article.create!(title: "Hello world", body: "Lorem ipsum dolor sit amet", year: 2012)
+        
+        Article.neo_search("hello").hits.should == [ article.neo_node ]
+      end
+      
+      it "should find results with a search string" do
+        article = Article.create!(title: "Hello world", body: "Lorem ipsum dolor sit amet", year: 2012)
+
+        Article.neo_search("hello").results.should == [ article ]
+      end
+      
+      it "should find results with a hash" do
+        articles = [
+          Article.create!(title: "How to draw manga", body: "Lorem ipsum dolor sit amet", year: 2012),
+          Article.create!(title: "Manga x", body: "Lorem ipsum dolor sit amet", year: 2013)
+        ]
+
+
+        Article.neo_search(year: 2012).results.should == [ articles[0] ]
+      end
+    end
+
+    context "search in multiple types" do
+      before :each do
+        @articles = [
+          Article.create!(title: "How to draw manga", body: "Lorem ipsum dolor sit amet", year: 2012),
+          Article.create!(title: "Manga x", body: "Lorem ipsum dolor sit amet", year: 2012)
+        ]
+
+        @movies = [
+          Movie.create!(name: "Anime is not Manga", slug: "anime")
+        ]
+      end
+
+      it "should search in multiple types" do
+        Neoid.search([Article, Movie], "manga").results.should =~ @articles + @movies
+      end
+
+      it "should search in single type when specified" do
+        Neoid.search([Article], "manga").results.should =~ @articles
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,12 +1,12 @@
 require 'neoid'
-require 'supermodel'
+require 'active_record'
 require 'neography'
 require 'rest-client'
 
-uri = URI.parse(ENV["NEO4J_URL"] || "http://localhost:7574")
+uri = URI.parse(ENV["NEO4J_URL"] ? ENV["NEO4J_URL"] : ENV['TRAVIS'] ? "http://localhost:7474" : "http://localhost:7574")
 $neo = Neography::Rest.new(uri.to_s)
 
-Neography::Config.tap do |c|
+Neography.configure do |c|
   c.server = uri.host
   c.port = uri.port
 
@@ -19,10 +19,26 @@ end
 
 Neoid.db = $neo
 
+ActiveRecord::Base.configurations = YAML::load(IO.read(File.join(File.dirname(__FILE__), 'support/database.yml')))
+ActiveRecord::Base.establish_connection('sqlite3')
+
 RSpec.configure do |config|
   config.mock_with :rspec
 
   config.before(:all) do
-    RestClient.delete "#{uri}/cleandb/secret-key"
+  end
+  
+  config.before(:each) do
+    Neoid.reset_cached_variables
+  end
+
+  config.before(:each) do
+    Neoid.clean_db(:yes_i_am_sure)
+    Neoid.models.each(&:destroy_all)
   end
 end
+
+require 'support/schema'
+require 'support/models'
+
+Neoid.initialize_all

data/spec/support/database.yml

@@ -0,0 +1,6 @@
+sqlite3:
+  adapter: sqlite3
+  database: ":memory:"
+  encoding: utf8
+  charset: utf8
+  timeout: 5000

data/spec/support/models.rb

@@ -0,0 +1,97 @@
+class User < ActiveRecord::Base
+  include ActiveModel::Validations::Callbacks
+  
+  has_many :likes
+  has_many :movies, through: :likes
+
+  has_many :user_follows
+  
+  def likes?(movie)
+    likes.where(movie_id: movie.id).exists?
+  end
+  
+  def like!(movie)
+    movies << movie unless likes?(movie)
+  end
+  
+  def unlike!(movie)
+    likes.where(movie_id: movie.id, user_id: self.id).destroy_all
+  end
+  
+  include Neoid::Node
+  
+  neoidable do |c|
+    c.field :name
+    c.field :slug
+  end
+end
+
+class Movie < ActiveRecord::Base
+  include ActiveModel::Validations::Callbacks
+  
+  has_many :likes
+  has_many :users, through: :likes
+  
+  include Neoid::Node
+  
+  neoidable do |c|
+    c.field :name
+    c.field :slug
+    c.field :year
+
+    c.search do |s|
+      s.fulltext :name
+
+      s.index :name
+      s.index :slug
+      s.index :year
+    end
+  end
+end
+
+class UserFollow < ActiveRecord::Base
+  include ActiveModel::Validations::Callbacks
+
+  belongs_to :user, dependent: :destroy
+  belongs_to :item, polymorphic: true
+  
+  include Neoid::Relationship
+  
+  neoidable do |c|
+    c.relationship start_node: :user, end_node: :item, type: :follows
+  end
+end
+
+class Like < ActiveRecord::Base
+  include ActiveModel::Validations::Callbacks
+  
+  belongs_to :user, dependent: :destroy
+  belongs_to :movie, dependent: :destroy
+  
+  include Neoid::Relationship
+  
+  neoidable do |c|
+    c.relationship start_node: :user, end_node: :movie, type: :likes
+    c.field :rate
+  end
+end
+
+class Article < ActiveRecord::Base
+  include ActiveModel::Validations::Callbacks
+  include Neoid::Node
+  neoidable do |c|
+    c.field :title
+    c.field :year
+    c.field :title_length do
+      self.title ? self.title.length : 0
+    end
+
+    c.search do |s|
+      s.fulltext :title
+
+      s.index :title
+      s.index :body
+      s.index :year
+    end
+  end
+end

data/spec/support/schema.rb

@@ -0,0 +1,40 @@
+ActiveRecord::Schema.define :version => 0 do
+  create_table :users do |t|
+    t.string :name
+    t.string :slug
+
+    t.timestamps
+  end
+
+  create_table :movies do |t|
+    t.string :name
+    t.string :slug
+    t.integer :year
+
+    t.timestamps
+  end
+
+  create_table :likes do |t|
+    t.integer :user_id
+    t.integer :movie_id
+    t.integer :rate
+
+    t.timestamps
+  end
+
+
+  create_table :articles do |t|
+    t.string :title
+    t.string :body
+    t.integer :year
+
+    t.timestamps
+  end
+
+  create_table :user_follows do |t|
+    t.belongs_to :user
+    t.belongs_to :item, polymorphic: true
+
+    t.timestamps
+  end
+end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: neoid
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 0.0.5.alpha
+  prerelease: 6
 platform: ruby
 authors:
 - Elad Ossadon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-21 00:00:00.000000000 Z
+date: 2012-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70163085349120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70163085349120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70163085342100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,31 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70163085342100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70163085341480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70163085341480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: supermodel
-  requirement: &70163085341000 !ruby/object:Gem::Requirement
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70163085341000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: neography
-  requirement: &70163085340500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +101,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70163085340500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Extend Ruby on Rails ActiveRecord with Neo4j nodes. Keep RDBMS and utilize
   the power of Neo4j queries
 email:
@@ -76,21 +117,32 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- TODO.md
 - lib/neoid.rb
+- lib/neoid/database_cleaner.rb
+- lib/neoid/middleware.rb
 - lib/neoid/model_additions.rb
 - lib/neoid/model_config.rb
 - lib/neoid/node.rb
+- lib/neoid/railtie.rb
 - lib/neoid/relationship.rb
+- lib/neoid/search_session.rb
 - lib/neoid/version.rb
 - neoid.gemspec
 - spec/neoid/model_additions_spec.rb
+- spec/neoid/model_config_spec.rb
+- spec/neoid/search_spec.rb
 - spec/neoid_spec.rb
 - spec/spec_helper.rb
+- spec/support/database.yml
+- spec/support/models.rb
+- spec/support/schema.rb
 homepage: ''
 licenses: []
 post_install_message: 
@@ -103,25 +155,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1739317772889618819
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -1739317772889618819
+      version: 1.3.1
 requirements: []
 rubyforge_project: neoid
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Neo4j for ActiveRecord
 test_files:
 - spec/neoid/model_additions_spec.rb
+- spec/neoid/model_config_spec.rb
+- spec/neoid/search_spec.rb
 - spec/neoid_spec.rb
 - spec/spec_helper.rb
+- spec/support/database.yml
+- spec/support/models.rb
+- spec/support/schema.rb
+has_rdoc: