ember_data_active_model_parser 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31076fab33df0652b49cf8644852ed956e01eefe
-  data.tar.gz: b6899da4c8032f5ff839d015c940d6ad0b229dad
+  metadata.gz: 28d493d89fdd39959771b48b3adffbdd2ce42e95
+  data.tar.gz: 344f3ebeea6af632994cee0da8a6318948422373
 SHA512:
-  metadata.gz: 3f99b3e115f000e221f71e6563a2ce51f6cdddfc79ce1e961f5a9f0bfe612fe67bce76f6525f31fe555de267a84d283ca6fd59d79feb793bab446b18909b2efa
-  data.tar.gz: 052262df9b34f76a0ed2e38b21ecb4514f5eeadaa416f0470ed5154ebe4ca0ac55b0d6f20bdbd2b845a87ceee08f0ebd117015c13d397b07c588cdf46ef124ad
+  metadata.gz: 5101a5950f89c699c79f43639baecdfe9759817033c93cdc1ec8a0cbbffe0e6253c0af4251ecf7e44a0ef961c702910f1ca8270c9066b9bc82699a12478b03ec
+  data.tar.gz: b7ee138fc70ff60673febbbd50d81503ede74a9e7447feff1ca7e9c9c73a5f8bc726cc80a712d2c486db728913572e58c40a19aadf405bfbc7e9967f098a4f77

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+  - 2.0
+  - 2.1
+  - 2.2
+script:
+  - bundle exec rspec
+

data/README.md

