factory_girl_remote_strategy 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce58337e23b72366c09ab620b0d6c70ce38da4e7
-  data.tar.gz: f7882563ab29647fcb1409f99359ca4b8f4aa45c
+  metadata.gz: 1bd2d2572ab0367269268716ba1a455f7a2fd60d
+  data.tar.gz: f9331007bf708479bbc1d105e3828003097c055a
 SHA512:
-  metadata.gz: 77531f5ee48247c23d5b8ae304988d1dad2e2d1a76e07ffc0a69a80c2b0c0f2ef04f7fa070f6a0fc247da726523355b3b5cdf16843210b14d2f28de4f69ce4c1
-  data.tar.gz: cc7d8714e9c337663e87d775564e1974c6be33e481d5939e73d66c10789e168e4b020c3c2e99efe3f8d8adfbc708cf732e078e7d3ca2adf1278d1c9c2f0c1342
+  metadata.gz: 49f8a43abee55530a7b84c1f3182e9818d0bb66d253ea47e611f34917e38dc27a1dcc4b10a4dd3dd2831ff5c50ed95d151aae2b356eb6e596edf813feff0e634
+  data.tar.gz: fac74153c6c9f41b5f8ee14ecaa557ea88e21d6f31255bb1b037a8699e7457af55a75bda907db92301f3655e56ca5f858f6e7dde882dc2e98b6f033d9c0a8785

data/lib/factory_girl_remote_strategy.rb

@@ -32,7 +32,7 @@ module FactoryGirl
     end
 
     class << self
-      def entity_hash(entity)
+      def entity_hash(entity, params = {})
         raise ArgumentError, "cann't construct hash for non ActiveResource::Base object" unless entity.is_a?(ActiveResource::Base)
         attributes = entity.attributes
         # Set belongs_to <association>_id instead of each <association>.
@@ -54,7 +54,9 @@ module FactoryGirl
             attributes[k] = v.map { |e| entity_hash(e) }
           end
         end
-        { entity.class.element_name => attributes, _metadata: { abilities: %w(update destroy) } }
+        { entity.class.element_name => attributes }.tap do |h|
+          h[:_metadata] = { abilities: %w(update destroy) } unless params[:metadata] == false
+        end
       end
 
       def entity_url(entity)
@@ -90,5 +92,5 @@ def remote_search(*args)
   params = args.extract_options!
   collection = args.flatten
   FakeWeb.register_uri(:get, FactoryGirl::RemoteStrategy.collection_url(collection, params),
-    body: (collection.first.is_a?(Class) ? "[]" : collection.map { |e| FactoryGirl::RemoteStrategy.entity_hash(e) }.to_json))
+    body: (collection.first.is_a?(Class) ? "[]" : collection.map { |e| FactoryGirl::RemoteStrategy.entity_hash(e, params) }.to_json))
 end

data/lib/factory_girl_remote_strategy/version.rb

@@ -1,3 +1,3 @@
 module FactoryGirlRemoteStrategy
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/factories/staff.rb

@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :staff do
+    sequence(:id)
+    group_id 18
+  end
+end

data/spec/factory_girl_remote_strategy_spec.rb

@@ -70,6 +70,17 @@ describe FactoryGirl::RemoteStrategy do
       memberships = Membership.find(:all, params: { search: { premises_id_in: [4] } }).to_a
       memberships.should eq []
     end
+
+    context "standard ActiveResource JSON formatter with included root" do
+      it "performs correct search if no metadata required" do
+        remote_search FactoryGirl.remote_list(:staff, 2), metadata: false
+        expect { Staff.find(:all, params: { metadata: false }) }.not_to raise_error
+        staff = Staff.find(:all, params: { metadata: false }).to_a
+        expect(staff).to be_kind_of Array
+        expect(staff.first).to be_kind_of Staff
+        expect(staff.first.group_id).to eq 18
+      end
+    end
   end
 
   describe "Search by primary_key" do

data/spec/support/staff.rb

@@ -0,0 +1,8 @@
+class Staff < ActiveResource::Base
+  self.format = :json
+  self.include_root_in_json = true 
+  self.site = "http://example.com"
+  self.prefix = "/api/v1/"
+  self.element_name = "staff"
+  self.collection_name = "staff"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: factory_girl_remote_strategy
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Alex Avoyants
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-17 00:00:00.000000000 Z
+date: 2015-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -128,6 +128,7 @@ files:
 - spec/factories/incident.rb
 - spec/factories/membership.rb
 - spec/factories/postcode.rb
+- spec/factories/staff.rb
 - spec/factories/user.rb
 - spec/factories/victim.rb
 - spec/factory_girl_remote_not_found_strategy_spec.rb
@@ -138,6 +139,7 @@ files:
 - spec/support/json_with_metadata_formatter.rb
 - spec/support/membership.rb
 - spec/support/postcode.rb
+- spec/support/staff.rb
 - spec/support/user.rb
 - spec/support/victim.rb
 homepage: ''
@@ -169,6 +171,7 @@ test_files:
 - spec/factories/incident.rb
 - spec/factories/membership.rb
 - spec/factories/postcode.rb
+- spec/factories/staff.rb
 - spec/factories/user.rb
 - spec/factories/victim.rb
 - spec/factory_girl_remote_not_found_strategy_spec.rb
@@ -179,5 +182,6 @@ test_files:
 - spec/support/json_with_metadata_formatter.rb
 - spec/support/membership.rb
 - spec/support/postcode.rb
+- spec/support/staff.rb
 - spec/support/user.rb
 - spec/support/victim.rb