her 0.6.3 → 0.6.4

data/lib/her/model/relation.rb

@@ -1,29 +1,38 @@
 module Her
   module Model
     class Relation
-      attr_accessor :query_attrs
+      # @private
+      attr_accessor :params
 
       # @private
       def initialize(parent)
         @parent = parent
-        @query_attrs = {}
+        @params = {}
       end
 
       # @private
       def apply_to(attributes)
-        @query_attrs.merge(attributes)
+        @params.merge(attributes)
       end
 
       # Build a new resource
-      def build(attrs = {})
-        @parent.new(@query_attrs.merge(attrs))
+      def build(attributes = {})
+        @parent.new(@params.merge(attributes))
       end
 
       # Add a query string parameter
-      def where(attrs = {})
-        return self if attrs.blank?
+      #
+      # @example
+      #   @users = User.all
+      #   # Fetched via GET "/users"
+      #
+      # @example
+      #   @users = User.where(:approved => 1).all
+      #   # Fetched via GET "/users?approved=1"
+      def where(params = {})
+        return self if params.blank? && @_fetch.blank?
         self.clone.tap do |r|
-          r.query_attrs = r.query_attrs.merge(attrs)
+          r.params = r.params.merge(params)
           r.clear_fetch_cache!
         end
       end
@@ -53,18 +62,12 @@ module Her
 
       # Fetch a collection of resources
       #
-      # @example
-      #   @users = User.all
-      #   # Fetched via GET "/users"
-      #
-      # @example
-      #   @users = User.where(:approved => 1).all
-      #   # Fetched via GET "/users?approved=1"
+      # @private
       def fetch
         @_fetch ||= begin
-          path = @parent.build_request_path(@query_attrs)
+          path = @parent.build_request_path(@params)
           method = @parent.method_for(:find)
-          @parent.request(@query_attrs.merge(:_method => method, :_path => path)) do |parsed_data, response|
+          @parent.request(@params.merge(:_method => method, :_path => path)) do |parsed_data, response|
             @parent.new_collection(parsed_data)
           end
         end
@@ -79,9 +82,9 @@ module Her
       # @example
       #   @user = User.where(:email => "tobias@bluth.com").create(:fullname => "Tobias Fünke")
       #   # Called via POST "/users/1" with `&email=tobias@bluth.com&fullname=Tobias+Fünke`
-      def create(attrs = {})
-        attrs ||= {}
-        resource = @parent.new(@query_attrs.merge(attrs))
+      def create(attributes = {})
+        attributes ||= {}
+        resource = @parent.new(@params.merge(attributes))
         resource.save
 
         resource
@@ -97,8 +100,8 @@ module Her
       #
       #   # If collection is empty:
       #   # POST /users with `email=remi@example.com`
-      def first_or_create(attrs = {})
-        fetch.first || create(attrs)
+      def first_or_create(attributes = {})
+        fetch.first || create(attributes)
       end
 
       # Fetch a resource and build it if it's not found
@@ -112,8 +115,8 @@ module Her
       #   # If collection is empty:
       #   @user.email # => "remi@example.com"
       #   @user.new? # => true
-      def first_or_initialize(attrs = {})
-        fetch.first || build(attrs)
+      def first_or_initialize(attributes = {})
+        fetch.first || build(attributes)
       end
 
       # @private

data/lib/her/version.rb

@@ -1,3 +1,3 @@
 module Her
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

data/spec/model/associations_spec.rb

@@ -8,7 +8,7 @@ describe Her::Model::Associations do
 
     context "single has_many association" do
       before { Foo::User.has_many :comments }
-      its([:has_many]) { should eql [{ :name => :comments, :data_key => :comments, :class_name => "Comment", :path => "/comments", :inverse_of => nil }] }
+      its([:has_many]) { should eql [{ :name => :comments, :data_key => :comments, :default => [], :class_name => "Comment", :path => "/comments", :inverse_of => nil }] }
     end
 
     context "multiple has_many associations" do
@@ -17,12 +17,12 @@ describe Her::Model::Associations do
         Foo::User.has_many :posts
       end
 
-      its([:has_many]) { should eql [{ :name => :comments, :data_key => :comments, :class_name => "Comment", :path => "/comments", :inverse_of => nil }, { :name => :posts, :data_key => :posts, :class_name => "Post", :path => "/posts", :inverse_of => nil }] }
+      its([:has_many]) { should eql [{ :name => :comments, :data_key => :comments, :default => [], :class_name => "Comment", :path => "/comments", :inverse_of => nil }, { :name => :posts, :data_key => :posts, :default => [], :class_name => "Post", :path => "/posts", :inverse_of => nil }] }
     end
 
     context "single has_one association" do
       before { Foo::User.has_one :category }
-      its([:has_one]) { should eql [{ :name => :category, :data_key => :category, :class_name => "Category", :path => "/category" }] }
+      its([:has_one]) { should eql [{ :name => :category, :data_key => :category, :default => nil, :class_name => "Category", :path => "/category" }] }
     end
 
     context "multiple has_one associations" do
