her 0.4 → 0.4.1

data/spec/model/nested_attributes_spec.rb

@@ -0,0 +1,98 @@
+# encoding: utf-8
+require File.join(File.dirname(__FILE__), "../spec_helper.rb")
+
+describe Her::Model::NestedAttributes do
+  context "with a belongs_to relation" do
+    before do
+      Her::API.setup :url => "https://api.example.com" do |builder|
+        builder.use Her::Middleware::FirstLevelParseJSON
+        builder.use Faraday::Request::UrlEncoded
+      end
+
+      spawn_model "Foo::User" do
+        belongs_to :company, :path => "/organizations/:id", :foreign_key => :organization_id
+        accepts_nested_attributes_for :company
+      end
+
+      spawn_model "Foo::Company"
+
+      @user_with_data_through_nested_attributes = Foo::User.new :name => "Test", :company_attributes => { :name => "Example Company" }
+    end
+
+    context "when child does not yet exist" do
+      it "creates an instance of the associated class" do
+        @user_with_data_through_nested_attributes.company.should be_a(Foo::Company)
+        @user_with_data_through_nested_attributes.company.name.should == "Example Company"
+      end
+    end
+
+    context "when child does exist" do
+      it "updates the attributes of the associated object" do
+        @user_with_data_through_nested_attributes.company_attributes = { :name => "Fünke's Company" }
+        @user_with_data_through_nested_attributes.company.should be_a(Foo::Company)
+        @user_with_data_through_nested_attributes.company.name.should == "Fünke's Company"
+      end
+    end
+  end
+
+  context "with a has_one relation" do
+    before do
+      Her::API.setup :url => "https://api.example.com" do |builder|
+        builder.use Her::Middleware::FirstLevelParseJSON
+        builder.use Faraday::Request::UrlEncoded
+      end
+
+      spawn_model "Foo::User" do
+        has_one :pet
+        accepts_nested_attributes_for :pet
+      end
+
+      spawn_model "Foo::Pet"
+
+      @user_with_data_through_nested_attributes = Foo::User.new :name => "Test", :pet_attributes => { :name => "Hasi" }
+    end
+
+    context "when child does not yet exist" do
+      it "creates an instance of the associated class" do
+        @user_with_data_through_nested_attributes.pet.should be_a(Foo::Pet)
+        @user_with_data_through_nested_attributes.pet.name.should == "Hasi"
+      end
+    end
+
+    context "when child does exist" do
+      it "updates the attributes of the associated object" do
+        @user_with_data_through_nested_attributes.pet_attributes = { :name => "Rodriguez" }
+        @user_with_data_through_nested_attributes.pet.should be_a(Foo::Pet)
+        @user_with_data_through_nested_attributes.pet.name.should == "Rodriguez"
+      end
+    end
+  end
+
+  context "with a has_many relation" do
+    before do
+      Her::API.setup :url => "https://api.example.com" do |builder|
+        builder.use Her::Middleware::FirstLevelParseJSON
+        builder.use Faraday::Request::UrlEncoded
+      end
+
+      spawn_model "Foo::User" do
+        has_many :pets
+        accepts_nested_attributes_for :pets
+      end
+
+      spawn_model "Foo::Pet"
+
+      @user_with_data_through_nested_attributes = Foo::User.new :name => "Test", :pets_attributes => [{ :name => "Hasi" }, { :name => "Rodriguez" }]
+    end
+
+    context "when children do not yet exist" do
+      it "creates an instance of the associated class" do
+        @user_with_data_through_nested_attributes.pets.length.should == 2
+        @user_with_data_through_nested_attributes.pets[0].should be_a(Foo::Pet)
+        @user_with_data_through_nested_attributes.pets[1].should be_a(Foo::Pet)
+        @user_with_data_through_nested_attributes.pets[0].name.should == "Hasi"
+        @user_with_data_through_nested_attributes.pets[1].name.should == "Rodriguez"
+      end
+    end
+  end
+end

data/spec/model/relationships_spec.rb

