active_poro 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c293f42fa865f7c17c588467950d0f20e7b225d
-  data.tar.gz: c8dad835f22660be2f81ebb56d8c9df423e05a95
+  metadata.gz: 657deddc2134e4fcaaa62c9fbe84bece78e613bd
+  data.tar.gz: 0268c80ce1c30a2462997463b86e94d64bd0b03b
 SHA512:
-  metadata.gz: a88a7027aaebd2f5192c129d21883245ac0a2ee2414841efd449de69f86a88de0a8ad99c02ba74a8f4f81cb51e5e533950fe4074f09bec8deabc78586d876eae
-  data.tar.gz: 24c5e384586c98f5099f2d184075240e067fe052de54d44564df3450301e1bc15ccbb5984afa32931cc04251b02d07efc599dff11a6fed9b8548cfc4569c2c92
+  metadata.gz: 02c15b6276f732edba9595b531f9640802d6a994e21ca64e947fd15993a67fb9010c1f5163639bc888b489f3cba76a4e8ae9e0e38082a6c2be17091a114a09eb
+  data.tar.gz: 6ed9ae1f95d3be32edea5df94da58011f89e039a61ff900b79488275b0a51d9fcc83841d2e7dcf53efd35a0c68e7aaa8e3b8b19affc077e1e49432c8eb53b300

data/.ruby-version

@@ -1 +1,2 @@
-2.0.0-p247
+2.0.0-p451
+

data/README.md

@@ -1,11 +1,9 @@
 # active_poro
-Makes possible the use of has_many, has_one, belongs_to relations in POROs as you would expect
-
-Important!
-----------
 
