embark-journey 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d585fc43842f526ac92b7baa33dfcc5b291bb7c5
-  data.tar.gz: b2d12857cb32c3f87b3c60fbf8bbe93b27a2fa60
+  metadata.gz: 903b83a147f53c1efba286cf039543a5c908ad1d
+  data.tar.gz: 0a87f6e082c435ca7f20851b3ec16faa71ce0ba8
 SHA512:
-  metadata.gz: 758328e28fe67df58ad60e9dba0f4a5ad8741795eab435c5c0dac31495f59f1861898f1a25836176f6522ace603ebb8a0da25b0c01bc39c15befa18f4f00f333
-  data.tar.gz: 197f52f761d88ec095145a1dd337a1ece4397cb8fc413fed1b33ec1692d6813861605d6bba43a636c80991cc4d2222ac43b84211a7dd7ff4036f9ef11237c706
+  metadata.gz: b1816e1461c44ffd10324977f097a94c01cc844f26a171c9b84da4ae8e2dd856fefe3c62b1ca1306e7eeb5a9646b084b97cdad9779376c3de293713b2c7295ce
+  data.tar.gz: d987784dae2d9bde8e8738091000d989c9e9aa245029672a545b15d30b3e388e6712e83da3713107663ee186c1ac30a3a265017eba5d1ac82951013752592102

data/README.md

@@ -40,6 +40,23 @@ Create your resource models, inheriting from `Journey::Resource`. Under the hood
     end
 
 
+### Searching
+
+To perform a text search on a model's attributes:
+
+    User.search('itni')
+    
+
+
+### Embedding associations
+
+Often you'll want to load associated resources without needing to make additional queries. This can be specified on the `belongs_to` declaration:
+
+    class User < Journey::Resource
+      belongs_to :account, embed: true
+    end
+
+
 ## Contributing
 
 1. Fork it

data/lib/active_resource/associations.rb

@@ -131,7 +131,7 @@ module ActiveResource::Associations
       elsif attributes.include?(method_name)
         attributes[method_name]
       elsif association_id = send(finder_key)
-        return nil if finder_key.blank?
+        return nil if association_id.blank?
         instance_variable_set(ivar_name, association_model.find(association_id))
       end
     end
@@ -143,9 +143,9 @@ module ActiveResource::Associations
   end
 
   attr_accessor :embeds
-  def defines_belongs_to_embed(method_name, association_model)
+  def defines_belongs_to_embed(method_name, association_model, foreign_key)
     self.embeds ||= []
-    self.embeds << method_name
+    self.embeds << association_model.to_s.underscore
   end
 
   def defines_has_many_finder_method(method_name, association_model)

data/lib/active_resource/associations/builder/belongs_to.rb

@@ -11,7 +11,7 @@ module ActiveResource::Associations::Builder
       reflection = model.create_reflection(self.class.macro, name, options)
       model.defines_belongs_to_finder_method(reflection.name, reflection.klass, reflection.foreign_key)
 
-      model.defines_belongs_to_embed(reflection.name, reflection.klass) if embed
+      model.defines_belongs_to_embed(reflection.name, reflection.klass, reflection.foreign_key) if embed
 
       return reflection
     end

data/lib/journey/resource/embed.rb

@@ -4,9 +4,6 @@ module Journey::Resource::Embed
   extend ActiveSupport::Concern
 
   included do
-    # def self.search(q)
-    #   instantiate_collection format.decode(post(:search, q: q).body)
-    # end
   end
 
 end

data/lib/journey/version.rb

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

data/spec/models/journey/resource_spec.rb

@@ -101,30 +101,30 @@ describe Journey::Resource do
   end
 
   describe '::Embed' do
-    class Client < Journey::Resource
+    class Asset < Journey::Resource
     end
 
-    class Technician < Journey::Resource
+    class Fault < Journey::Resource
     end
 
-    class Asset < Journey::Resource
-      belongs_to :client, embed: true
-      belongs_to :technician, embed: true
+    class Job < Journey::Resource
+      belongs_to :asset, embed: true
+      belongs_to :reported_fault, class_name: 'Fault', embed: true
     end
 
     it 'loads an embedded belongs_to association automatically' do
-      client = Client.create name: 'branch'
-      technician = Technician.create name: 'technician'
+      asset = Asset.create name: 'asset'
+      fault = Fault.create name: 'fault'
 
-      asset = Asset.create name: 'asset', client_id: client.id, technician_id: technician.id
-      id = asset.id
-      asset = Asset.find(id)
+      job = Job.create name: 'job', asset_id: asset.id, reported_fault_id: fault.id
+      id = job.id
+      job = Job.find(id)
 
-      expect(asset.attributes['client']).to eq client
-      expect(asset.client).to eq client
+      expect(job.attributes['asset']).to eq asset
+      expect(job.asset).to eq asset
 
-      expect(asset.attributes['technician']).to eq technician
-      expect(asset.technician).to eq technician
+      expect(job.attributes['reported_fault']).to eq fault
+      expect(job.reported_fault).to eq fault
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embark-journey
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Dan Davey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-14 00:00:00.000000000 Z
+date: 2014-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr