cot 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b47b0825bf582a0dded1ff4736bef69945d6f485
-  data.tar.gz: f10875feef7630460c617c154dd6564bb1eb210a
+  metadata.gz: b54755a09317578c48c93d680043d3e6bcf1caab
+  data.tar.gz: a264c498df609509981b8c5afb837a211ad84d36
 SHA512:
-  metadata.gz: b1c6d69f790c266a5e73a29d4ed74dbb491d0f2111a3f1224c03abcc87e4520822ebd094e8a6979a77ede993cfb64a5e78187ce1a506468c5c8a62e0ba5f20e2
-  data.tar.gz: 155a93d43a4b96ed4f71d3e4e08653c251b4235ba4d35f53d61396327136e103b3a8972b66e809bd96a9896764f29bbe24d52e85e2275412a36b5c42fcb696b7
+  metadata.gz: 5f71356f473c1de0f94513b553dd8222977744489434808c90de5fa9f130019cb710278b7df826f37b6365d532712886148a28e027cd88c8bda0c5729dfc7cf3
+  data.tar.gz: d25fc72929dd6e80b7ece0d5ccbd02854a8bb49df4376a17d188ae11b1ec8209187a2c9d2717f10fcc8602e7fdad1489b443568e86950231d33b2837fbed54de

data/.ackrc

@@ -0,0 +1,3 @@
+--ignore-dir=coverage
+--ignore-dir=out
+--color

data/.ruby-version

@@ -1 +1 @@
-ruby-2.0.0-p247
+ruby-2.0.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cot (0.2.0)
+    cot (0.3.0)
       activemodel
 
 GEM
@@ -17,6 +17,8 @@ GEM
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
     ast (2.0.0)
+    astrolabe (1.3.0)
+      parser (>= 2.2.0.pre.3, < 3.0)
     builder (3.2.2)
     diff-lcs (1.2.5)
     docile (1.1.5)
@@ -24,7 +26,7 @@ GEM
     json (1.8.1)
     minitest (5.4.0)
     multi_json (1.10.1)
-    parser (2.2.0.pre.3)
+    parser (2.2.0.pre.4)
       ast (>= 1.1, < 3.0)
       slop (~> 3.4, >= 3.4.5)
     powerpack (0.0.9)
@@ -44,9 +46,9 @@ GEM
     rspec-mocks (3.0.2)
       rspec-support (~> 3.0.0)
     rspec-support (3.0.2)
-    rubocop (0.24.1)
-      json (>= 1.7.7, < 2)
-      parser (>= 2.2.0.pre.3, < 3.0)
+    rubocop (0.26.0)
+      astrolabe (~> 1.3)
+      parser (>= 2.2.0.pre.4, < 3.0)
       powerpack (~> 0.0.6)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
@@ -62,7 +64,7 @@ GEM
       multi_json
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
-    slop (3.5.0)
+    slop (3.6.0)
     thread_safe (0.3.4)
     tzinfo (1.2.1)
       thread_safe (~> 0.1)
@@ -75,6 +77,6 @@ DEPENDENCIES
   cot!
   rspec
   rspec-its
-  rubocop
+  rubocop (>= 0.26.0)
   shoulda
   simplecov

data/cot.gemspec

@@ -22,6 +22,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'bundler', '>= 1.0.0'
   s.add_development_dependency 'rspec', '>= 0'
   s.add_development_dependency 'rspec-its', '>= 0'
-  s.add_development_dependency 'rubocop', '>= 0'
+  s.add_development_dependency 'rubocop', '>= 0.26.0'
   s.add_development_dependency 'simplecov', '>= 0'
 end

data/lib/cot.rb

@@ -1,4 +1,5 @@
 require 'active_model'
+require 'active_support/core_ext/hash/indifferent_access'
 
 require 'cot/version'
 require 'cot/frame'

data/lib/cot/collection.rb

@@ -1,8 +1,10 @@
 module Cot
   class Collection < SimpleDelegator
-    def initialize(klass, objects, sub_key = false)
+    def initialize(klass, objects, options = {})
+      options = { sub_key: options } unless options.is_a?(Hash)
+      @options = options.with_indifferent_access
+      @options[:default_attributes] = {} unless @options[:default_attributes].is_a?(Hash)
       @klass = klass
-      @sub_key = sub_key
       @objects = objects
 
       # If you pass in different types of things here we can't be friends
@@ -24,7 +26,7 @@ module Cot
     end
 
     def errors
-      Hash[@objects.reject { |x| x.valid? }.map { |x| [x.id, x.errors] }]
+      Hash[@objects.reject(&:valid?).map { |x| [x.id, x.errors] }]
     end
 
     def update_members(payload)
@@ -41,10 +43,10 @@ module Cot
     def initialize_objects(objects)
       @objects = []
       @objects = objects.map do |payload|
-        if @sub_key
-          @klass.new payload[@sub_key]
+        if @options[:sub_key]
+          @klass.new @options[:default_attributes].merge(payload.fetch(@options[:sub_key], {}))
         else
-          @klass.new payload
+          @klass.new @options[:default_attributes].merge(payload || {})
         end
       end
 

data/lib/cot/rspec/matchers.rb

@@ -46,7 +46,7 @@ RSpec::Matchers.define :set_property do |field|
   end
 
   failure_message do
-    failed = @tests.keys.select { |v| !v }
+    failed = @tests.select { |_, v| !v }.keys
     "Expected the property #{field} to be set, but the following attributes weren't set correctly #{failed}"
   end
 

data/lib/cot/version.rb

@@ -1,3 +1,3 @@
 module Cot
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/spec/lib/cot/collection_spec.rb

@@ -81,11 +81,24 @@ describe Cot::Collection do
       expect(coll.first).to be_kind_of FakeDouble
     end
 
-    it 'takes an optional sub_key to pull the object out of the payload' do
+    it 'takes an optional sub_key option to pull the object out of the payload' do
+      coll = Cot::Collection.new FakeDouble, [{ inner: { fooy: :bar } }, { inner: { asdf: :fdas } }], sub_key: :inner
+      expect(coll.first).to be_kind_of FakeDouble
+      expect(coll.first.fooy).to eq :bar
+    end
+
+    it 'takes an optional default_attributes option to add set attributes in every object.' do
+      coll = Cot::Collection.new FakeDouble, [{ fooy: :bar }, { asdf: :fdas }], default_attributes: { foo: :baz }
+      expect(coll).to all be_kind_of FakeDouble
+      expect(coll.map(&:foo).uniq).to eq [:baz]
+    end
+
+    it 'support a legacy optional sub_key parameter to pull the object out of the payload' do
       coll = Cot::Collection.new FakeDouble, [{ inner: { fooy: :bar } }, { inner: { asdf: :fdas } }], :inner
       expect(coll.first).to be_kind_of FakeDouble
       expect(coll.first.fooy).to eq :bar
     end
+
   end
 
   context 'update members' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cot
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Joseph Henrich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-08 00:00:00.000000000 Z
+date: 2014-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.26.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.26.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -115,6 +115,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .ackrc
 - .gitignore
 - .rubocop.yml
 - .ruby-gemset
@@ -153,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Simplifies creating models for rest based resources