has_associations 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd029faa545adfba12e9df0164da7178ad05ac73
-  data.tar.gz: 4946e8b1b998d2435f7d789efb4d538affa210d3
+  metadata.gz: d1622b7b49275aafa1daba01f43ad836e328e2cb
+  data.tar.gz: 362e2ee7777bd1fa3623b92089d87950deacee7d
 SHA512:
-  metadata.gz: 8550b826bedd29a08a81f03c74ca25bdcc4664473cf632a7883f28231091ff1993fcef121d4a4f32f2d7f4341636ecb9dcd505fda3e28f5288ec2259fb1a1188
-  data.tar.gz: 338a247a228495d30b07462e8f3c569d301fbef98286c7bbab45112b82b35dec8e9e0e6eae63ba51b929fdc2e21262ed2fff2704ef3750bf3b0f724f2ed369a2
+  metadata.gz: f136240543289fb001be4e18ba450eb447360c8ac92660a32ada1adcfcff190eefa755b0ebd8c01d10b4a99de58d6ad4a552ae17afafa31573a590d73311b686
+  data.tar.gz: 22d1c4c9f9fc7e28463fd2bcd1c355e37bd0112f2639e54e8d386731b30fd7ee43cd94be6fea83d481f44661dc23008a783a11200ced91146ebd4bd0959fa29c

data/README.md

@@ -35,7 +35,7 @@ end
 
 class Son < ActiveRecord::Base
   belongs_to :father
-  has_one :grandfather, through: :grandfather
+  has_one :grandfather, through: :father
   has_association_helpers
 end
 ```
@@ -54,7 +54,7 @@ grandfather.has_father? father
 # => NameError: undefined local variable or method `has_father?`
 ```
 
-### ::belongs_to?(`AR`), ::has_many?(`AR`), ::has_one?(`AR`), ::has_association?(`AR`)
+### ::has_association?(`AR`), ::belongs_to?(`AR`), ::has_many?(`AR`), ::has_one?(`AR`)
 
 Verifies the ActiveRecord association exists
 
@@ -65,18 +65,21 @@ Son.has_one? Father # false
 Son.has_one? Grandfather # true
 ```
 
-### ::has_associations(`type`)
+### ::has_associations(`names_with_macro = nil`)
 
-Gathers the ActiveRecords associations (filtering results by `type`)
+Gathers the ActiveRecords associations
+ * `names_with_macro`: Used to return only the names of associations.
+   If `Symbol`, returns names of associations with macro (ie. `:has_many` or `:belongs_to`).
+   If `true`, returns names of all associations.
+   If `nil` or `false`, returns all AssociationReflection(s)
 
 ```ruby
 Father.has_associations
-# => [
-#      {:name => :sons, :type => :has_many, :class_name => "Son"},
-#      {:name => :grandfather, :type => :belongs_to, :class_name => "Grandfather"}
-#   ]
+# => [#<AssociationReflection @name=:grandfather, @macro=:belongs_to>, #<AssociationReflection @name=:sons, @macro=:has_many>]
 Father.has_associations :has_many
