polymorpheus 2.0.1 → 2.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 98f62a13d469e88f1edb1e1698d2898847d2a502
+  data.tar.gz: 5fc6c4393b389fb1484380869acd665486989c99
+SHA512:
+  metadata.gz: cbc7cbdaa014f3dfe73be1259d7e3ccfe9be282891077a52223bd67ea6607025d2147e89122e26ca3760f64fd47312f6f69c1c0e34e5c3c66f3b05df33f0d82e
+  data.tar.gz: a857f954015d60c9ba09cbfee46370b3db654b23a32ef6ac7e2c518c42ec23ee7120c24065144aa3e8c7f6325f9d032e77793fd253508643aed9a78515a57dbc

data/lib/polymorpheus.rb

@@ -5,6 +5,17 @@ module Polymorpheus
   autoload :Trigger, 'polymorpheus/trigger'
   autoload :SchemaDumper, 'polymorpheus/schema_dumper'
 
+  module Interface
+    autoload :BelongsToPolymorphic, 'polymorpheus/interface/belongs_to_polymorphic'
+    autoload :ValidatesPolymorph, 'polymorpheus/interface/validates_polymorph'
+
+    if ActiveRecord::VERSION::MAJOR >= 4
+      autoload :HasManyAsPolymorph, 'polymorpheus/interface/rails4/has_many_as_polymorph'
+    else
+      autoload :HasManyAsPolymorph, 'polymorpheus/interface/rails3/has_many_as_polymorph'
+    end
+  end
+
   class InterfaceBuilder
     autoload :Association, 'polymorpheus/interface_builder/association'
   end

data/lib/polymorpheus/interface.rb

@@ -17,86 +17,9 @@ module Polymorpheus
     end
 
     def self.included(base)
-      base.extend(ClassMethods)
+      base.extend(BelongsToPolymorphic)
+      base.extend(HasManyAsPolymorph)
+      base.extend(ValidatesPolymorph)
     end
-
-    module ClassMethods
-
-      def belongs_to_polymorphic(*association_names, options)
-        polymorphic_api = options[:as]
-        builder = Polymorpheus::InterfaceBuilder.new(polymorphic_api,
-                                                     association_names)
-
-        # The POLYMORPHEUS_ASSOCIATIONS constant is useful for two reasons:
-        #
-        # 1. It is useful for other classes to be able to ask this class
-        #    about its polymorphic relationship.
-        #
-        # 2. It prevents a class from defining multiple polymorphic
-        #    relationships. Doing so would be a bad idea from a design
-        #    standpoint, and we don't want to allow for (and support)
-        #    that added complexity.
-        #
-        const_set('POLYMORPHEUS_ASSOCIATIONS', builder.association_names)
-
-        # Set belongs_to associations
-        builder.associations.each do |association|
-          belongs_to association.name.to_sym
-        end
-
-        # Exposed interface for introspection
-        define_method 'polymorpheus' do
-          builder.exposed_interface(self)
-        end
-
-        # Getter method
-        define_method polymorphic_api do
-          builder.get_associated_object(self)
-        end
-
-        # Setter method
-        define_method "#{polymorphic_api}=" do |object_to_associate|
-          builder.set_associated_object(self, object_to_associate)
-        end
-      end
-
-      def has_many_as_polymorph(association, options = {})
-        options.symbolize_keys!
-        conditions = options.fetch(:conditions, {})
-        fkey = name.foreign_key
-
-        class_name = options[:class_name] || association.to_s.classify
-
-        options[:conditions] = proc do
-          keys = class_name.constantize
-                  .const_get('POLYMORPHEUS_ASSOCIATIONS')
-                  .map(&:foreign_key)
-          keys.delete(fkey)
-
-          nil_columns = keys.reduce({}) { |hash, key| hash.merge!(key => nil) }
-
-
-          if self.is_a?(ActiveRecord::Associations::JoinDependency::JoinAssociation)
-            { aliased_table_name => nil_columns }
-          else
-            { association => nil_columns }
-          end
-        end
-
-        has_many association, options
-      end
-
-      def validates_polymorph(polymorphic_api)
-        validate Proc.new {
-          unless polymorpheus.active_association
-            association_names = polymorpheus.associations.map(&:name)
-            errors.add(:base, "You must specify exactly one of the following: "\
-                              "{#{association_names.join(', ')}}")
-          end
-        }
-      end
-
-    end
-
   end
 end

data/lib/polymorpheus/interface/belongs_to_polymorphic.rb

@@ -0,0 +1,43 @@
+module Polymorpheus
+  module Interface
+    module BelongsToPolymorphic
+      def belongs_to_polymorphic(*association_names, options)
+        polymorphic_api = options[:as]
+        builder = Polymorpheus::InterfaceBuilder.new(polymorphic_api,
+                                                     association_names)
+
+        # The POLYMORPHEUS_ASSOCIATIONS constant is useful for two reasons:
+        #
+        # 1. It is useful for other classes to be able to ask this class
+        #    about its polymorphic relationship.
+        #
+        # 2. It prevents a class from defining multiple polymorphic
+        #    relationships. Doing so would be a bad idea from a design
+        #    standpoint, and we don't want to allow for (and support)
+        #    that added complexity.
+        #
+        const_set('POLYMORPHEUS_ASSOCIATIONS', builder.association_names)
+
+        # Set belongs_to associations
+        builder.associations.each do |association|
+          belongs_to association.name.to_sym
+        end
+
+        # Exposed interface for introspection
+        define_method 'polymorpheus' do
+          builder.exposed_interface(self)
+        end
+
+        # Getter method
+        define_method polymorphic_api do
+          builder.get_associated_object(self)
+        end
+
+        # Setter method
+        define_method "#{polymorphic_api}=" do |object_to_associate|
+          builder.set_associated_object(self, object_to_associate)
+        end
+      end
+    end
+  end
+end

