twin 0.1.0 → 0.1.1

data/lib/twin.rb

@@ -3,7 +3,9 @@ require 'active_support/core_ext/hash/conversions'
 require 'active_support/core_ext/hash/keys'
 require 'active_support/core_ext/hash/indifferent_access'
 require 'active_support/json'
-require 'active_support/core_ext/object/to_query'
+# Active Support 2 doesn't have the following file, but it's OK
+# since we already got the method from "hash/conversions"
+require 'active_support/core_ext/object/to_query' unless {}.respond_to? :to_query
 require 'digest/md5'
 
 class Twin
@@ -39,9 +41,9 @@ class Twin
     if path != '/' and found = recognize_resource(path)
       block, matches = found
       
-      # TODO: bail out early if authentication failed
       twin_token = env[AUTHORIZATION] =~ / oauth_token="(.+?)"/ && $1
       authenticated_user = twin_token && model.find_by_twin_token(twin_token)
+      return not_authenticated if twin_token and not authenticated_user
       
       clone = self.dup
       clone.request = Rack::Request.new env
@@ -83,7 +85,7 @@ class Twin
       }
       # later sent back as: oauth_token="..."
     else
-      [400, {'Content-Type' => 'text/plain'}, ['Bad credentials']]
+      not_authenticated
     end
   end
   
@@ -120,6 +122,14 @@ class Twin
     [404, {'Content-Type' => 'text/plain'}, ['Not found']]
   end
   
+  def not_implemented
+    [501, {'Content-Type' => 'text/plain'}, ['Not implemented']]
+  end
+  
+  def not_authenticated
+    [400, {'Content-Type' => 'text/plain'}, ['Not authenticated']]
+  end
+  
   def normalize_statuses(statuses)
     statuses.map do |status|
       hash = convert_twin_hash(status)

data/lib/twin/resources.rb

@@ -1,6 +1,6 @@
 class Twin
   resource 'statuses/home_timeline' do
-    statuses = self.model.statuses(params.with_indifferent_access)
+    statuses = self.model.statuses(params.with_indifferent_access, current_user)
     respond_with('statuses', normalize_statuses(statuses))
   end
   
@@ -73,6 +73,10 @@ class Twin
     respond_with('saved_searches', [])
   end
   
+  resource 'account/(settings|apple_push_destinations(/(destroy|device))?)' do
+    not_implemented
+  end
+  
   DEFAULT_STATUS_PARAMS = {
     :id => nil,
     :text => "",
@@ -135,7 +139,3 @@ class Twin
   #   :sender
   #   :recipient
 end
-
-# POST /1/account/apple_push_destinations.xml
-# POST /1/account/apple_push_destinations/destroy.xml
-# GET /1/account/settings.xml

data/test/app.rb

@@ -28,7 +28,7 @@ module Adapter
     user[:email]
   end
   
-  def self.statuses(params)
+  def self.statuses(params, current_user)
     STATUSES
   end
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: twin
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - "Mislav Marohni\xC4\x87"