passive_record 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f29ddf4304ae896f01ee7455929a409966799df
-  data.tar.gz: cfa9db856459164c5864e4df1f2679cf2764a20f
+  metadata.gz: bd4210b6d42edbbc3b345887b2a15918d452fdd2
+  data.tar.gz: c5c73ddb836c84ceaaf9290e829f7b7d31ae6e20
 SHA512:
-  metadata.gz: 0cb01f630b4bf056a4747a0f181afa3bd86859b663c831ef4f845d099d83078cc9fc20eef247ac3a08619fed9bc381996554409c113591cda491c9328817abbe
-  data.tar.gz: ae8db06335510ad6bb9213e4ce7c6024e85a02a979f0d4d718b1bea05de713a398488b74bd9d3dfdbe678857ad873c34d0c4b38397793c8347a9b98965300ff7
+  metadata.gz: c56f0f03af33458ed3a8d0e0d8b8d4795187df9197a71c95625a688f47636b1898c4ce03450142bc4baaedf615c70b34ca075e018e038cdb2731a05e94254f07
+  data.tar.gz: 18e488e25f0ad1a0ca791920160bd0fc7f4c3fb49987f1801fa5f1485aa93dd8463ca5cf8be723ae966a5b43544c69c15aa7ea640335aba4342f4dc6780c1f07

data/README.md

