activeshepherd 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 153175687781797f0c540d8d0f3dfb197fdf5614
-  data.tar.gz: b9313dacab98cc1705485bedc41681edd150b337
+  metadata.gz: 99198041d4010d96c14b417691a345b9488e4cef
+  data.tar.gz: 71e6095aff2faa19f06750e4cd8cdc1eb37d2880
 SHA512:
-  metadata.gz: c2fd7733faa80b4a9bddf7e6eecac5a2739774e9c157fbbe06621f3960e54143803aab9ec88826e717c83741cb281231d1151104a1fc4f6db7f2e44e318fb47f
-  data.tar.gz: b4a4fc0c6d5104a9c2d5746532ac3bf88e241040d7d27e68e4a5814b6faa3c0bec639a469a8b341b972b97d0677a8e626a0950585529fd61635a2bcf09e45f2b
+  metadata.gz: ac3736238e51bfd0868b2afda8495ea524b691230a00f10209cdc86eb8fafd491c375231615d9f273014b87050726e466b4ac38f62c0e0dd6155f99c12e159c8
+  data.tar.gz: fff6353d44206d5fc680e94ea7ccfde186e78b396a5eb1a22b68b19e763ef342b1fd90353c67dc71d2721a193c08289bbf842612eee3fd60739e6a010463282f

data/activeshepherd.gemspec

@@ -21,11 +21,9 @@ Gem::Specification.new do |gem|
   gem.add_dependency "activerecord", ">= 2.3.17"
   gem.add_dependency "activesupport", ">= 2.3.17"
 
-  gem.add_development_dependency "activerecord", "4.0.0.beta1"
-  gem.add_development_dependency "guard"
-  gem.add_development_dependency "guard-minitest"
+  gem.add_development_dependency "activerecord", "~> 4.0.2"
   gem.add_development_dependency "hashie"
-  gem.add_development_dependency "minitest-reporters"
+  gem.add_development_dependency "minitest"
   gem.add_development_dependency "pry"
   gem.add_development_dependency "pry-debugger"
   gem.add_development_dependency "rake"

data/lib/active_shepherd/aggregate.rb

@@ -50,9 +50,9 @@ private
 
   def associations
     @associations ||= begin
-      all_associations = model.class.reflect_on_all_associations
       ostruct = OpenStruct.new untraversable: {}, traversable: {}
-      all_associations.each_with_object(ostruct) do |association_reflection, ostruct|
+      associations_by_table.each_with_object(ostruct) do |(table, associations), ostruct|
+        association_reflection = preferred_association_from_set associations
         if traverse_association?(association_reflection)
           key = :traversable
         else
@@ -63,6 +63,24 @@ private
     end
   end
 
+  def associations_by_table
+    @associations_by_table ||=
+      begin
+        by_table = Hash.new { |h,k| h[k] = Array.new }
+        model.class.reflect_on_all_associations.each do |association_reflection, hash|
+          next unless association_reflection.active_record == model.class
+          if traverse_association? association_reflection
+            by_table[association_reflection.table_name] << association_reflection
+          end
+        end
+        by_table
+      end
+  end
+
+  def preferred_association_from_set(associations)
+    associations.detect { |a| a.macro == :has_many } || associations.first
+  end
+
   def run_through_serializer(attribute_name, value, method)
     serializer = model.class.serialized_attributes[attribute_name.to_s]
     if serializer
@@ -76,6 +94,7 @@ private
     return false if association.options[:readonly]
     return false if association.macro == :belongs_to
     return false unless in_namespace?(association.klass.to_s)
+    return false if association.is_a?(ActiveRecord::Reflection::ThroughReflection)
 
     true
   end

data/lib/active_shepherd/version.rb

@@ -1,3 +1,3 @@
 module ActiveShepherd
-  VERSION = "0.8.3"
+  VERSION = "0.8.4"
 end

data/test/integration/project_todo_scenario_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class IntegrationTest < MiniTest::Unit::TestCase
+class IntegrationTest < Minitest::Test
   def setup
     Project.destroy_all
 
@@ -118,9 +118,9 @@ class IntegrationTest < MiniTest::Unit::TestCase
   end
 
   def test_does_not_walk_associations_to_other_entities
-    @project.aggregate_state = { owner: { name: "Joe Schmoe" } }
-
-    refute_equal "Joe Schmoe", @project.owner.try(:name)
+    assert_raises ActiveShepherd::AggregateMismatchError do
+      @project.aggregate_state = { owner: { name: "Joe Schmoe" } }
+    end
   end
 
 =begin

data/test/setup_test_models.rb

@@ -1,5 +1,6 @@
 ActiveRecord::Migration.create_table :users, force: true do |t|
   t.string :name