-This project is under active development
+[![Gem Version](https://badge.fury.io/rb/active_poro.svg)](http://badge.fury.io/rb/active_poro)
+[![Test Coverage](https://codeclimate.com/github/codescrum/active_poro/badges/coverage.svg)](https://codeclimate.com/github/codescrum/active_poro)
 
+Makes possible the use of has_many, has_one, belongs_to relations in POROs as you would expect
 
 ## Installation
 

data/active_poro.gemspec

@@ -22,6 +22,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency('rspec')
   spec.add_development_dependency('jazz_hands')
+  spec.add_development_dependency('simplecov', '0.9.0')
+  spec.add_development_dependency('codeclimate-test-reporter', '0.4.0')
 
   spec.add_runtime_dependency('activesupport')
 end

data/lib/active_poro/relations.rb

@@ -4,6 +4,7 @@ module ActivePoro
 
     module ClassMethods
       def has_many(target_name)
+
         # define getter method
         define_method target_name do
           instance_variable_get("@#{target_name}") || []
@@ -17,12 +18,12 @@ module ActivePoro
 
           # set the instance variable only if I am now the rightful owner
           instance_variable_set("@#{target_name}", members)
-          reflected_association_name = self.class.name.underscore
+          singular_reflection_name = self.class.name.underscore
           members.each do |member|
 
-            current_owner = member.send(reflected_association_name)
+            current_owner = member.send(singular_reflection_name)
             if current_owner.nil? # no current assignment
-              member.send "#{reflected_association_name}=", self
+              member.send "#{singular_reflection_name}=", self
             elsif current_owner != self # current assignment is not me
               other_members = current_owner.send target_name
               if other_members.include?(member)
@@ -33,7 +34,7 @@ module ActivePoro
                 raise "Unmatching association; Current owner (#{current_owner.class.name}) of #{member.class.name} does not have it as a member"
               end
               # add me as associated to the member I am also including
-              member.send "#{reflected_association_name}=", self
+              member.send "#{singular_reflection_name}=", self
             else
               # its already me, do not do anything
             end
@@ -41,13 +42,16 @@ module ActivePoro
           end
         end
 
+        # the singular suffix for add and remove methods
+        singular_target_name = target_name.to_s.singularize
+
         # define the "add_<name>" method
-        define_method "add_#{target_name.to_s.singularize}" do |member|
+        define_method "add_#{singular_target_name}" do |member|
           send("#{target_name}=", (send(target_name) + [member]).uniq)
         end
 
         # define the "remove_<name>" method
-        define_method "remove_#{target_name.to_s.singularize}" do |member|
+        define_method "remove_#{singular_target_name}" do |member|
           send("#{target_name}=", (send(target_name) - [member]).uniq)
         end
 
@@ -61,9 +65,9 @@ module ActivePoro
 
         # define setter method
         define_method "#{target_name}=" do |member|
-          reflected_association_name = self.class.name.underscore
-          if member.respond_to?(reflected_association_name) && member.send(reflected_association_name) != self
-            member.send "#{reflected_association_name}=", self
+          singular_reflection_name = self.class.name.underscore
+          if member.respond_to?(singular_reflection_name) && member.send(singular_reflection_name) != self
+            member.send "#{singular_reflection_name}=", self
           end
           instance_variable_set("@#{target_name}", member)
         end
@@ -79,33 +83,30 @@ module ActivePoro
         define_method "#{target_name}=" do |member|
           previous_member = instance_variable_get("@#{target_name}")
           instance_variable_set("@#{target_name}", member)
-          reflected_association_name = self.class.name.underscore
+
+          singular_reflection_name = self.class.name.underscore
+          plural_reflection_name = singular_reflection_name.pluralize
+
           # add myself to reflected association
-          if member.respond_to?(reflected_association_name) && member.send(reflected_association_name) != self
-            member.send("#{reflected_association_name}=", self)
-          elsif member.respond_to? reflected_association_name.pluralize
-            reflected_members = member.send(reflected_association_name.pluralize)
-            unless reflected_members.include? self
-              member.send("#{reflected_association_name.pluralize}=", reflected_members + [self])
-            end
+          if member.respond_to?(singular_reflection_name) && member.send(singular_reflection_name) != self
+            member.send("#{singular_reflection_name}=", self)
+          elsif member.respond_to? plural_reflection_name
+            reflected_members = member.send(plural_reflection_name)
+            member.send("#{plural_reflection_name}=", reflected_members + [self]) unless reflected_members.include? self
           else
-            raise "Association definition missing: no #{reflected_association_name} or #{reflected_association_name.pluralize} association defined in #{member.class}"
+            raise "Association definition missing: no #{singular_reflection_name} or #{plural_reflection_name} association defined in #{member.class}"
           end
 
           # remove myself from old reflected association
-          if previous_member.respond_to? reflected_association_name
-            if previous_member.send(reflected_association_name) == self
-              previous_member.send("#{reflected_association_name}=", nil)
-            end
-          elsif previous_member.respond_to? reflected_association_name.pluralize
-            previous_reflected_members = previous_member.send(reflected_association_name.pluralize)
-            if previous_reflected_members.include? self
-              previous_member.send("#{reflected_association_name.pluralize}=", previous_reflected_members - [self])
-            end
+          if previous_member.respond_to? singular_reflection_name
+              previous_member.send("#{singular_reflection_name}=", nil) if previous_member.send(singular_reflection_name) == self
+          elsif previous_member.respond_to? plural_reflection_name
+            previous_reflected_members = previous_member.send(plural_reflection_name)
+            previous_member.send("#{plural_reflection_name}=", previous_reflected_members - [self]) if previous_reflected_members.include? self
           elsif previous_member.nil?
-            # there was not previous member
+            # there wasn't any previous member
           else # there was a previous member
-            raise "Ghost association definition: no #{reflected_association_name} or #{reflected_association_name.pluralize} association defined in #{member.class}, although it was there previously, dirty contamination"
+            raise "Ghost association definition: no #{singular_reflection_name} or #{plural_reflection_name} association defined in #{member.class}, although it was there previously, dirty contamination"
           end
         end
       end

data/lib/active_poro/version.rb

@@ -1,3 +1,3 @@
 module ActivePoro
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/active_poro_spec.rb

@@ -131,26 +131,47 @@ describe 'ActivePoro' do
 
         end
 
-        context 'when a flea jumps between dogs' do
+        context 'when fleas jump between dogs' do
 
           let(:small_dog){ Dog.new('Small dog') }
 
           it 'cannot be in two dogs at the same time' do
             flea_a.dog = big_dog
+            flea_b.dog = big_dog
             expect(flea_a.dog).to eq(big_dog)
-            expect(big_dog.fleas).to eq([flea_a])
+            expect(flea_b.dog).to eq(big_dog)
+            expect(big_dog.fleas).to eq([flea_a, flea_b])
 
-            # flea jumps from big dog to small dog
+            # flea A jumps from big dog to small dog
             flea_a.dog = small_dog
             expect(flea_a.dog).to eq(small_dog)
             expect(small_dog.fleas).to eq([flea_a])
 
             # flea A no longer in big dog
             expect(big_dog.fleas).to_not include(flea_a)
-            expect(big_dog.fleas).to be_empty # sanity check
+            expect(big_dog.fleas).to eq([flea_b])# sanity check
+          end
+
+        end
+
+        context 'when a dog catches some fleas from another dog' do
+
+          let(:small_dog){ Dog.new('Small dog') }
+
+          it 'the other dog losses part of its fleas' do
+
+            big_dog.fleas = [flea_a, flea_b]
+
+            # small_dog is close enough to bid_dog and it caches a flea
+            small_dog.fleas = [flea_a]
+
+            # flea A no longer in big dog
+            expect(big_dog.fleas).to_not include(flea_a)
+            expect(big_dog.fleas).to eq([flea_b])# sanity check
           end
 
         end
+
       end
 
     end

data/spec/spec_helper.rb

@@ -1,3 +1,18 @@
+# Add coverage with simple_cov and codeclimate
+# These must be the first lines in the file
+require 'codeclimate-test-reporter'
+require 'simplecov'
+
+formatters = [SimpleCov::Formatter::HTMLFormatter]
+formatters << CodeClimate::TestReporter::Formatter if ENV['CODECLIMATE_REPO_TOKEN']
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[*formatters]
+SimpleCov.start do
+  add_filter '/spec/'
+end
+
+#######################################################################
+
 require 'rubygems'
 require 'pry'
 

data/spec/support/base_test_class.rb

@@ -1,17 +1,12 @@
 # this is just a class that includes convenience methods for testing
 # such as a giving it a name so that is easy to inspect
-class BaseTestClass
-  attr_accessor :name
-
-  def initialize(name)
-    self.name = name
-  end
+BaseTestClass = Struct.new(:name) do
 
   def to_s
     name
   end
 
   def inspect
-    "\"#{to_s}\""
+    "\"#{self}\""
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_poro
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Miguel Diaz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2014-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -123,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Makes possible the use of has_many, has_one, belongs_to relations in POROs