motion-resource 0.0.2 → 0.1.0

data/.gitignore

@@ -7,3 +7,4 @@ resources/*.storyboardc
 .bundle
 Gemfile.lock
 pkg/*
+.dat*

data/README.md

@@ -12,22 +12,22 @@ Add MotionResource to your Gemfile, like this:
 
 Consider this example for a fictional blog API.
 
-    class User < RemoteModule::RemoteModel
+    class User < MotionResource::Base
       attr_accessor :id
 
       has_many :posts
 
-      collection_url "users"
-      member_url "users/:id"
+      self.collection_url = "users"
+      self.member_url = "users/:id"
     end
 
-    class Post < RemoteModule::RemoteModel
+    class Post < MotionResource::Base
       attr_accessor :id, :user_id, :title, :text
 
       belongs_to :user
 
-      collection_url "users/:user_id/posts"
-      member_url "users/:user_id/posts/:id"
+      self.collection_url = "users/:user_id/posts"
+      self.member_url = "users/:user_id/posts/:id"
     end
 
 Now, we can access a user's posts like that:

data/Rakefile

@@ -5,10 +5,10 @@ require "bundler/gem_tasks"
 Bundler.setup
 Bundler.require
 
-$:.unshift("./lib/")
-require './lib/motion-resource'
+require 'motion-resource'
 
 Motion::Project::App.setup do |app|
   # Use `rake config' to see complete project settings.
   app.name = 'MotionResource'
-end
+  app.detect_dependencies = false
+end

data/examples/Colr/Rakefile

@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
 $:.unshift("/Library/RubyMotion/lib")
 require 'motion/project'
-require 'motion-support'
-require 'motion-resource'
+
+require '../../lib/motion-resource'
 
 Motion::Project::App.setup do |app|
   # Use `rake config' to see complete project settings.
   app.name = 'Colr'
+  app.detect_dependencies = false
 end

data/lib/motion-resource/attributes.rb

@@ -1,6 +1,7 @@
 module MotionResource
   class Base
-    class_inheritable_array :attributes
+    class_attribute :attributes
+    self.attributes = []
     
     class << self
       def attribute(*fields)

data/lib/motion-resource/logger.rb

@@ -1,6 +1,6 @@
 module MotionResource
   class Base
-    class_inheritable_accessor :logger
+    class_attribute :logger
     self.logger = MotionSupport::NullLogger.new
   end
 end

data/lib/motion-resource/requests.rb

@@ -7,7 +7,7 @@ module MotionResource
         self.class.send(method, *args, &block)
       end
     end
-    
+
     class << self
       def get(url, params = {}, &block)
         http_call(:get, url, params, &block)
@@ -25,6 +25,10 @@ module MotionResource
         http_call(:delete, url, params, &block)
       end
 
+      def on_auth_failure(&block)
+        @on_auth_failure = block
+      end
+
     private
       def complete_url(fragment)
         if fragment[0..3] == "http"
@@ -34,20 +38,21 @@ module MotionResource
       end
 
       def http_call(method, url, call_options = {}, &block)
-        options = call_options 
+        url = complete_url(url)
+
+        options = call_options
         options.merge!(MotionResource::Base.default_url_options || {})
-        url += self.extension
         if query = options.delete(:query)
-          if url.index("?").nil?
-            url += "?"
-          end
-          url += query.map{|k,v| "#{k}=#{v}"}.join('&')
+          url.build_query_string!(query)
         end
         if self.default_url_options
           options.merge!(self.default_url_options)
         end
-        logger.log "#{method.upcase} #{complete_url(url)}"
-        BubbleWrap::HTTP.send(method, complete_url(url), options) do |response|
+        logger.log "#{method.upcase} #{url}"
+
+        url.insert_extension!(self.extension)
+
+        BubbleWrap::HTTP.send(method, url, options) do |response|
           if response.ok?
             body = response.body.to_str.strip rescue nil
             logger.log "response: #{body}"
@@ -56,6 +61,8 @@ module MotionResource
             else
               block.call response, BubbleWrap::JSON.parse(body)
             end
+          elsif response.status_code.to_s =~ /401/ && @on_auth_failure
+            @on_auth_failure.call
           else
             block.call response, nil
           end

data/lib/motion-resource/string.rb

@@ -4,7 +4,7 @@ class String
   def fill_url_params(params = {}, delegate = nil)
     params ||= {}
     split = self.split '/'
-    split.collect { |path|
+    url = split.collect { |path|
       ret = path
       if path[0] == ':'
         path_sym = path[1..-1].to_sym
@@ -14,10 +14,33 @@ class String
           curr = delegate.send(path_sym)
         end
 
-        ret = (curr || params[path_sym] || path).to_s
+        ret = (curr || params.delete(path_sym) || path).to_s
       end
 
       ret
     }.join '/'
+    url.build_query_string! params
+  end
+
+  def build_query_string!(params = {})
+    return self if params.keys.empty?
+    # 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('&')
+    if url.query.nil? || url.query.empty?
+      # strip the beginning / and add the query
+      self.replace "#{url.path[1..-1]}?#{query_string}"
+    else
+      self.replace "#{url.path[1..-1]}?#{url.query}&#{query_string}"
+    end
+  end
+
+  def insert_extension!(extension)
+    return self if extension.blank?
+    
+    url = NSURL.URLWithString(self)
+    extension = extension.gsub(".", "")
+    self.replace url.URLByAppendingPathExtension(extension).absoluteString
   end
 end

data/lib/motion-resource/urls.rb

@@ -1,8 +1,8 @@
 module MotionResource
   class Base
-    class_inheritable_accessor :collection_url, :member_url
-    class_inheritable_accessor :root_url, :default_url_options
-    class_inheritable_accessor :extension
+    class_attribute :collection_url, :member_url
+    class_attribute :root_url, :default_url_options
+    class_attribute :extension
     self.extension = '.json'
     
     class << self

data/lib/motion-resource/version.rb

@@ -1,3 +1,3 @@
 module MotionResource
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/lib/motion-resource.rb

@@ -1,5 +1,4 @@
-require "motion-resource/version"
+require 'motion-support'
 require 'bubble-wrap'
-Dir.glob(File.join(File.dirname(__FILE__), 'motion-resource/*.rb')).each do |file|
-  BW.require file
-end
+
+Motion::Require.all(Dir.glob(File.expand_path('../motion-resource/**/*.rb', __FILE__)))

data/motion-resource.gemspec

@@ -15,6 +15,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency 'bubble-wrap'
-  s.add_dependency 'motion-support'
+  s.add_dependency 'motion-support', ">= 0.2.0"
   s.add_development_dependency 'rake'
 end

data/spec/motion-resource/requests_spec.rb

@@ -1,6 +1,6 @@
 describe "requests" do
   extend WebStub::SpecHelpers
-  
+
   it "should define GET method on instance and class" do
     Comment.new.should.respond_to :get
     Comment.should.respond_to :get
@@ -20,100 +20,113 @@ describe "requests" do
     Comment.new.should.respond_to :delete
     Comment.should.respond_to :delete
   end
-  
+
   it "should add query string" do
     stub_request(:get, "http://example.com/comments/10.json?foo=bar").to_return(json: { id: 10 })
     Comment.new.get("comments/10", :query => { :foo => 'bar' }) do |response, json|
       @result = json
       resume
     end
-    
+
     wait_max 1.0 do
       @result.should.not.be.nil
     end
   end
-  
+
   it "should parse JSON in response" do
     stub_request(:get, "http://example.com/comments/10.json").to_return(json: { id: 10, foo: 'bar' })
     Comment.new.get("comments/10") do |response, json|
       @result = json
       resume
     end
-    
+
     wait_max 1.0 do
       @result.should == { "id" => 10, "foo" => "bar" }
     end
   end
-  
+
   it "should yield empty hash if response is blank" do
     stub_request(:get, "http://example.com/comments/10.json").to_return(body: "")
     Comment.new.get("comments/10") do |response, json|
       @result = json
       resume
     end
-    
+
     wait_max 1.0 do
       @result.should == {}
     end
   end
-  
+
   it "should yield nil if response is not ok" do
     stub_request(:get, "http://example.com/comments/10.json").to_return(status_code: 404)
     Comment.new.get("comments/10") do |response, json|
       @result = json
       resume
     end
-    
+
     wait_max 1.0 do
       @result.should.be.nil
     end
   end
-  
+
   it "should get attributes" do
     stub_request(:get, "http://example.com/comments/10.json").to_return(json: { id: 10, text: "Hello" })
     Comment.new.get("comments/10") do |response, json|
       @result = json
       resume
     end
-    
+
     wait_max 1.0 do
       @result["text"].should == "Hello"
     end
   end
-  
+
   it "should post" do
     stub_request(:post, "http://example.com/comments.json").to_return(json: { id: 10 })
     Comment.post("comments") do |response, json|
       @result = json
       resume
     end
-    
+
     wait_max 1.0 do
       @result.should.not.be.nil
     end
   end
-  
+
   it "should put" do
     stub_request(:put, "http://example.com/comments/10.json").to_return(json: { id: 10 })
     Comment.new.put("comments/10") do |response, json|
       @result = json
       resume
     end
-    
+
     wait_max 1.0 do
       @result.should.not.be.nil
     end
   end
-  
+
   it "should delete" do
     stub_request(:delete, "http://example.com/comments/10.json").to_return(json: { id: 10 })
     Comment.new.delete("comments/10") do |response, json|
       @result = json
       resume
     end
-    
+
     wait_max 1.0 do
       @result.should.not.be.nil
     end
   end
+
+  it "should call a block given to on_auth_failure on 401" do
+    stub_request(:get, "http://example.com/comments/10.json").to_return(status_code: 401)
+    @fail = false
+    Comment.on_auth_failure { @fail = true; resume }
+    Comment.new.get("comments/10") do |response, json|
+      resume
+    end
+
+    wait_max 1.0 do
+      @fail.should == true
+    end
+  end
 end

data/spec/motion-resource/string_spec.rb

@@ -7,7 +7,32 @@ describe "String" do
     string = "accounts/:id/users/:name".fill_url_params(id: 10, name: 'john')
     string.should == "accounts/10/users/john"
   end
-  
+
+  it "should insert an extension if missing" do
+    string = "accounts/fabulous".insert_extension!(".json")
+    string.should == "accounts/fabulous.json"
+  end
+
+  it "should not insert extension if it is blank" do
+    string = "accounts/fabulous".insert_extension!("")
+    string.should == "accounts/fabulous"
+  end
+
+  it "should add a query string for non-url params" do
+    string = "accounts/fabulous".build_query_string!(foo: 10, moo: "rar")
+    string.should == "accounts/fabulous?foo=10&moo=rar"
+  end
+
+  it "should not add a ? when building a query string if it exists" do
+    string = "accounts/fabulous?".build_query_string!(foo: 10, moo: "rar")
+    string.should == "accounts/fabulous?foo=10&moo=rar"
+  end
+
+  it "should tag new query params onto existing ones" do
+    string = "accounts/fabulous?moo=rar".build_query_string!(foo: 10)
+    string.should == "accounts/fabulous?moo=rar&foo=10"
+  end
+
   it "should fill url params from delegate object" do
     obj = DelegateObject.new
     obj.id = 10
@@ -15,11 +40,11 @@ describe "String" do
     string = "accounts/:id/users/:name".fill_url_params({}, obj)
     string.should == "accounts/10/users/john"
   end
-  
+
   it "should not crash when a param is unknown" do
     lambda { "accounts/:id".fill_url_params({}) }.should.not.raise
   end
-  
+
   it "should not crash when params hash contains an unused value" do
     lambda { "accounts".fill_url_params(foo: 'bar') }.should.not.raise
   end

metadata

@@ -2,7 +2,7 @@
 name: motion-resource
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - Thomas Kadauke
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-31 00:00:00 Z
+date: 2013-04-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bubble-wrap
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: *id002
@@ -107,7 +107,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3639208948173529629
+      hash: 1896856864951168664
       segments: 
       - 0
       version: "0"
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3639208948173529629
+      hash: 1896856864951168664
       segments: 
       - 0
       version: "0"