her 0.6.6 → 0.6.7

data/.travis.yml

@@ -6,4 +6,15 @@ rvm:
   - 1.9.2
   - 1.8.7
 
+gemfile:
+  - Gemfile
+  - gemfiles/activemodel-4.0.gemfile
+
+matrix:
+  exclude:
+  - rvm: 1.8.7
+    gemfile: gemfiles/activemodel-4.0.gemfile
+  - rvm: 1.9.2
+    gemfile: gemfiles/activemodel-4.0.gemfile
+
 script: "echo 'COME ON!' && bundle exec rake spec"

data/README.md

@@ -367,6 +367,20 @@ You can use the association methods to build new objects and save them.
 # => [#<Comment id=3 body="Hello world." user_id=1>]
 ```
 
+You can also explicitly request a new object via the API when using ``build``. This is useful if you're dealing with default attributes.
+
+```ruby
+class Comment
+  include Her::Model
+  request_new_object_on_build true
+end
+
+@user = User.find(1)
+@user.comments.build(body: "Just a draft")
+# GET "/users/1/comments/new" with `body=Just+a+draft.`
+# => [#<Comment id=nil body="Just a draft" archived=false user_id=1>]
+```
+
 #### Notes about paths
 
 Resources must always have all the required attributes to build their complete path. For example, if you have these models:
@@ -448,7 +462,7 @@ class User
   end
 end
 
-@user = User.create(fullname: "Tobias Funke")
+@user = User.create(fullname: "Tobias Fünke")
 # POST "/users" with `fullname=Tobias+Fünke&internal_id=42`
 
 @user = User.find(1)
@@ -891,6 +905,7 @@ These [fine folks](https://github.com/remiprev/her/contributors) helped with Her
 * [@seanreads](https://github.com/seanreads)
 * [@jonkarna](https://github.com/jonkarna)
 * [@aclevy](https://github.com/aclevy)
+* [@stevschmid](https://github.com/stevschmid)
 
 ## License
 

data/gemfiles/activemodel-4.0.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gemspec path: "../"
+
+gem 'activemodel', '~> 4.0.0.rc1'

data/her.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake", "~> 10.0"
   s.add_development_dependency "rspec", "~> 2.13"
   s.add_development_dependency "fivemat", "~> 1.2"
+  s.add_development_dependency "json", "~> 1.7.7"
 
   s.add_runtime_dependency "activemodel", ">= 3.0.0"
   s.add_runtime_dependency "activesupport", ">= 3.0.0"

data/lib/her/model/associations/belongs_to_association.rb

@@ -45,7 +45,7 @@ module Her
         #   new_organization = user.organization.build(:name => "Foo Inc.")
         #   new_organization # => #<Organization name="Foo Inc.">
         def build(attributes = {})
-          @klass.new(attributes)
+          @klass.build(attributes)
         end
 
         # Create a new object, save it and associate it to the parent

data/lib/her/model/associations/has_many_association.rb

@@ -49,7 +49,7 @@ module Her
         #   new_comment = user.comments.build(:body => "Hello!")
         #   new_comment # => #<Comment user_id=1 body="Hello!">
         def build(attributes = {})
-          @klass.new(attributes.merge(:"#{@parent.singularized_resource_name}_id" => @parent.id))
+          @klass.build(attributes.merge(:"#{@parent.singularized_resource_name}_id" => @parent.id))
         end
 
         # Create a new object, save it and add it to the associated collection

data/lib/her/model/associations/has_one_association.rb

@@ -44,7 +44,7 @@ module Her
         #   new_role = user.role.build(:title => "moderator")
         #   new_role # => #<Role user_id=1 title="moderator">
         def build(attributes = {})
-          @klass.new(attributes.merge(:"#{@parent.singularized_resource_name}_id" => @parent.id))
+          @klass.build(attributes.merge(:"#{@parent.singularized_resource_name}_id" => @parent.id))
         end
 
         # Create a new object, save it and associate it to the parent

data/lib/her/model/orm.rb

@@ -88,7 +88,7 @@ module Her
         #   User.page(2).all # Called via GET "/users?page=2"
         def scope(name, code)
           # Add the scope method to the class
-          (class << self; self end).define_method(name) do |*args|
+          (class << self; self end).send(:define_method, name) do |*args|
             instance_exec(*args, &code)
           end
 
@@ -165,6 +165,24 @@ module Her
           @method_for[action] = method.to_s.downcase.to_sym
         end
 
+        # Build a new resource with the given attributes.
+        # If the request_new_object_on_build flag is set, the new object is requested via API.
+        def build(attributes = {})
+          params = attributes
+          return self.new(params) unless self.request_new_object_on_build?
+
+          path = self.build_request_path(params.merge(self.primary_key => 'new'))
+          method = self.method_for(:new)
+
+          resource = nil
+          self.request(params.merge(:_method => method, :_path => path)) do |parsed_data, response|
+            if response.success?
+              resource = self.new_from_parsed_data(parsed_data)
+            end
+          end
+          resource
+        end
+
         private
         # @private
         def blank_relation

data/lib/her/model/parse.rb

@@ -61,6 +61,23 @@ module Her
         end
         alias parse_root_in_json? parse_root_in_json
 
+        # Return or change the value of `request_new_object_on_build`
+        #
+        # @example
+        #   class User
+        #     include Her::Model
+        #     request_new_object_on_build true
+        #   end
+        def request_new_object_on_build(value = nil)
+          @_her_request_new_object_on_build ||= begin
+            superclass.request_new_object_on_build if superclass.respond_to?(:request_new_object_on_build)
+          end
+
+          return @_her_request_new_object_on_build unless value
+          @_her_request_new_object_on_build = value
+        end
+        alias request_new_object_on_build? request_new_object_on_build
+
         # Return or change the value of `root_element`. Always defaults to the base name of the class.
         #
         # @example

data/lib/her/model/relation.rb

@@ -17,7 +17,7 @@ module Her
 
       # Build a new resource
       def build(attributes = {})
-        @parent.new(@params.merge(attributes))
+        @parent.build(@params.merge(attributes))
       end
 
       # Add a query string parameter
@@ -30,7 +30,7 @@ module Her
       #   @users = User.where(:approved => 1).all
       #   # Fetched via GET "/users?approved=1"
       def where(params = {})
-        return self if params.blank? && @_fetch.blank?
+        return self if params.blank? && !@_fetch.nil?
         self.clone.tap do |r|
           r.params = r.params.merge(params)
           r.clear_fetch_cache!

data/lib/her/model.rb

@@ -53,6 +53,7 @@ module Her
       method_for :update, :put
       method_for :find, :get
       method_for :destroy, :delete
+      method_for :new, :get
 
       # Define the default primary key
       primary_key :id

data/lib/her/version.rb

@@ -1,3 +1,3 @@
 module Her
-  VERSION = "0.6.6"
+  VERSION = "0.6.7"
 end

data/spec/model/orm_spec.rb

@@ -208,6 +208,43 @@ describe Her::Model::ORM do
     end
   end
 
+  context "building resources" do
+    context "when request_new_object_on_build is not set (default)" do
+      before do
+        spawn_model("Foo::User")
+      end
+
+      it "builds a new resource without requesting it" do
+        Foo::User.should_not_receive(:request)
+        @new_user = Foo::User.build(:fullname => "Tobias Fünke")
+        @new_user.new?.should be_true
+        @new_user.fullname.should == "Tobias Fünke"
+      end
+    end
+
+    context "when request_new_object_on_build is set" 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|
+            stub.get("/users/new") { |env| ok! :id => nil, :fullname => params(env)[:fullname], :email => "tobias@bluthcompany.com" }
+          end
+        end
+
+        spawn_model("Foo::User") { request_new_object_on_build true }
+      end
+
+      it "requests a new resource" do
+        Foo::User.should_receive(:request).once.and_call_original
+        @new_user = Foo::User.build(:fullname => "Tobias Fünke")
+        @new_user.new?.should be_true
+        @new_user.fullname.should == "Tobias Fünke"
+        @new_user.email.should == "tobias@bluthcompany.com"
+      end
+    end
+  end
+
   context "creating resources" do
     before do
       Her::API.setup :url => "https://api.example.com" do |builder|

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: her
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
+  prerelease: 
 platform: ruby
 authors:
 - Rémi Prévost
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-03 00:00:00.000000000 Z
+date: 2013-05-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
@@ -20,6 +22,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fivemat
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,13 +54,31 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.7.7
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.7.7
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,6 +86,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -69,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -76,6 +102,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -83,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -90,6 +118,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -97,6 +126,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -104,6 +134,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -125,6 +156,7 @@ files:
 - README.md
 - Rakefile
 - UPGRADE.md
+- gemfiles/activemodel-4.0.gemfile
 - her.gemspec
 - lib/her.rb
 - lib/her/api.rb
@@ -179,26 +211,33 @@ files:
 homepage: http://her-rb.org
 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: 1578317715926145011
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1578317715926145011
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A simple Representational State Transfer-based Hypertext Transfer Protocol-powered
   Object Relational Mapper. Her?
 test_files:

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NWQ2MzM5ODU1NDgyMmFlODFmNzJiZWRkY2ViMGNhYmY0MDc2YTIyZQ==
-  data.tar.gz: !binary |-
-    YTUzYTM2MjY4ZGM2Njc3NDA2ZGRlMDUyYzc4MmNmOGFkODhjNmVlZA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ZmMyZTY3NTg1ODFjNDBkODYzYWFlZDg4YTZhNTM5Mzk2NzViYzZhZmI3NTQw
-    OTI5ZDQyOWVjZDg5MzRmNGVhMDYzOTcyYTlkM2MwNWI1NzYzYTIyNDU2NGE1
-    YTg3MDY3OWU5NTQxODFlYjhiY2Y0MGYwYTVkMjdlZTg3NzUzZmM=
-  data.tar.gz: !binary |-
-    ZGE4MjRkN2Y1NjFhYjcxNGE5MTI5ODAzMTdjNGZkMDgzZGNmYmRjODExNDBm
-    YTU0NDM4YjQ5ZGFhM2I0MTEyZDZlMTlmOTMxZjY4NjNiODVhYTczMjY1Njc0
-    YzFmMzQxOGU1MmU1ODEyYTY0MDc1YWQxODY2NmMyZmYwYTRlMjQ=