neo4j-rspec 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 653bc759e3464273407eb45f963541e3f71734a6
-  data.tar.gz: cb46b0e8a9b396fb2a43d1761ffde2ee0d1df933
+  metadata.gz: c07494702e7a337029d2e268c8d1b2d909d56a3e
+  data.tar.gz: 82fef422106a2c7debb6bdf45297b54354016ce1
 SHA512:
-  metadata.gz: b7e99b9d4d8f34ea64dce43152d1cb27d46b140f8b7ba41c77c77e2366f2c8695bad34977e05cadf2c24049f6460a292dcaf6d4bcc56d00d99d73635f5d676da
-  data.tar.gz: 800c6fd90a0b1bb4c46f330c6fc90cfe71936fd2bb3ba3245d144d3ecab00cca3fd15b219fcbda4322c2ff89ac9df943a7dacca2b1c447cf5acd57ba38ec32de
+  metadata.gz: b5a523760325d6bd1eb2f1f82977f03ac7ad466906836dc39b364782231b3ae64da9b76ac13056dccb493163571a270a88604c0c43e1a4c6a51fa5558131d67b
+  data.tar.gz: 299ce90f0eb799ab8ce27a093339658e10dcf0603a98ce087499e89d6d758c73f0574aa57914ba99572f72bd45cece894168d8f7e39fd7a8f1913d8d2cc535ca

data/.travis.yml

@@ -5,3 +5,10 @@ sudo: false
 rvm:
   - 2.2.0
   - 2.3.0
+gemfile: travis.gemfile
+env:
+  global:
+  - TRAVISCI=1
+  matrix:
+  - NEO4J_VERSION=6.0.0
+  - NEO4J_VERSION=7.0.0

data/README.md

@@ -2,8 +2,6 @@
 
 This gem contains of several testing one-liners for [neo4j](https://github.com/neo4jrb/neo4j) gem.
 
-Current version (0.2.x) supports 7th version of neo4jrb gem. If you use 6th version of neo4jrb gem, try 0.1.2 version.
-
 ## Install
 
 Add line into your Gemfile:
@@ -23,50 +21,36 @@ gem install neo4j-rspec
 
 - Properties
 
-        ```ruby
         it { is_expected.to define_property :general }
-        it { is_expected.to define_property :string, String }
-        it { is_expected.to define_property :boolean, Neo4j::Shared::Boolean }
-        ```
+        it { is_expected.to define_property :string, :String }
+        it { is_expected.to define_property :boolean, :Boolean }
 - Relationships
 
-        ```ruby
         it { is_expected.to have_many(:comments) }
         it { is_expected.to have_many(:comments).with_direction(:in) }
         it { is_expected.to have_many(:comments).with_direction(:in).with_origin(:post) }
         it { is_expected.to have_many(:written_things).with_direction(:in).without_type.with_model_class([:Post, :Comment]) }
-        ```
 - Constraints
 
-        ```ruby
         it { is_expected.to define_constraint :name, :unique }
-        ```
 - Indexes
 
-        ```ruby
         it { is_expected.to define_index(:index_name) }
-        ```
 - Tracking
 
-        ```ruby
         it { is_expected.to track_creations } # `created_at`
         it { is_expected.to track_modifications } # `updated_at`
-        ```
 
 
 ### ActiveRel matchers:
 
 - Directions
 
-        ```ruby
         it { is_expected.to come_from(:Person) }
         it { is_expected.to lead_to(:any) }
-        ```
 - Types
 
-        ```ruby
         it { is_expected.to have_relationship_type("WROTE") }
-        ```
 
 
 ## Need yet another matcher?

data/lib/neo4j/rspec/compat.rb

@@ -0,0 +1,34 @@
+module Neo4j
+  module RSpec
+    module Compat
+      class << self
+        def current
+          case Neo4j::VERSION
+          when /^6/ then Neo4jrb6.new
+          when /^7/ then Neo4jrb7.new
+          end
+        end
+      end
+
+      class Neo4jrb6
+        def property_nesting
+          ActiveAttr::Typecasting
+        end
+
+        def property_constraint?(attr, type)
+          attr[:constraint] == type
+        end
+      end
+
+      class Neo4jrb7
+        def property_nesting
+          Neo4j::Shared
+        end
+
+        def property_constraint?(attr, type)
+          attr.constraint? type
+        end
+      end
+    end
+  end
+end

data/lib/neo4j/rspec/matchers.rb

@@ -1,6 +1,7 @@
 require "neo4j/rspec/matchers/has_n"
 require "neo4j/rspec/matchers/properties"
 require "neo4j/rspec/matchers/relations"
+require "neo4j/rspec/compat"
 
 module Neo4j
   module RSpec

data/lib/neo4j/rspec/matchers/properties.rb

@@ -28,8 +28,15 @@ module Neo4j
 
         matcher :define_property do |name, type = nil|
           match do |model|
-            model.attributes.key?(name.to_s) &&
-              (type ? model.attributes[name.to_s][:type] == type : true)
+            name = name.to_s
+            return false unless model.attributes.key?(name)
+
+            if type
+              nesting = Neo4j::RSpec::Compat.current.property_nesting
+              [nesting, Module].any? { |md| md.constants.any? { |c| type == c } }
+            else
+              true
+            end
           end
 
           failure_message do |model|
@@ -47,7 +54,7 @@ module Neo4j
 
           match do |model|
             model.attributes.key?(name.to_s) &&
-              model.attributes[name.to_s].constraint?(type)
+              Neo4j::RSpec::Compat.current.property_constraint?(model.attributes[name.to_s], type)
           end
 
           failure_message do |model|

data/lib/neo4j/rspec/version.rb

@@ -1,5 +1,5 @@
 module Neo4j
   module RSpec
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/neo4j-rspec.gemspec

@@ -16,6 +16,6 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "neo4j", "~> 7"
+  spec.add_dependency "neo4j", ">= 6.0.0"
   spec.add_dependency "rspec", "~> 3.4"
 end

data/travis.gemfile

@@ -0,0 +1,4 @@
+source "https://rubygems.org"
+
+gem "neo4j", ENV["NEO4J_VERSION"]
+gem "rspec", "~> 3.4"

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-rspec
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Denis Tataurov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-18 00:00:00.000000000 Z
+date: 2016-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: neo4j
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '7'
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '7'
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -53,12 +53,14 @@ files:
 - README.md
 - Rakefile
 - lib/neo4j/rspec.rb
+- lib/neo4j/rspec/compat.rb
 - lib/neo4j/rspec/matchers.rb
 - lib/neo4j/rspec/matchers/has_n.rb
 - lib/neo4j/rspec/matchers/properties.rb
 - lib/neo4j/rspec/matchers/relations.rb
 - lib/neo4j/rspec/version.rb
 - neo4j-rspec.gemspec
+- travis.gemfile
 homepage: https://github.com/sineed/neo4j-rspec
 licenses:
 - MIT