roaster 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 668ded2510b25dae16c54d05a170f84fb2ea38f8
-  data.tar.gz: 4a6a005c80f4242a590abfe0a82e567955606b6b
+  metadata.gz: 7edd1920bcea40877ce475c8342562ba9af1a184
+  data.tar.gz: ee99be23ae5e17e5f9f836ac3a4b71fb26347ccc
 SHA512:
-  metadata.gz: 7711f840dda137ba4c0d32dd96455f7817d6f6c1fd7131bd2e32eb32f8ab2e10bc832ae3684d34e7bdd621c2cf8ba305f18e34c8ffe7f266fa926d8b9176081c
-  data.tar.gz: e08002f241379cf7ee049ee8c1530ce55387df00f53ecfea988a12562e11b6d8494d2ab3e9e61925507c7b9a243f48647d381b54c458c3d96a9468b0e99bbb8e
+  metadata.gz: bb3235f615b1d0efadcca5de7e1174e3196698f7b942d6ee80f751e1a5d2b4d42ff4ac20d5e36692545b6fbb2c5e266510e76c48c9db6c45e85426efbee39529
+  data.tar.gz: b803b241de1e0ace8de2aa1b1ff4ca55370e56f1099b036a9a569ad69a059ae558bc78ca84bb0d793a781cdf0669cb99925ef56d8f2478b5d273edf2c515945a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    roaster (0.0.4)
+    roaster (0.0.5)
       activerecord (~> 4.1)
       activesupport (~> 4.1)
       representable (~> 2.0.4)
@@ -36,6 +36,7 @@ GEM
       activesupport (>= 3.0.0)
     i18n (0.6.11)
     json (1.8.1)
+    json_expressions (0.8.3)
     mini_portile (0.6.0)
     minitest (5.4.1)
     multi_json (1.10.1)
@@ -61,6 +62,7 @@ DEPENDENCIES
   byebug (~> 3.4)
   database_cleaner (~> 1.3)
   factory_girl (~> 4.4)
+  json_expressions
   minitest (~> 5.1)
   rake (~> 10.3)
   roaster!

data/lib/roaster/decorator.rb

@@ -11,6 +11,19 @@ module Roaster
 
     class << self
 
+      def has_one(name)
+        representable_attrs[:_has_one] ||= []
+        property name
+        representable_attrs[:_has_one].push({key: name.to_s + '_id', name: name.to_s})
+      end
+
+      #PING: Overriding build_definition is maybe required
+      def has_many(name)
+        representable_attrs[:_has_many] ||= []
+        collection name
+        representable_attrs[:_has_many].push({key: name.to_s.singularize + '_ids', name: name.to_s})
+      end
+
       def can_filter_by(*attrs)
         representable_attrs[:_filterable_attributes] ||= []
         representable_attrs[:_filterable_attributes].push(*attrs.map(&:to_sym)).uniq!

data/lib/roaster/json_api.rb

@@ -6,30 +6,18 @@ require 'representable/bindings/hash_bindings'
 module Roaster
   module JsonApi
 
-    class Binding < Representable::Hash::PropertyBinding
-      alias_method :parent_serialize, :serialize
-
-      def serialize(value)
-        super
+    class CollectionBinding < Representable::Hash::PropertyBinding
+      def self.build_for(definition, *args)
+        self.new(definition, *args)
       end
 
-      def serialize_collection(value)
+      def serialize(value)
         @mapping_class = @definition[:extend].instance_variable_get('@value')
         collection = value.collect { |item|
-          parent_serialize(item)
+          super(item)
         }
         { @mapping_class.get_resource_name => collection }
       end
-    end
-
-    class CollectionBinding < Binding
-      def self.build_for(definition, *args)
-        self.new(definition, *args)
-      end
-
-      def serialize(value)
-        serialize_collection(value)
-      end
 
       # TODO
       # def deserialize(fragment)
@@ -41,11 +29,34 @@ module Roaster
       include Representable::JSON
 
       def to_hash(option)
-        obj = {'id' => resource_id.to_s}.merge super(option)
-        if option[:single_resource].nil?
-          obj
+
+        roaster_type = option[:roaster]
+        links = {}
+
+        representable_attrs[:_has_one].each do |link|
+          representable_attrs[:definitions].delete(link[:name].to_s)
+          links[link[:name]] = @represented[link[:key]].to_s
+        end unless representable_attrs[:_has_one].nil?
+
+
+        representable_attrs[:_has_many].each do |link|
+          representable_attrs[:definitions].delete(link[:name].to_s)
+          links[link[:name]] = @represented.send(link[:key]).map(&:to_s) || []
+        end unless representable_attrs[:_has_many].nil?
+
+        if roaster_type.nil?
+          resource_id.to_s
         else
-          { self.class.get_resource_name => obj }
+          sup = {'id' => resource_id.to_s }
+          sup.merge!({'links' => links }) unless links.empty?
+          case roaster_type
+            when :resource
+              {
+                self.class.get_resource_name => sup.merge(super(option))
+              }
+            when :collection
+              sup.merge(super(option))
+          end
         end
       end
 

data/lib/roaster/request.rb

@@ -63,9 +63,9 @@ module Roaster
 
     def represent(data)
       if @query.target.resource_ids.size == 1
-        @mapping_class.prepare(data.first).to_hash({single_resource: true})
+        @mapping_class.prepare(data.first).to_hash({roaster: :resource})
       elsif data.respond_to?(:each)
-        @mapping_class.for_collection.prepare(data).to_hash({}, Roaster::JsonApi::CollectionBinding)
+        @mapping_class.for_collection.prepare(data).to_hash({roaster: :collection}, Roaster::JsonApi::CollectionBinding)
       else
         # TODO: HANDLE ERROR ?
         byebug

data/lib/roaster/version.rb

@@ -1,3 +1,3 @@
 module Roaster
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/roaster.gemspec

@@ -26,5 +26,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'sqlite3', '~> 1.3'
   gem.add_development_dependency 'database_cleaner', '~> 1.3'
   gem.add_development_dependency 'byebug', '~> 3.4'
+  gem.add_development_dependency 'json_expressions'
 
 end

data/test/mappings/album.rb

@@ -3,6 +3,8 @@ require 'roaster/json_api'
 class AlbumMapping < Roaster::JsonApi::Mapping
 
   property :title
+
+  has_many :tracks
   # property :created_at
 
   # TODO: auto include included mapping

data/test/mappings/track.rb

@@ -3,6 +3,6 @@ require 'roaster/json_api'
 class TrackMapping < Roaster::JsonApi::Mapping
 
   property :title
+  has_one :album
 
 end
- 

data/test/test_helper.rb

@@ -3,6 +3,7 @@ require 'database_cleaner'
 require 'awesome_print'
 require 'factory_girl'
 require 'byebug'
+require 'json_expressions/minitest'
 
 require_relative 'support/active_record'
 require_relative 'models/album'

data/test/wut_test.rb

@@ -48,27 +48,36 @@ class PoniesTest < MiniTest::Test
     target = build_target(:albums, 1)
     rq = build_request(:read, target: target)
     res = rq.execute
-    assert_equal({'albums'=>{'id'=>'1', 'title'=>'Animals'}}, res)
+    assert_equal({'albums'=>{'id'=>'1', 'links'=>{'tracks'=>[]}, 'title'=>'Animals'}}, res)
   end
 
   def test_ponies
     rq = build_request(:read)
     res = rq.execute
-    assert_equal({'albums' => [{'id' => '1', 'title' => 'Animals'}, {'id' => '2', 'title' => 'The Wall'}, {'id' => '3', 'title' => 'Meddle'}, {'id' => '4', 'title' => 'Wages of Sin'}]}, res)
+    assert_equal({'albums' => [
+      {'id' => '1', 'links'=>{'tracks'=>[]}, 'title' => 'Animals'},
+      {'id' => '2', 'links'=>{'tracks'=>[]}, 'title' => 'The Wall'},
+      {'id' => '3', 'links'=>{'tracks'=>[]}, 'title' => 'Meddle'},
+      {'id' => '4', 'links'=>{'tracks'=>['1', '2', '3']}, 'title' => 'Wages of Sin'}]}, res)
   end
 
    def test_sorted_ponies
     params = {sort: :title}
     rq = build_request(:read, params: params)
     res = rq.execute
-    assert_equal({'albums' => [{'id' => '1', 'title' => 'Animals'}, {'id' => '3', 'title' => 'Meddle'}, {'id' => '2', 'title' => 'The Wall'}, {'id' => '4', 'title' => 'Wages of Sin'}]}, res)
+    assert_equal({'albums' => [
+        {'id' => '1', 'links'=>{'tracks'=>[]}, 'title' => 'Animals'},
+        {'id' => '3', 'links'=>{'tracks'=>[]}, 'title' => 'Meddle'},
+        {'id' => '2', 'links'=>{'tracks'=>[]}, 'title' => 'The Wall'},
+        {'id' => '4', 'links'=>{'tracks'=>['1', '2', '3']}, 'title' => 'Wages of Sin'}]},
+      res)
   end
 
   def test_simple_filtered_ponies
     params = {title: 'Animals'}
     rq = build_request(:read, params: params)
     res = rq.execute
-    assert_equal({'albums' => [{'id' => '1', 'title' => 'Animals'}]}, res)
+    assert_equal({'albums' => [{'id' => '1', 'links'=>{'tracks'=>[]}, 'title' => 'Animals'}]}, res)
   end
 
   #TODO: Make this one pass !
@@ -178,6 +187,43 @@ class PoniesTest < MiniTest::Test
     assert_equal 'Megadeth', album.band.name
   end
 
+  def test_read_has_one_links
+    album = FactoryGirl.create :album, title: 'Ride the Lightning'
+    track = FactoryGirl.create :track, title: 'Fight Fire With Fire', album: album
+    target = build_target(:track, track)
+    rq = build_request(:read, target: target)
+    res = rq.execute
+    assert_json_match({
+      tracks: {
+        id: '4',
+        links: {
+          album: '5'
+        },
+        title: 'Fight Fire With Fire',
+      }}, res)
+  end
+
+  def test_read_has_many_links
+    track_1 = FactoryGirl.create :track, title: 'Fight Fire With Fire'
+    # Track 2 omitted because it has the same title as the album
+    track_3 = FactoryGirl.create :track, title: 'For Whom The Bell Tolls'
+    track_4 = FactoryGirl.create :track, title: 'Fade to Black'
+    album = FactoryGirl.create :album, title: 'Ride the Lightning', tracks: [track_1, track_3, track_4]
+    # byebug
+    target = build_target(:album, album)
+    rq = build_request(:read, target: target)
+    res = rq.execute
+    assert_json_match({
+      albums: {
+        id: '5',
+        links: {
+          tracks: [track_1.id.to_s, track_3.id.to_s, track_4.id.to_s]
+        },
+        title: 'Ride the Lightning',
+      }}, res)
+  end
+
+
   def test_update_to_many_relationship
     track_1 = FactoryGirl.create :track, title: 'Fight Fire With Fire'
     # Track 2 omitted because it has the same title as the album

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roaster
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Nicolas Albeza
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-22 00:00:00.000000000 Z
+date: 2014-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: representable
@@ -137,6 +137,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: json_expressions
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Model/JSONAPI mapping
 email:
 - n.albeza@gmail.com