neo4j-rspec 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0ad68a0d597c5eb07fd04204d67753160f3ca37
-  data.tar.gz: 10796e7f9d7fd0237f04259862e41173e932378c
+  metadata.gz: ee149c3a79b54728a0c8eb5143504c274c24414d
+  data.tar.gz: 24a61f9cf468b5e96e457221329c814941a8168b
 SHA512:
-  metadata.gz: 17f1dbc7daaf197cbda8d4c06ce0d6ada2b759a0d1e0bd1399e24894b51702bd67405f3777bbd76823e65a0c2da7252808f50d6756e593635ea2ebc68520695d
-  data.tar.gz: 2a455fc7025658b6970828ed7c9f10e84d22cbfa6e5fe5b7e827fc84d7372cc2a1836d43d9662462cee3695053b509f2adac53fc604be11dcc5162443c73d1f0
+  metadata.gz: 1190c3ab180492d432979ca534514bf63e0f181c056d0349f0541ce2d7efe45afbe31f7109db5e114e611c157c1b1a329a781369c73223067385e256b7a1b4e1
+  data.tar.gz: f06d85d848c244b0041c3532b5d4cad52ec011da42f2f43cb96b45adee1665548eafaf51772560def5cad4366ce21961951f585c7ff8c082f45ac82015e9f325

data/README.md

@@ -1,32 +1,45 @@
 # Neo4j::Rspec [![Build Status](https://travis-ci.org/sineed/neo4j-rspec.svg?branch=master)](https://travis-ci.org/sineed/neo4j-rspec)
 
-## Examples
-
+## Install
+Add line into your Gemfile:
 ```ruby
-subject { ModelClass }
+gem "neo4j-rspec"
+```
+or install it directly
 
-# Properties
+```
+gem install neo4j-rspec
+```
 
+## Examples
+
+### Properties
+
+```ruby
 it { is_expected.to define_property :general }
 it { is_expected.to define_property :string, String }
 it { is_expected.to define_property :boolean, Boolean } # This might need to be `ActiveAttr::Typecasting::Boolean`
+```
 
-it { is_expected.to have_many(:written_things).with_direction(:in).without_type.with_model_class([:Post, :Comment]) }
-
-# etc...
 
-# `has_one` and `has_many`
+### `has_one` and `has_many`
 
+```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
+### Constraints
 
+```ruby
 it { is_expected.to define_constraint :name, :unique }
+```
 
-# `created_at` and `updated_at`
+### `created_at` and `updated_at`
 
+```ruby
 it { is_expected.to track_creations } # `created_at`
 it { is_expected.to track_modifications } # `updated_at`
 

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

@@ -2,221 +2,141 @@ module Neo4j
   module RSpec
     module Matchers
       module HasN
-        class BaseMatcher
-          attr_reader :matcher, :value, :key, :actual
+        module With
+          class Base
+            attr_reader :expected
 
-          def initialize(matcher, value)
-            @matcher = matcher
-            @value = convert_value(value)
-          end
-
-          def add
-            matcher.expectation_message << expectation_message
-            matcher.association[key] = self
-            matcher
+            def initialize(expected)
+              @expected = expected
+            end
           end
 
-          def add_negative
-            matcher.expectation_message << negative_expectation_message
-            matcher.association[key] = self
-            matcher
-          end
+          class DirectionMatcher < Base
+            def match(association)
+              expected == association.direction
+            end
 
-          def matches?(actual)
-            @actual = extact_actual(actual)
-            if matches
-              matcher.negative_result_message = result_message
-              false
-            else
-              matcher.positive_result_message = result_message
-              true
+            def description
+              "with #{expected} direction"
             end
           end
 
-          private
+          class OriginMatcher < Base
+            def match(association)
+              expected == association.relationship_type
+            end
 
-          def matches
-            value != actual
+            def description
+              "with #{expected} origin"
+            end
           end
 
-          def convert_value(val)
-            val
-          end
-        end
-
-        class DirectionMatcher < BaseMatcher
-          private
-
-          def key
-            :direction
-          end
+          class TypeMatcher < Base
+            def match(association)
+              expected == association.relationship_type
+            end
 
-          def extact_actual(actual)
-            actual.direction
+            def description
+              "with #{expected} type"
+            end
           end
 
-          def expectation_message
-            " with #{value} direction"
-          end
+          class ModelClassMatcher < Base
+            def match(association)
+              actual = Array(association.model_class)
+              actual & expected == actual
+            end
 
-          def result_message
-            "#{actual} direction"
+            def description
+              "with #{expected.join(', ')} model class"
+            end
           end
         end
 
-        class TypeMatcher < BaseMatcher
-          private
-
-          def key
-            :type
-          end
-
-          def extact_actual(actual)
-            actual.relationship_type
-          end
-
-          def expectation_message
-            " with #{value} relationship type"
-          end
-
-          def negative_expectation_message
-            " without relationship type"
-          end
+        module Without
+          class TypeMatcher
+            def match(association)
+              !association.relationship_type
+            end
 
