motion-resource 0.1.2 → 0.1.3

data/lib/motion-resource/associations.rb

@@ -17,7 +17,13 @@ module MotionResource
         end
       end
 
-      def has_many(name, params = lambda { |o| Hash.new })
+      def has_many(name, options = {})
+        default_options = {
+          :params => lambda { |o| Hash.new },
+          :class_name => name.to_s.classify
+        }
+        options = default_options.merge(options)
+        
         backwards_association = self.name.underscore
         
         define_method name do |&block|
@@ -29,8 +35,10 @@ module MotionResource
               MotionResource::Base.request_block_call(block, cached, cached_response)
               return
             end
+
+            klass = options[:class_name].constantize
             
-            Object.const_get(name.to_s.classify).find_all(params.call(self)) do |results, response|
+            klass.find_all(options[:params].call(self)) do |results, response|
               if results && results.first && results.first.respond_to?("#{backwards_association}=")
                 results.each do |result|
                   result.send("#{backwards_association}=", self)
@@ -44,7 +52,8 @@ module MotionResource
         end
         
         define_method "#{name}=" do |array|
-          klass = Object.const_get(name.to_s.classify)
+          klass = options[:class_name].constantize
+          
           instance_variable_set("@#{name}", [])
           
           array.each do |value|

data/lib/motion-resource/base.rb

@@ -2,6 +2,9 @@ module MotionResource
   class Base
     include MotionSupport::DescendantsTracker
     
+    class_attribute :primary_key
+    self.primary_key = :id
+    
     attr_accessor :id
     
     def initialize(params = {})
@@ -16,7 +19,7 @@ module MotionResource
     class << self
       def instantiate(json)
         json = json.symbolize_keys
-        raise ArgumentError, "No :id parameter given for #{self.name}.instantiate" unless json[:id]
+        raise ArgumentError, "No :#{primary_key} parameter given for #{self.name}.instantiate" unless json[primary_key]
         
         klass = if json[:type]
           begin
@@ -28,11 +31,11 @@ module MotionResource
           self
         end
         
-        if result = klass.recall(json[:id])
+        if result = klass.recall(json[primary_key])
           result.update_attributes(json)
         else
           result = klass.new(json)
-          klass.remember(result.id, result)
+          klass.remember(result.send(result.primary_key), result)
         end
         result.send(:instance_variable_set, "@new_record", false)
         result

data/lib/motion-resource/find.rb

@@ -2,11 +2,11 @@ module MotionResource
   class Base
     class << self
       def find(id, params = {}, &block)
-        fetch_member(member_url.fill_url_params(params.merge(id: id)), &block)
+        fetch_member(member_url_or_default.fill_url_params(params.merge(id: id)), &block)
       end
 
       def find_all(params = {}, &block)
-        fetch_collection(collection_url.fill_url_params(params), &block)
+        fetch_collection(collection_url_or_default.fill_url_params(params), &block)
       end
       
       def fetch_member(url, &block)

data/lib/motion-resource/string.rb

@@ -27,7 +27,7 @@ class String
     # fake a url so we avoid regex nastiness with URL's
     url = NSURL.URLWithString("http://blah.com/#{self}")
     # build our query string (needs encoding support!)
-    query_string = params.map{|k,v| "#{k}=#{v}"}.join('&')
+    query_string = params.to_query
     if url.query.nil? || url.query.empty?
       # strip the beginning / and add the query
       self.replace "#{url.path[1..-1]}?#{query_string}"

data/lib/motion-resource/urls.rb

@@ -16,14 +16,22 @@ module MotionResource
           end
         end
       end
+      
+      def collection_url_or_default
+        collection_url || name.underscore.pluralize
+      end
+      
+      def member_url_or_default
+        member_url || "#{name.underscore.pluralize}/:#{primary_key}"
+      end
     end
 
     def collection_url(params = {})
-      self.class.collection_url.fill_url_params(params, self)
+      self.class.collection_url_or_default.fill_url_params(params, self)
     end
 
     def member_url(params = {})
-      self.class.member_url.fill_url_params(params, self)
+      self.class.member_url_or_default.fill_url_params(params, self)
     end
   end
 end

