embark-journey 0.0.23 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73bfa618c8bb7d12327a585e9b77b26e788f4079
-  data.tar.gz: 67eec85eb4b1e9041aa2035a614ceebb96ce66a2
+  metadata.gz: 9f363e3beebc3becd4006da77ab91e8431916896
+  data.tar.gz: e628d433b2194af9a0598746560eb1ed46a224d9
 SHA512:
-  metadata.gz: 6ec9ad4191602cbc964e3fe9df8d1249308cc1e3c0148a8d5579fba310a6cc7daf34f9ef3ab89f749955f9721991eda3dd5ab86a5d85c883c08eb66e05a3663e
-  data.tar.gz: 73cba9c2fbea9cadc7b0d1260837959518f794f9c7c44620c0555923e5215df977a0a7002ac8553195df3bb045a84759a129fdb58866e58f83d2d19dec264af6
+  metadata.gz: a3524f6e49727b6c96a77b62b2742f40bad9f6940bc6985ba3bd91e3aa8b5f0c0a6f1bc13429ad90ead85a393271dda8dfab00fe706cf8b5749aaf8b3269c864
+  data.tar.gz: bbdfc9093951b07b1a260072599c35dea6bb03ac1ba4131adc5e8073a2a0cff4f7062b5d4a150a81a92a93ce729f3104b916ad039b57179f8c2f555ea8bddecf

data/lib/journey/resource.rb

@@ -8,7 +8,10 @@ module Journey
 
       self.embeds ||= []
 
-      unless options.has_key?(:embed) && !options.delete(:embed)
+      if options.has_key?(:embed)
+        embed_option = options.delete(:embed)
+        options.deep_merge!(params: { embed: embed_option }) if embed_option
+      else
         options.deep_merge!(params: { embed: embeds })
       end
 
@@ -17,9 +20,14 @@ module Journey
 
     def self.where(clauses={})
       raise ArgumentError, "expected a clauses Hash, got #{clauses.inspect}" unless clauses.is_a? Hash
-      embed = clauses.delete(:embed)
-      arguments = { params: clauses }
-      arguments.merge!(embed: embed) if clauses.has_key?(:embed)
+
+      arguments = if clauses.has_key?(:embed)
+        embed = clauses.delete(:embed)
+        { params: clauses, embed: embed }        
+      else
+        { params: clauses }
+      end
+
       find(:all, arguments)
     end
 

data/lib/journey/version.rb

@@ -2,7 +2,7 @@ module Journey
   module VERSION
     MAJOR = 0
     MINOR = 0
-    TINY  = 23
+    TINY  = 24
     PRE   = nil
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

data/spec/models/journey/resource_spec.rb

@@ -206,7 +206,7 @@ describe Journey::Resource do
       expect(job.reported_fault).to eq fault
     end
 
-    it 'skips embedded belongs_to associations when opted for' do
+    it 'skips embedded belongs_to associations on Class.find when opted for' do
       asset = Asset.create name: 'asset'
       fault = Fault.create name: 'fault'
 
@@ -221,6 +221,23 @@ describe Journey::Resource do
       expect(job.reported_fault).to eq fault
     end
 
+    it 'skips embedded belongs_to association on Class.where when opted for' do
+      asset = Asset.create name: 'asset'
+      fault = Fault.create name: 'fault'
+
+      job_resolution_comments = SecureRandom.uuid
+      job = Job.create name: 'job', resolution_comments: job_resolution_comments, asset_id: asset.id, reported_fault_id: fault.id
+
+      job = Job.where(query: { resolution_comments: job_resolution_comments }, embed: false).first
+      expect(job).to be_a Job
+
+      expect(job.attributes['asset']).to be_nil
+      expect(job.asset).to eq asset
+
+      expect(job.attributes['reported_fault']).to be_nil
+      expect(job.reported_fault).to eq fault
+    end
+
     it 'updates an embedded association id correctly' do
       asset = Asset.create name: 'asset'
       job = Job.create name: 'job', asset_id: asset.id

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embark-journey
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24
 platform: ruby
 authors:
 - Dan Davey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-23 00:00:00.000000000 Z
+date: 2014-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr