ully 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 814210f81a154678ba28247936979ad8ba7fc567
-  data.tar.gz: 00780b266bf4a4af59dd853f5e3713c128c7d830
+  metadata.gz: 4a97f89996532048cfd94def85912a5e2878a9b6
+  data.tar.gz: ae90535729cb2e4b8a24cc60e78aae9ccdf5d9a7
 SHA512:
-  metadata.gz: ff5809d5cb24cbeaf531dba9a65c73f7999201adc163daa047687ac980e503bdc5249e662cda7f5de3cc034c832cab4c044895d79c9470f6e598191d79758516
-  data.tar.gz: 2ea02eebca63348e9fa7a8dbfa55f7f35879cd73e9995e276af6ce26c8dd7f86e9fe43a75383a15a24247c6fd761a27695d9012f4bfc1d6f6d483d033284db64
+  metadata.gz: c54759bf64ca0756b4a705117ff94d48d82df0e82fb26e68a9e4aace10780814f62de0275492c1a9ae95a98c906703824309ea2498a168569cfde2c2ed0d8a65
+  data.tar.gz: b352ef1956b07dd81b1d81a3f3a7819711d4fb79a94ee290b2354452a9896c55db00ec9c4d437cb6337d576f983c4c16f1b5b4496d626dd3d4ec77a5e25ee941

data/lib/ully.rb

@@ -13,7 +13,7 @@ require "yaml"
 module Ully
   class Client
     include HTTParty
-    base_uri "https://ully.herokuapp.com"
+    base_uri ENV["ULLY_URI"] || "https://ully.in/api"
 
     def initialize(access_token)
         self.class.default_params :access_token => access_token
@@ -22,20 +22,22 @@ module Ully
     # Pretty responses in terminal
     def self.pretty_response(response, format)
         json = JSON.parse(response.body)
+        json_response = json["response"]
         if format == "json"
-            JSON.pretty_generate(json)
+            JSON.pretty_generate(json_response)
         elsif format == "yaml"
-            json.to_yaml
+            json_response.to_yaml
         else
-            json
+            json_response
         end
     end
 
     # Login in user account
     def login(email, password)
-        response = self.class.post('/forgot/token', :body => {:email => email, :password => password})
-        config = JSON.parse(response.body)
-        if config.has_key?("token") && config.has_key?("role")
+        response = self.class.post("/forgot/access_token", :body => {:email => email, :password => password})
+        json_response = JSON.parse(response.body)
+        config = json_response["response"]
+        if config.has_key?("access_token") && config.has_key?("permissions")
             File.open("ullyConfig.yml", "w"){ |f| f << config.to_yaml }
             puts "Logged successfully!"
         else
@@ -46,8 +48,8 @@ module Ully
     # Check if user is logged
     def logged_in?
         if File.exist?("ullyConfig.yml")
-            config = YAML.load_file('ullyConfig.yml')
-            if config.has_key?("token") && config.has_key?("role")
+            config = YAML.load_file("ullyConfig.yml")
+            if config.has_key?("access_token") && config.has_key?("permissions")
                 true
             else
                 false
@@ -59,97 +61,97 @@ module Ully
 
     # Create accounts
     def signup(name, email, username, password, format=false)
-        response = self.class.post('/signup', :body => {:name => name, :email => email, :username => username, :password => password})
+        response = self.class.post("/signup", :body => {:name => name, :email => email, :username => username, :password => password})
         self.class.pretty_response(response, format)
     end
 
     # Forgot password
     def forgot(email, username, format=false)
-        response = self.class.post('/forgot', :body => {:email => email, :username => username})
+        response = self.class.post("/forgot", :body => {:email => email, :username => username})
         self.class.pretty_response(response, format)
     end
 
     # Stats of Ully
     def stats(format=false)
-        response = self.class.get('/stats')
+        response = self.class.get("/stats")
         self.class.pretty_response(response, format)
     end
 
     # Stats of Ully
     def stats_by_username(username, format=false)
-        response = self.class.get('/stats/'+username)
+        response = self.class.get("/stats/"+username)
         self.class.pretty_response(response, format)
     end
 
     # Status of Ully API
     def status(format=false)
-        response = self.class.get('/status')
+        response = self.class.get("/status")
         self.class.pretty_response(response, format)
     end
 
     # Show profile info
     def me(format=false)
-        response = self.class.get('/me')
+        response = self.class.get("/me")
         self.class.pretty_response(response, format)
     end
 
     # Update profile info
     def update_me(current_password, name="", email="", username="", password="", format=false)
-        response = self.class.put('/me', :body => {:name => name, :email => email, :username => username, :currentpassword => current_password, :password => password})
+        response = self.class.put("/me", :body => {:name => name, :email => email, :username => username, :currentpassword => current_password, :password => password})
         self.class.pretty_response(response, format)
     end
 
     # Delete profile info
     def delete_me(format=false)
-        response = self.class.delete('/me')
+        response = self.class.delete("/me")
         self.class.pretty_response(response, format)
     end
 
     # Show collections
     def collections(format=false)
-        response = self.class.get('/collections', :query => {:fields => "name,slug,urls,public"})
+        response = self.class.get("/collections", :query => {:fields => "name,slug,urls,public"})
         self.class.pretty_response(response, format)
     end
 
     # Show collections by username
     def collections_by_username(username, format=false)
-        response = self.class.get('/collections/of/'+username, :query => {:fields => "name,slug,urls,public"})
+        response = self.class.get("/collections/of/"+username, :query => {:fields => "name,slug,urls,public"})
         self.class.pretty_response(response, format)
     end
 
     # Create collections
     def create_collections(name, slug, public_collection=true, format=false)
-        response = self.class.post('/collections', :body => {:name => name, :slug => slug, :public => public_collection})
+        response = self.class.post("/collections", :body => {:name => name, :slug => slug, :public => public_collection})
         self.class.pretty_response(response, format)
     end
 
     # Update collections
     def update_collections(collection_slug, name="", slug="", public_collection=true, format=false)
-        response = self.class.put('/collections/'+collection_slug, :body => {:name => name, :slug => slug, :public => public_collection})
+        response = self.class.put("/collections/"+collection_slug, :body => {:name => name, :slug => slug, :public => public_collection})
         self.class.pretty_response(response, format)
     end
 
     # Delete collections
     def delete_collections(collection_slug, format=false)
-        response = self.class.delete('/collections/'+collection_slug)
+        response = self.class.delete("/collections/"+collection_slug)
         self.class.pretty_response(response, format)
     end
 
     # Create urls
     def create_urls(collection_slug, url, title="", description="", format=false)
-        response = self.class.post('/collections/'+collection_slug+'/urls', :body => {:title => title, :url => url, :description => description})
+        response = self.class.post("/collections/"+collection_slug+"/urls", :body => {:title => title, :url => url, :description => description})
         self.class.pretty_response(response, format)
     end
 
     # Update urls
     def update_urls(collection_slug, url_id, url, title="", description="", format=false)
-        response = self.class.put('/collections/'+collection_slug+'/urls/'+url_id, :body => {:title => title, :url => url, :description => description})
+        response = self.class.put("/collections/"+collection_slug+"/urls/"+url_id, :body => {:title => title, :url => url, :description => description})
         self.class.pretty_response(response, format)
     end
 
     # Delete urls
     def delete_urls(collection_slug, url_id, format=false)
-        response = self.class.delete('/collections/'+collection_slug+'/urls/'+url_id)
+        response = self.class.delete("/collections/"+collection_slug+"/urls/"+url_id)
         self.class.pretty_response(response, format)
     end
   end

data/lib/ully/version.rb

@@ -5,5 +5,5 @@
 # Licensed under the BSD license.
 
 module Ully
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ully
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Christopher EnyTC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty