selfish_associations 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3bd7fff1c41265161aea2372a9fb041ce4ff77e0
-  data.tar.gz: 7af54ffb489231247f270348800a6e144418d847
+  metadata.gz: 37dbe42af345cf9c60fff0b7dde1d3c2fee952a0
+  data.tar.gz: 6a31f1c1d716d52783ff858e395a944a628b2b00
 SHA512:
-  metadata.gz: 93cdb13cfba94868478e470979fb9cbc4696771ae45344ead80bb9cb3f578039d61622dc833e96914fa86b5869bc2a0a3dfa8a79f012fca3623d8a8b6fcc8e35
-  data.tar.gz: 3a50a8ef46c954d305ddfce23a041b53b059b33103e7fc88f53c9fa80db0b0a24ca9f3633a9fe953c965678f3e1662f2f614211b0c5a0abf2b8963a7daab39aa
+  metadata.gz: cc986cfd6243a3f802aee3c7f1d3cd46bb8516ddebf48e8d0145e3ebd7d416ef4f08581b0124ad3e4cbaeadc58d3e7b2dede36c807d7a7a03c4307b9d7ac5a5f
+  data.tar.gz: 9406b9a11d824ecfbc2db5292bfe03e63d0736da2a9f7607df365600fe24f835575ad3489fc5f86115f41e5ca5a355f0fa358c582788e96cfd6e4ba45be6a7c4

data/lib/selfish_associations/associations/association.rb

@@ -13,10 +13,12 @@ module SelfishAssociations
       options = options.symbolize_keys
       @name = name.to_s
       @model = model
-      @scope = scope
       @foreign_class_name = (options[:class_name] || name.to_s.classify).to_s
       @foreign_key = options[:foreign_key] == false ? false : (options[:foreign_key] || @model.name.foreign_key).to_sym
-      @foreign_key_scope = @foreign_key.present? ? foreign_key_scope : nil
+      @scopes = []
+
+      add_scope(scope) if scope.present?
+      add_scope(foreign_key_scope) if @foreign_key.present?
       validate
     end
 
@@ -38,15 +40,22 @@ module SelfishAssociations
       foreign_class.where(instance_find_conditions(instance))
     end
 
+    def initialize_for(instance)
+      foreign_class.new(instance_create_attributes(instance))
+    end
+
     def create_for(instance)
       foreign_class.create(instance_create_attributes(instance))
     end
 
     private
 
+    def add_scope(scope)
+      @scopes << scope
+    end
+
     def apply_scopes(reader)
-      reader.read(@scope) if @scope.present?
-      reader.read(@foreign_key_scope) if @foreign_key.present?
+      @scopes.each{|scope| reader.read(scope) }
       return reader
     end
 
@@ -111,9 +120,9 @@ module SelfishAssociations
     end
 
     def validate
-      if @scope.present?
-        @scope.is_a?(Proc) or raise SelfishAssociations::SelfishException, "Scope must be a Proc"
-        @scope.arity == 0 || @scope.arity == 1 or raise SelfishAssociations::SelfishException, "Scope must have arity of 0 or 1"
+      @scopes.each do |scope|
+        scope.is_a?(Proc) or raise SelfishAssociations::SelfishException, "Scope must be a Proc"
+        scope.arity == 0 || scope.arity == 1 or raise SelfishAssociations::SelfishException, "Scope must have arity of 0 or 1"
       end
       @model.is_a?(Class) && @model < ActiveRecord::Base or raise SelfishAssociations::SelfishException, "Tried to define a SelfishAssociation for an invalid object (#{@model})"
     end

data/lib/selfish_associations/utils/association_traverser.rb

@@ -54,14 +54,11 @@ module SelfishAssociations
       merge ? PathMerger.new(@associations).merge : @associations
     end
 
-    # Method Missing pattern (reluctantly).
-    # Really we could initialize anew at each node and pre-define all methods
-    # But this actually seems more lightweight.
-    # Intercept any method to check if it is an association or a column
+    # Check if method is an association or a column
     # If Association, store current node and iterate to the association.
     # If it is a column, return an Arel::Node representing that value
     # Else, raise NoMethodError
-    def method_missing(method, *args)
+    def send(method, *args)
       if @klass.column_names.include?(method.to_s)
         @associations << @path if @path.present?
         node = @klass.arel_table[method]
@@ -81,5 +78,12 @@ module SelfishAssociations
         ::Kernel.raise ::NoMethodError, message
       end
     end
+
+    # Method Missing pattern (reluctantly).
+    # Really we could initialize a new at each node and pre-define all methods
+    # But this actually seems more lightweight.
+    def method_missing(method, *args)
+      send(method, *args)
+    end
   end
-end
+end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: selfish_associations
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Andrew Schwartz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-04 00:00:00.000000000 Z
+date: 2016-09-26 00:00:00.000000000 Z
 dependencies: []
-description: Create joinable associations with instance/record-level constraints
+description: Use instance-level where conditions with joinable associations
 email: ozydingo@gmail.com
 executables: []
 extensions: []