passive_record 0.3.17 → 0.3.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57f65c2807d7cfe4fdedb6ed50a176e4d93f6372
-  data.tar.gz: e2ec1ce8b73eee02815c22acf0ce143a7388bfc4
+  metadata.gz: 55612b91f34d4ac833ad318343274c028a7d9db3
+  data.tar.gz: ee4c132e59ab5c9c2eef23fa7ad6a643b50e9419
 SHA512:
-  metadata.gz: c3507ad80dd941d6d6afb5a5efe3542ae4b8052d53c31dfaa2c58ac737c5825d16c02b1189677e60ca80949d2e505e926c652ee46883da5ec9dcd0af3f07f055
-  data.tar.gz: 49c26b8bdfb5ffbfd4c8f4a0b152ea19763214ee8edae5ee4ed65be561e9ad7c4f15bc223c38dcd28c6c2a09ca1ab51d78ae938496b191282c746a452df687c0
+  metadata.gz: aad41fefd6877ee5d43bbba3f42efd03c89e86e2600aca84f83a69a66a1186f974beb731c8a2ae2e9aa4de7b5b1958b10df557d95bf00c6b0303cda4bfa664ad
+  data.tar.gz: e331d278b6dcc08bfdb31312018dc8aa727dc7af6d7dd0a49e7f1205e672c6589fdd7d24672dde8d2bae09c4dee07d60158c5385c9d4a90ce6daf2f512c2952d

data/README.md