data/lib/motion-resource/version.rb

@@ -1,3 +1,3 @@
 module MotionResource
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/env.rb

@@ -6,6 +6,7 @@ class Post < MotionResource::Base
   self.member_url = 'posts/:id'
   
   has_many :comments
+  has_many :parent_posts, :class_name => 'Post'
 end
 
 class Comment < MotionResource::Base
@@ -39,3 +40,8 @@ end
 class Rectangle < Shape
   attribute :size
 end
+
+class Membership < MotionResource::Base
+  self.primary_key = :membership_id
+  attr_accessor :membership_id
+end

data/spec/motion-resource/associations/has_many_spec.rb

@@ -20,6 +20,27 @@ describe "has_many" do
     post.comments.should == []
   end
   
+  describe "custom class name" do
+    extend WebStub::SpecHelpers
+  
+    before do
+      stub_request(:get, "http://example.com/posts.json").to_return(json: [{ id: 1, text: 'Whats up?' }])
+    end
+  
+    it "should fetch resources when called with a block" do
+      @post = Post.new
+      @post.parent_posts do |results|
+        @results = results
+        resume
+      end
+    
+      wait_max 1.0 do
+        @results.size.should == 1
+        @results.first.text.should == 'Whats up?'
+      end
+    end
+  end
+  
   describe "reader" do
     extend WebStub::SpecHelpers
     

data/spec/motion-resource/base_spec.rb

@@ -1,6 +1,16 @@
 describe "base" do
-  it "should define the id method" do
-    Post.new.should.respond_to :id
+  describe "primary key" do
+    it "should have a default primary key" do
+      Post.primary_key.should == :id
+    end
+    
+    it "should be overridable" do
+      Membership.primary_key.should == :membership_id
+    end
+    
+    it "should define the id method" do
+      Post.new.should.respond_to :id
+    end
   end
   
   it "should set new_record to true when calling new" do
@@ -22,6 +32,11 @@ describe "base" do
       shape.should.is_a Rectangle
     end
     
+    it "should instantiate with non-standard primary key" do
+      membership = Membership.instantiate(:membership_id => 1)
+      membership.should.is_a Membership
+    end
+    
     it "should instantiate base type if concrete type does not exist" do
       shape = Shape.instantiate(:id => 2, :type => 'FuzzyCircle')
       shape.should.is_a Shape

data/spec/motion-resource/urls_spec.rb

@@ -19,6 +19,18 @@ describe "urls" do
     MotionResource::Base.extension.should == '.json'
   end
   
+  it "should have a default collection URL" do
+    Rectangle.collection_url_or_default.should == "rectangles"
+  end
+  
+  it "should have a default member URL" do
+    Rectangle.member_url_or_default.should == "rectangles/:id"
+  end
+
+  it "should have a default member URL with custom primary key" do
+    Membership.member_url_or_default.should == "memberships/:membership_id"
+  end
+  
   it "should define custom url method" do
     comment = Comment.new
     comment.should.respond_to :by_user_url
@@ -43,10 +55,25 @@ describe "urls" do
     comment.collection_url.should == 'comments'
   end
   
+  it "should fall back to default URL in collection_url method" do
+    rectangle = Rectangle.new
+    rectangle.collection_url.should == 'rectangles'
+  end
+  
   it "should define convenience member_url method" do
     comment = Comment.new
     comment.should.respond_to :member_url
     comment.member_url.should.is_a String
     comment.member_url(id: 10).should == 'comments/10'
   end
+
+  it "should fall back to default URL in collection_url method" do
+    rectangle = Rectangle.new
+    rectangle.member_url(:id => 10).should == 'rectangles/10'
+  end
+
+  it "should fall back to default URL in collection_url method with custom primary key" do
+    membership = Membership.new
+    membership.member_url(:membership_id => 10).should == 'memberships/10'
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-resource
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-12 00:00:00.000000000 Z
+date: 2013-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bubble-wrap
@@ -121,7 +121,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4144364702470032416
+      hash: -3993476988303272926
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4144364702470032416
+      hash: -3993476988303272926
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25