passive_record 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bddfa4e4c2c50662999f1bc1949e44f1e0878a93
-  data.tar.gz: 50b8eba073d411dd99e0cca965d6e5e7676418ca
+  metadata.gz: 50c7310ba09f037ee279f9ee0fb42cadb875c7b8
+  data.tar.gz: 6d61cec9dca1338c117a996fa2330580e66861b4
 SHA512:
-  metadata.gz: 90549bebdef9863aa15c1d0fd32a0dd71eeb411a8705d63e263b84656bd4e79db976467aa39d41fdc205e7cf0c7fd4e43590d3a9b7973137548e9cc0bcbc3264
-  data.tar.gz: ad5276c142395eb0b9432952f6bae95ab1e3dd0179d91964dac484aa0358f47d88738e8f13f2fb3e641b0862b1bd64e7ccd5cfa9368185c9669c87cba531eba3
+  metadata.gz: 7422229e4baeac8309309ab02e043a1bda67ecdec36be394eea4ec29ad5c25dc21eeda9384c5f3e6b46120a3f28cfe36a81e350050596ce9f8d846e093d61fc9
+  data.tar.gz: ef897faa83e6699f666f46c29334045ae1962ebe071ac87a19efbf840c9b3716d2c0e6ea176ec4b868f9d007dab8d0d75796a3c344538a714aa548fb6d7e26cd

data/lib/passive_record/associations/has_many.rb

@@ -20,7 +20,7 @@ module PassiveRecord
         child_class.where(parent_model_id_field => parent_model.id).all
       end
 
-      def_delegators :all, :each, :last, :all?, :empty?
+      def_delegators :all, :each, :last, :all?, :empty?, :sample
 
       def where(conditions={})
         child_class.where(conditions.merge(parent_model_id_field.to_sym => parent_model.id))

data/lib/passive_record/associations/has_many_through.rb

@@ -91,20 +91,22 @@ module PassiveRecord
       end
 
       def intermediary_conditions
-        nested_conds = {
-          intermediary_relation.association.children_name_sym.to_s.singularize.to_sym => {
-            parent_model_id_field.to_sym => parent_model.id
-          }
-        }
+        intermediary_key = if intermediary_relation.association.is_a?(HasManyAssociation)
+                             intermediary_relation.association.children_name_sym.to_s.singularize.to_sym
+                           elsif intermediary_relation.association.is_a?(HasManyThroughAssociation)
+                             intermediary_relation.association.through_class.to_s.singularize.to_sym
+                           else 
+                             raise "Intermediary association #{intermediary_relation.association} is not has many or has many through...?"
+                           end
+        
+        nested_conds = { intermediary_key => { parent_model_id_field.to_sym => parent_model.id } }
 
         if nested_association.is_a?(HasManyThroughAssociation)
           n = nested_association
           hash = nested_conds
-          compound_key = []
 
-          until n.is_a?(HasManyAssociation)
+          until !n.is_a?(HasManyThroughAssociation)
             key = n.through_class.to_s.singularize.to_sym
-            compound_key.push(key)
             hash = {key => hash}
             n = n.nested_association
           end

data/lib/passive_record/core/query.rb

@@ -5,6 +5,8 @@ module PassiveRecord
       extend Forwardable
       include PassiveRecord::ArithmeticHelpers
 
+      attr_reader :conditions
+
       def initialize(klass,conditions={},scope=nil)
         @klass = klass
         @conditions = conditions
@@ -20,19 +22,41 @@ module PassiveRecord
       end
 
       def all
-        return [] unless @conditions
-        matching = method(:matching_instances)
         if @scope
+          matching = @scope.method(:matching_instances)
           if negated?
-            @klass.reject(&@scope.method(:matching_instances))
+            @klass.reject(&matching)
           else
-            @klass.select(&@scope.method(:matching_instances))
+            @klass.select(&matching)
           end
         else
+          matching = method(:matching_instances)
           @klass.select(&matching)
         end
       end
-      def_delegators :all, :each
+      def_delegators :all, :sample
+
+      def each
+        if @scope
+          matching = @scope.method(:matching_instances)
+          if negated?
+            @klass.all.each do |instance| #reject(&matching)
+              yield instance unless matching[instance]
+            end
+          else
+            @klass.all.each do |instance|
+              yield instance if matching[instance]
+            end
+            # @klass.select(&matching)
+          end
+        else
+          matching = method(:matching_instances)
+          @klass.all.each do |instance|
+            yield instance if matching[instance]
+          end
+          # @klass.select(&matching)
+        end
+      end
 
       def matching_instances(instance)
         @conditions.all? do |(field,value)|