-          def result_message
-            "#{actual} relationship type"
+            def description
+              "without type"
+            end
           end
         end
 
-        class OriginMatcher < BaseMatcher
-          private
-
-          def key
-            :origin
-          end
-
-          def extact_actual(actual)
-            actual.relationship_type
+        class HaveMany
+          def name
+            :have_many
           end
 
-          def expectation_message
-            " with #{value} origin"
+          def description(model_name)
+            "have many #{model_name}"
           end
 
-          def result_message
-            "#{actual} origin"
+          def failure_message(model_name)
+            "expected the #{model_name} model to have many #{name}"
           end
         end
 
-        class ModelClassesMatcher < BaseMatcher
-          private
-
-          def key
-            :model_classes
-          end
-
-          def convert_value(val)
-            Array(val)
+        class HaveOne
+          def name
+            :have_one
           end
 
-          def extact_actual(actual)
-            Array(actual.model_class)
+          def description(model_name)
+            "have one #{model_name}"
           end
 
-          def matches
-            (value & actual) != value
-          end
-
-          def expectation_message
-            " with #{value.join(", ")} model classes"
-          end
-
-          def result_message
-            "#{actual.join(", ")} model classes"
+          def failure_message(model_name)
+            "expected the #{model_name} model to have one #{name}"
           end
         end
 
+        extend ::RSpec::Matchers::DSL
 
-        class AssociationMatcher
-          attr_accessor :association, :expectation_message, :negative_result_message,
-            :positive_result_message
-
-          def initialize(name, macro)
-            @association = {}
-            @association[:name] = name.to_sym
-            @association[:macro] = macro
-            @expectation_message = "#{macro_description} #{@association[:name]}"
-          end
-
-          def macro_description
-            case association[:macro]
-            when :has_many then "have many"
-            when :has_one then "have one"
+        [HaveMany.new, HaveOne.new].each do |macro|
+          matcher macro.name do |association_name|
+            def matchers
+              @matchers ||= []
             end
-          end
-
-          def matchers
-            association.select { |_, v| v.is_a? BaseMatcher }
-          end
-
-          def with_direction(direction)
-            DirectionMatcher.new(self, direction).add
-          end
-
-          def with_type(type)
-            TypeMatcher.new(self, type).add
-          end
-
-          def without_type
-            TypeMatcher.new(self, false).add_negative
-          end
 
-          def with_origin(origin)
-            OriginMatcher.new(self, origin).add
-          end
-
-          def with_model_class(model_class)
-            ModelClassesMatcher.new(self, model_class).add
-          end
+            match do |model|
+              association = model.class.associations[association_name]
+              association && matchers.all? { |m| m.match(association) }
+            end
 
-          def matches?(actual)
-            @actual = actual
-            actual_association = actual.class.associations[association[:name]]
+            chain :with_direction do |direction|
+              matchers.push With::DirectionMatcher.new(direction)
+            end
 
-            unless actual_association
-              self.negative_result_message = "no association named #{association[:name]}"
-              return false
-            else
-              self.positive_result_message = "association named #{association[:name]}"
+            chain :with_origin do |origin|
+              matchers.push With::OriginMatcher.new(origin)
             end
 
-            matchers.each do |_, matcher|
-              return false unless matcher.matches?(actual_association)
+            chain :with_type do |type|
+              matchers.push With::TypeMatcher.new(type)
             end
 
-            true
-          end
+            chain :with_model_class do |*model_classes|
+              matchers.push With::ModelClassMatcher.new(model_classes)
+            end
 
-          def failure_message
-            "Expected #{@actual.class} to #{expectation_message}, got #{negative_result_message}"
-          end
+            chain :without_type do
+              matchers.push Without::TypeMatcher.new
+            end
 
-          def failure_message_when_negated
-            "Expected #{@actual.class} to not #{expectation_message}, got #{positive_result_message}"
-          end
+            description do |model|
+              with_messages = matchers.map(&:description).join(" ")
+              macro.description(model.class.name) + " " + with_messages
+            end
 
-          def description
-            expectation_message
+            failure_message do |model|
+              with_messages = matchers.map(&:description).join(" ")
+              macro.failure_message(model.class.name) + " " + with_messages
+            end
           end
         end
-
-        def have_many(association_name)
-          AssociationMatcher.new(association_name, :has_many)
-        end
-
-        def have_one(association_name)
-          AssociationMatcher.new(association_name, :has_one)
-        end
       end
     end
   end

data/lib/neo4j/rspec/version.rb

@@ -1,5 +1,5 @@
 module Neo4j
   module RSpec
-    VERSION = "0.1.0"
+    VERSION = "0.1.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", "~> 6"
+  spec.add_dependency "neo4j", ">= 6.0.0"
   spec.add_dependency "rspec", "~> 3.4"
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-rspec
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Denis Tataurov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-01 00:00:00.000000000 Z
+date: 2016-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: neo4j
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '6'
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '6'
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.4'
 description: RSpec matchers for Neo4j.rb
@@ -45,9 +45,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -68,17 +68,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: RSpec matchers for Neo4j.rb