@@ -87,6 +87,9 @@ describe Her::Model::Relationships do
           stub.get("/users/1/posts") { |env| [200, {}, {:id => 1, :body => 'blogging stuff', :admin_id => 1 }.to_json] }
           stub.get("/organizations/1") { |env| [200, {}, { :id => 1, :name => "Bluth Company Foo" }.to_json] }
           stub.get("/organizations/2") { |env| [200, {}, { :id => 2, :name => "Bluth Company" }.to_json] }
+          stub.post("/users") { |env| [200, {}, { :id => 5, :name => "Mr. Krabs", :comments => [{ :id => 99, :body => "Rodríguez, nasibisibusi?", :user_id => 5 }], :role => { :id => 1, :body => "Admin" }, :organization => { :id => 3, :name => "Krusty Krab" }, :organization_id => 3 }.to_json] }
+          stub.put("/users/5") { |env| [200, {}, { :id => 5, :name => "Clancy Brown", :comments => [{ :id => 99, :body => "Rodríguez, nasibisibusi?", :user_id => 5 }], :role => { :id => 1, :body => "Admin" }, :organization => { :id => 3, :name => "Krusty Krab" }, :organization_id => 3 }.to_json] }
+          stub.delete("/users/5") { |env| [200, {}, { :id => 5, :name => "Clancy Brown", :comments => [{ :id => 99, :body => "Rodríguez, nasibisibusi?", :user_id => 5 }], :role => { :id => 1, :body => "Admin" }, :organization => { :id => 3, :name => "Krusty Krab" }, :organization_id => 3 }.to_json] }
         end
       end
 
@@ -110,6 +113,10 @@ describe Her::Model::Relationships do
       @user_without_included_data = Foo::User.find(2)
     end
 
+    let(:user_with_included_data_after_create) { Foo::User.create }
+    let(:user_with_included_data_after_save_existing) { Foo::User.save_existing(5, :name => "Clancy Brown") }
+    let(:user_with_included_data_after_destroy) { Foo::User.new(:id => 5).destroy }
+
     it "maps an array of included data through has_many" do
       @user_with_included_data.comments.first.should be_a(Foo::Comment)
       @user_with_included_data.comments.length.should == 2
@@ -177,6 +184,25 @@ describe Her::Model::Relationships do
       @user_without_included_data.get_relationship(:unknown_relationship).should be_nil
       @user_without_included_data.get_relationship(:organization).name.should == "Bluth Company"
     end
+
+    [:create, :save_existing, :destroy].each do |type|
+      context "after #{type}" do
+        let(:subject) { self.send("user_with_included_data_after_#{type}")}
+
+        it "maps an array of included data through has_many" do
+          subject.comments.first.should be_a(Foo::Comment)
+          subject.comments.length.should == 1
+          subject.comments.first.id.should == 99
+          subject.comments.first.body.should == "Rodríguez, nasibisibusi?"
+        end
+
+        it "maps an array of included data through has_one" do
+          subject.role.should be_a(Foo::Role)
+          subject.role.id.should == 1
+          subject.role.body.should == "Admin"
+        end
+      end
+    end
   end
 
   context "handling relationships with details" do

data/spec/model_spec.rb

@@ -3,41 +3,29 @@ require 'spec_helper'
 
 describe Her::Model do
   before do
-    Her::API.setup :url => "https://api.example.com" do |builder|
-      builder.use Her::Middleware::FirstLevelParseJSON
-      builder.use Faraday::Request::UrlEncoded
-      builder.adapter :test do |stub|
+    Her::API.setup :url => "https://api.example.com" do |connection|
+      connection.use Her::Middleware::FirstLevelParseJSON
+      connection.adapter :test do |stub|
         stub.get("/users/1") { |env| [200, {}, { :id => 1, :name => "Tobias Fünke" }.to_json] }
         stub.get("/users/1/comments") { |env| [200, {}, [{ :id => 4, :body => "They're having a FIRESALE?" }].to_json] }
       end
     end
 
