diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..77de825 --- /dev/null +++ b/.gitignore @@ -0,0 +1,38 @@ +# ignore Rubymine +.idea + +.rvmrc +.bundle +/tmp/ +/db/ +/pkg/ +/doc +/target/ +/neo4j/ +/example/blog/neo4j-db +/example/blog/log +.yardoc +# jedit +*~ +.ruby-version +.ruby-gemset + +# vim +.*.sw[a-z] + +Gemfile.lock +coverage + +docs_site/ +/docs/_build +/docs/api + +# dotenv +.env + +# Mac +.DS_Store + +# Vagrant +.vagrant/* +ubuntu* diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index 62f62b1..0000000 --- a/Gemfile.lock +++ /dev/null @@ -1,138 +0,0 @@ -PATH - remote: . - specs: - cancancan-neo4j (0.1.0) - cancancan (~> 2.0) - -GEM - remote: https://rubygems.org/ - specs: - activemodel (5.1.4) - activesupport (= 5.1.4) - activesupport (5.1.4) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (~> 0.7) - minitest (~> 5.1) - tzinfo (~> 1.1) - ast (2.3.0) - cancancan (2.1.3) - codeclimate-test-reporter (1.0.7) - simplecov - coderay (1.1.2) - concurrent-ruby (1.0.5) - concurrent-ruby (1.0.5-java) - coveralls (0.8.21) - json (>= 1.8, < 3) - simplecov (~> 0.14.1) - term-ansicolor (~> 1.3) - thor (~> 0.19.4) - tins (~> 1.6) - diff-lcs (1.3) - docile (1.1.5) - ethon (0.11.0) - ffi (>= 1.3.0) - faraday (0.13.1) - multipart-post (>= 1.2, < 3) - faraday_middleware (0.10.1) - faraday (>= 0.7.4, < 1.0) - faraday_middleware-multi_json (0.0.6) - faraday_middleware - multi_json - ffi (1.9.18) - ffi (1.9.18-java) - httpclient (2.8.3) - i18n (0.9.1) - concurrent-ruby (~> 1.0) - json (2.1.0) - json (2.1.0-java) - method_source (0.9.0) - minitest (5.11.1) - multi_json (1.13.1) - multipart-post (2.0.0) - neo4j (9.0.7) - activemodel (>= 4.0) - activesupport (>= 4.0) - neo4j-core (>= 7.2.2) - orm_adapter (~> 0.5.0) - neo4j-community (2.2.4.1) - neo4j-core (8.1.0) - activesupport (>= 4.0) - faraday (>= 0.9.0) - faraday_middleware (~> 0.10.0) - faraday_middleware-multi_json - httpclient - json - multi_json - typhoeus (>= 1.1.2) - orm_adapter (0.5.0) - parser (2.4.0.2) - ast (~> 2.3) - powerpack (0.1.1) - pry (0.11.3) - coderay (~> 1.1.0) - method_source (~> 0.9.0) - pry (0.11.3-java) - coderay (~> 1.1.0) - method_source (~> 0.9.0) - spoon (~> 0.0) - rainbow (2.2.2) - rake - rake (10.5.0) - rspec (3.7.0) - rspec-core (~> 3.7.0) - rspec-expectations (~> 3.7.0) - rspec-mocks (~> 3.7.0) - rspec-core (3.7.1) - rspec-support (~> 3.7.0) - rspec-expectations (3.7.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.7.0) - rspec-mocks (3.7.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.7.0) - rspec-support (3.7.0) - rubocop (0.48.1) - parser (>= 2.3.3.1, < 3.0) - powerpack (~> 0.1) - rainbow (>= 1.99.1, < 3.0) - ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.0, >= 1.0.1) - ruby-progressbar (1.9.0) - simplecov (0.14.1) - docile (~> 1.1.0) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) - simplecov-html (0.10.2) - spoon (0.0.6) - ffi - term-ansicolor (1.6.0) - tins (~> 1.0) - thor (0.19.4) - thread_safe (0.3.6) - thread_safe (0.3.6-java) - tins (1.16.3) - typhoeus (1.3.0) - ethon (>= 0.9.0) - tzinfo (1.2.4) - thread_safe (~> 0.1) - unicode-display_width (1.3.0) - -PLATFORMS - java - ruby - -DEPENDENCIES - bundler (~> 1.3) - cancancan-neo4j! - codeclimate-test-reporter (~> 1.0) - coveralls (~> 0.8) - neo4j (~> 9.0.0) - neo4j-community (~> 2.0) - pry (~> 0.11.3) - rake (~> 10.1) - rspec (~> 3.2) - rubocop (~> 0.48.1) - simplecov (~> 0.12) - -BUNDLED WITH - 1.16.1 diff --git a/Rakefile b/Rakefile index 4c774a2..776b300 100644 --- a/Rakefile +++ b/Rakefile @@ -1,5 +1,6 @@ require 'bundler/gem_tasks' require 'rspec/core/rake_task' +require 'neo4j/rake_tasks' RSpec::Core::RakeTask.new(:spec) diff --git a/cancancan-neo4j.gemspec b/cancancan-neo4j.gemspec index a2b5ddd..2cc078f 100644 --- a/cancancan-neo4j.gemspec +++ b/cancancan-neo4j.gemspec @@ -19,6 +19,7 @@ Gem::Specification.new do |spec| spec.require_paths = ['lib'] spec.add_dependency 'cancancan', '~> 2.0' + spec.add_dependency 'neo4j', '~> 9.0.0' spec.add_development_dependency 'bundler', '~> 1.3' spec.add_development_dependency 'rake', '~> 10.1' @@ -27,7 +28,6 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'simplecov', '~> 0.12' spec.add_development_dependency 'coveralls', '~> 0.8' spec.add_development_dependency 'codeclimate-test-reporter', '~> 1.0' - spec.add_development_dependency 'neo4j', '~> 9.0.0' spec.add_development_dependency 'pry', '~> 0.11.3' - spec.add_development_dependency('neo4j-community', '~> 2.0') if RUBY_PLATFORM =~ /java/ + spec.add_development_dependency('neo4j-rake_tasks', '>= 0.3.0') end diff --git a/lib/cancancan/neo4j/version.rb b/lib/cancancan/neo4j/version.rb index a28b887..1990859 100644 --- a/lib/cancancan/neo4j/version.rb +++ b/lib/cancancan/neo4j/version.rb @@ -2,6 +2,6 @@ module CanCanCan end module CanCanCan module Neo4j - VERSION = '0.1.0'.freeze + VERSION = '1.0.0.beta1'.freeze end end diff --git a/spec/cancancan/model_adapters/neo4j_adapter_spec.rb b/spec/cancancan/model_adapters/neo4j_adapter_spec.rb index fb2c835..6f085c2 100644 --- a/spec/cancancan/model_adapters/neo4j_adapter_spec.rb +++ b/spec/cancancan/model_adapters/neo4j_adapter_spec.rb @@ -10,8 +10,6 @@ User.delete_all Mention.delete_all (@ability = double).extend(CanCan::Ability) - @article_table = 'article' - @comment_table = 'comment' end it 'is for only neo4j classes' do @@ -58,7 +56,7 @@ article2 = Article.create!(published: true, secret: true) article3 = Article.create!(published: false, secret: true) Article.create!(published: false, secret: false) - expect(Article.accessible_by(@ability).to_a).to eq([article1, article2, article3]) + expect(Article.accessible_by(@ability)).to contain_exactly(article1, article2, article3) end context 'nested rules' do