embark-journey 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2dcc38289e37dd4adcc48a94c56954573ddbbaa
-  data.tar.gz: 1913f1561e0bc6c0e8233bd787e8b4fb83fce68d
+  metadata.gz: d585fc43842f526ac92b7baa33dfcc5b291bb7c5
+  data.tar.gz: b2d12857cb32c3f87b3c60fbf8bbe93b27a2fa60
 SHA512:
-  metadata.gz: d5be2dd99aad0404baf17a4ef7179929bd45da83a663557acb0e9f5f4520828c637f3ed2a7d159c06eccd4a3e40ec7630559e9daec53c37949cf11a00843ee11
-  data.tar.gz: 70c34a52ee6f46e65b5a827892c5606e8a0318622f59d78d596ef67169710120d2bb773e71aab010c65b967b100ff6cf3342c1658923e7abfbc8c70a71adb2c4
+  metadata.gz: 758328e28fe67df58ad60e9dba0f4a5ad8741795eab435c5c0dac31495f59f1861898f1a25836176f6522ace603ebb8a0da25b0c01bc39c15befa18f4f00f333
+  data.tar.gz: 197f52f761d88ec095145a1dd337a1ece4397cb8fc413fed1b33ec1692d6813861605d6bba43a636c80991cc4d2222ac43b84211a7dd7ff4036f9ef11237c706

data/lib/active_resource/active_resource.rb

@@ -1,2 +1,2 @@
 require 'active_resource'
-require 'active_resource/associations'
+require_relative 'associations'

data/lib/active_resource/associations.rb

@@ -4,11 +4,11 @@ module ActiveResource::Associations
     autoload :Association, 'active_resource/associations/builder/association'
     autoload :HasMany,     'active_resource/associations/builder/has_many'
     autoload :HasOne,      'active_resource/associations/builder/has_one'
-    autoload :BelongsTo,   'active_resource/associations/builder/belongs_to'
+    # autoload :BelongsTo,   'active_resource/associations/builder/belongs_to'
+    require_relative 'associations/builder/belongs_to'
   end
 
 
-
   # Specifies a one-to-many association.
   #
   # === Options
@@ -142,6 +142,12 @@ module ActiveResource::Associations
     end
   end
 
+  attr_accessor :embeds
+  def defines_belongs_to_embed(method_name, association_model)
+    self.embeds ||= []
+    self.embeds << method_name
+  end
+
   def defines_has_many_finder_method(method_name, association_model)
     ivar_name = :"@#{method_name}"
 

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

@@ -0,0 +1,19 @@
+module ActiveResource::Associations::Builder 
+  class BelongsTo < Association
+    self.valid_options += [:foreign_key, :embed]
+
+    self.macro = :belongs_to
+
+    def build
+      validate_options
+      embed = options.delete(:embed)
+
+      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
+
+      return reflection
+    end
+  end
+end

data/lib/journey.rb

@@ -1,4 +1,5 @@
 require 'active_resource/active_resource'
+
 require 'journey/version'
 require 'journey/configuration'
 require 'journey/configurable'

data/lib/journey/resource.rb

@@ -1,6 +1,16 @@
-require 'active_resource/active_resource'
 module Journey
   class Resource < ActiveResource::Base
+
+    def self.find(*arguments)
+      scope   = arguments.slice!(0)
+
+      self.embeds ||= []
+      options = arguments.slice!(0) || {}
+      options.deep_merge!(params: { embed: self.embeds })
+
+      super *([scope, options] + arguments)
+    end
+
   end
 end
 
@@ -9,6 +19,7 @@ require 'journey/resource/attribute_loading'
 require 'journey/resource/enums'
 require 'journey/resource/queries'
 require 'journey/resource/search'
+require 'journey/resource/embed'
 
 class Journey::Resource
   include API
@@ -16,6 +27,7 @@ class Journey::Resource
   include Enums
   include AttributeLoading
   include Search
+  include Embed
 end
 
 

data/lib/journey/resource/attribute_loading.rb

@@ -8,7 +8,7 @@ module Journey::Resource::AttributeLoading
     # for the purpose of enums
     def load(attributes, remove_root = false, persisted = false)
       super(attributes, remove_root, persisted).tap do
-        attributes.each do |key, value|
+        self.attributes.each do |key, value|
           send("#{key}=", value) if respond_to?("#{key}=")
         end
       end

data/lib/journey/resource/embed.rb

@@ -0,0 +1,12 @@
+require 'active_support/concern'
+
+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  = 6
+    TINY  = 7
     PRE   = nil
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

data/spec/models/journey/resource_spec.rb

@@ -99,4 +99,32 @@ describe Journey::Resource do
       expect(results).to_not be_any
     end
   end
+
+  describe '::Embed' do
+    class Client < Journey::Resource
+    end
+
+    class Technician < Journey::Resource
+    end
+
+    class Asset < Journey::Resource
+      belongs_to :client, embed: true
+      belongs_to :technician, 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', client_id: client.id, technician_id: technician.id
+      id = asset.id
+      asset = Asset.find(id)
+
+      expect(asset.attributes['client']).to eq client
+      expect(asset.client).to eq client
+
+      expect(asset.attributes['technician']).to eq technician
+      expect(asset.technician).to eq technician
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embark-journey
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Dan Davey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2014-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr
@@ -142,12 +142,14 @@ files:
 - journey.gemspec
 - lib/active_resource/active_resource.rb
 - lib/active_resource/associations.rb
+- lib/active_resource/associations/builder/belongs_to.rb
 - lib/journey.rb
 - lib/journey/configurable.rb
 - lib/journey/configuration.rb
 - lib/journey/resource.rb
 - lib/journey/resource/api.rb
 - lib/journey/resource/attribute_loading.rb
+- lib/journey/resource/embed.rb
 - lib/journey/resource/enums.rb
 - lib/journey/resource/queries.rb
 - lib/journey/resource/search.rb