@@ -31,12 +31,12 @@ describe Her::Model::Associations do
         Foo::User.has_one :role
       end
 
-      its([:has_one]) { should eql [{ :name => :category, :data_key => :category, :class_name => "Category", :path => "/category" }, { :name => :role, :data_key => :role, :class_name => "Role", :path => "/role" }] }
+      its([:has_one]) { should eql [{ :name => :category, :data_key => :category, :default => nil, :class_name => "Category", :path => "/category" }, { :name => :role, :data_key => :role, :default => nil, :class_name => "Role", :path => "/role" }] }
     end
 
     context "single belongs_to association" do
       before { Foo::User.belongs_to :organization }
-      its([:belongs_to]) { should eql [{ :name => :organization, :data_key => :organization, :class_name => "Organization", :foreign_key => "organization_id", :path => "/organizations/:id" }] }
+      its([:belongs_to]) { should eql [{ :name => :organization, :data_key => :organization, :default => nil, :class_name => "Organization", :foreign_key => "organization_id", :path => "/organizations/:id" }] }
     end
 
     context "multiple belongs_to association" do
@@ -45,7 +45,7 @@ describe Her::Model::Associations do
         Foo::User.belongs_to :family
       end
 
-      its([:belongs_to]) { should eql [{ :name => :organization, :data_key => :organization, :class_name => "Organization", :foreign_key => "organization_id", :path => "/organizations/:id" }, { :name => :family, :data_key => :family, :class_name => "Family", :foreign_key => "family_id", :path => "/families/:id" }] }
+      its([:belongs_to]) { should eql [{ :name => :organization, :data_key => :organization, :default => nil, :class_name => "Organization", :foreign_key => "organization_id", :path => "/organizations/:id" }, { :name => :family, :data_key => :family, :default => nil, :class_name => "Family", :foreign_key => "family_id", :path => "/families/:id" }] }
     end
   end
 
@@ -55,18 +55,18 @@ describe Her::Model::Associations do
 
     context "in base class" do
       context "single has_many association" do
-        before { Foo::User.has_many :comments, :class_name => "Post", :inverse_of => :admin, :data_key => :user_comments }
-        its([:has_many]) { should eql [{ :name => :comments, :data_key => :user_comments, :class_name => "Post", :path => "/comments", :inverse_of => :admin }] }
+        before { Foo::User.has_many :comments, :class_name => "Post", :inverse_of => :admin, :data_key => :user_comments, :default => {} }
+        its([:has_many]) { should eql [{ :name => :comments, :data_key => :user_comments, :default => {}, :class_name => "Post", :path => "/comments", :inverse_of => :admin }] }
       end
 
       context "signle has_one association" do
-        before { Foo::User.has_one :category, :class_name => "Topic", :foreign_key => "topic_id", :data_key => :topic }
-        its([:has_one]) { should eql [{ :name => :category, :data_key => :topic, :class_name => "Topic", :foreign_key => "topic_id", :path => "/category" }] }
+        before { Foo::User.has_one :category, :class_name => "Topic", :foreign_key => "topic_id", :data_key => :topic, :default => nil }
+        its([:has_one]) { should eql [{ :name => :category, :data_key => :topic, :default => nil, :class_name => "Topic", :foreign_key => "topic_id", :path => "/category" }] }
       end
 
       context "single belongs_to association" do
-        before { Foo::User.belongs_to :organization, :class_name => "Business", :foreign_key => "org_id", :data_key => :org }
-        its([:belongs_to]) { should eql [{ :name => :organization, :data_key => :org, :class_name => "Business", :foreign_key => "org_id", :path => "/organizations/:id" }] }
+        before { Foo::User.belongs_to :organization, :class_name => "Business", :foreign_key => "org_id", :data_key => :org, :default => true }
+        its([:belongs_to]) { should eql [{ :name => :organization, :data_key => :org, :default => true, :class_name => "Business", :foreign_key => "org_id", :path => "/organizations/:id" }] }
       end
     end
 
@@ -76,7 +76,7 @@ describe Her::Model::Associations do
       describe "associations accessor" do
         subject { Class.new(Foo::User).associations }
         its(:object_id) { should_not eql Foo::User.associations.object_id }
-      its([:has_many]) { should eql [{ :name => :comments, :data_key => :comments, :class_name => "Post", :path => "/comments", :inverse_of => nil }] }
+      its([:has_many]) { should eql [{ :name => :comments, :data_key => :comments, :default => [], :class_name => "Post", :path => "/comments", :inverse_of => nil }] }
       end
     end
   end
@@ -145,11 +145,11 @@ describe Her::Model::Associations do
     end
 
     it "does not refetch the parents models data if they have been fetched before" do
-      @user_with_included_data.comments.first.user.object_id.should == @user_with_included_data.object_id
+      @user_with_included_data.comments.first.user.fetch.object_id.should == @user_with_included_data.object_id
     end
 
     it "uses the given inverse_of key to set the parent model" do
-      @user_with_included_data.posts.first.admin.object_id.should == @user_with_included_data.object_id
+      @user_with_included_data.posts.first.admin.fetch.object_id.should == @user_with_included_data.object_id
     end
 
     it "fetches data that was not included through has_many" do

data/spec/model/attributes_spec.rb

@@ -163,4 +163,85 @@ describe Her::Model::Attributes do
       expect { @user.metadata }.to raise_error(NoMethodError)
     end
   end
+
+  context "overwriting default attribute methods" do
+    context "for getter method" do
+      before do
+        Her::API.setup :url => "https://api.example.com" do |builder|
+          builder.use Her::Middleware::FirstLevelParseJSON
+          builder.adapter :test do |stub|
+            stub.get("/users/1") { |env| [200, {}, { :id => 1, :fullname => "Tobias Fünke", :document => { :url => "http://example.com" } }.to_json] }
+          end
+        end
+
+        spawn_model 'Foo::User' do
+          def document
+            @attributes[:document][:url]
+          end
+        end
+      end
+
+      it "bypasses Her's method" do
+        @user = Foo::User.find(1)
+        @user.document.should == "http://example.com"
+
+        @user = Foo::User.find(1)
+        @user.document.should == "http://example.com"
+      end
+    end
+
+    context "for setter method" do
+      before do
+        Her::API.setup :url => "https://api.example.com" do |builder|
+          builder.use Her::Middleware::FirstLevelParseJSON
+          builder.adapter :test do |stub|
+            stub.get("/users/1") { |env| [200, {}, { :id => 1, :fullname => "Tobias Fünke", :document => { :url => "http://example.com" } }.to_json] }
+          end
+        end
+
+        spawn_model 'Foo::User' do
+          def document=(document)
+            @attributes[:document] = document[:url]
+          end
+        end
+      end
+
+      it "bypasses Her's method" do
+        @user = Foo::User.find(1)
+        @user.document.should == "http://example.com"
+
+        @user = Foo::User.find(1)
+        @user.document.should == "http://example.com"
+      end
+    end
+
+    context "for predicate method" do
+      before do
+        Her::API.setup :url => "https://api.example.com" do |builder|
+          builder.use Her::Middleware::FirstLevelParseJSON
+          builder.adapter :test do |stub|
+            stub.get("/users/1") { |env| [200, {}, { :id => 1, :fullname => "Lindsay Fünke", :document => { :url => nil } }.to_json] }
+            stub.get("/users/2") { |env| [200, {}, { :id => 1, :fullname => "Tobias Fünke", :document => { :url => "http://example.com" } }.to_json] }
+          end
+        end
+
+        spawn_model 'Foo::User' do
+          def document?
+            document[:url].present?
+          end
+        end
+      end
+
+      it "byoasses Her's method" do
+        @user = Foo::User.find(1)
+        @user.document?.should be_false
+
+        @user = Foo::User.find(1)
+        @user.document?.should be_false
+
+        @user = Foo::User.find(2)
+        @user.document?.should be_true
+      end
+    end
+  end
 end

data/spec/model/relation_spec.rb

@@ -10,7 +10,19 @@ describe Her::Model::Relation do
           builder.adapter :test do |stub|
             stub.get("/users?foo=1&bar=2") { |env| ok! [{ :id => 2, :fullname => "Tobias Fünke" }] }
             stub.get("/users?admin=1") { |env| ok! [{ :id => 1, :fullname => "Tobias Fünke" }] }
-            stub.get("/users") { |env| ok! [{ :id => 1, :fullname => "Tobias Fünke" }, { :id => 2, :fullname => "Lindsay Fünke" }] }
+
+            stub.get("/users") do |env|
+              ok! [
+                { :id => 1, :fullname => "Tobias Fünke" },
+                { :id => 2, :fullname => "Lindsay Fünke" },
+                @created_user,
+              ].compact
+            end
+
+            stub.post('/users') do |env|
+              @created_user = { :id => 3, :fullname => 'George Michael Bluth' }
+              ok! @created_user
+            end
           end
         end
 
@@ -33,6 +45,12 @@ describe Her::Model::Relation do
         @user = Foo::User.where(:foo => 1).where(:bar => 2).first
         @user.id.should == 2
       end
+
+      it "does not reuse relations" do
+        Foo::User.all.should have(2).items
+        Foo::User.create(:fullname => 'George Michael Bluth').id.should == 3
+        Foo::User.all.should have(3).items
+      end
     end
 
     context "for parent class" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: her
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Rémi Prévost
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-24 00:00:00.000000000 Z
+date: 2013-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -118,6 +118,7 @@ files:
 - .gitignore
 - .rspec
 - .travis.yml
+- .yardopts
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE
@@ -175,7 +176,7 @@ files:
 - spec/support/macros/her_macros.rb
 - spec/support/macros/model_macros.rb
 - spec/support/macros/request_macros.rb
-homepage: http://remiprev.github.com/her
+homepage: http://her-rb.org
 licenses:
 - MIT
 metadata: {}