metwit 0.0.2 → 0.0.3

data/README.md

@@ -46,6 +46,9 @@ metag = Metwit::Metag.find('id')
 
 ## How to get metags in a geographical region
 metags = Metwit::Metag.in_rect(45.4, 9.1, 45.3, 9.0)
+
+## How to get last metags
+metags = Metwit::Metag.feed
 ```
 
 ## Contributing

data/lib/metwit/auth.rb

@@ -18,7 +18,7 @@ module Metwit
       @logged = false
       url = BASE_URL + '/auth/'
 
-      response = HTTParty.post(url, :body => {:username=>username, :password=>password}, :headers => {'Authorization' => "Bearer #{@api_key}"})
+      response = HTTParty.post(url, :body => {:username=>username, :password=>password}.to_json, :headers => {'Authorization' => "Bearer #{@api_key}"})
       @access_token = response['bearer_token']
       @logged = true if response.code == 200
       response

data/lib/metwit/metag.rb

@@ -9,7 +9,6 @@ module Metwit
   class Metag
     include HTTParty
     base_uri(BASE_URL+'/metags')
-    headers 'Authorization' => "Bearer #{Metwit.bearer_token}"
 
     # Mandatory and guaranteed.  
     # Weather is an Hash with two keys: :status and :details  
@@ -108,7 +107,7 @@ module Metwit
     # This metod POST a metag
     def create!
       raise "invalid metag" unless self.valid?
-      response = self.class.post('/', :body => self.to_json, :headers => {'Cookie' => Metwit.cookie, 'Content-Type' => 'application/json' })
+      response = self.class.post('/', authenticated(:body => self.to_json, :headers => {'Content-Type' => 'application/json'}))
       raise "post failed" unless response.code == 201
       response
     end
@@ -117,22 +116,35 @@ module Metwit
       # Return the metag associated with the id
       # @return [Metag]
       def find(id)
-        response = get("/#{id}/")
+        response = get("/#{id}/", authenticated({}))
         raise "http error" unless response.code == 200
         self.from_json(response)
       end
 
       # Return metags in a geographical region
-      # return [Array<Metag>]
+      # @return [Array<Metag>]
       def in_rect(lat_n, lng_w, lat_s, lng_e)
-        response = get('/', :query => {:rect => "#{lat_n},#{lng_w},#{lat_s},#{lng_e}"})
+        response = get('/', authenticated(:query => {:rect => "#{lat_n},#{lng_w},#{lat_s},#{lng_e}"}))
+        raise "in_rect error" unless response.code == 200
         metags = []
         response['objects'].each do |metag_json|
           metags << self.from_json(metag_json)
         end
         metags
       end
-      
+
+      # Return last metags posted
+      # @return [Array<Metag>]
+      def feed
+        response = get('/', authenticated({}))
+        raise "feed error" unless response.code == 200
+        metags = []
+        response['objects'].each do |metag_json|
+          metags << self.from_json(metag_json)
+        end
+        metags
+      end
+            
       # Return a metag form a JSON response
       # @return [User]
       def from_json(response)
@@ -147,7 +159,21 @@ module Metwit
         }
         Metag.new(args)
       end
-      
+
+      private
+      # Default HTTParty options
+      # @return [Hash]
+      def authenticated(opts)
+        opts.deep_merge(:headers => {'Authorization' => "Bearer #{Metwit.bearer_token}"})
+      end
+    
+    end
+
+    private
+    # HTTParty options for authenticaded calls
+    # @return [Hash]
+    def authenticated(opts)
+      self.class.authenticated(opts)
     end
     
   end

data/lib/metwit/user.rb

@@ -93,7 +93,7 @@ module Metwit
       # Return the user associated with the id
       # @return [User]
       def find(id)
-        response = get("/#{id}/")
+        response = get("/#{id}/", authenticated({}))
         raise "http error" unless response.code == 200
         self.from_json(response)
       end
@@ -115,8 +115,21 @@ module Metwit
         }
         User.new(args)
       end
-            
+
+      private
+      # Default HTTParty options
+      # @return [Hash]
+      def authenticated(opts)
+        opts.deep_merge(:headers => {'Authorization' => "Bearer #{Metwit.bearer_token}"})
+      end
     end
-      
+
+    private
+    # HTTParty options for authenticaded calls
+    # @return [Hash]
+    def authenticated(opts)
+      self.class.authenticated(opts)
+    end
+
   end
 end

data/lib/metwit/version.rb

@@ -1,4 +1,4 @@
 module Metwit
   # The version of the metwit gem
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/metwit.rb

@@ -3,7 +3,7 @@ require "metwit/constants"
 require "metwit/version"
 require "metwit/metag"
 require "metwit/user"
-
+require 'active_support/all'
 
 # All classes are qualified in the namespace Metwit
 module Metwit

data/metwit.gemspec

@@ -16,4 +16,5 @@ Gem::Specification.new do |gem|
   gem.version       = Metwit::VERSION
   gem.add_dependency('httparty')
   gem.add_dependency('rgeo-geojson')
+  gem.add_dependency('activesupport')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metwit
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby SDK for Metwit public APIs
 email:
 - sim@me.com