@@ -2,6 +2,10 @@
 
 This is a middleware for [Her](http://her-rb.org/) which makes it possible to consume API endpoints used by ember-data's [ActiveModelAdapter](http://emberjs.com/api/data/classes/DS.ActiveModelAdapter.html). You can read more about the data format in the ember-data's [docs](http://emberjs.com/api/data/classes/DS.ActiveModelAdapter.html)
 
+## Status
+
+[![Build status](https://travis-ci.org/valo/ember_data_active_model_parser.svg)](https://travis-ci.org/valo/ember_data_active_model_parser)
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/ember_data_active_model_parser/embed_associations.rb

@@ -28,7 +28,7 @@ module EmberDataActiveModelParser
     def walk_hash(hash)
       hash.keys.each do |key|
         if association_ids_key(key, hash[key])
-          handle_association_ids(hash, hash.delete(key), association_name(key))
+          handle_association_ids(hash, hash[key], association_name(key))
         end
       end
     end
@@ -42,14 +42,14 @@ module EmberDataActiveModelParser
             }
           }
         when Fixnum
-          hash[association_name.to_sym] = {
-            association_name.to_sym => association_array(association_name).find { |association_item| association_item[:id] == association_ids }
-          }
+          hash[association_name.to_sym] = association_array(association_name).find { |association_item| association_item[:id] == association_ids }
+        when nil
+          hash[association_name.to_sym] = nil
       end
     end
 
     def association_ids_key(key, value)
-      key.to_s =~ /(.+)_id(s?)$/ && association_array(association_name(key)) && (value.is_a?(Array) || value.is_a?(Fixnum))
+      key.to_s =~ /(.+)_id(s?)$/ && association_array(association_name(key)) && (value.is_a?(Array) || value.is_a?(Fixnum) || value.nil?)
     end
 
     def association_name(key)

data/lib/ember_data_active_model_parser/version.rb

@@ -1,3 +1,3 @@
 module EmberDataActiveModelParser
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/embed_associations_spec.rb

@@ -26,7 +26,7 @@ describe EmberDataActiveModelParser::EmbedAssociations do
       end
       let(:expected_json) do
         {
-          project: { id: 1, name: "Shop list", tasks: { tasks: tasks } },
+          project: { id: 1, name: "Shop list", tasks: { tasks: tasks }, task_ids: [1,2,3] },
           tasks: tasks
         }
       end
@@ -79,22 +79,25 @@ describe EmberDataActiveModelParser::EmbedAssociations do
         [{
           id: 1,
           name: "Milk",
-          project: { project: projects[0] }
+          project: projects[0],
+          project_id: projects[0][:id]
         },
         {
           id: 2,
           name: "Bread",
-          project: { project: projects[0] }
+          project: projects[0],
+          project_id: projects[0][:id]
         },
         {
           id: 3,
           name: "Butter",
-          project: { project: projects[1] }
+          project: projects[1],
+          project_id: projects[1][:id]
         }]
       end
 
       let(:expected_projects) do
-        [{ id: 1, name: "Shop list", tasks: { tasks: expected_tasks[0, 2] } }, { id: 2, name: "Other Shop list", tasks: { tasks: expected_tasks[2, 3] } }]
+        [{ id: 1, name: "Shop list", tasks: { tasks: expected_tasks[0, 2] }, task_ids: [1,2] }, { id: 2, name: "Other Shop list", tasks: { tasks: expected_tasks[2, 3] }, task_ids: [3] }]
       end
 
       let(:expected_json) do
@@ -110,7 +113,6 @@ describe EmberDataActiveModelParser::EmbedAssociations do
       end
     end
 
-
     context "with an object with some associations that have associations" do
       let(:tasks) do
         [{
@@ -122,6 +124,11 @@ describe EmberDataActiveModelParser::EmbedAssociations do
           id: 2,
           name: "Bread",
           author_id: 2
+        },
+        {
+          id: 3,
+          name: "Cheese",
+          author_id: nil
         }]
       end
 
@@ -129,12 +136,20 @@ describe EmberDataActiveModelParser::EmbedAssociations do
         [{
           id: 1,
           name: "Milk",
-          author: { author: authors[0] }
+          author: authors[0],
+          author_id: 1
         },
         {
           id: 2,
           name: "Bread",
-          author: { author: authors[1] }
+          author: authors[1],
+          author_id: 2
+        },
+        {
+          id: 3,
+          name: "Cheese",
+          author: nil,
+          author_id: nil
         }]
       end
 
@@ -151,14 +166,14 @@ describe EmberDataActiveModelParser::EmbedAssociations do
 
       let(:json) do
         {
-          project: { id: 1, name: "Shop list", task_ids: [1,2] },
+          project: { id: 1, name: "Shop list", task_ids: [1, 2, 3] },
           tasks: tasks,
           authors: authors
         }
       end
       let(:expected_json) do
         {
-          project: { id: 1, name: "Shop list", tasks: { tasks: expected_tasks } },
+          project: { id: 1, name: "Shop list", tasks: { tasks: expected_tasks }, task_ids: [1, 2, 3] },
           tasks: expected_tasks,
           authors: authors
         }

data/spec/her_parsing_spec.rb

@@ -0,0 +1,85 @@
+require 'spec_helper'
+require 'her'
+require 'active_support/core_ext/object/json'
+
+class Project
+  include Her::Model
+
+  parse_root_in_json true, format: :active_model_serializers
+
+  has_many :tasks
+  has_one :organization
+end
+
+class Task
+  include Her::Model
+
+  parse_root_in_json true, format: :active_model_serializers
+end
+
+class Organization
+  include Her::Model
+
+  parse_root_in_json true, format: :active_model_serializers
+end
+
+
+describe "Parsing" do
+  let(:tasks) do
+    [{
+      id: 1,
+      name: "Milk",
+    },
+    {
+      id: 2,
+      name: "Bread"
+    },
+    {
+      id: 3,
+      name: "Butter"
+    }]
+  end
+
+  let(:organizations) do
+    [{
+      id: 1,
+      name: "ACME Inc."
+    }]
+  end
+
+  let(:project_response) do
+    {
+      project: { id: 1, name: "Shop list", task_ids: [1,2,3], organization_id: 1 },
+      tasks: tasks,
+      organizations: organizations
+    }.to_json
+  end
+
+  before do
+    stub_api_for(Project) do |stub|
+      stub.get("/projects/1") { |env| [200, {}, project_response] }
+    end
+    stub_api_for(Organization) { }
+    stub_api_for(Task) { }
+  end
+
+  describe :find do
+    let(:project) { Project.find(1) }
+
+    it "has an array of tasks" do
+      expect(project.tasks).to be_an(Array)
+    end
+
+    it "has the correct number of tasks" do
+      expect(project.tasks.length).to eq(tasks.length)
+    end
+
+    it "has an organization" do
+      expect(project.organization).to be_an(Organization)
+    end
+
+    it "assigns the correct organization" do
+      expect(project.organization.id).to eq(organizations[0][:id])
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,15 @@
+# spec/spec_helper.rb
+RSpec.configure do |config|
+  config.include(Module.new do
+    def stub_api_for(klass)
+      klass.use_api (api = Her::API.new)
+
+      # Here, you would customize this for your own API (URL, middleware, etc)
+      # like you have done in your application’s initializer
+      api.setup url: "http://api.example.com" do |c|
+        c.use EmberDataActiveModelParser::Middleware
+        c.adapter(:test) { |s| yield(s) }
+      end
+    end
+  end)
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ember_data_active_model_parser
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Valentin Mihov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-17 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: her
@@ -75,6 +75,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -84,6 +85,8 @@ files:
 - lib/ember_data_active_model_parser/embed_associations.rb
 - lib/ember_data_active_model_parser/version.rb
 - spec/embed_associations_spec.rb
+- spec/her_parsing_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/valo/ember_data_active_model_parser
 licenses:
 - MIT
@@ -110,3 +113,5 @@ specification_version: 4
 summary: A parser for Her compatible with ember-data's active_model_serializers format
 test_files:
 - spec/embed_associations_spec.rb
+- spec/her_parsing_spec.rb
+- spec/spec_helper.rb