data/lib/polymorpheus/interface/rails3/has_many_as_polymorph.rb

@@ -0,0 +1,29 @@
+module Polymorpheus
+  module Interface
+    module HasManyAsPolymorph
+      def has_many_as_polymorph(association, options = {})
+        options.symbolize_keys!
+        fkey = name.foreign_key
+
+        class_name = options[:class_name] || association.to_s.classify
+
+        options[:conditions] = proc do
+          keys = class_name.constantize
+                  .const_get('POLYMORPHEUS_ASSOCIATIONS')
+                  .map(&:foreign_key)
+          keys.delete(fkey)
+
+          nil_columns = keys.reduce({}) { |hash, key| hash.merge!(key => nil) }
+
+          if self.is_a?(ActiveRecord::Associations::JoinDependency::JoinAssociation)
+            { aliased_table_name => nil_columns }
+          else
+            { association => nil_columns }
+          end
+        end
+
+        has_many association, options
+      end
+    end
+  end
+end

data/lib/polymorpheus/interface/rails4/has_many_as_polymorph.rb

@@ -0,0 +1,32 @@
+module Polymorpheus
+  module Interface
+    module HasManyAsPolymorph
+      def has_many_as_polymorph(association, scope = nil, options = {})
+        if scope.instance_of?(Hash)
+          options = scope
+          scope = nil
+        end
+
+        options.symbolize_keys!
+        fkey = name.foreign_key
+
+        class_name = options[:class_name] || association.to_s.classify
+
+        conditions = proc do
+          keys = class_name.constantize
+                  .const_get('POLYMORPHEUS_ASSOCIATIONS')
+                  .map(&:foreign_key)
+          keys.delete(fkey)
+
+          nil_columns = keys.reduce({}) { |hash, key| hash.merge!(key => nil) }
+
+          relation = where(nil_columns)
+          relation = scope.call.merge(relation) unless scope.nil?
+          relation
+        end
+
+        has_many association, conditions, options
+      end
+    end
+  end
+end

data/lib/polymorpheus/interface/validates_polymorph.rb

@@ -0,0 +1,15 @@
+module Polymorpheus
+  module Interface
+    module ValidatesPolymorph
+      def validates_polymorph(polymorphic_api)
+        validate Proc.new {
+          unless polymorpheus.active_association
+            association_names = polymorpheus.associations.map(&:name)
+            errors.add(:base, "You must specify exactly one of the following: "\
+                              "{#{association_names.join(', ')}}")
+          end
+        }
+      end
+    end
+  end
+end

data/lib/polymorpheus/version.rb

@@ -1,3 +1,3 @@
 module Polymorpheus
-  VERSION = '2.0.1'
+  VERSION = '2.1.0'
 end

data/polymorpheus.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.license = 'MIT'
 
   s.add_dependency('foreigner')
-  s.add_dependency('activerecord', '>=3.0')
-  s.add_development_dependency('rspec-rails')
-  s.add_development_dependency('mysql2')
+  s.add_dependency('activerecord', '>= 3.2', '< 5.0')
+  s.add_development_dependency('rspec-rails', '~> 2.14.0')
+  s.add_development_dependency('mysql2', '~> 0.3')
 end

data/spec/mysql2_adapter_spec.rb

@@ -107,8 +107,8 @@ describe Polymorpheus::ConnectionAdapters::MysqlAdapter do
   end
 
   describe "#triggers" do
-    let(:trigger1) { stub(Trigger, :name => '1') }
-    let(:trigger2) { stub(Trigger, :name => '2') }
+    let(:trigger1) { double(Trigger, :name => '1') }
+    let(:trigger2) { double(Trigger, :name => '2') }
 
     before do
       connection.stub_sql('show triggers', [:trigger1, :trigger2])

data/spec/support/class_defs.rb

@@ -9,7 +9,12 @@ end
 
 # Hannibal Lecter is a villain, but not a supervillain
 class Villain < ActiveRecord::Base
-  has_many_as_polymorph :story_arcs, order: 'id DESC'
+  if ActiveRecord::VERSION::MAJOR >= 4
+    has_many_as_polymorph :story_arcs, -> { order('id DESC') }
+  else
+    has_many_as_polymorph :story_arcs, order: 'id DESC'
+  end
+
   has_many :battles, through: :story_arcs
 end
 

metadata

@@ -1,80 +1,77 @@
 --- !ruby/object:Gem::Specification
 name: polymorpheus
 version: !ruby/object:Gem::Version
-  version: 2.0.1
-  prerelease: 
+  version: 2.1.0
 platform: ruby
 authors:
 - Barun Singh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-09 00:00:00.000000000 Z
+date: 2014-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreigner
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - <
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
 description: Provides a database-friendly method for polymorphic relationships
 email: bsingh@wegowise.com
 executables: []
@@ -84,6 +81,10 @@ extra_rdoc_files:
 - LICENSE.txt
 files:
 - lib/polymorpheus/adapter.rb
+- lib/polymorpheus/interface/belongs_to_polymorphic.rb
+- lib/polymorpheus/interface/rails3/has_many_as_polymorph.rb
+- lib/polymorpheus/interface/rails4/has_many_as_polymorph.rb
+- lib/polymorpheus/interface/validates_polymorph.rb
 - lib/polymorpheus/interface.rb
 - lib/polymorpheus/interface_builder/association.rb
 - lib/polymorpheus/interface_builder.rb
@@ -111,26 +112,25 @@ files:
 homepage: http://github.com/wegowise/polymorpheus
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Provides a database-friendly method for polymorphic relationships
 test_files: []