-    spawn_model "Foo::User" do
-      has_many :comments
-    end
-
-    spawn_model "Foo::Comment"
-
-    @user_without_included_data = Foo::User.find(1)
-  end
-
-  it "handles has_key? for data" do
-    @user_without_included_data.should_not have_key(:unknown_method_for_a_user)
-    @user_without_included_data.should have_key(:name)
-  end
-
-  it "handles has_key? for relationships" do
-    @user_without_included_data.should_not have_key(:unknown_method_for_a_user)
-    @user_without_included_data.should have_key(:comments)
+    spawn_model("Foo::User") { has_many :comments }
+    spawn_model("Foo::Comment")
   end
+  subject { Foo::User.find(1) }
 
-  it "handles [] for data" do
-    @user_without_included_data[:unknown_method_for_a_user].should be_nil
-    @user_without_included_data[:name].should == "Tobias Fünke"
+  describe :has_key? do
+    it { should_not have_key(:unknown_method_for_a_user) }
+    it { should_not have_key(:unknown_method_for_a_user) }
+    it { should have_key(:name) }
+    it { should have_key(:comments) }
   end
 
-  it "handles [] for relationships" do
-    @user_without_included_data[:unknown_relationship].should be_nil
-    @user_without_included_data[:comments].first.body.should == "They're having a FIRESALE?"
+  describe :[] do
+    it { should_not have_key(:unknown_method_for_a_user) }
+    specify { subject[:name].should == "Tobias Fünke" }
+    specify { subject[:comments].first.body.should == "They're having a FIRESALE?" }
   end
 end

data/spec/spec_helper.rb

@@ -4,14 +4,14 @@ require "rspec"
 require "mocha/api"
 require "her"
 
-RSpec.configure do |c|
-  c.mock_with :mocha
+RSpec.configure do |config|
+  config.mock_with :mocha
 
-  c.before :each do
+  config.before :each do
     @globals = []
   end
 
-  c.after :each do
+  config.after :each do
     @globals.each do |global|
       Object.instance_eval { remove_const global } if Object.const_defined?(global)
     end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: her
 version: !ruby/object:Gem::Version
-  version: '0.4'
-  prerelease: 
+  version: 0.4.1
 platform: ruby
 authors:
 - Rémi Prévost
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-19 00:00:00.000000000 Z
+date: 2013-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,23 +27,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '2.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '2.13'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -117,12 +104,12 @@ files:
 - .gitignore
 - .rspec
 - .travis.yml
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- docs/CONTRIBUTING.md
-- docs/UPGRADE.md
+- UPGRADE.md
 - examples/twitter-oauth/Gemfile
 - examples/twitter-oauth/app.rb
 - examples/twitter-oauth/config.ru
@@ -145,6 +132,7 @@ files:
 - lib/her/model/hooks.rb
 - lib/her/model/http.rb
 - lib/her/model/introspection.rb
+- lib/her/model/nested_attributes.rb
 - lib/her/model/orm.rb
 - lib/her/model/paths.rb
 - lib/her/model/relationships.rb
@@ -157,6 +145,7 @@ files:
 - spec/model/hooks_spec.rb
 - spec/model/http_spec.rb
 - spec/model/introspection_spec.rb
+- spec/model/nested_attributes_spec.rb
 - spec/model/orm_spec.rb
 - spec/model/paths_spec.rb
 - spec/model/relationships_spec.rb
@@ -165,33 +154,26 @@ files:
 homepage: http://remiprev.github.com/her
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2845158545991818661
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2845158545991818661
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A simple Representational State Transfer-based Hypertext Transfer Protocol-powered
   Object Relational Mapper. Her?
 test_files:
@@ -203,6 +185,7 @@ test_files:
 - spec/model/hooks_spec.rb
 - spec/model/http_spec.rb
 - spec/model/introspection_spec.rb
+- spec/model/nested_attributes_spec.rb
 - spec/model/orm_spec.rb
 - spec/model/paths_spec.rb
 - spec/model/relationships_spec.rb