@@ -5,7 +5,7 @@
 * [Email](mailto:joe at deepc.io)
 
 [![Code Climate GPA](https://codeclimate.com/github/deepcerulean/passive_record/badges/gpa.svg)](https://codeclimate.com/github/deepcerulean/passive_record)
-[![Codeship Status for deepcerulean/passive_record](https://www.codeship.io/projects/66bb2d90-ba61-0133-af95-025ac38368ea/status)](https://codeship.com/projects/128700)
+[![Codeship Status for deepcerulean/passive_record](https://www.codeship.io/projects/66bb2d90-ba61-0133-af95-025ac38368ea/status)](https://codeship.com/projects/135673)
 [![Test Coverage](https://codeclimate.com/github/deepcerulean/passive_record/badges/coverage.svg)](https://codeclimate.com/github/deepcerulean/passive_record/coverage)
 [![Gem Version](https://badge.fury.io/rb/passive_record.svg)](https://badge.fury.io/rb/passive_record)
 [![Join the chat at https://gitter.im/deepcerulean/passive_record](https://badges.gitter.im/deepcerulean/passive_record.svg)](https://gitter.im/deepcerulean/passive_record?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

data/lib/passive_record.rb

@@ -38,6 +38,6 @@ module PassiveRecord
   end
 
   def self.drop_all
-    (model_classes + model_classes.flat_map(&:descendants)).each(&:destroy_all)
+    (model_classes + model_classes.flat_map(&:descendants)).uniq.each(&:destroy_all)
   end
 end

data/lib/passive_record/core/identifier.rb

@@ -9,7 +9,8 @@ module PassiveRecord
     end
 
     def ==(other_id)
-      self.value == other_id.value rescue self.value == other_id
+      self.value == other_id || 
+        (other_id.is_a?(SecureRandomIdentifier) && self.value == other_id&.value)
     end
 
     def inspect

data/lib/passive_record/core/query.rb

@@ -4,41 +4,43 @@ module PassiveRecord
       include Enumerable
       extend Forwardable
 
-      attr_accessor :klass, :conditions
-
-      def initialize(klass,conditions={})
+      def initialize(klass,conditions={},scope=nil)
         @klass = klass
         @conditions = conditions
-        @scope = nil
+        @scope = scope
+      end
+
+      def not(new_conditions={})
+        NegatedQuery.new(@klass, new_conditions)
       end
 
-      def not(conditions={})
-        NegatedQuery.new(@klass, conditions)
+      def or(query=nil)
+        DisjoinedQuery.new(@klass, self, query)
       end
 
       def all
-        return [] unless conditions
+        return [] unless @conditions
         matching = method(:matching_instances)
         if @scope
           if negated?
-            klass.reject(&@scope.method(:matching_instances))
+            @klass.reject(&@scope.method(:matching_instances))
           else
-            klass.select(&@scope.method(:matching_instances))
+            @klass.select(&@scope.method(:matching_instances))
           end
         else
-          klass.select(&matching)
+          @klass.select(&matching)
         end
       end
       def_delegators :all, :each
 
       def matching_instances(instance)
-        conditions.all? do |(field,value)|
+        @conditions.all? do |(field,value)|
           evaluate_condition(instance, field, value)
         end
       end
 
       def create(attrs={})
-        klass.create(conditions.merge(attrs))
+        @klass.create(@conditions.merge(attrs))
       end
 
       def first_or_create
@@ -46,24 +48,31 @@ module PassiveRecord
       end
 
       def where(new_conditions={})
-        @conditions = new_conditions.merge(conditions)
+        @conditions = new_conditions.merge(@conditions)
         self
       end
 
-      def ==(other_query)
-        @klass == other_query.klass && @conditions == other_query.conditions
+      def negated?
+        false
       end
 
-      def negated?
+      def disjoined?
         false
       end
 
+      def and(scope_query)
+        ConjoinedQuery.new(@klass, self, scope_query)
+      end
+
       def method_missing(meth,*args,&blk)
-        if klass.methods.include?(meth)
-          # okay, so this thing is a query
-          # and we need to 'compose' with it somehow
-          @scope = klass.send(meth,*args,&blk)
-          self
+        if @klass.methods.include?(meth)
+          scope_query = @klass.send(meth,*args,&blk)
+          if negated? && @scope.nil? && @conditions.empty?
+            @scope = scope_query
+            self
+          else
+            scope_query.and(self)
+          end
         else
           super(meth,*args,&blk)
         end
@@ -94,7 +103,7 @@ module PassiveRecord
 
     class NegatedQuery < Query
       def matching_instances(instance)
-        conditions.none? do |(field,value)|
+        @conditions.none? do |(field,value)|
           evaluate_condition(instance, field, value)
         end
       end
@@ -103,5 +112,33 @@ module PassiveRecord
         true
       end
     end
+
+    class DisjoinedQuery < Query
+      def initialize(klass, first_query, second_query)
+        @klass = klass
+        @first_query = first_query
+        @second_query = second_query
+      end
+
+      def all
+        (@first_query.all + @second_query.all).uniq
+      end
+
+      def disjoined?
+        true
+      end
+    end
+
+    class ConjoinedQuery < Query
+      def initialize(klass, first_query, second_query)
+        @klass = klass
+        @first_query = first_query
+        @second_query = second_query
+      end
+
+      def all
+        @first_query.all & @second_query.all
+      end
+    end
   end
 end

data/lib/passive_record/version.rb

@@ -1,4 +1,4 @@
 module PassiveRecord
   # passive_record version
-  VERSION = "0.3.17"
+  VERSION = "0.3.18"
 end

data/spec/passive_record_spec.rb

@@ -205,9 +205,35 @@ describe "passive record models" do
           end
         end
 
+        context 'queries with disjunctions' do
+          it 'should find where attributes match EITHER query' do
+            pom = Family::Dog.create breed: 'pom'
+            pug = Family::Dog.create breed: 'pug'
+            Family::Dog.create breed: 'mutt'
+            Family::Dog.create breed: 'lab'
+            Family::Dog.create breed: 'papillon'
+
+            expect(
+              Family::Dog.
+                where(breed: 'pom').or(Family::Dog.where(breed: 'pug')).all
+            ).to eq([pom, pug])
+          end
+        end
+
+        context 'query chaining' do
+          it 'should handle conjoining scopes together' do
+            Post.create published_at: 10.days.ago, active: true
+            Post.create active: false
+            recent_and_active = Post.create active: true
+
+            expect(Post.active.recent.all).to eq([recent_and_active])
+            expect(Post.recent.active.all).to eq([recent_and_active])
+          end
+        end
+
         context 'queries with scopes' do
-          let(:post) { Post.create(published_at: 10.days.ago) }
-          let(:another_post) {Post.create(published_at: 2.days.ago)}
+          let!(:post) { Post.create(published_at: 10.days.ago) }
+          let!(:another_post) {Post.create(published_at: 2.days.ago)}
 
           describe 'should restrict using class method' do
             it 'should use a class method as a scope' do
@@ -341,11 +367,11 @@ describe "passive record models" do
 
         expect(
           child.dogs.
-            where(breed: 'mutt')
+            where(breed: 'mutt').all
         ).to eq(
           Family::Dog.
             where(child_id: child.id).
-            where(breed: 'mutt')
+            where(breed: 'mutt').all
         )
       end
 

data/spec/spec_helper.rb

@@ -105,9 +105,13 @@ class Post < Model
   has_many :comments
   has_many :commenters, :through => :comments, :class_name => "User"
 
-  attr_accessor :published_at
+  attr_accessor :active, :published_at
   before_create { @published_at = Time.now }
 
+  def self.active
+    where(active: true)
+  end
+
   def self.recent
     where(:published_at => 3.days.ago..Time.now)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passive_record
 version: !ruby/object:Gem::Version
-  version: 0.3.17
+  version: 0.3.18
 platform: ruby
 authors:
 - Joseph Weissman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-03 00:00:00.000000000 Z
+date: 2016-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport