otis 0.0.6 → 0.0.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGM4ZjdiZmM3YjEyZDYzZGJhODAwMWEyYzU0ODliNmVlNDI4Mjk1OA==
+    MGJhMGRmNjE3ZDcyZmRjYmFmZTNlOGJlZmZkYTJmMDZiNDZkMjUzMw==
   data.tar.gz: !binary |-
-    Mzc2M2JhZDE1MTFlYWVkOTJiNzA1ODZlZTYwZDc3MjQyYzNiZmQ0MQ==
+    MzJiOTU1ZjhlYTkyNjAzNmQ3NTcyNDZkMTRmNzQ4OWM4ZWU0MzNjMQ==
 SHA512:
   metadata.gz: !binary |-
-    NmYxNjFlZWZjNjUwZTE0OTI5ZmUyNDAwYzFhNmYzYTY3MDM5ODk3YWEyMDRi
-    ZWRmYmExNGU1ZTMyZmY2MDM3ZGUxMjhjODQ1MTNiZmRlNGM1ZWM1YTI0NmUw
-    NzFiN2QxNzRmNGY1ZmI3YjQxYmMxZmY3NjA1Yjk3Y2M1MWU3Njg=
+    ZjlkZDJlMTIyMzU3ZGE4MTMxM2U3MzdkYTUyNjI2MTdhZWMwZDZiMjE0MWZl
+    Mjc4MTY4ZDBlMGM0M2VjM2RmNjJkMDQxZWZiOTM2ZDZkZDViNDY5NzdhMDZj
+    OGE0NTYwYmQ2M2UwZmE2ZGYzMTFkMGM1ZDZkYmIzOWQ5YTU0NWY=
   data.tar.gz: !binary |-
-    MGM5ZWU3YzljNmRiNDAxNTJkZTFkZjIzMDg2MGViZjFiY2Q4YjlhZTgwZjNk
-    MGY4NmJkN2YyOTMxNjBkYWZmMzZkYjJiMjQzODI5YWU3N2Q5NGNkMzRmMTg4
-    NmFiYzFhZDZiMDhiNmJmNTUzYzMyMzZkNmFjYTdmNDExYmRlOWQ=
+    NTM1YzNkMjA4Njg5NGZjMjEyNGEyNWEwZmU1NzAyMmYzNWRkZDg5ODJjZTIy
+    NzAwMzllYmI2NGM4ZmYyOWMzMDIzMThlMDNlNTFjY2VlNTA3NDQzYmZjZWIx
+    OTRlMTM3NTNiMDljOGM1ODQ0ODk4YmFhYzE0MzUyZmRiYTBkN2E=

data/lib/otis.rb

@@ -3,6 +3,7 @@ require "virtus"
 require "savon"
 require 'json'
 module Otis
+  require 'otis/error'
   require 'otis/hash_content'
   require 'otis/otis_object'
   require 'otis/model'

data/lib/otis/error.rb

@@ -0,0 +1,4 @@
+module Otis
+  class UnexpectedContentError < StandardError; end
+
+end

data/lib/otis/otis_object.rb

@@ -5,9 +5,10 @@ module Otis
       base.extend(ClassExtension)
     end
 
-    def initialize(attrs = {})
-      @response = attrs
-      attrs.each_pair do |k, v|
+    def initialize(attributes = {})
+      raise UnexpectedContentError.new("Array received when a hash was expected by class #{self.class}: \n#{@response}") if attributes.is_a?(Array)
+      @response = attributes
+      @response.each_pair do |k, v|
         m = underscore(k.to_s)
         self.send("#{m}=", v ) if self.respond_to?("#{m}=")
       end
@@ -28,7 +29,7 @@ module Otis
       def collection(opts ={})
         collection = opts[:as].to_s
         klass = opts[:of]