@@ -7,7 +7,7 @@
 [![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)
 [![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)
 
 ## Description
 
@@ -27,7 +27,6 @@ PassiveRecord may be right for you!
 
 ## Features
 
-  - New objects are tracked and assigned IDs
   - Build relationships with belongs_to, has_one and has_many
   - Query on attributes and associations
   - Supports many-to-many and self-referential relationships

data/lib/passive_record/class_methods.rb

@@ -0,0 +1,98 @@
+module PassiveRecord
+  module ClassMethods
+    include PassiveRecord::Core
+    include PassiveRecord::Associations
+    include PassiveRecord::Hooks
+
+    include Enumerable
+    extend Forwardable
+
+    # from http://stackoverflow.com/a/2393750/90042
+    def descendants
+      ObjectSpace.each_object(Class).select { |klass| klass < self }
+    end
+
+    def all
+      instances_by_id.values
+    end
+    def_delegators :all, :each
+
+    def last
+      all.last
+    end
+
+    def find(id_or_ids)
+      if id_or_ids.is_a?(Array)
+        find_by_ids(id_or_ids)
+      else
+        find_by_id(id_or_ids)
+      end
+    end
+
+    def find_by(conditions)
+      if conditions.is_a?(Identifier)
+        find_by_id(conditions)
+      elsif conditions.is_a?(Array) && conditions.all? { |c| c.is_a?(Identifier) }
+        find_by_ids(conditions)
+      else
+        where(conditions).first
+      end
+    end
+
+    def find_all_by(conditions)
+      if conditions.is_a?(Array) && conditions.all? { |c| c.is_a?(Identifier) }
+        find_by_ids(conditions)
+      else
+        where(conditions).all
+      end
+    end
+
+    def where(conditions)
+      Query.new(self, conditions)
+    end
+
+    def create(attrs={})
+      instance = new
+
+      instance.singleton_class.class_eval { attr_accessor :id }
+      instance.send(:"id=", Identifier.generate(self))
+
+      register(instance)
+
+      attrs.each do |(k,v)|
+        instance.send("#{k}=", v)
+      end
+
+      after_create_hooks.each do |hook|
+        hook.run(instance)
+      end
+
+      instance
+    end
+
+    def destroy_all
+      @instances = {}
+    end
+
+    protected
+    def find_by_id(_id)
+      key = instances_by_id.keys.detect { |id,_| id == _id }
+      instances_by_id[key] if key
+    end
+
+    def find_by_ids(ids)
+      instances_by_id.select { |id,_| ids.include?(id) }.values
+    end
+
+    private
+    def instances_by_id
+      @instances ||= {}
+    end
+
+    def register(model)
+      instances_by_id[model.id] = model
+      self
+    end
+  end
+
+end

data/lib/passive_record/instance_methods.rb

@@ -0,0 +1,70 @@
+module PassiveRecord
+  module InstanceMethods
+    include PrettyPrinting
+
+    def respond_to?(meth,*args,&blk)
+      if find_relation_by_target_name_symbol(meth)
+        true
+      else
+        super(meth,*args,&blk)
+      end
+    end
+
+    def method_missing(meth, *args, &blk)
+      if (matching_relation = find_relation_by_target_name_symbol(meth))
+        send_relation(matching_relation, meth, *args, &blk)
+      else
+        super(meth,*args,&blk)
+      end
+    end
+
+    protected
+
+    def send_relation(matching_relation, meth, *args, &blk)
+      target_name = matching_relation.association.target_name_symbol.to_s
+
+      case meth.to_s
+      when target_name
+        matching_relation.lookup
+      when "#{target_name}="
+        matching_relation.parent_model_id = args.first.id
+      when "create_#{target_name}", "create_#{target_name.singularize}"
+        matching_relation.create(*args)
+      when "#{target_name}_id"
+        matching_relation.parent_model_id
+      when "#{target_name}_id="
+        matching_relation.parent_model_id = args.first
+      when "#{target_name}_ids", "#{target_name.singularize}_ids"
+        matching_relation.parent_model.send(target_name).map(&:id)
+      end
+    end
+
+    def relata
+      @_relata ||= self.class.associations.map do |assn|
+        assn.to_relation(self)
+      end
+    end
+
+    private
+
+    def find_relation_by_target_name_symbol(meth)
+      relata.detect do |relation|  # matching relation...
+        possible_target_names(relation).include?(meth.to_s)
+      end
+    end
+
+    def possible_target_names(relation)
+      target_name = relation.association.target_name_symbol.to_s
+      [
+        target_name,
+        "#{target_name}=",
+        "#{target_name}_id",
+        "#{target_name}_ids",
+        "#{target_name.singularize}_ids",
+        "#{target_name}_id=",
+        "create_#{target_name}",
+        "create_#{target_name.singularize}"
+      ]
+    end
+  end
+end

data/lib/passive_record/pretty_printing.rb

@@ -0,0 +1,33 @@
+module PassiveRecord
+  module PrettyPrinting
+    def inspect
+      pretty_vars = instance_variables_hash.map do |k,v|
+        "#{k.to_s.gsub(/^\@/,'')}: #{v.inspect}"
+      end.join(', ')
+      "#{self.class.name} (#{pretty_vars})"
+    end
+
+    protected
+
+    def uninspectable_instance_variables
+      []
+    end
+
+    private
+
+    def inspectable_instance_variables
+      vars = instance_variables
+      vars += members rescue []
+      vars - uninspectable_instance_variables
+    end
+
+    # from http://stackoverflow.com/a/8417341/90042
+    def instance_variables_hash
+      Hash[
+        inspectable_instance_variables.
+        reject { |sym| sym.to_s.start_with?("@_") }.
+        map { |name| [name, (instance_variable_get(name) rescue send(name))] }
+      ]
+    end
+  end
+end

data/lib/passive_record/version.rb

@@ -1,4 +1,4 @@
 module PassiveRecord
   # passive_record version
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/lib/passive_record.rb

@@ -10,6 +10,11 @@ require 'passive_record/class_inheritable_attrs'
 require 'passive_record/associations'
 require 'passive_record/hooks'
 
+require 'passive_record/pretty_printing'
+
+require 'passive_record/instance_methods'
+require 'passive_record/class_methods'
+
 module PassiveRecord
   def self.included(base)
     base.send :include, InstanceMethods
@@ -31,165 +36,4 @@ module PassiveRecord
   def self.drop_all
     (model_classes + model_classes.flat_map(&:descendants)).each(&:destroy_all)
   end
-
-  module InstanceMethods
-    def inspect
-      pretty_vars = instance_variables_hash.map do |k,v|
-        "#{k.to_s.gsub(/^\@/,'')}: #{v.inspect}"
-      end.join(', ')
-      "#{self.class.name} (#{pretty_vars})"
-    end
-
-    # from http://stackoverflow.com/a/8417341/90042
-    def instance_variables_hash
-      Hash[
-        instance_variables.
-          reject { |sym| sym.to_s.start_with?("@_") }.
-          map { |name| [name, instance_variable_get(name)] }
-      ]
-    end
-
-    def relata
-      @_relata ||= self.class.associations.map do |assn|
-        assn.to_relation(self)
-      end
-    end
-
-
-    def find_relation_by_target_name_symbol(meth)
-      relata.detect do |relation|  # matching relation...
-        meth == relation.association.target_name_symbol ||
-          meth.to_s == relation.association.target_name_symbol.to_s + "=" ||
-          meth.to_s == relation.association.target_name_symbol.to_s + "_id" ||
-          meth.to_s == relation.association.target_name_symbol.to_s + "_id=" ||
-          meth.to_s == "create_" + relation.association.target_name_symbol.to_s ||
-          meth.to_s == "create_" + (relation.association.target_name_symbol.to_s).singularize
-      end
-    end
-
-    def respond_to?(meth,*args,&blk)
-      if find_relation_by_target_name_symbol(meth)
-        true
-      else
-        super(meth,*args,&blk)
-      end
-    end
-
-    def method_missing(meth, *args, &blk)
-      matching_relation = find_relation_by_target_name_symbol(meth)
-
-      if matching_relation
-        if meth.to_s == matching_relation.association.target_name_symbol.to_s + "_id"
-          matching_relation.parent_model_id
-        elsif meth.to_s.end_with?("_id=")
-          matching_relation.parent_model_id = args.first
-        elsif meth.to_s.end_with?("=")
-          matching_relation.parent_model_id = args.first.id
-        elsif meth.to_s.start_with?("create_")
-          matching_relation.create(*args)
-        else
-          # lookup the matching associated entities
-          matching_relation.lookup
-        end
-      else
-        super(meth,*args,&blk)
-      end
-    end
-  end
-
-  module ClassMethods
-    include PassiveRecord::Core
-    include PassiveRecord::Associations
-    include PassiveRecord::Hooks
-
-    include Enumerable
-    extend Forwardable
-
-    # from http://stackoverflow.com/a/2393750/90042
-    def descendants
-      ObjectSpace.each_object(Class).select { |klass| klass < self }
-    end
-
-    def all
-      instances_by_id.values
-    end
-    def_delegators :all, :each
-
-    def last
-      all.last
-    end
-
-    def find(id_or_ids)
-      if id_or_ids.is_a?(Array)
-        find_by_ids(id_or_ids)
-      else
-        find_by_id(id_or_ids)
-      end
-    end
-
-    def find_by(conditions)
-      if conditions.is_a?(Identifier)
-        find_by_id(conditions)
-      elsif conditions.is_a?(Array) && conditions.all? { |c| c.is_a?(Identifier) }
-        find_by_ids(conditions)
-      else
-        where(conditions).first
-      end
-    end
-
-    def find_all_by(conditions)
-      if conditions.is_a?(Array) && conditions.all? { |c| c.is_a?(Identifier) }
-        find_by_ids(conditions)
-      else
-        where(conditions).all
-      end
-    end
-
-    def where(conditions)
-      Query.new(self, conditions)
-    end
-
-    def create(attrs={})
-      instance = new
-
-      instance.singleton_class.class_eval { attr_accessor :id }
-      instance.send(:"id=", Identifier.generate(self))
-
-      register(instance)
-
-      attrs.each do |(k,v)|
-        instance.send("#{k}=", v)
-      end
-
-      after_create_hooks.each do |hook|
-        hook.run(instance)
-      end
-
-      instance
-    end
-
-    def destroy_all
-      @instances = {}
-    end
-
-    protected
-    def find_by_id(_id)
-      key = instances_by_id.keys.detect { |id,_| id == _id }
-      instances_by_id[key] if key
-    end
-
-    def find_by_ids(ids)
-      instances_by_id.select { |id,_| ids.include?(id) }.values
-    end
-
-    private
-    def instances_by_id
-      @instances ||= {}
-    end
-
-    def register(model)
-      instances_by_id[model.id] = model
-      self
-    end
-  end
 end

data/spec/passive_record_spec.rb

@@ -21,6 +21,12 @@ describe Model do
     let!(:model) { SimpleModel.create(foo: value) }
     let(:value) { 'foo_value' }
 
+    describe "#inspect" do
+      it 'should report attribute details' do
+        expect(model.inspect).to eq("SimpleModel (id: 1, foo: \"foo_value\")")
+      end
+    end
+
     describe "#id" do
       it 'should be retrievable by id' do
         expect(SimpleModel.find_by(model.id)).to eq(model)
@@ -69,6 +75,27 @@ describe Model do
           expect(SimpleModel.find([model.id, model_b.id])).to eq([model, model_b])
         end
       end
+
+      describe "#where" do
+        it 'should return a query obj' do
+          expect(SimpleModel.where(id: 'fake_id')).to be_a(PassiveRecord::Core::Query)
+        end
+
+        context "queries" do
+          describe "#create" do
+          it 'should create objects' do
+            expect{SimpleModel.where(id: 'new_id').create }.to change{SimpleModel.count}.by(1)
+          end
+          end
+
+          describe "#first_or_create" do
+            it 'should create the object or return matching' do
+              expect{SimpleModel.where(id: 'another_id').first_or_create }.to change{SimpleModel.count}.by(1)
+              expect{SimpleModel.where(id: 'another_id').first_or_create }.not_to change{SimpleModel.count}
+            end
+          end
+        end
+      end
     end
 
     context 'querying by attributes' do
@@ -157,6 +184,7 @@ describe Model do
 
         expect(child.id).not_to eq(another_child.id)
         expect(parent.children).to eq([child, another_child])
+        expect(parent.children_ids).to eq([child.id, another_child.id])
       end
     end
 
@@ -169,6 +197,7 @@ describe Model do
         expect(parent.dogs).to all(be_a(Dog))
         expect(parent.dogs.count).to eq(1)
         expect(parent.dogs.first).to eq(child.dogs.first)
+        expect(parent.dog_ids).to eq([child.dogs.first.id])
       end
 
       it 'should do the nested query example from the readme' do
@@ -228,4 +257,5 @@ describe Model do
       end
     end
   end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passive_record
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Joseph Weissman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-21 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -140,9 +140,12 @@ files:
 - lib/passive_record/associations/has_many_through.rb
 - lib/passive_record/associations/has_one.rb
 - lib/passive_record/class_inheritable_attrs.rb
+- lib/passive_record/class_methods.rb
 - lib/passive_record/core/identifier.rb
 - lib/passive_record/core/query.rb
 - lib/passive_record/hooks.rb
+- lib/passive_record/instance_methods.rb
+- lib/passive_record/pretty_printing.rb
 - lib/passive_record/version.rb
 - passive_record.gemspec
 - spec/passive_record_spec.rb