-# => [ {:name => :sons, :type => :has_many, :class_name => "Son"} ]
+# => [:sons]
+Father.has_associations true
+# => [:grandfather, :sons]
 ```
 
 ### #has_(assoc)?(`record`)

data/has_associations.gemspec

@@ -5,7 +5,7 @@ require 'has_associations/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "has_associations"
-  spec.version       = HasAssociations::VERSION
+  spec.version       = ActiveRecord::HasAssociations::VERSION
   spec.authors       = ["Bradyn Poulsen"]
   spec.email         = ["bradyn@bradynpoulsen.com"]
   spec.summary       = %q{ActiveRecord helpers for checking associations}
@@ -18,6 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "activesupport", ">= 3.2"
+  spec.add_dependency "activerecord", ">= 3.2"
+
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake", "~> 0"
 end

data/lib/has_associations.rb

@@ -6,36 +6,34 @@ module ActiveRecord
 
     included do
       ## Gather associations for the current ActiveRecord model
-      def self.has_associations(type = nil)
-        associations = reflect_on_all_associations.map { |a| {:name => a.name, :type => a.macro, :class_name => a.class_name} }
-
-        if type
-          associations.select! { |a| a[:type] == type.to_sym } if type.respond_to? :to_sym
-          associations.map { |a| a[:name] }
+      def self.has_associations(names_with_macro = nil)
+        associations = reflect_on_all_associations names_with_macro.is_a?(Symbol) ? names_with_macro : nil
+        if names_with_macro
+          associations.map { |association| association.name }
         else
           associations
         end
       end
 
       ## Create association helpers (for use in ActiveRecord model)
-      def self.has_association_helpers(*associations)
-        associations.map! &:to_sym
-        assoc = has_associations
-        assoc.select! { |a| associations.include? a[:name] } unless associations.empty?
+      def self.has_association_helpers(*only_associations)
+        only_associations.map! &:to_sym
+        associations = has_associations
+        associations.select! { |association| only_associations.include? association.name } unless only_associations.empty?
 
-        assoc.each do |a|
-          name = a[:name].to_s
-          if [:belongs_to, :has_one].include? a[:type]
+        associations.each do |association|
+          name = association.name.to_s
+          if [:belongs_to, :has_one].include? association.type
             class_eval <<-RUBY_EVAL, __FILE__, __LINE__+1
               def has_#{name.singularize}?(object)
-                return nil unless object.is_a? #{a[:class_name]}
+                return nil unless object.is_a? #{association.class_name}
                 #{name}.id == object.id
               end
             RUBY_EVAL
           else
             class_eval <<-RUBY_EVAL, __FILE__, __LINE__+1
               def has_#{name.singularize}?(object)
-                return nil unless object.is_a? #{a[:class_name]}
+                return nil unless object.is_a? #{association.class_name}
                 #{name}.where(id: object.id).exists?
               end
             RUBY_EVAL
@@ -44,34 +42,34 @@ module ActiveRecord
       end
 
       ## Process class name of object as ActiveRecord or String/Symbol
-      def self.association_class_name(object)
-        if object.is_a? ActiveRecord::Base
+      def self.model_element_name(record)
+        if record.is_a? ActiveRecord::Base
           # if AR instance
-          object = object.class
+          record = record.class
         end
 
-        if object < ActiveRecord::Base
+        if record < ActiveRecord::Base
           # if AR class
-          object.model_name.element.to_sym
-        elsif object.is_a?(String) || object.is_a?(Symbol)
-          object.to_sym
+          record.model_name.element.to_sym
+        elsif record.is_a?(String) || record.is_a?(Symbol)
+          record.to_sym
         else
           false
         end
       end
 
-      %w(belongs_to has_many has_one).each do |type|
+      %w(belongs_to has_many has_one).each do |macro|
         class_eval <<-RUBY_EVAL, __FILE__, __LINE__+1
-          def self.#{type}?(object)
-            has_association? object, :#{type}
+          def self.#{macro}?(record)
+            has_association? record, :#{macro}
           end
         RUBY_EVAL
       end
 
-      def self.has_association?(name, type = nil)
-        name = association_class_name name
-        assoc = has_associations(type || true)
-        assoc.include?(name) || assoc.include?(name.to_s.pluralize.to_sym)
+      def self.has_association?(record, macro = nil)
+        name = model_element_name record
+        associations = has_associations macro || true
+        associations.include?(name) || associations.include?(name.to_s.pluralize.to_sym)
       end
     end
   end

data/lib/has_associations/version.rb

@@ -1,3 +1,5 @@
-module HasAssociations
-  VERSION = "0.0.1"
+module ActiveRecord
+  module HasAssociations
+    VERSION = "0.0.2"
+  end
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: has_associations
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Bradyn Poulsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-06 00:00:00.000000000 Z
+date: 2014-04-08 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement