kebab_remote_api 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27202b7d0dc73cacd11aa45a00bddb5a6ea05d28
-  data.tar.gz: 51a7d3515409dc30f5c14af4e2d16f088db6834b
+  metadata.gz: 1ec600e6c5d221f52cfb5af4504baf7fd7945bfc
+  data.tar.gz: ed7ed9773b78c7a1e5e5441dca3afbac85ea1a44
 SHA512:
-  metadata.gz: f5f52e722492fda58e2a1482113c4ed84006426b74513a4ddc9e50b84c05e4de30503ddf60f1f23f70be7b556397d73296ebeb9417397310a4dd416bed7a1ef6
-  data.tar.gz: d5b782cb5c2c32ecadcf961e90bf94c89af9915b7e04e815426f03ce781d5ed16523aac7d790cf776db2050690bf5c458b4d0073d7f250f63734a9eb4422b6a7
+  metadata.gz: e9f9838ae9c1de6350ae9d68f8d3b172d9f183ca73223777b1a1ba0a26b2614bacc85d919b0d24cc2b40e6dbd04ccde71aadc5956c3fd3162b4b58ab2e22cfbc
+  data.tar.gz: fac299c37753cba07c808cb64aca4f7b7499392f25071bb05479630c8d46443294ed52bbef9904b5666bd8440f74ff6f3cb1134dec92c597cf53fb0790f49b1e

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 
 #### [Current]
+ * [deaa841](../../commit/deaa841) - __(Ahmet Sezgin Duran)__ Reduce complexity of server info init method
+ * [569cccd](../../commit/569cccd) - __(Ahmet Sezgin Duran)__ Fix tab-spaces
+
+#### 1.0.0
+ * [b7935db](../../commit/b7935db) - __(Ahmet Sezgin Duran)__ [#8](../../issues/8) Get ready for gem publish
  * [18facb0](../../commit/18facb0) - __(Ahmet Sezgin Duran)__ Clean up application controller
  * [8316731](../../commit/8316731) - __(Ahmet Sezgin Duran)__ Remove unnecessary gems
  * [4d7db82](../../commit/4d7db82) - __(Ahmet Sezgin Duran)__ Fix CybeleInstallation tutorial

data/Gemfile.lock

@@ -1,11 +1,10 @@
 PATH
   remote: .
   specs:
-    kebab_remote_api (0.2.1)
+    kebab_remote_api (1.0.0)
       enumerize (~> 0.7.0)
-      pg (~> 0.16.0)
       rails (~> 4.0.0)
-      vmstat (~> 2.0.0)
+      vmstat (~> 2.1.0)
 
 GEM
   remote: https://rubygems.org/
@@ -45,10 +44,9 @@ GEM
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.25)
+    mime-types (1.25.1)
     minitest (4.7.5)
     multi_json (1.8.2)
-    pg (0.16.0)
     polyglot (0.3.3)
     rack (1.5.2)
     rack-test (0.6.2)
@@ -67,7 +65,7 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.1.0)
-    sprockets (2.10.0)
+    sprockets (2.10.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -85,7 +83,7 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.38)
-    vmstat (2.0.0)
+    vmstat (2.1.0)
 
 PLATFORMS
   ruby

data/app/controllers/kebab_remote_api/api/v1/server_info_controller.rb

@@ -1,8 +1,8 @@
 module KebabRemoteApi
-	class Api::V1::ServerInfoController < KebabRemoteApi::ApplicationController
-   	def get_server_info
-    	@info = ServerInfo.new
-    	render status: 200, json: @info.as_json
-  	end
-	end
+  class Api::V1::ServerInfoController < KebabRemoteApi::ApplicationController
+    def get_server_info
+      @info = ServerInfo.new
+      render status: 200, json: @info.as_json
+    end
+  end
 end

data/app/controllers/kebab_remote_api/api/v1/sessions_controller.rb

@@ -1,52 +1,52 @@
 module KebabRemoteApi
 
-	class Api::V1::SessionsController < KebabRemoteApi::ApplicationController
-  	skip_before_filter :verify_authenticity_token, :authenticate_request, :restrict_access
-  	respond_to :json
-
-  	def create
-  	  email = params[:email]
-	    password = params[:password]
-
-  	  # Checking whether format is json or not
-	  	if request.format != :json
-      	render status: 406, json: { message: I18n.t('kebab_remote_api.not_json') }
-      	return
-    	end
-
-    	# Checking for empty email or password
-    	if email.nil? or password.nil?
-      	render status: 400, json: { message: I18n.t('kebab_remote_api.empty_input') }
-      	return
-    	end
-
-    	@admin = Admin.where(email: email.downcase).first
-
-	    # Checking whether user exists
-  	  if @admin.nil?
-    	  render status: 401, json: { message: I18n.t('kebab_remote_api.invalid_field') }
-      	return
-	    end
-
-  	  @admin.ensure_authentication_token!
-
-    	# Finally, checking for password
-    	unless @admin.valid_password?(password)
-     	 render status: 401, json: { message: I18n.t('kebab_remote_api.invalid_field') }
-    	else
-      	render status: 200, json: @admin.as_json.merge(success: true)
-    	end
-	  end
-
-  	def destroy
-    	@admin = Admin.find_by_authentication_token(params[:id])
-
-    	if @admin.nil?
-      	render status: 404, json: { message: I18n.t('kebab_remote_api.invalid_token') }
-    	else
-      	@admin.reset_authentication_token!
-      	render status: 200, json: { token: params[:id] }
-    	end
-  	end
-	end
+  class Api::V1::SessionsController < KebabRemoteApi::ApplicationController
+    skip_before_filter :verify_authenticity_token, :authenticate_request, :restrict_access
+    respond_to :json
+
+    def create
+      email = params[:email]
+      password = params[:password]
+
+      # Checking whether format is json or not
+     if request.format != :json
+      render status: 406, json: { message: I18n.t('kebab_remote_api.not_json') }
+        return
+      end
+
+      # Checking for empty email or password
+      if email.nil? or password.nil?
+        render status: 400, json: { message: I18n.t('kebab_remote_api.empty_input') }
+        return
+      end
+
+      @admin = Admin.where(email: email.downcase).first
+
+      # Checking whether user exists
+      if @admin.nil?
+        render status: 401, json: { message: I18n.t('kebab_remote_api.invalid_field') }
+        return
+      end
+
+      @admin.ensure_authentication_token!
+
+      # Finally, checking for password
+      unless @admin.valid_password?(password)
+        render status: 401, json: { message: I18n.t('kebab_remote_api.invalid_field') }
+      else
+        render status: 200, json: @admin.as_json.merge(success: true)
+      end
+    end
+
+    def destroy
+      @admin = Admin.find_by_authentication_token(params[:id])
+
+      if @admin.nil?
+        render status: 404, json: { message: I18n.t('kebab_remote_api.invalid_token') }
+      else
+        @admin.reset_authentication_token!
+        render status: 200, json: { token: params[:id] }
+      end
+    end
+  end
 end

data/app/controllers/kebab_remote_api/api/v1/users_controller.rb

@@ -1,14 +1,14 @@
 module KebabRemoteApi
-	class Api::V1::UsersController < KebabRemoteApi::ApplicationController
-  	respond_to :json
+  class Api::V1::UsersController < KebabRemoteApi::ApplicationController
+    respond_to :json
 
-	  def index
-  	  render status: 200, json: {
-    	  'active_user' => User.with_block_status(:active).count,
-      	'total_user'  => User.all.count,
-   	    'total_user_by_role' => User.role.values.map { |role| { "role_name" => role.to_s,
+    def index
+      render status: 200, json: {
+        'active_user' => User.with_block_status(:active).count,
+        'total_user'  => User.all.count,
+        'total_user_by_role' => User.role.values.map { |role| { "role_name" => role.to_s,
                                                   "count" => User.with_role(role).count } }
-    	}.to_json
-  	end
-	end
+      }.to_json
+    end
+  end
 end

data/app/controllers/kebab_remote_api/application_controller.rb

@@ -1,22 +1,22 @@
 module KebabRemoteApi
-	class ApplicationController < ActionController::Base
-		before_filter :authenticate_request, :restrict_access
+  class ApplicationController < ActionController::Base
+    before_filter :authenticate_request, :restrict_access
 
-		respond_to :json
+    respond_to :json
 
-  	# Prevent CSRF attacks by raising an exception.
-  	# For APIs, you may want to use :null_session instead.
-  	protect_from_forgery with: :exception
+    # Prevent CSRF attacks by raising an exception.
+    # For APIs, you may want to use :null_session instead.
+    protect_from_forgery with: :exception
 
-  	protected
-  		def authenticate_request
-  			admin = Admin.find_by_authentication_token(params[:secret_token])
-  			head :unauthorized unless admin
-  		end
+    protected
+      def authenticate_request
+        admin = Admin.find_by_authentication_token(params[:secret_token])
+        head :unauthorized unless admin
+      end
 
-  		def restrict_access
-    		api_key = ApiKey.first
-    		head :unauthorized unless api_key
-  		end
-	end
+      def restrict_access
+        api_key = ApiKey.first
+        head :unauthorized unless api_key
+      end
+  end
 end

data/kebab_remote_api.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "rails", "~> 4.0.0"
   s.add_dependency 'enumerize', '~> 0.7.0'
-  s.add_dependency 'vmstat', '~> 2.0.0'
+  s.add_dependency 'vmstat', '~> 2.1.0'
 
   s.add_development_dependency "sqlite3"
 end

data/lib/generators/kebab_remote_api/install/templates/models/admin.rb

@@ -2,10 +2,10 @@ class Admin < ActiveRecord::Base
   # Include default devise modules. Others available are:
   # :token_authenticatable, :confirmable,
   # :lockable, :timeoutable and :omniauthable
-  devise :database_authenticatable, 
+  devise :database_authenticatable,
          :recoverable, :rememberable, :trackable, :validatable,
          :token_authenticatable
-  
+
   def as_json
     { id: id,
       auth_token: authentication_token,

data/lib/generators/kebab_remote_api/install/templates/models/server_info.rb

@@ -6,7 +6,6 @@ class ServerInfo < ActiveRecord::Base
 
   def init
     mem = Vmstat.memory
-    total_mem = mem.active_bytes + mem.inactive_bytes + mem.free_bytes + mem.wired_bytes
     # Getting disk info for main partition is, temprorarily, for only
     # UN*X-like systems, such as GNU/Linux, BSD, Mac OS X etc.
     # Windows implementation will be added in future
@@ -14,8 +13,8 @@ class ServerInfo < ActiveRecord::Base
     # CPU load data => Float typed
     self.cpu_load = Vmstat.load_average.five_minutes
     # All size data => Megabytes (MB)
-    self.mem_total = (mem.active_bytes + mem.inactive_bytes + mem.free_bytes + mem.wired_bytes) / 1024**2
-    self.mem_used = self.mem_total - (mem.free_bytes / 1024**2)
+    self.mem_total = mem.total_bytes / 1024**2
+    self.mem_used = (mem.total_bytes - mem.free_bytes) / 1024**2
     self.disk_total = disk.total_bytes / 1024**2
     self.disk_used = (disk.total_bytes - disk.free_bytes) / 1024**2
     # Uptime data => Minutes

data/lib/kebab_remote_api/version.rb

@@ -1,3 +1,3 @@
 module KebabRemoteApi
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kebab_remote_api
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - lab2023
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-15 00:00:00.000000000 Z
+date: 2013-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement