metwit 0.0.4 → 0.0.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 58242f1ce3f075ea331eca28f6526161a1d56923
+  data.tar.gz: aed018ed68cd9672e18aa4963966f5e6f639eecc
+SHA512:
+  metadata.gz: 72ab478b3cd93e2a04033fc2026ceb3e2c3abb1438c5012d13e77a8fe85b2de7ea2e49806a4c8954fb87d15cd5a22e458621a4e9d94c985e3a538e52fa7aa778
+  data.tar.gz: a70309df81b9f73aef7107a16aa58039554546f043ee4b67ac74899ae5ef18516e550b952a59d55e570afdf9e0944738df0affc89f006800afa8ad7b31a2747a

data/README.md

@@ -22,34 +22,13 @@ Or install it yourself as:
 # First require the gem
 require 'metwit'
 
-# Set your api key
-Metwit.api_key = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-
-## How to post a Metag
-# If you don't authenticate a user you may not be able to post metags
-Metwit.authenticate("username", "password")
-# You need a rgeo factory to project the point coordinates
-factory = RGeo::Cartesian.factory
-# Then you can create a basic metag
-metag = Metwit::Metag.new(
-      :weather => {:status => :clear},
-      :position => factory.point(45.4, 9.1)
-)
-# Then post it to the server
-metag.create!
-
-## How to get a user by id
-user = Metwit::User.find('id')
-
-## How to get a metag by id
-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
-```
+# Set your client_id and client secret. See http://metwit.com/developers
+Metwit.client_id = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+Metwit.client_secret = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+Metwit.get_access_token
+
+# To retrieve the current weather status and forecasts for a geographical point
+Metwit::Weather.in_location(latitude, longitude)
 
 ## Contributing
 

data/lib/metwit.rb

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

data/lib/metwit/auth.rb

@@ -1,32 +1,47 @@
+require 'base64'
+
 module Metwit
   class << self
-    
-    # The developer api key
-    attr_accessor :api_key
 
-    # The user access token
+    # The developer application id
+    attr_accessor :client_id
+
+    # The developer application secret
+    attr_accessor :client_secret
+
+    # The access token
     attr_accessor :access_token
 
+    # The refresh token
+    attr_accessor :refresh_token
+
     # Tell if login was successuful
     # @return [Boolean]
     def logged?
       @logged ||= false
     end
 
-    # Exchange the developer api key for a user access token
-    def authenticate(username, password)
-      @logged = false
-      url = BASE_URL + '/auth/'
-
-      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
+    def refresh_access_token
+      url = 'https://api.metwit.com/token/'
+      response = HTTParty.post(url, :body => {:grant_type => 'refresh_token',
+                               :refresh_token => refresh_token},
+                               :headers => {'Authorization' => "Basic #{Base64.strict_encode64(client_id+":"+client_secret)}"})
+      # TODO: check if correctly logged
+      @logged = true
+      @refresh_token = response['refresh_token'] if response['refresh_token']
+      @access_token = response['access_token']
     end
 
-    def bearer_token
-      self.logged? ? @access_token : @api_key
+    def get_access_token
+      url = 'https://api.metwit.com/token/'
+      response = HTTParty.post(url, :body => {:grant_type => 'client_credentials'},
+                               :headers => {'Authorization' => "Basic #{Base64.strict_encode64(client_id+":"+client_secret)}"})
+      # TODO: check if correctly logged
+      @logged = true
+      @refresh_token = response['refresh_token']
+      @access_token = response['access_token']
     end
-        
   end
+
+  class AccessTokenExpiredError < StandardError ;  end
 end

data/lib/metwit/constants.rb

@@ -1,3 +1,3 @@
 module Metwit
-  BASE_URL = "https://api.metwit.me/v2"
+  BASE_URL = "https://api.metwit.com/v2"
 end

data/lib/metwit/metag.rb

@@ -10,9 +10,9 @@ module Metwit
     include HTTParty
     base_uri(BASE_URL+'/metags')
 
-    # Mandatory and guaranteed.  
-    # Weather is an Hash with two keys: :status and :details  
-    # Valid :status values are:  
+    # Mandatory and guaranteed.
+    # Weather is an Hash with two keys: :status and :details
+    # Valid :status values are:
     # :clear, :rainy, :stormy, :snowy, :partly\_cloudy, :cloudy, :hailing, :heavy\_seas, :calm\_seas, :foggy, :snow\_flurries, :windy, :partly\_cloudy, :uknown
     # @return [{Symbol => String, Hash}] weather data
     attr_accessor :weather
@@ -46,8 +46,8 @@ module Metwit
     # The number of thanks
     # @return [Fixnum] the number of thanks
     attr_accessor :thanks_count
-    
-      
+
+
     def initialize(args={})
       @id = args[:id]
       @weather = args[:weather]
@@ -83,8 +83,8 @@ module Metwit
       return false unless RGeo::Feature::Point.check_type(@position)
       true
     end
-    
-    
+
+
     # This method return all the reognized weather statuses
     # @return [Array<Symbol>]
     def weather_statuses
@@ -95,7 +95,7 @@ module Metwit
     # @return [String]
     def to_json
       raise "metag in invalid" unless valid?
-      
+
       {
         weather: {
           status: self.weather[:status].to_s.gsub(/_/,' '),
@@ -111,7 +111,7 @@ module Metwit
       raise "post failed" unless response.code == 201
       response
     end
-        
+
     class << self
       # Return the metag associated with the id
       # @return [Metag]
@@ -144,7 +144,7 @@ module Metwit
         end
         metags
       end
-            
+
       # Return a metag form a JSON response
       # @return [User]
       def from_json(response)
@@ -163,9 +163,9 @@ module Metwit
       # Default HTTParty options
       # @return [Hash]
       def authenticated(opts)
-        opts.deep_merge(:headers => {'Authorization' => "Bearer #{Metwit.bearer_token}"})
+#        opts.deep_merge(:headers => {'Authorization' => "Bearer #{Metwit.bearer_token}"})
       end
-    
+
     end
 
     # HTTParty options for authenticaded calls
@@ -173,6 +173,6 @@ module Metwit
     def authenticated(opts)
       self.class.authenticated(opts)
     end
-    
+
   end
 end

data/lib/metwit/user.rb

@@ -6,8 +6,8 @@ module Metwit
   class User
     include HTTParty
     base_uri(BASE_URL+'/users')
-    headers 'Authorization' => "Bearer #{Metwit.bearer_token}"
-    
+#    headers 'Authorization' => "Bearer #{Metwit.bearer_token}"
+
     # Guaranteed.
     # The user id
     # @return [String] unique identifier of the user
@@ -88,7 +88,7 @@ module Metwit
       @has_facebook = args[:has_facebook]
       @has_twitter = args[:has_twitter]
     end
-    
+
     class << self
       # Return the user associated with the id
       # @return [User]
@@ -119,7 +119,7 @@ module Metwit
       # Default HTTParty options
       # @return [Hash]
       def authenticated(opts)
-        opts.deep_merge(:headers => {'Authorization' => "Bearer #{Metwit.bearer_token}"})
+        #        opts.deep_merge(:headers => {'Authorization' => "Bearer #{Metwit.bearer_token}"})
       end
     end
 

data/lib/metwit/version.rb

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

data/lib/metwit/weather.rb

@@ -0,0 +1,73 @@
+require 'rgeo'
+require 'rgeo-geojson'
+require 'httparty'
+require 'json'
+
+module Metwit
+  class Weather
+    include HTTParty
+    base_uri(BASE_URL+'/weather')
+
+    # Guaranteed.
+    # Weather is an Hash with two keys: :status and :details
+    # Valid :status values are:
+    # :clear, :rainy, :stormy, :snowy, :partly\_cloudy, :cloudy, :hailing, :heavy\_seas, :calm\_seas, :foggy, :snow\_flurries, :windy, :partly\_cloudy, :uknown
+    # @return [{Symbol => String, Hash}] weather data
+    attr_reader :weather
+
+    # Guaranteed.
+    # The metag timestamp.
+    # @return [Time] when the metag was created
+    attr_reader :timestamp
+
+    # Guaranteed.
+    # The geo location of the metag with GeoJSON format
+    # @return [RGeo::Feature::Point] geo location of the metag
+    attr_reader :geo
+
+    # The locality and country name for this geographical location
+    attr_reader :location
+
+    # The icon URL
+    attr_reader :icon
+
+    # The altitude of the sun
+    attr_reader :sun_altitude
+
+    # The sources for the weather status
+    attr_reader :sources
+
+    def initialize(args={})
+      args.each do |key, value|
+        instance_variable_set("@#{key}", value)
+      end
+    end
+
+    class << self
+
+      # An array with current weather and weather forecast
+      def in_location(lat, lng)
+        response = get("/?location_lat=#{lat}&location_lng=#{lng}", authenticated({}))
+        raise AccessTokenExpiredError if response.code == 401
+        raise "api error" unless response.code == 200
+        response['objects'].map {|weather_json| self.from_json(weather_json)}
+      rescue AccessTokenExpiredError => e
+        Metwit.refresh_access_token
+        in_location(lat, lng)
+      end
+
+      def from_json(response)
+        self.new(timestamp: Time.parse(response['timestamp']),
+                 weather: response['weather'],
+                 geo: RGeo::GeoJSON.decode(response['geo']),
+                 sun_altitude: response['sun_altitude'],
+                 sources: response['sources'],
+                 location: response['location'])
+      end
+
+      def authenticated(opts)
+        opts.deep_merge(:headers => {'Authorization' => "Basic #{Metwit.access_token}"}) if Metwit.logged?
+      end
+    end
+  end
+end

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: metwit
 version: !ruby/object:Gem::Version
-  version: 0.0.4
-  prerelease: 
+  version: 0.0.5
 platform: ruby
 authors:
 - Simone D'Amico
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-21 00:00:00.000000000 Z
+date: 2013-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   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'
 - !ruby/object:Gem::Dependency
   name: rgeo-geojson
   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'
 - !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
@@ -78,6 +71,7 @@ files:
 - lib/metwit/metag.rb
 - lib/metwit/user.rb
 - lib/metwit/version.rb
+- lib/metwit/weather.rb
 - metwit.gemspec
 - spec/fixtures/metag1234
 - spec/fixtures/user6576
@@ -86,27 +80,26 @@ files:
 - spec/spec_helper.rb
 homepage: http://metwit.com
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby SDK for Metwit public APIs
 test_files:
 - spec/fixtures/metag1234