cot 0.5.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: c694dae2bac88f952a49ce4b4c7b5663edbd0fb7
-  data.tar.gz: 4001ebb79a3a8da5bd4b6828a814c9f7d408d728
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NzRhMGE4M2I0NmZlYjUyMTRkMjdlMzQ2MzNkNjUzNGM0Y2M5MjI1MA==
+  data.tar.gz: !binary |-
+    OWFhMTM2MmI3NjQ1ZTE3OTFhMDMwZTA2YzY3NDVhNDJkN2QwOWYyZg==
 SHA512:
-  metadata.gz: c5eba0c2e611e055dd3129491d25144f303fa5f740a790afdffd7b7ae8181000c9668c71ea915005a91ce93c6f52e491cbaaa8432609b8f7a5212a32e7552439
-  data.tar.gz: 1d42ba345c4223f9dab0ae101f73e78a0829f6fda56ba4b8109bd9f8eebfe5dd498c70456c3706151b68652dea024b396a870700611ce72be0dfaa062dc662bc
+  metadata.gz: !binary |-
+    MWM5ZTA2OTJjMWFmY2IxOTA5MTE1NmNlNGY4OTdmM2U5Y2Q0NmJhYzdiNmEw
+    OWFjNDAwNGZjZDViMDNhZTk0YjY5N2IxMjVkMThlMGEwYmNmMzRlYTU1MzUz
+    YTI2MTQ0ODNkMjA4MzY2OGZmMGYxZGQ2ZDIxYzVmYjQxOWVmMmU=
+  data.tar.gz: !binary |-
+    ZWQ2MTJlNzFiMzNmNTkyMmI3NDRjZDg2NmEzMTY0M2RlYWZiMGYwZjBkYmE5
+    NDgwMTYzMDI0NTBmYmY3OGUwMzE5Nzc2Y2Q4OTc1NGIxM2Q3ODZkNDg2YmRl
+    ODE0ZTBlNjk3NGVhOTQ4ZWZjMzY2ZGZlZGQzNDNhM2NmOGU0ZmE=

data/.ruby-version

@@ -1 +1 @@
-ruby-2.0.0
+ruby-2.1.2

data/.travis.yml

@@ -0,0 +1,16 @@
+language: ruby
+rvm:
+- 2.1.5
+#- 2.0.0
+- 2.2.0
+script:
+  - bundle exec rake
+  - bundle exec rake mutant
+deploy:
+  provider: rubygems
+  api_key:
+    secure: LWCk/pKVdaX6qUWGsg+QxImR1nbB0nYzUd7LBSxbY96YXdjjED1pFdwjf2tY184hUBQF+LupWwVjEfPOkRBmGH290qjF4/Bz5z4vs1ZS+k77owMR4aeiVptS05BOUOVLq2CcAuNiVVB3hCRcXAKdd0wFFco4pXqLUAj3GlOjhl4=
+  gem: cot
+  on:
+    tags: true
+    repo: crimsonknave/cot

data/Gemfile.lock

@@ -1,73 +1,125 @@
 PATH
   remote: .
   specs:
-    cot (0.4.3)
+    cot (0.5.2)
       activemodel
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.1.4)
-      activesupport (= 4.1.4)
+    abstract_type (0.0.7)
+    activemodel (4.2.1)
+      activesupport (= 4.2.1)
       builder (~> 3.1)
-    activesupport (4.1.4)
-      i18n (~> 0.6, >= 0.6.9)
+    activesupport (4.2.1)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
+    adamantium (0.2.0)
+      ice_nine (~> 0.11.0)
+      memoizable (~> 0.4.0)
+    anima (0.2.0)
+      abstract_type (~> 0.0.7)
+      adamantium (~> 0.1)
+      equalizer (~> 0.0.8)
     ast (2.0.0)
     astrolabe (1.3.0)
       parser (>= 2.2.0.pre.3, < 3.0)
     builder (3.2.2)
+    concord (0.1.5)
+      adamantium (~> 0.2.0)
+      equalizer (~> 0.0.9)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    i18n (0.6.11)
-    json (1.8.1)
-    minitest (5.4.0)
-    multi_json (1.10.1)
-    parser (2.2.0.pre.4)
+    equalizer (0.0.11)
+    i18n (0.7.0)
+    ice_nine (0.11.1)
+    json (1.8.2)
+    memoizable (0.4.2)
+      thread_safe (~> 0.3, >= 0.3.1)
+    minitest (5.5.1)
+    morpher (0.2.3)
+      abstract_type (~> 0.0.7)
+      adamantium (~> 0.2.0)
+      anima (~> 0.2.0)
+      ast (~> 2.0.0)
+      concord (~> 0.1.4)
+      equalizer (~> 0.0.9)
+      ice_nine (~> 0.11.0)
+      procto (~> 0.0.2)
+    multi_json (1.11.0)
+    mutant (0.7.8)
+      abstract_type (~> 0.0.7)
+      adamantium (~> 0.2.0)
+      anima (~> 0.2.0)
+      ast (~> 2.0)
+      concord (~> 0.1.5)
+      diff-lcs (~> 1.2)
+      equalizer (~> 0.0.9)
+      ice_nine (~> 0.11.1)
+      memoizable (~> 0.4.2)
+      morpher (~> 0.2.3)
+      parallel (~> 1.3)
+      parser (~> 2.2.0.2)
+      procto (~> 0.0.2)
+      unparser (~> 0.2.2)
+    mutant-rspec (0.7.8)
+      mutant (~> 0.7.8)
+      rspec-core (>= 3.0.0, < 3.3.0)
+    parallel (1.4.1)
+    parser (2.2.0.3)
       ast (>= 1.1, < 3.0)
-      slop (~> 3.4, >= 3.4.5)
-    powerpack (0.0.9)
+    powerpack (0.1.0)
+    procto (0.0.2)
     rainbow (2.0.0)
-    rspec (3.0.0)
-      rspec-core (~> 3.0.0)
-      rspec-expectations (~> 3.0.0)
-      rspec-mocks (~> 3.0.0)
-    rspec-core (3.0.2)
-      rspec-support (~> 3.0.0)
-    rspec-expectations (3.0.2)
+    rake (10.4.2)
+    rspec (3.2.0)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+    rspec-core (3.2.2)
+      rspec-support (~> 3.2.0)
+    rspec-expectations (3.2.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-its (1.2.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+    rspec-mocks (3.2.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.0.0)
-    rspec-its (1.0.1)
-      rspec-core (>= 2.99.0.beta1)
-      rspec-expectations (>= 2.99.0.beta1)
-    rspec-mocks (3.0.2)
-      rspec-support (~> 3.0.0)
-    rspec-support (3.0.2)
-    rubocop (0.26.0)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.2)
+    rubocop (0.29.1)
       astrolabe (~> 1.3)
-      parser (>= 2.2.0.pre.4, < 3.0)
-      powerpack (~> 0.0.6)
+      parser (>= 2.2.0.1, < 3.0)
+      powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
-    ruby-progressbar (1.5.1)
+    ruby-progressbar (1.7.5)
     shoulda (3.5.0)
       shoulda-context (~> 1.0, >= 1.0.1)
       shoulda-matchers (>= 1.4.1, < 3.0)
     shoulda-context (1.2.1)
-    shoulda-matchers (2.6.1)
+    shoulda-matchers (2.8.0)
       activesupport (>= 3.0.0)
-    simplecov (0.9.0)
+    simplecov (0.9.2)
       docile (~> 1.1.0)
-      multi_json
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    slop (3.6.0)
-    thread_safe (0.3.4)
-    tzinfo (1.2.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.9.0)
+    simplecov-html (0.9.0)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
       thread_safe (~> 0.1)
+    unparser (0.2.2)
+      abstract_type (~> 0.0.7)
+      adamantium (~> 0.2.0)
+      concord (~> 0.1.5)
+      diff-lcs (~> 1.2.5)
+      equalizer (~> 0.0.9)
+      parser (~> 2.2.0.2)
+      procto (~> 0.0.2)
 
 PLATFORMS
   ruby
@@ -75,8 +127,11 @@ PLATFORMS
 DEPENDENCIES
   bundler (>= 1.0.0)
   cot!
+  mutant
+  mutant-rspec
+  rake
   rspec
-  rspec-its
-  rubocop (>= 0.26.0)
+  rspec-its (>= 1)
+  rubocop
   shoulda
   simplecov

data/README.md

@@ -1,4 +1,4 @@
-cot
+cot [![Build Status](https://travis-ci.org/crimsonknave/cot.svg?branch=master)](https://travis-ci.org/crimsonknave/cot) [![Gem Version](https://badge.fury.io/rb/cot.svg)](http://badge.fury.io/rb/cot)
 ===
 
 Cot is a gem designed to help convert rest based resources into ruby objects.  Currently it only handles converting the responses into objects and doesn't deal with the requests themselves, there are plenty of gems for that out there.

data/Rakefile

@@ -2,19 +2,21 @@
 
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
+
+RuboCop::RakeTask.new
 
 RSpec::Core::RakeTask.new('spec') do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rspec_opts = '--tag ~broken'
 end
 
-require 'rubocop'
-if defined? RuboCop
-  desc 'run rubocop'
-  task :rubocop do
-    puts `rubocop`
-  end
-end
-
 task default: [:spec, :rubocop]
 task test: :spec
+
+require 'mutant'
+desc 'Run mutation tests using mutant'
+task :mutant do
+  result = Mutant::CLI.run(%w( -Ilib -rcot --use rspec Cot* ))
+  fail unless result == Mutant::CLI::EXIT_SUCCESS
+end

data/cot.gemspec

@@ -19,10 +19,14 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_dependency 'activemodel'
+
+  s.add_development_dependency 'rake'
   s.add_development_dependency 'shoulda', '>= 0'
   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.26.0'
+  s.add_development_dependency 'rspec-its', '>= 1'
+  s.add_development_dependency 'rubocop'
   s.add_development_dependency 'simplecov', '>= 0'
+  s.add_development_dependency 'mutant'
+  s.add_development_dependency 'mutant-rspec'
 end

data/lib/cot/collection.rb

@@ -11,15 +11,14 @@ module Cot
     def initialize(*params)
       parse_params(params)
 
-      puts self.class.klass.inspect
       # If you pass in different types of things here we can't be friends
-      initialize_objects(@objects) unless @objects.first.is_a? self.class.klass
+      initialize_objects(@objects) unless @objects.first.instance_of? self.class.klass
 
       super @objects
     end
 
     def serializable_hash
-      @objects.map(&:serializable_hash)
+      map(&:serializable_hash)
     end
 
     def to_json
@@ -27,11 +26,11 @@ module Cot
     end
 
     def exists?
-      @objects.map(&:exists?).all?
+      map(&:exists?).all?
     end
 
     def errors
-      Hash[@objects.reject(&:valid?).map { |x| [x.id, x.errors] }]
+      Hash[reject(&:valid?).map { |x| [x.id, x.errors] }]
     end
 
     def update_members(payload)
@@ -40,7 +39,7 @@ module Cot
     end
 
     def changed?
-      @objects.map(&:changed?).include? true
+      map(&:changed?).include? true
     end
 
     private
@@ -48,9 +47,9 @@ module Cot
     def parse_params(params)
       until params.empty?
         item = params.shift
-        if item.class == Class
+        if item.instance_of? Class
           self.class.klass = item
-        elsif item.class == Array
+        elsif item.instance_of? Array
           @objects = item
         else
           options = item
@@ -61,21 +60,17 @@ module Cot
     end
 
     def parse_options(options)
-      options = { sub_key: options } unless options.is_a?(Hash)
+      options = { sub_key: options } unless options.instance_of?(Hash)
       @options = options.with_indifferent_access
-      @options[:default_attributes] = {} unless @options[:default_attributes].is_a?(Hash)
+      @options[:default_attributes] = {} unless @options[:default_attributes]
       self.class.set_default_values
       @options.merge! self.class.options
     end
 
     def initialize_objects(objects)
-      @objects = []
       @objects = objects.map do |payload|
-        if @options[:sub_key]
-          self.class.klass.new @options[:default_attributes].merge(payload.fetch(@options[:sub_key], {}))
-        else
-          self.class.klass.new @options[:default_attributes].merge(payload || {})
-        end
+        payload = payload.fetch(@options[:sub_key], {}) if @options[:sub_key]
+        self.class.klass.new @options[:default_attributes].merge(payload)
       end
 
       # Set the delegator methods to point to the new objects array

data/lib/cot/enum.rb

@@ -12,7 +12,7 @@ module Cot
         fail "#{name} tried to set value #{value}, which is already used by #{used[value]}. Enum values are unique."
       end
 
-      self.class.send :define_method, name do
+      self.class.__send__ :define_method, name do
         value
       end
 
@@ -21,7 +21,7 @@ module Cot
     end
 
     def [](key)
-      send key
+      public_send key
     end
   end
 end

data/lib/cot/frame.rb

@@ -6,28 +6,18 @@ module Cot
 
     include ActiveModel::Dirty
 
-    def initialize(payload = {})
+    def initialize(payload = nil)
       @errors = {}
 
       @data = convert_keys payload
 
-      @data.each do |k, v|
-        if self.class.value_blocks[k]
-          block = self.class.value_blocks[k]
-          @data[k] = instance_exec(v, &block)
-        end
-      end
+      add_value_blocks
 
-      defined_properties.each do |prop|
-        if @data[prop].nil? && self.class.missing_blocks[prop]
-          block = self.class.missing_blocks[prop]
-          @data[prop] = instance_exec(self, &block)
-        end
-      end
+      add_missing_blocks
     end
 
     def exists?
-      send self.class.primary_key
+      public_send self.class.primary_key
     end
 
     def defined_properties
@@ -35,7 +25,15 @@ module Cot
     end
 
     def properties_mapping
-      self.class.mappings
+      self.class.mappings || {}
+    end
+
+    def value_blocks
+      self.class.value_blocks || {}
+    end
+
+    def missing_blocks
+      self.class.missing_blocks || {}
     end
 
     def inverted_properties_mapping
@@ -55,11 +53,11 @@ module Cot
     end
 
     def []=(key, value)
-      if self.class.value_blocks[key]
-        block = self.class.value_blocks[key]
+      if value_blocks[key]
+        block = value_blocks[key]
         value = instance_exec(value, &block)
       end
-      @data[convert_key key] = value
+      @data[key] = value
     end
 
     def valid?
@@ -73,11 +71,8 @@ module Cot
     def serializable_hash(options = {})
       attrs = {}
       properties_list = defined_properties
-      if options[:only]
-        properties_list &= Array(options[:only]).map(&:to_sym)
-      elsif options[:except]
-        properties_list -= Array(options[:except]).map(&:to_sym)
-      end
+      properties_list &= Array(options[:only]).map(&:to_sym) if options[:only]
+      properties_list -= Array(options[:except]).map(&:to_sym)
       properties_list.each do |m|
         attrs[inverted_properties_mapping.fetch(m, m)] = self[m]
       end
@@ -86,9 +81,27 @@ module Cot
 
     private
 
+    def add_missing_blocks
+      defined_properties.each do |prop|
+        if self[prop].nil? && missing_blocks[prop]
+          block = missing_blocks[prop]
+          self[prop] = instance_exec(&block)
+        end
+      end
+    end
+
+    def add_value_blocks
+      @data.each do |k, v|
+        if value_blocks[k]
+          block = value_blocks[k]
+          @data[k] = instance_exec(v, &block)
+        end
+      end
+    end
+
     def convert_key(key)
       key = key.to_sym
-      properties_mapping.fetch(key, key).to_sym
+      properties_mapping.fetch(key, key)
     end
 
     def convert_keys(hash)

data/lib/cot/frame_class_methods.rb

@@ -10,8 +10,6 @@ module Cot
                   :mappings
 
     def search_property(name, args = {})
-      @search_mappings ||= {}
-
       key = args[:from] ? args[:from] : name
       @search_mappings[name] = key
     end
@@ -42,15 +40,15 @@ module Cot
     private
 
     def set_blocks(name, prop)
-      @value_blocks[name] = prop.value if prop.value
-      @missing_blocks[name] = prop.missing if prop.missing
+      @value_blocks[name] = prop.value
+      @missing_blocks[name] = prop.missing
     end
 
     def set_mappings(name, prop)
       key = prop.from
-      @mappings[key.to_sym] = name if key
+      @mappings[key] = name if key
       @search_mappings[name] = key ? key : name if prop.searchable
-      attr_methods << name.to_sym
+      attr_methods << name
     end
 
     # Can't seem to get an intialize in for the class, so we need to set these
@@ -70,7 +68,7 @@ module Cot
       end
 
       define_method "#{name}=" do |value|
-        send("#{name}_will_change!") unless value == self[name]
+        public_send("#{name}_will_change!") unless value.eql?(self[name])
         self[name] = value
       end
       define_attribute_method name

data/lib/cot/rspec/matchers.rb

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

data/lib/cot/version.rb

@@ -1,3 +1,3 @@
 module Cot
-  VERSION = '0.5.0'
+  VERSION = '0.5.2'
 end

data/spec/lib/cot/collection_spec.rb

@@ -16,7 +16,6 @@ describe Cot::Collection do
     end
 
     it 'should respond to array methods' do
-
       # In theory we'd test more, but that's good enough for me
       expect(collection).to respond_to :[]
       expect(collection).to respond_to :first
@@ -81,13 +80,21 @@ describe Cot::Collection do
           expect(coll.first.fooy).to eq :bar
         end
 
+        it 'takes options as strings and symbols' 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
+        it 'supports 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
@@ -96,7 +103,17 @@ describe Cot::Collection do
 
       context 'without options' do
         it 'does not process the objects if they are already the correct class' do
-          coll = Cot::Collection.new FakeDouble, [FakeDouble.new(fooy: :bar), FakeDouble.new(asdf: :fdas)]
+          coll = Cot::Collection.new [FakeDouble.new(fooy: :bar), FakeDouble.new(asdf: :fdas)]
+          expect(coll.first).to be_kind_of FakeDouble
+        end
+
+        it 'does not set the subkey if none is provided' do
+          coll = Cot::Collection.new [FakeDouble.new(fooy: :bar), FakeDouble.new(asdf: :fdas)]
+          expect(coll.instance_variable_get :@options).to_not have_key :sub_key
+        end
+
+        it 'can accept empty hashes' do
+          coll = Cot::Collection.new FakeDouble, [{}]
           expect(coll.first).to be_kind_of FakeDouble
         end
 

data/spec/lib/cot/enum_spec.rb

@@ -23,4 +23,49 @@ describe Cot::Enum do
     expect(enum[:third]).to eq 3
     expect(enum[:fourth]).to eq 4
   end
+
+  it 'sets used keys and values' do
+    expect(TestObject.types.used).to have_key 1
+    expect(TestObject.types.used[1]).to eq :first
+  end
+
+  it 'does not allow duplicates' do
+    expect do
+      class TestObject < Cot::Frame
+        enum :types do
+          entry :first
+          entry :first_again, value: 1
+        end
+      end
+    end.to raise_error StandardError,
+                       'first_again tried to set value 1, which is already used by first. Enum values are unique.'
+  end
+
+  context 'objext' do
+    it 'sets the value starting at 1' do
+      expect(@foo.types.first).to eq 1
+    end
+
+    it 'allows the value to be set' do
+      expect(@foo.types.third).to eq 3
+    end
+
+    it 'increments after the next value' do
+      expect(@foo.types.fourth).to eq 4
+    end
+  end
+
+  context 'class' do
+    it 'sets the value starting at 1' do
+      expect(TestObject.types.first).to eq 1
+    end
+
+    it 'allows the value to be set' do
+      expect(TestObject.types.third).to eq 3
+    end
+
+    it 'increments after the next value' do
+      expect(TestObject.types.fourth).to eq 4
+    end
+  end
 end

data/spec/lib/cot/frame_spec.rb

@@ -2,15 +2,16 @@ require 'spec_helper'
 describe Cot::Frame do
   before :each do
     class TestObject < Cot::Frame
-      property :foo, from: :bar
+      property :foo, from: :bar, searchable: true
       property :id
+      property :only, searchable: true
       search_property :john, from: :crichton
+      search_property :pilot
     end
-    @foo = TestObject.new(bar: 'this will be foo', id: 5)
+    @foo = TestObject.new(bar: 'this will be foo', id: 5, only: 3)
   end
   subject { @foo }
   its(:to_json) { should be_kind_of String }
-  it 'needs more serialziable tests'
   its(:id) { should eq 5 }
   its(:foo) { should eq 'this will be foo' }
 
@@ -21,7 +22,7 @@ describe Cot::Frame do
   context 'serializable_hash' do
     its(:serializable_hash) { should be_kind_of Hash }
     it 'has two keys' do
-      expect(subject.serializable_hash.size).to eq 2
+      expect(subject.serializable_hash.size).to eq 3
     end
 
     it 'should accept an option hash' do
@@ -30,6 +31,12 @@ describe Cot::Frame do
       end.to_not raise_error
     end
 
+    it 'does not require an option hash' do
+      expect do
+        subject.serializable_hash
+      end.to_not raise_error
+    end
+
     context 'only option' do
       it 'should return properties specified' do
         expect(subject.serializable_hash(only: :foo).size).to eq 1
@@ -43,15 +50,27 @@ describe Cot::Frame do
 
     context 'except option' do
       it 'should not return properties specified' do
-        expect(subject.serializable_hash(except: :foo).size).to eq 1
+        expect(subject.serializable_hash(except: :foo).size).to eq 2
         expect(subject.serializable_hash(except: :foo)[:id]).to eq 5
-        expect(subject.serializable_hash(except: [:foo, :id]).size).to eq 0
-        expect(subject.serializable_hash(except: 'foo').size).to eq 1
+        expect(subject.serializable_hash(except: [:foo, :id]).size).to eq 1
+        expect(subject.serializable_hash(except: 'foo').size).to eq 2
         expect(subject.serializable_hash(except: 'foo')[:id]).to eq 5
       end
     end
   end
 
+  context 'valid?' do
+    it 'returns true if there are no errors' do
+      expect(@foo).to receive(:errors).and_return []
+      expect(@foo.valid?).to be true
+    end
+
+    it 'returns false if there is an error' do
+      expect(@foo).to receive(:errors).and_return [1]
+      expect(@foo.valid?).to be false
+    end
+  end
+
   context 'exists?' do
     it 'is true if id is present' do
       expect(@foo.exists?).to be_truthy
@@ -70,8 +89,52 @@ describe Cot::Frame do
     it 'is an array' do
       expect(@foo.defined_properties).to be_kind_of Array
     end
+
+    it 'defaults to []' do
+      class EmptyObject < Cot::Frame
+      end
+      foo = EmptyObject.new
+      expect(foo.defined_properties).to eq []
+    end
+  end
+
+  context 'value_blocks' do
+    it 'defaults to {}' do
+      class EmptyObject < Cot::Frame
+      end
+      foo = EmptyObject.new
+      expect(foo.value_blocks).to eq({})
+    end
+
+    it 'has nil for no values' do
+      expect(@foo.value_blocks).to eq(foo: nil, id: nil, only: nil)
+    end
   end
+
+  context 'missing_blocks' do
+    it 'defaults to {}' do
+      class EmptyObject < Cot::Frame
+      end
+      foo = EmptyObject.new
+      expect(foo.missing_blocks).to eq({})
+    end
+
+    it 'has nil for no values' do
+      expect(@foo.missing_blocks).to eq(foo: nil, id: nil, only: nil)
+    end
+  end
+
   context 'properties_mapping' do
+    it 'defaults to {}' do
+      class EmptyObject < Cot::Frame
+      end
+      foo = EmptyObject.new
+      expect(foo.properties_mapping).to eq({})
+    end
+    it 'does not set if there is no from' do
+      expect(@foo.properties_mapping).to_not have_key nil
+    end
+
     it 'has bar => foo' do
       expect(@foo.properties_mapping).to have_key :bar
       expect(@foo.properties_mapping[:bar]).to eq :foo
@@ -99,6 +162,8 @@ describe Cot::Frame do
     it 'adds to search_mappings' do
       expect(TestObject.search_mappings).to have_key :john
       expect(TestObject.search_mappings[:john]).to be :crichton
+      expect(TestObject.search_mappings).to have_key :pilot
+      expect(TestObject.search_mappings[:pilot]).to be :pilot
     end
   end
   context 'property' do
@@ -107,6 +172,24 @@ describe Cot::Frame do
       expect(TestObject.mappings[:bar]).to be :foo
     end
 
+    it 'adds to search properties when searchable is true' do
+      expect(TestObject.search_mappings).to have_key :only
+      expect(TestObject.search_mappings[:only]).to be :only
+      expect(TestObject.search_mappings).to have_key :foo
+      expect(TestObject.search_mappings[:foo]).to be :bar
+    end
+
+    it 'does not add to search mappings if not searchable' do
+      expect(TestObject.search_mappings).to_not have_key :id
+    end
+
+    it 'works for strings and symbols' do
+      foo1 = TestObject.new(bar: 'this will be foo', 'id' => 1)
+      foo2 = TestObject.new(bar: 'this will be foo', id: 2)
+      expect(foo1.id).to eq 1
+      expect(foo2.id).to eq 2
+    end
+
     it 'creates accessor methods' do
       foo = TestObject.new
       expect(foo).to respond_to :foo
@@ -133,6 +216,7 @@ describe Cot::Frame do
         end
         class TestObject < Cot::Frame
           property :my_id, from: :key, primary: true
+          property :foo, from: :bar
           property :blank do
             missing do
               "this was blank #{my_id}"
@@ -159,8 +243,24 @@ describe Cot::Frame do
         expect(TestObject.search_mappings[:thing]).to be :stuff
       end
 
-      it 'stores missing' do
-        expect(@foo.blank).to eq 'this was blank 42'
+      context 'missing' do
+        it 'does not call the block if the value is provided' do
+          foo = TestObject.new(blank: 'blank')
+          expect(foo.blank).to eq 'blank'
+        end
+
+        it 'does not set the block if missing is false' do
+          foo = TestObject.new(blank: 'blank')
+          expect(foo.foo).to be_nil
+        end
+
+        it 'calls the value if there is a block' do
+          expect(@foo.blank).to eq 'this was blank 42'
+        end
+
+        it 'returns nil if there is no block' do
+          expect(@foo.id).to be_nil
+        end
       end
 
       it 'sets the primary key' do
@@ -172,11 +272,44 @@ describe Cot::Frame do
         expect(@foo.thing.params[:passed]).to eq 42
       end
 
-      it 'sets the value on []=' do
-        bar = TestObject.new(key: 42)
-        bar.thing = { key: 'this will be in foo' }
-        expect(bar.thing).to be_kind_of Foo
-        expect(bar.thing.params[:passed]).to eq 42
+      context '[]' do
+        it 'accesses an unmapped key' do
+          expect(@foo[:blank]).to eq 'this was blank 42'
+        end
+
+        it 'accesses a mapped key' do
+          expect(@foo[:my_id]).to eq 42
+        end
+      end
+
+      context '[]=' do
+        it 'sets the value block' do
+          bar = TestObject.new(key: 42)
+          bar.thing = { key: 'this will be in foo' }
+          expect(bar.thing).to be_kind_of Foo
+          expect(bar.thing.params[:passed]).to eq 42
+          expect(bar[:stuff]).to be_kind_of Foo
+          expect(bar[:thing]).to be_kind_of Foo
+        end
+
+        it 'notifys that the field will change if the value is different' do
+          bar = TestObject.new(key: 42, foo: 'thing')
+          expect(bar).to receive(:foo_will_change!).and_return true
+          bar.foo = 'baz'
+        end
+
+        it 'does not notify that the field will change if the value is the same' do
+          bar = TestObject.new(key: 42, foo: 'baz')
+          expect(bar).to_not receive(:foo_will_change!)
+          bar.foo = 'baz'
+        end
+
+        it 'sets the value if it is not a block' do
+          bar = TestObject.new(key: 42)
+          bar.foo = 'baz'
+          expect(bar.foo).to eq 'baz'
+          expect(bar[:bar]).to eq 'baz'
+        end
       end
     end
   end
@@ -194,54 +327,4 @@ describe Cot::Frame do
       expect(@foo.errors[:status]).to eq 200
     end
   end
-  context 'enum' do
-    before :each do
-      class TestObject < Cot::Frame
-        enum :types do
-          entry :first
-          entry :third, value: 3
-          entry :fourth
-        end
-      end
-      @foo = TestObject.new
-    end
-    context 'object' do
-      it 'sets the value starting at 1' do
-        expect(@foo.types.first).to eq 1
-      end
-
-      it 'allows the value to be set' do
-        expect(@foo.types.third).to eq 3
-      end
-
-      it 'increments after the next value' do
-        expect(@foo.types.fourth).to eq 4
-      end
-    end
-
-    context 'class' do
-      it 'sets the value starting at 1' do
-        expect(TestObject.types.first).to eq 1
-      end
-
-      it 'allows the value to be set' do
-        expect(TestObject.types.third).to eq 3
-      end
-
-      it 'increments after the next value' do
-        expect(TestObject.types.fourth).to eq 4
-      end
-    end
-
-    it 'does not allow duplicates' do
-      expect do
-        class TestObject < Cot::Frame
-          enum :types do
-            entry :first
-            entry :first_again, value: 1
-          end
-        end
-      end.to raise_error StandardError
-    end
-  end
 end

data/spec/lib/cot/property_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+describe Cot::Property do
+  it 'can set the primary attribute' do
+    prop = described_class.new
+    expect(prop.primary?).to be_nil
+    prop.primary
+    expect(prop.primary?).to be true
+  end
+end

data/spec/spec_helper.rb

@@ -9,7 +9,15 @@ require 'cot'
 require 'rspec'
 require 'rspec/its'
 
+require 'timeout'
+
 RSpec.configure do |config|
   config.color = true
   config.formatter = 'documentation'
+  # Add a timeout so mutant can't create infinite loops
+  config.around do |example|
+    Timeout.timeout(5) do
+      example.run
+    end
+  end
 end

metadata

@@ -1,111 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: cot
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Joseph Henrich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-06 00:00:00.000000000 Z
+date: 2015-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mutant
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mutant-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Simplifies creating models for rest based resources
@@ -121,6 +163,7 @@ files:
 - .ruby-gemset
 - .ruby-version
 - .simplecov
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -139,6 +182,7 @@ files:
 - spec/lib/cot/collection_spec.rb
 - spec/lib/cot/enum_spec.rb
 - spec/lib/cot/frame_spec.rb
+- spec/lib/cot/property_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/crimsonknave/cot
 licenses:
@@ -150,22 +194,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Simplifies creating models for rest based resources
-test_files:
-- spec/lib/cot/collection_spec.rb
-- spec/lib/cot/enum_spec.rb
-- spec/lib/cot/frame_spec.rb
-- spec/spec_helper.rb
+test_files: []