-        class_eval %(def #{collection}; @#{collection} ||= Array(@response[:#{collection}]).map{|c| #{klass}.new(c)}; end)
+        class_eval %( def #{collection}; @#{collection} ||= [@response[:#{collection}]].compact.flatten.map{|c| #{klass}.new(c)}; end )
       end
 
       #

data/lib/otis/version.rb

@@ -1,3 +1,3 @@
 module Otis
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/otis.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "debugger"
   spec.add_development_dependency "rspec"
 
-  spec.add_dependency 'savon', '~> 2.2.0'
+  spec.add_dependency 'savon', '~> 2.3'
   spec.add_dependency 'faraday'
   spec.add_dependency 'virtus'
 end

data/spec/lib/otis/otis_object_spec.rb

@@ -1,48 +1,67 @@
 require 'spec_helper'
 
-describe Otis::Object do
+module Otis
+  describe Object do
 
-  describe 'collection' do
-    class Thing < Otis::Model
-      attribute :a
+    describe 'initializer' do
+      class TestClass; include Object; end
+      context 'with an unexpected content' do
+        it 'raises an exception' do
+          expect { TestClass.new([])}.to raise_error(UnexpectedContentError)
+        end
+      end
     end
 
-    class TestClass
-      include Otis::Object
-      collection of: Thing, as: :things
-    end
+    describe 'collection' do
+      class Thing < Model
+        attribute :a
+      end
 
-    let(:klass) { TestClass.new }
+      class TestClass
+        include Object
+        collection of: Thing, as: :things
+      end
 
-    it 'creates the get' do
-      expect(klass).to respond_to(:things)
-    end
+      let(:klass) { TestClass.new }
 
-    it 'holds a collection' do
-      klass.things << Thing.new
-      klass.things << Thing.new
-      expect(klass.things.count).to eq(2)
-    end
+      it 'creates the get' do
+        expect(klass).to respond_to(:things)
+      end
 
-    it 'transforms correctly the collection' do
-      klass = TestClass.new(:things => [{a: 'foo'},  {b: 'bar'}])
-      expect(klass.things.count).to eq(2)
-      expect(klass.things.first.a).to eq('foo')
-    end
-  end
+      it 'holds a collection' do
+        klass = TestClass.new
+        klass.things << Thing.new
+        klass.things << Thing.new
+        expect(klass.things.count).to eq(2)
+      end
+
+      it 'transforms correctly the collection' do
+        klass = TestClass.new(:things => [{a: 'foo'},  {b: 'bar'}])
+        expect(klass.things.count).to eq(2)
+        expect(klass.things.first.a).to eq('foo')
+      end
 
-  describe 'tag attributes' do
-    class TestAttributeClass < Otis::Model
-      tag_attributes :foo, :bar
+      context 'when element is no a collection' do
+        subject {TestClass.new(:things => {a: 'foo'}).things}
+        it 'makes a new collection containing the element' do
+          expect(subject.count).to eq(1)
+          expect(subject.first.a).to eq('foo')
+        end
+      end
     end
 
-    describe 'dinamic method creation' do
-      it 'reads from the hash removing @' do
-        t = TestAttributeClass.new(:@foo => 'f', :@bar => 'b')
-        t.foo.should == 'f'
-        t.bar.should == 'b'
+    describe 'tag attributes' do
+      class TestAttributeClass < Model
+        tag_attributes :foo, :bar
+      end
+
+      describe 'dinamic method creation' do
+        it 'reads from the hash removing @' do
+          t = TestAttributeClass.new(:@foo => 'f', :@bar => 'b')
+          t.foo.should == 'f'
+          t.bar.should == 'b'
+        end
       end
     end
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: otis
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Thiago Bueno
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-26 00:00:00.000000000 Z
+date: 2014-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +123,7 @@ files:
 - Rakefile
 - lib/otis.rb
 - lib/otis/client.rb
+- lib/otis/error.rb
 - lib/otis/hash_content.rb
 - lib/otis/hooks.rb
 - lib/otis/http_client.rb