acfs 0.32.1.1.b274 → 0.32.1.1.b275

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDhjM2JmMTcxNDM2ODcwNzE3NTExM2FjM2UyZGZmNjA4ZWM2MjZlOA==
+    NGZmNGMyYTFkNTc3MDVlNzE2OTYxN2FkZjI5YmFiYzFlZTIyMWIwNQ==
   data.tar.gz: !binary |-
-    MDkwYzcyZjJjYzA0ODU0ODMyZGI0MDIzZjQzMWUyYjcxOGNkNTRkMw==
+    MGFhMTlhN2U0MmY5NDZlZDhiYzk2ZmI1MTliY2I3MjM0OGNkY2IxMQ==
 SHA512:
   metadata.gz: !binary |-
-    OWEzYzdmOGZmNzU0MTMzODgwMGQ2MWM4YjJlMjU1NTM5ZjE4NTg3MzBjOWI3
-    YjVjMjQ2ZTQ4YmFjOGMyNDNmMjczYWFhOTJkODM3ODVjMjE2NDY1ZTc3OTFi
-    ZGYyMmEzODVkNTdhMTMzZTQ4MjhiYjlkNWJhM2JlMjFmZDZmMTE=
+    NzMyNDkzYTI4YTE5MzRkYTY0NWEzMjUwNThhYzliZjc1ZWMzNDYwNWE3N2E2
+    Njg3YWY4NWU2OTNlNzk4MDNmNWQ1ZjdjNGM5MTE3ZmRhYjIwYTM3NDJlNWRi
+    NzRkZjA0ZjU4OTRmMjdiMWYxOGNkNmYyOTMxMWU3YmNjNWUyOGM=
   data.tar.gz: !binary |-
-    ZDQzNjM4MDVmMDYyYzEzNjc5ZWY2ODMzNTMyYmZmODAyYTQ4NjFjZWU3YzY5
-    NDY2YzViODc3MDE5YWQ0ZjBhYWY0MzFiYzE1ZDFhOGExZmQ3MDFjMmUzYmYw
-    NWQyNTdiNmQwMDg0ODU2MDA1OTg0ZjdkMWFkZTUyYmMyOTQ3YjA=
+    NDllMTVmMjU2ZmE5NjQwOGQxNWU4MGIyMTI5Yjg0ZDg4NWZmZDUxYmM1NWY3
+    YTM5Mjc1ZTFhMDVlNTU1ZTRmOGQ4OWVlMDFkZDg3ZWJiZDFjMmI2NzBlODhj
+    MDIwZjM5MGI5ZWQzOGU3MmFiOWFkMjBmZmFkYTM1YzkwNzZjMzc=

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Next
+
+* Do not raise errors on unknown attributes by default, add :unknown option.
+
 ## 0.32.1
 
 * Fix multiple callbacks on `QueryMethods#all`

data/lib/acfs/model/attributes.rb

@@ -98,6 +98,16 @@ module Acfs::Model
     def write_attributes(attributes, opts = {})
       return false unless attributes.respond_to? :each
 
+      if opts.fetch(:unknown,:ignore) == :raise
+        if (attributes.keys.map(&:to_s) - self.class.attributes.keys).any?
+          raise ArgumentError.new "Unknown attributes: #{(attributes.keys - self.class.attributes.keys).map(&:inspect).join(', ')}"
+        end
+      end
+
+      attributes = attributes.select do |k, v|
+        self.class.attributes.keys.include? k.to_s
+      end
+
       procs = {}
 
       attributes.each do |key, _|

data/lib/acfs/model/query_methods.rb

@@ -170,7 +170,7 @@ module Acfs::Model
         type = data.delete 'type'
         klass = resource_class_lookup(type)
         (opts[:origin].is_a?(klass) ? opts[:origin] : klass.new).tap do |m|
-          m.attributes = data
+          m.write_attributes data, opts
           m.loaded!
         end
       end

data/spec/acfs/model/attributes_spec.rb

@@ -42,19 +42,42 @@ describe Acfs::Model::Attributes do
       model.attribute :name, :string, default: 'John'
       model.attribute :age, :integer, default: 25
     end
+    let(:args) { [params] }
+    let(:params){ {name: 'James'} }
     let(:m) { model.new }
+    let(:action) { lambda{ m.write_attributes *args } }
+    subject { action }
 
-    it 'should update attributes' do
-      m.write_attributes name: 'James'
+    it 'should update attributes'  do
+      should change(m, :attributes)
+             .from({'name' => 'John', 'age' => 25})
+             .to({'name' => 'James', 'age' => 25})
+    end
+
+    context 'without non-hash params' do
+      let(:params) { 'James' }
 
-      expect(m.attributes).to be == { name: 'James', age: 25 }.stringify_keys
+      it { should_not change(m, :attributes) }
+      its(:call) { should eq false }
     end
 
-    it 'should do nothing on non-array types' do
-      ret = m.write_attributes 'James'
+    context 'with unknown attributes' do
+      let(:params) { {name: 'James', born_at: Time.now} }
 
-      expect(ret).to be false
-      expect(m.attributes).to be == { name: 'John', age: 25 }.stringify_keys
+      it { should_not raise_error }
+
+      it 'should update known attributes'  do
+        should change(m, :attributes)
+               .from({'name' => 'John', 'age' => 25})
+               .to({'name' => 'James', 'age' => 25})
+      end
+
+      context 'with unknown: :raise option' do
+        let(:args) { [params, {unknown: :raise}] }
+
+        it { should raise_error(ArgumentError, /unknown attribute/i) }
+        it { expect{ subject.call rescue true }.to_not change(m, :attributes) }
+      end
     end
   end
 

data/spec/spec_helper.rb

@@ -32,9 +32,6 @@ RSpec.configure do |config|
   #     --seed 1234
   config.order = 'random'
 
-  # Raise error when using old :should expectation syntax.
-  config.raise_errors_for_deprecations!
-
   config.before :each do
     Acfs.runner.clear
     Acfs::Stub.clear

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acfs
 version: !ruby/object:Gem::Version
-  version: 0.32.1.1.b274
+  version: 0.32.1.1.b275
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-13 00:00:00.000000000 Z
+date: 2014-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport