ninja-model 0.8.0 → 0.8.1

data/lib/ninja_model/associations/has_many_association.rb

@@ -3,7 +3,7 @@ module NinjaModel
     class HasManyAssociation
       def initialize(owner, reflection)
         @owner, @reflection = owner, reflection
-        @relation = reflection.klass.scoped.where(reflection.primary_key_name.to_sym.eq(owner.id))
+        @relation = apply_default_scope(reflection.klass.scoped)
       end
 
       delegate :each, :collect, :map, :to_a, :size, :blank?, :empty?, :to => :relation
@@ -12,7 +12,7 @@ module NinjaModel
         if @relation.respond_to?(method)
           @relation.send(method, *args)
         elsif @relation.klass.respond_to?(method)
-          @relation.klass.send(method, *args)
+          apply_default_scope(@relation.klass.scoped).send(method, *args)
         else
           super
         end
@@ -37,6 +37,12 @@ module NinjaModel
       def to_ary
         @relation.to_a
       end
+
+      private
+
+      def apply_default_scope(scoping)
+        scoping.where(@reflection.primary_key_name.to_sym.eq(@owner.id))
+      end
     end
   end
 end

data/lib/ninja_model/rails_ext/active_record.rb

@@ -212,7 +212,7 @@ module NinjaModel
             @ninja_proxy ||= begin
               self.class.ninja_proxy.instance(self)
             end
-            @ninja_proxy.attributes = self.attributes.delete_if { |k,v| k.eql?('id') }
+            @ninja_proxy.attributes = self.attributes
             @ninja_proxy
           end
         end

data/lib/ninja_model/version.rb

@@ -1,3 +1,3 @@
 module NinjaModel
- VERSION = "0.8.0"
+ VERSION = "0.8.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ninja-model
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &9709260 !ruby/object:Gem::Requirement
+  requirement: &9388120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *9709260
+  version_requirements: *9388120
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &9708520 !ruby/object:Gem::Requirement
+  requirement: &9387240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *9708520
+  version_requirements: *9387240
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &9705000 !ruby/object:Gem::Requirement
+  requirement: &9386660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *9705000
+  version_requirements: *9386660
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &9704320 !ruby/object:Gem::Requirement
+  requirement: &9383260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.10.0
   type: :development
   prerelease: false
-  version_requirements: *9704320
+  version_requirements: *9383260
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &9703640 !ruby/object:Gem::Requirement
+  requirement: &9382620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.5.0
   type: :development
   prerelease: false
-  version_requirements: *9703640
+  version_requirements: *9382620
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &9702980 !ruby/object:Gem::Requirement
+  requirement: &9381940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.5.10
   type: :development
   prerelease: false
-  version_requirements: *9702980
+  version_requirements: *9381940
 - !ruby/object:Gem::Dependency
   name: libnotify
-  requirement: &9702340 !ruby/object:Gem::Requirement
+  requirement: &9381280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *9702340
+  version_requirements: *9381280
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &9701740 !ruby/object:Gem::Requirement
+  requirement: &9380660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.7.4
   type: :development
   prerelease: false
-  version_requirements: *9701740
+  version_requirements: *9380660
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &9701160 !ruby/object:Gem::Requirement
+  requirement: &9379980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +109,7 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *9701160
+  version_requirements: *9379980
 description: Pseudo-ORM for Ruby/Rails with an ActiveRecord-like interface
 email: theprime@codingprime.com
 executables: []
@@ -190,7 +190,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1070647489390734539
+      hash: -2496958608719154652
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -199,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1070647489390734539
+      hash: -2496958608719154652
 requirements: []
 rubyforge_project: ninja-model
 rubygems_version: 1.8.10