@@ -49,7 +73,7 @@ module PassiveRecord
       end
 
       def where(new_conditions={})
-        @conditions = new_conditions.merge(@conditions)
+        @conditions.merge!(new_conditions)
         self
       end
 
@@ -61,6 +85,14 @@ module PassiveRecord
         false
       end
 
+      def conjoined?
+        false
+      end
+
+      def basic?
+        !negated? && !disjoined? && !conjoined?
+      end
+
       def and(scope_query)
         ConjoinedQuery.new(@klass, self, scope_query)
       end
@@ -71,6 +103,9 @@ module PassiveRecord
           if negated? && @scope.nil? && @conditions.empty?
             @scope = scope_query
             self
+          elsif basic? && scope_query.basic?
+            @conditions.merge!(scope_query.conditions)
+            self
           else
             scope_query.and(self)
           end
@@ -81,12 +116,10 @@ module PassiveRecord
 
       protected
       def evaluate_condition(instance, field, value)
-        if value.is_a?(Hash)
-          evaluate_nested_conditions(instance, field, value)
-        elsif value.is_a?(Range)
-          value.cover?(instance.send(field))
-        elsif value.is_a?(Array)
-          value.include?(instance.send(field))
+        case value
+        when Hash  then evaluate_nested_conditions(instance, field, value)
+        when Range then value.cover?(instance.send(field))
+        when Array then value.include?(instance.send(field))
         else
           instance.send(field) == value
         end
@@ -97,12 +130,10 @@ module PassiveRecord
         association && value.all? do |(association_field,val)|
           if association.is_a?(Associations::Relation) && !association.singular?
             association.where(association_field => val).any?
+          elsif val.is_a?(Hash)
+            evaluate_nested_conditions(association, association_field, val)
           else
-            if val.is_a?(Hash)
-              evaluate_nested_conditions(association, association_field, val)
-            else
-              association.send(association_field) == val
-            end
+            association.send(association_field) == val
           end
         end
       end
@@ -146,6 +177,14 @@ module PassiveRecord
       def all
         @first_query.all & @second_query.all
       end
+
+      def where(new_conditions={})
+        @first_query.where(new_conditions)
+      end
+
+      def conjoined?
+        true
+      end
     end
   end
 end

data/lib/passive_record/version.rb

@@ -1,4 +1,4 @@
 module PassiveRecord
   # passive_record version
-  VERSION = "0.4.6"
+  VERSION = "0.4.7"
 end

data/notes.md

@@ -0,0 +1,42 @@
+                  (channel spec)               (stream spec)
+
+    Stream ->                                  [parent]
+    Channel ->    [from parent model]          [intermed]
+    Feed ->       [intermediary relation]      [from nested...]
+    (*) Blog ->   [ from nested assn...? ]
+    Post
+
+   we need a process that starts the other way, and 'completes' the through
+   like a belongs_to :through ... ?
+
+for stream spec:
+
+  - nested assn is (channel has_many posts through feeds)
+    if we could get at (feed has_many posts through blogs)
+    i think we could recurse?
+    note: it should be the 'nested assn' for (channels has_many posts)...
+
+  - intermediray relation is (stream has many channels...) # through
+    can we get at channels has many posts?
+
+    in this context Channel is 
+
+      `intermediary_relation.child_class_name.to_s.singularize.constantize' [ ugh! ]
+     
+
+
+
+Post.where(blog_id: 1)
+
+Post.where(blog: { feed_id: 234 })
+
+Post.where(blog: { feed: { channel_id: 567 }})
+
+Post.where(blog: { feed: { channel: { stream: 890 }}})
+
+
+# network.posts.recent
+
+Post.where(published_at: 1.day.ago...Time.now, blog: { feed: { channel: { stream: { network_id: 1234 }}}})
+
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passive_record
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Joseph Weissman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-04 00:00:00.000000000 Z
+date: 2016-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -131,6 +131,7 @@ extra_rdoc_files:
 - ChangeLog.md
 - LICENSE.txt
 - README.md
+- notes.md
 files:
 - ".document"
 - ".gitignore"
@@ -162,6 +163,7 @@ files:
 - lib/passive_record/pretty_printing.rb
 - lib/passive_record/version.rb
 - logo.png
+- notes.md
 - passive_record.gemspec
 - spec/passive_record_spec.rb
 - spec/spec_helper.rb