+  t.belongs_to :favorite_project
 end
 
 ActiveRecord::Migration.create_table :comments, force: true do |t|
@@ -44,6 +45,7 @@ class User < ActiveRecord::Base
 
   has_many :projects, inverse_of: :owner, dependent: :destroy, autosave: true,
     validate: true, foreign_key: :owner_id
+  belongs_to :favorite_project, class_name: "Project"
 end
 
 class Comment < ActiveRecord::Base
@@ -55,6 +57,8 @@ class Project < ActiveRecord::Base
   act_as_aggregate_root!
 
   belongs_to :owner, class_name: "User", inverse_of: :projects, touch: true
+  has_many :watchers, inverse_of: :favorite_project, class_name: "User",
+    foreign_key: :favorite_project_id
 
   has_one :detail, inverse_of: :project, dependent: :destroy, autosave: true
 

data/test/test_helper.rb

@@ -7,13 +7,8 @@ require 'pry'
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'active_shepherd'
 
-require 'minitest/mock'
-require 'minitest/reporters'
-
 require 'minitest/autorun'
 
-MiniTest::Reporters.use! MiniTest::Reporters::DefaultReporter.new
-
 ActiveRecord::Base.establish_connection adapter: "sqlite3", database: ":memory:"
 
 ActiveShepherd.enable!(ActiveRecord::Base)

data/test/unit/aggregate_test.rb

@@ -4,12 +4,14 @@ class MyKlass
   SubKlass = Class.new
 end
 
-class AggregateTest < MiniTest::Unit::TestCase
+class AggregateTest < Minitest::Test
   def setup
-    @aggregate = ActiveShepherd::Aggregate.new MyKlass.new
+    @aggregate = ActiveShepherd::Aggregate.new Project.new
   end
 
   def test_in_namespace_returns_true_only_if_associated_klass_in_namespace
+    @aggregate = ActiveShepherd::Aggregate.new MyKlass.new
+
     refute @aggregate.in_namespace?('MyKlass')
     assert @aggregate.in_namespace?('MyKlass::SubKlass')
     refute @aggregate.in_namespace?('MyKlass::SubKlass::SubSubKlass')
@@ -24,4 +26,26 @@ class AggregateTest < MiniTest::Unit::TestCase
     assert @aggregate.in_namespace?('MyKlass::SubSubKlass')
     refute @aggregate.in_namespace?('Foo')
   end
+
+  def test_traversable_associations_excludes_classes_outside_namespace
+    refute_includes @aggregate.traversable_associations.keys, :watchers
+  end
+
+  def test_traversable_associations_ignores_redundant_associations
+    refute_includes @aggregate.traversable_associations.keys, :recent_todo_list
+  end
+
+  def test_traversable_associations_returns_traversable_associations
+    assert_includes @aggregate.traversable_associations.keys, :detail
+    assert_includes @aggregate.traversable_associations.keys, :todo_lists
+  end
+
+  def test_traversable_associations_ignores_base_class
+    @aggregate = ActiveShepherd::Aggregate.new Project::Comment.new
+    refute_includes @aggregate.traversable_associations.keys, :commentable
+  end
+
+  def test_traversable_associations_ignores_has_many_through
+    refute_includes @aggregate.traversable_associations.keys, :todos
+  end
 end

data/test/unit/apply_changes_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class ApplyChangesTest < MiniTest::Unit::TestCase
+class ApplyChangesTest < Minitest::Test
   def setup
     @aggregate = OpenStruct.new(
       raw_attributes: {},

data/test/unit/changes_validator_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class ChangesValidatorTest < MiniTest::Unit::TestCase
+class ChangesValidatorTest < Minitest::Test
   def test_deep_reverse_returns_self
     skip
   end

data/test/unit/class_validator_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class ClassValidatorTest < MiniTest::Unit::TestCase
+class ClassValidatorTest < Minitest::Test
   def test_model_must_autosave_associations
     skip
   end

data/test/unit/traversal_test.rb

@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class TraversalTest < Minitest::Test
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeshepherd
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - ntl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-27 00:00:00.000000000 Z
+date: 2013-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -42,44 +42,16 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta1
+        version: 4.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta1
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.2
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -95,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest-reporters
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -220,6 +192,7 @@ files:
 - test/unit/apply_changes_test.rb
 - test/unit/changes_validator_test.rb
 - test/unit/class_validator_test.rb
+- test/unit/traversal_test.rb
 homepage: http://github.com/ntl/activeshepherd
 licenses:
 - MIT
@@ -254,4 +227,5 @@ test_files:
 - test/unit/apply_changes_test.rb
 - test/unit/changes_validator_test.rb
 - test/unit/class_validator_test.rb
+- test/unit/traversal_test.rb
 has_rdoc: