remote_factory_girl 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc49d97c232bfdba862ab52c9eabe313d7a3012f
-  data.tar.gz: 644c676dc15e1da5935d545e5341e48a11773a56
+  metadata.gz: d8b42f8eed81c36f43aae8e0965e146f7a6882ee
+  data.tar.gz: 4aed3ffaff3534cd3fe42d1556636e9b3632431b
 SHA512:
-  metadata.gz: 6e964470880d4c8fd4d091ccd92922deddd53bd0e0a21b65c2065fb25fa60c07ae3344806fe880d882586d71abb53d1bbf6f6b5e4707c2e9a082ef989ea4c13d
-  data.tar.gz: d3dfbb436a42441ede4fe8b745c8b3f29a27eb34a2914c91bf89ee16253d62778f906b5a161b70523cd7b2e43cfa31b0c582313b9e040226d0e2005287939c7a
+  metadata.gz: 5101e0ebec7e4b744df4971682aebb58d642ddade2445af34d9fc52d5029f8523163d746c734e93bf9840e1f6e5d95f936970418ddff42c6b9851a82b54c6acd
+  data.tar.gz: 5f7c90c31af76477fff52c6d57cb633ad1523451dfc5e98f972f180725fd5c4f33fea261e0a129024090eb2f3e1227283f02599a77624b3a6389f8c00e9a4273

data/lib/remote_factory_girl/config_applier.rb

@@ -1,7 +1,6 @@
 require 'remote_factory_girl/hash_to_dot'
 require 'remote_factory_girl/json_to_active_resource'
-require 'ostruct'
-require 'json'
+require 'remote_factory_girl/factory_girl_json_parser'
 
 module  RemoteFactoryGirl
   class ConfigApplier 
@@ -21,13 +20,14 @@ module  RemoteFactoryGirl
       apply_config_options
     end
 
+    private
+
     def default_config
       { :hash_to_dot_klass             => HashToDot, 
-        :json_to_active_resource_klass => JsonToActiveResource }
+        :json_to_active_resource_klass => JsonToActiveResource,
+        :response_parser               => FactoryGirlJsonParser }
     end
 
-    private
-
     def apply_config_options
       if config[:return_as_active_resource]
         configured_json = config[:json_to_active_resource_klass].convert(json)
@@ -42,8 +42,8 @@ module  RemoteFactoryGirl
       config[:return_response_as] == :dot_notation ? config[:hash_to_dot_klass].convert(parsed_json) : parsed_json
     end
 
-    def return_with_root(parsed_json)
-      config[:return_with_root] == false ? Array(parsed_json).flatten.last : parsed_json
+    def return_with_root(response_hash)
+      config[:return_with_root] == false ? config[:response_parser].without_root(response_hash) : response_hash
     end
   end
 end

data/lib/remote_factory_girl/factory_girl_json_parser.rb

@@ -0,0 +1,29 @@
+module RemoteFactoryGirl
+  class FactoryGirlJsonParser
+
+    def self.without_root(response_hash)
+      new(response_hash).without_root
+    end
+
+    attr_reader :response_hash
+
+    def initialize(response_hash)
+      @response_hash = response_hash
+    end
+
+    def without_root
+      has_root_key? ? response_array.last : response_hash
+    end
+
+    private
+
+    def has_root_key?
+      response_array.length == 2 && response_array.last.is_a?(Hash)
+    end
+
+    def response_array
+      @response_array ||= Array(response_hash).flatten
+    end
+  end
+end
+

data/lib/remote_factory_girl/version.rb

@@ -1,3 +1,3 @@
 module RemoteFactoryGirl
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/models/remote_factory_girl/config_applier_spec.rb

@@ -1,29 +1,44 @@
 require 'remote_factory_girl/config_applier'
 require 'remote_factory_girl/json_to_active_resource'
+require 'ostruct'
 
 describe RemoteFactoryGirl::ConfigApplier do
 
   describe '.post' do
-
-    let(:unparsed_json) {
-      '{ "user": {"first_name": "Sam", "last_name": "Iam"}}'
-      }
     let(:json) {  
       { :user => { :first_name => "Sam", :last_name => "Iam"}}
     }
     let(:hash_to_dot_klass)      { double('RemoteFactoryGirl::HashToDot') }
     let(:dish_json_with_user)    { OpenStruct.new(:user => OpenStruct.new(:first_name => 'Sam', :last_name => 'Iam')) }
-    let(:dish_json_without_user) { OpenStruct.new(:first_name => 'Sam', :last_name => 'Iam') }
+    let(:dot_notation_without_root) { OpenStruct.new(:first_name => 'Sam', :last_name => 'Iam') }
 
     describe '.apply_config' do
-      it 'should not return root hash key when .return_with_root is false' do
-        response = RemoteFactoryGirl::ConfigApplier.apply_config(json, :return_with_root => false)
-        expect(response).to_not have_key(:user) 
+      describe 'when configured to return root key' do
+        it 'should return a hash with a root key when initialized with a hash that has a root key' do
+          response = RemoteFactoryGirl::ConfigApplier.apply_config(json, :with_root => true)
+
+          expect(response).to have_key(:user)
+        end
       end
 
-      it 'should not return root hash key when .return_with_root is false' do
-        response = RemoteFactoryGirl::ConfigApplier.apply_config(json, :with_root => true)
-        expect(response).to have_key(:user)
+      describe 'when configured to not return root key' do
+
+        let(:factory_girl_json_parser) { double('RemoteFactoryGirl::FactoryGirlJsonParser', without_root: { :first_name => 'Sam', :last_name => 'Iam'}) }
+
+        it 'should not return a hash with a root key when initialized with a hash that has a root key' do
+          response = RemoteFactoryGirl::ConfigApplier.apply_config(json, :return_with_root => false,
+                                                                         :factory_girl_json_parser => factory_girl_json_parser)
+
+          expect(response).to_not have_key(:user)
+          expect(response[:first_name]).to eq('Sam')
+        end
+
+        it 'should not return a hash with a root key when initialized with a hash that does not have a root key' do
+          hash_without_root_key = { :first_name => 'Sam', :last_name => 'Iam'}
+          response              = RemoteFactoryGirl::ConfigApplier.apply_config(hash_without_root_key, :return_with_root => false,
+                                                                                                       :factory_girl_json_parser => factory_girl_json_parser)
+          expect(response[:first_name]).to eq('Sam')
+        end
       end
 
       it 'should return an object that responds to dot notation' do
@@ -34,10 +49,12 @@ describe RemoteFactoryGirl::ConfigApplier do
       end
 
       it 'should not return root hash key and should return an object that responds to dot notation' do
-        hash_to_dot_klass.stub(:convert).and_return(dish_json_without_user)
+        factory_girl_json_parser = double('RemoteFactoryGirl::FactoryGirlJsonParser', without_root: { :first_name => 'Sam', :last_name => 'Iam'})
+        hash_to_dot_klass.stub(:convert).and_return(dot_notation_without_root)
         response = RemoteFactoryGirl::ConfigApplier.apply_config(json, :return_response_as => :dot_notation, 
                                                                        :return_with_root   => false,
-                                                                       :hash_to_dot_klass  => hash_to_dot_klass)
+                                                                       :hash_to_dot_klass  => hash_to_dot_klass,
+                                                                       :factory_girl_json_parser => factory_girl_json_parser)
         expect(response.first_name).to eq('Sam') 
       end
     end

data/spec/models/remote_factory_girl/factory_girl_json_parser_spec.rb

@@ -0,0 +1,22 @@
+require 'remote_factory_girl/factory_girl_json_parser'
+
+describe RemoteFactoryGirl::FactoryGirlJsonParser do
+
+  let(:hash_with_root)    { { :user => { :first_name => 'Sam', :last_name => 'Iam' }} }
+  let(:hash_without_root) { { :first_name => 'Sam', :last_name => 'Iam' } }
+
+  describe '.without_root' do
+    it 'should return a hash without a root key when given a hash with a root key' do
+      without_root = RemoteFactoryGirl::FactoryGirlJsonParser.without_root(hash_with_root)
+
+      expect(without_root).to_not have_key(:user)
+      expect(without_root[:first_name]).to eq('Sam')
+    end
+
+    it 'should return a hash without a root key when given a hash without a root key' do
+      without_root = RemoteFactoryGirl::FactoryGirlJsonParser.without_root(hash_with_root)
+
+      expect(without_root).to_not have_key('user')
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: remote_factory_girl
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - tdouce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-23 00:00:00.000000000 Z
+date: 2014-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -83,6 +83,7 @@ files:
 - lib/remote_factory_girl/config.rb
 - lib/remote_factory_girl/config_applier.rb
 - lib/remote_factory_girl/exceptions.rb
+- lib/remote_factory_girl/factory_girl_json_parser.rb
 - lib/remote_factory_girl/hash_to_dot.rb
 - lib/remote_factory_girl/http.rb
 - lib/remote_factory_girl/json_to_active_resource.rb
@@ -91,6 +92,7 @@ files:
 - spec/integration/remote_factory_girl_spec.rb
 - spec/models/remote_factory_girl/config_applier_spec.rb
 - spec/models/remote_factory_girl/config_spec.rb
+- spec/models/remote_factory_girl/factory_girl_json_parser_spec.rb
 - spec/models/remote_factory_girl/http_spec.rb
 - spec/models/remote_factory_girl/json_to_active_resource_spec.rb
 - spec/models/remote_factory_girl_spec.rb
@@ -124,8 +126,8 @@ test_files:
 - spec/integration/remote_factory_girl_spec.rb
 - spec/models/remote_factory_girl/config_applier_spec.rb
 - spec/models/remote_factory_girl/config_spec.rb
+- spec/models/remote_factory_girl/factory_girl_json_parser_spec.rb
 - spec/models/remote_factory_girl/http_spec.rb
 - spec/models/remote_factory_girl/json_to_active_resource_spec.rb
 - spec/models/remote_factory_girl_spec.rb
 - spec/spec_helper.rb
-has_rdoc: